Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[silverblade] 34459: Started implementing wave stream state checking/controlling (eg play/stop).

by silverblade＠svn.reactos.org

Author: silverblade Date: Sun Jul 13 08:22:54 2008 New Revision: 34459 URL: http://svn.reactos.org/svn/reactos?rev=34459&view=rev Log: Started implementing wave stream state checking/controlling (eg play/stop). Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sun Jul 13 08:22:54 2008 @@ -214,6 +214,8 @@ typedef struct _WAVE_STREAM_INFO { + /* Current wave stream state */ + WORD State; /* Buffer queue head and tail */ PWAVEHDR BufferQueueHead; PWAVEHDR BufferQueueTail; @@ -307,6 +309,14 @@ IN PSOUND_DEVICE Device, OUT PUCHAR DeviceType); +MMRESULT +DefaultInstanceConstructor( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance); + +VOID +DefaultInstanceDestructor( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance); + /* nt4.c @@ -445,7 +455,7 @@ /* - ... + capabilities.c */ MMRESULT @@ -457,6 +467,11 @@ DefaultGetSoundDeviceCapabilities( IN PSOUND_DEVICE Device, OUT PUNIVERSAL_CAPS Capabilities); + + +/* + wave/format.c +*/ MMRESULT QueryWaveDeviceFormatSupport( @@ -481,14 +496,6 @@ IN PSOUND_DEVICE_INSTANCE Instance, IN PWAVEFORMATEX WaveFormat, IN DWORD WaveFormatSize); - -MMRESULT -DefaultInstanceConstructor( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance); - -VOID -DefaultInstanceDestructor( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance); /* @@ -516,6 +523,13 @@ IN PVOID Parameter); +/* + wave/streamcontrol.c +*/ + +MMRESULT +InitWaveStreamData( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); MMRESULT QueueWaveDeviceBuffer( @@ -523,9 +537,8 @@ IN PWAVEHDR BufferHeader); - -/* - mme/wodMessage.c +/* + wave/wodMessage.c */ APIENTRY DWORD Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c [iso-8859-1] Sun Jul 13 08:22:54 2008 @@ -59,6 +59,7 @@ IN PSOUND_DEVICE SoundDevice, IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { + MMRESULT Result; PSOUND_DEVICE_INSTANCE CurrentInstance = NULL; ASSERT(SoundDevice != NULL); @@ -66,6 +67,26 @@ ASSERT(SoundDeviceInstance->Device == NULL); SoundDeviceInstance->Device = SoundDevice; + + if ( IS_WAVE_DEVICE_TYPE(SoundDevice->DeviceType) ) + { + Result = InitWaveStreamData(SoundDeviceInstance); + ASSERT(Result == MMSYSERR_NOERROR); + } + else if ( IS_MIDI_DEVICE_TYPE(SoundDevice->DeviceType) ) + { + } + else if ( IS_MIXER_DEVICE_TYPE(SoundDevice->DeviceType) ) + { + } + else if ( IS_AUX_DEVICE_TYPE(SoundDevice->DeviceType) ) + { + } + else + { + /* What kind of device do we have, then?!?! */ + ASSERT(FALSE); + } /* Search for an appropriate place in the list to put this instance */ if ( ! SoundDevice->FirstInstance ) @@ -171,6 +192,25 @@ } MMRESULT +GetSoundDeviceFromInstance( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + OUT PSOUND_DEVICE* SoundDevice) +{ + ASSERT(SoundDeviceInstance); + ASSERT(SoundDevice); + + if ( ! SoundDeviceInstance ) + return MMSYSERR_INVALPARAM; + + if ( ! SoundDevice ) + return MMSYSERR_INVALPARAM; + + *SoundDevice = SoundDeviceInstance->Device; + + return MMSYSERR_NOERROR; +} + +MMRESULT DestroySoundDeviceInstance( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { @@ -214,19 +254,3 @@ return MMSYSERR_NOERROR; } - -MMRESULT -GetSoundDeviceFromInstance( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PSOUND_DEVICE* SoundDevice) -{ - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; - - *SoundDevice = SoundDeviceInstance->Device; - - return MMSYSERR_NOERROR; -} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] Sun Jul 13 08:22:54 2008 @@ -11,8 +11,33 @@ #include <windows.h> #include <mmsystem.h> +#include <ntddk.h> +#include <ntddsnd.h> + #include <mmebuddy.h> #include "wave.h" + +MMRESULT +InitWaveStreamData( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + PWAVE_STREAM_INFO StreamInfo; + + if ( ! SoundDeviceInstance ) + return MMSYSERR_INVALPARAM; + + StreamInfo = &SoundDeviceInstance->Streaming.Wave; + + StreamInfo->State = WAVE_DD_IDLE; + + StreamInfo->BufferQueueHead = NULL; + StreamInfo->BufferQueueTail = NULL; + StreamInfo->CurrentBuffer = NULL; + + StreamInfo->BuffersOutstanding = 0; + + return MMSYSERR_NOERROR; +} MMRESULT QueueWaveDeviceBuffer( @@ -40,6 +65,34 @@ BufferHeader->lpNext = NULL; return CallUsingSoundThread(SoundDeviceInstance, - QueueBuffer_Request, + QueueWaveBuffer_Request, BufferHeader); } + +MMRESULT +GetWaveDeviceState( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + OUT PUCHAR State) +{ + if ( ! SoundDeviceInstance ) + return MMSYSERR_INVALPARAM; + + if ( ! State ) + return MMSYSERR_INVALPARAM; + + return CallUsingSoundThread(SoundDeviceInstance, + GetWaveDeviceState_Request, + State); +} + +MMRESULT +PauseWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + if ( ! SoundDeviceInstance ) + return MMSYSERR_INVALPARAM; + + /* TODO */ + + return MMSYSERR_NOERROR; +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Sun Jul 13 08:22:54 2008 @@ -12,6 +12,9 @@ #include <windows.h> #include <mmsystem.h> +#include <ntddk.h> +#include <ntddsnd.h> + #include <mmebuddy.h> @@ -50,23 +53,40 @@ return (StreamInfo->CurrentBuffer != NULL); } -DWORD +MMRESULT PerformWaveIo( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { + PSOUND_DEVICE SoundDevice; + MMRESULT Result; PWAVE_STREAM_INFO StreamInfo; DWORD BytesToStream, BytesStreamed = 0; + UCHAR DeviceType; TRACE_("PerformWaveIo\n"); ASSERT(SoundDeviceInstance); + + /* These shouldn't fail unless we pass them garbage */ + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, + &SoundDevice); + + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + ASSERT(Result == MMSYSERR_NOERROR); + ASSERT(IS_WAVE_DEVICE_TYPE(DeviceType)); StreamInfo = &SoundDeviceInstance->Streaming.Wave; /* If we're out of buffers, mark stream as stopped and do nothing */ if ( ! StreamInfo->CurrentBuffer ) { - TRACE_("*** NOTHING TO DO ***\n"); + TRACE_("*** NOTHING TO DO - state is now WAVE_DD_IDLE ***\n"); + + /* The stream is idle */ + StreamInfo->State = WAVE_DD_IDLE; + return 0; } @@ -74,8 +94,6 @@ BytesToStream = MinimumOf(StreamInfo->CurrentBuffer->dwBufferLength - StreamInfo->CurrentBuffer->reserved, MAX_SOUND_BUFFER_SIZE); - - TRACE_("About to report what I'm about to write...\n"); TRACE_("Writing %p + %d (%d bytes) - buffer length is %d bytes\n", StreamInfo->CurrentBuffer->lpData, @@ -83,15 +101,37 @@ (int) BytesToStream, (int) StreamInfo->CurrentBuffer->dwBufferLength); - /* TODO: Error checking */ - OverlappedSoundDeviceIo(SoundDeviceInstance, - (PCHAR) StreamInfo->CurrentBuffer->lpData + + /* Perform I/O */ + Result = OverlappedSoundDeviceIo( + SoundDeviceInstance, + (PCHAR) StreamInfo->CurrentBuffer->lpData + StreamInfo->CurrentBuffer->reserved, - BytesToStream, - CompleteWaveBuffer, - (PVOID) StreamInfo->CurrentBuffer); - - /* FIXME? - find out how much was actually sent? */ + BytesToStream, + CompleteWaveBuffer, + (PVOID) StreamInfo->CurrentBuffer); + + if ( Result != MMSYSERR_NOERROR ) + { + ERR_("Failed to perform wave device I/O! MMSYS Error %d\n", + (int) Result); + return Result; + } + + /* TODO: Deal with INPUT as well */ + if ( DeviceType == WAVE_OUT_DEVICE_TYPE ) + { + TRACE_("Streamed data - state is now WAVE_DD_PLAYING\n"); + StreamInfo->State = WAVE_DD_PLAYING; + } + else + { + /* NOTE - MME wavein recording does not begin immediately!! */ + /* + TRACE_("Streamed data - state is now WAVE_DD_RECORDING\n"); + StreamInfo->State = WAVE_DD_RECORDING; + */ + } + BytesStreamed = BytesToStream; /* Advance the offset */ @@ -108,13 +148,14 @@ /* Increase the number of outstanding buffers */ ++ StreamInfo->BuffersOutstanding; - return BytesStreamed; + return MMSYSERR_NOERROR; } MMRESULT StreamWaveBuffers( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { + MMRESULT Result; PWAVE_STREAM_INFO StreamInfo; ASSERT(SoundDeviceInstance); @@ -125,7 +166,10 @@ StreamHasBuffersQueued(StreamInfo) ) { TRACE_("Performing wave I/O ...\n"); - PerformWaveIo(SoundDeviceInstance); + Result = PerformWaveIo(SoundDeviceInstance); + + if ( Result != MMSYSERR_NOERROR ) + return Result; } TRACE_("<== Done streaming ==>\n"); @@ -159,7 +203,7 @@ } MMRESULT -QueueBuffer_Request( +QueueWaveBuffer_Request( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter) { @@ -220,3 +264,47 @@ return MMSYSERR_NOERROR; } + +MMRESULT +GetWaveDeviceState_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + OUT PVOID Parameter) +{ + PUCHAR State = (PUCHAR) Parameter; + + if ( ! SoundDeviceInstance ) + return MMSYSERR_INVALPARAM; + + if ( ! State ) + return MMSYSERR_INVALPARAM; + + *State = SoundDeviceInstance->Streaming.Wave.State; + + return MMSYSERR_NOERROR; +} + +MMRESULT +PauseWaveDevice_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter) +{ + if ( ! SoundDeviceInstance ) + return MMSYSERR_INVALPARAM; + + /* TODO */ + + return MMSYSERR_NOERROR; +} + +MMRESULT +ContinueWaveDevice_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter) +{ + if ( ! SoundDeviceInstance ) + return MMSYSERR_INVALPARAM; + + /* TODO */ + + return MMSYSERR_NOERROR; +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h [iso-8859-1] Sun Jul 13 08:22:54 2008 @@ -13,7 +13,22 @@ #define ROS_MMEBUDDY_WAVE_H MMRESULT -QueueBuffer_Request( +QueueWaveBuffer_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter); + +MMRESULT +GetWaveDeviceState_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + OUT PVOID Parameter); + +MMRESULT +PauseWaveDevice_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter); + +MMRESULT +ContinueWaveDevice_Request( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter);

16 years, 2 months

[mkupfer] 34458: - minor changes to prepare inf-files for trunk - minor fix in README

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sun Jul 13 07:22:13 2008 New Revision: 34458 URL: http://svn.reactos.org/svn/reactos?rev=34458&view=rev Log: - minor changes to prepare inf-files for trunk - minor fix in README Modified: branches/matthias-i18n/media/inf/README branches/matthias-i18n/media/inf/hdc.inf branches/matthias-i18n/media/inf/machine.inf Modified: branches/matthias-i18n/media/inf/README URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/README?… ============================================================================== --- branches/matthias-i18n/media/inf/README [iso-8859-1] (original) +++ branches/matthias-i18n/media/inf/README [iso-8859-1] Sun Jul 13 07:22:13 2008 @@ -50,4 +50,4 @@ We can translate the programm files and perhaps the registry entries in the described above. But how to handle files/directories with translatabel names? If we intend to have a (native) language for each user, so the directory -structure may become confusing and hard to handle correctly. +structure may become confusing and may be hard to handle correctly. Modified: branches/matthias-i18n/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/hdc.inf… ============================================================================== --- branches/matthias-i18n/media/inf/hdc.inf [iso-8859-1] (original) +++ branches/matthias-i18n/media/inf/hdc.inf [iso-8859-1] Sun Jul 13 07:22:13 2008 @@ -81,7 +81,7 @@ - + Modified: branches/matthias-i18n/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/branches/matthias-i18n/media/inf/machine… ============================================================================== --- branches/matthias-i18n/media/inf/machine.inf [iso-8859-1] (original) +++ branches/matthias-i18n/media/inf/machine.inf [iso-8859-1] Sun Jul 13 07:22:13 2008 @@ -153,8 +153,6 @@ - - @@ -163,23 +161,12 @@ - - - - - - - - - - -

16 years, 2 months

[jimtabor] 34457: Add part of a patch by Daniel Verkamp, see bug 3441.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jul 13 07:08:54 2008 New Revision: 34457 URL: http://svn.reactos.org/svn/reactos?rev=34457&view=rev Log: Add part of a patch by Daniel Verkamp, see bug 3441. Modified: trunk/reactos/tools/mkhive/reginf.c Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] Sun Jul 13 07:08:54 2008 @@ -471,7 +471,7 @@ /* Load inf file from install media. */ if (InfHostOpenFile(&hInf, FileName, &ErrorLine) != 0) { - DPRINT1 ("InfHostOpenFile() failed\n"); + DPRINT1 ("InfHostOpenFile(%s) failed\n", FileName); return FALSE; }

16 years, 2 months

[ros-arm-bringup] 34456: - Separate KDCOM into i386 and ARM versions. - Stub out ARM version. - Eventually the arm_kprintf hack will go away and true serial debugging output will be done through kdcom just like on x86. - Fix formatting of bootvid.rbuild.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jul 13 03:47:07 2008 New Revision: 34456 URL: http://svn.reactos.org/svn/reactos?rev=34456&view=rev Log: - Separate KDCOM into i386 and ARM versions. - Stub out ARM version. - Eventually the arm_kprintf hack will go away and true serial debugging output will be done through kdcom just like on x86. - Fix formatting of bootvid.rbuild. Added: trunk/reactos/drivers/base/kdcom/arm/ trunk/reactos/drivers/base/kdcom/arm/kdbg.c (with props) trunk/reactos/drivers/base/kdcom/i386/ trunk/reactos/drivers/base/kdcom/i386/kdbg.c - copied unchanged from r34444, trunk/reactos/drivers/base/kdcom/kdbg.c Removed: trunk/reactos/drivers/base/kdcom/kdbg.c Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild trunk/reactos/drivers/base/kdcom/kdcom.rbuild Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] Sun Jul 13 03:47:07 2008 @@ -6,19 +6,19 @@ <include base="bootvid">.</include> <library>ntoskrnl</library> <library>hal</library> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>bootvid.c</file> - <file>bootdata.c</file> - <file>vga.c</file> - </directory> - </if> - <if property="ARCH" value="arm"> - <directory name="arm"> - <file>bootvid.c</file> - <file>bootdata.c</file> - </directory> - </if> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>bootvid.c</file> + <file>bootdata.c</file> + <file>vga.c</file> + </directory> + </if> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>bootvid.c</file> + <file>bootdata.c</file> + </directory> + </if> <file>bootvid.rc</file> - <pch>precomp.h</pch> -</module> + <pch>precomp.h</pch> +</module> Added: trunk/reactos/drivers/base/kdcom/arm/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/arm/kdb… ============================================================================== --- trunk/reactos/drivers/base/kdcom/arm/kdbg.c (added) +++ trunk/reactos/drivers/base/kdcom/arm/kdbg.c [iso-8859-1] Sun Jul 13 03:47:07 2008 @@ -1,0 +1,201 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/base/kdcom/arm/kdbg.c + * PURPOSE: Serial Port Kernel Debugging Transport Library + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#define NOEXTAPI +#include <ntddk.h> +#define NDEBUG +#include <halfuncs.h> +#include <stdio.h> +#include <debug.h> +#include "arc/arc.h" +#include "windbgkd.h" +#include <kddll.h> +#include <ioaccess.h> + +/* GLOBALS ********************************************************************/ + +typedef struct _KD_PORT_INFORMATION +{ + ULONG ComPort; + ULONG BaudRate; + ULONG BaseAddress; +} KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; + +KD_PORT_INFORMATION DefaultPort = {0, 0, 0}; + +/* REACTOS FUNCTIONS **********************************************************/ + +BOOLEAN +NTAPI +KdPortInitialize(IN PKD_PORT_INFORMATION PortInformation, + IN ULONG Unknown1, + IN ULONG Unknown2) +{ + UNIMPLEMENTED; + while (TRUE); + return TRUE; +} + +BOOLEAN +NTAPI +KdPortInitializeEx(IN PKD_PORT_INFORMATION PortInformation, + IN ULONG Unknown1, + IN ULONG Unknown2) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOLEAN +NTAPI +KdPortGetByteEx(IN PKD_PORT_INFORMATION PortInformation, + OUT PUCHAR ByteReceived) +{ + UNIMPLEMENTED; + while (TRUE); + return FALSE; +} + +BOOLEAN +NTAPI +KdPortGetByte(OUT PUCHAR ByteReceived) +{ + return KdPortGetByteEx(&DefaultPort, ByteReceived); +} + +BOOLEAN +NTAPI +KdPortPollByteEx(IN PKD_PORT_INFORMATION PortInformation, + OUT PUCHAR ByteReceived) +{ + UNIMPLEMENTED; + while (TRUE); + return TRUE; +} + +BOOLEAN +NTAPI +KdPortPollByte(OUT PUCHAR ByteReceived) +{ + return KdPortPollByteEx(&DefaultPort, ByteReceived); +} + +VOID +NTAPI +KdPortPutByteEx(IN PKD_PORT_INFORMATION PortInformation, + IN UCHAR ByteToSend) +{ + UNIMPLEMENTED; + while (TRUE); +} + +VOID +NTAPI +KdPortPutByte(IN UCHAR ByteToSend) +{ + KdPortPutByteEx(&DefaultPort, ByteToSend); +} + +VOID +NTAPI +KdPortRestore(VOID) +{ + UNIMPLEMENTED; + while (TRUE); +} + +VOID +NTAPI +KdPortSave(VOID) +{ + UNIMPLEMENTED; + while (TRUE); +} + +BOOLEAN +NTAPI +KdPortDisableInterrupts(VOID) +{ + UNIMPLEMENTED; + while (TRUE); + return TRUE; +} + +BOOLEAN +NTAPI +KdPortEnableInterrupts(VOID) +{ + UNIMPLEMENTED; + while (TRUE); + return TRUE; +} + +/* WINDOWS FUNCTIONS **********************************************************/ + +NTSTATUS +NTAPI +KdDebuggerInitialize0(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +KdDebuggerInitialize1(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +KdSave(IN BOOLEAN SleepTransition) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdRestore(IN BOOLEAN SleepTransition) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +VOID +NTAPI +KdSendPacket(IN ULONG PacketType, + IN PSTRING MessageHeader, + IN PSTRING MessageData, + IN OUT PKD_CONTEXT Context) +{ + UNIMPLEMENTED; + while (TRUE); + return; +} + +KDSTATUS +NTAPI +KdReceivePacket(IN ULONG PacketType, + OUT PSTRING MessageHeader, + OUT PSTRING MessageData, + OUT PULONG DataLength, + IN OUT PKD_CONTEXT Context) +{ + UNIMPLEMENTED; + while (TRUE); + return 0; +} + +/* EOF */ Propchange: trunk/reactos/drivers/base/kdcom/arm/kdbg.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/base/kdcom/arm/kdbg.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Removed: trunk/reactos/drivers/base/kdcom/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdbg.c?… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdbg.c (removed) @@ -1,548 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/base/kdcom/kdbg.c - * PURPOSE: Serial i/o functions for the kernel debugger. - * PROGRAMMER: Alex Ionescu - * Hervé Poussineau - */ - -/* INCLUDES *****************************************************************/ - -#define NOEXTAPI -#include <ntddk.h> -#define NDEBUG -#include <halfuncs.h> -#include <stdio.h> -#include <debug.h> -#include "arc/arc.h" -#include "windbgkd.h" -#include <kddll.h> -#include <ioaccess.h> /* port intrinsics */ - -typedef struct _KD_PORT_INFORMATION -{ - ULONG ComPort; - ULONG BaudRate; - ULONG BaseAddress; -} KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; - -BOOLEAN -NTAPI -KdPortInitializeEx( - IN PKD_PORT_INFORMATION PortInformation, - IN ULONG Unknown1, - IN ULONG Unknown2); - -BOOLEAN -NTAPI -KdPortGetByteEx( - IN PKD_PORT_INFORMATION PortInformation, - OUT PUCHAR ByteReceived); - -BOOLEAN -NTAPI -KdPortPollByteEx( - IN PKD_PORT_INFORMATION PortInformation, - OUT PUCHAR ByteReceived); - -VOID -NTAPI -KdPortPutByteEx( - IN PKD_PORT_INFORMATION PortInformation, - IN UCHAR ByteToSend); - -#define DEFAULT_BAUD_RATE 19200 - -#ifdef _M_IX86 -const ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; -#elif defined(_M_PPC) -const ULONG BaseArray[2] = {0, 0x800003f8}; -#elif defined(_M_MIPS) -const ULONG BaseArray[3] = {0, 0x80006000, 0x80007000}; -#elif defined(_M_ARM) -const ULONG BaseArray[2] = {0, 0xF1012000}; -#else -#error Unknown architecture -#endif - -/* MACROS *******************************************************************/ - -#define SER_RBR(x) ((PUCHAR)(x)+0) -#define SER_THR(x) ((PUCHAR)(x)+0) -#define SER_DLL(x) ((PUCHAR)(x)+0) -#define SER_IER(x) ((PUCHAR)(x)+1) -#define SR_IER_ERDA 0x01 -#define SR_IER_ETHRE 0x02 -#define SR_IER_ERLSI 0x04 -#define SR_IER_EMS 0x08 -#define SR_IER_ALL 0x0F -#define SER_DLM(x) ((PUCHAR)(x)+1) -#define SER_IIR(x) ((PUCHAR)(x)+2) -#define SER_FCR(x) ((PUCHAR)(x)+2) -#define SR_FCR_ENABLE_FIFO 0x01 -#define SR_FCR_CLEAR_RCVR 0x02 -#define SR_FCR_CLEAR_XMIT 0x04 -#define SER_LCR(x) ((PUCHAR)(x)+3) -#define SR_LCR_CS5 0x00 -#define SR_LCR_CS6 0x01 -#define SR_LCR_CS7 0x02 -#define SR_LCR_CS8 0x03 -#define SR_LCR_ST1 0x00 -#define SR_LCR_ST2 0x04 -#define SR_LCR_PNO 0x00 -#define SR_LCR_POD 0x08 -#define SR_LCR_PEV 0x18 -#define SR_LCR_PMK 0x28 -#define SR_LCR_PSP 0x38 -#define SR_LCR_BRK 0x40 -#define SR_LCR_DLAB 0x80 -#define SER_MCR(x) ((PUCHAR)(x)+4) -#define SR_MCR_DTR 0x01 -#define SR_MCR_RTS 0x02 -#define SR_MCR_OUT1 0x04 -#define SR_MCR_OUT2 0x08 -#define SR_MCR_LOOP 0x10 -#define SER_LSR(x) ((PUCHAR)(x)+5) -#define SR_LSR_DR 0x01 -#define SR_LSR_TBE 0x20 -#define SER_MSR(x) ((PUCHAR)(x)+6) -#define SR_MSR_CTS 0x10 -#define SR_MSR_DSR 0x20 -#define SER_SCR(x) ((PUCHAR)(x)+7) - - -/* GLOBAL VARIABLES *********************************************************/ - -/* STATIC VARIABLES *********************************************************/ - -static KD_PORT_INFORMATION DefaultPort = { 0, 0, 0 }; - -/* The com port must only be initialized once! */ -static BOOLEAN PortInitialized = FALSE; - - -/* STATIC FUNCTIONS *********************************************************/ - -static BOOLEAN -KdpDoesComPortExist( - IN ULONG BaseAddress) -{ - BOOLEAN found; - UCHAR mcr; - UCHAR msr; - - found = FALSE; - - /* save Modem Control Register (MCR) */ - mcr = READ_PORT_UCHAR(SER_MCR(BaseAddress)); - - /* enable loop mode (set Bit 4 of the MCR) */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), SR_MCR_LOOP); - - /* clear all modem output bits */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), SR_MCR_LOOP); - - /* read the Modem Status Register */ - msr = READ_PORT_UCHAR(SER_MSR(BaseAddress)); - - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((msr & 0xF0) == 0x00) - { - /* set all modem output bits */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), SR_MCR_DTR | SR_MCR_RTS | SR_MCR_OUT1 | SR_MCR_OUT2 | SR_MCR_LOOP); - - /* read the Modem Status Register */ - msr = READ_PORT_UCHAR(SER_MSR(BaseAddress)); - - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((msr & 0xF0) == 0xF0) - { - /* - * setup a resonable state for the port: - * enable fifo and clear recieve/transmit buffers - */ - WRITE_PORT_UCHAR(SER_FCR(BaseAddress), - (SR_FCR_ENABLE_FIFO | SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT)); - WRITE_PORT_UCHAR(SER_FCR(BaseAddress), 0); - READ_PORT_UCHAR(SER_RBR(BaseAddress)); - WRITE_PORT_UCHAR(SER_IER(BaseAddress), 0); - found = TRUE; - } - } - - /* restore MCR */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), mcr); - - return found; -} - - -/* FUNCTIONS ****************************************************************/ - -/* HAL.KdPortInitialize */ -BOOLEAN -NTAPI -KdPortInitialize( - IN PKD_PORT_INFORMATION PortInformation, - IN ULONG Unknown1, - IN ULONG Unknown2) -{ - SIZE_T i; - CHAR buffer[80]; - - if (!PortInitialized) - { - DefaultPort.BaudRate = PortInformation->BaudRate; - - if (PortInformation->ComPort == 0) - { - for (i = sizeof(BaseArray) / sizeof(BaseArray[0]) - 1; i > 0; i--) - { - if (KdpDoesComPortExist(BaseArray[i])) - { - DefaultPort.BaseAddress = BaseArray[i]; - DefaultPort.ComPort = i; - PortInformation->BaseAddress = DefaultPort.BaseAddress; - PortInformation->ComPort = DefaultPort.ComPort; - break; - } - } - if (i == 0) - { - sprintf(buffer, - "\nKernel Debugger: No COM port found!\n\n"); - HalDisplayString(buffer); - return FALSE; - } - } - - PortInitialized = TRUE; - } - - /* initialize port */ - if (!KdPortInitializeEx(&DefaultPort, Unknown1, Unknown2)) - return FALSE; - - /* set global info */ - *KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress; - - return TRUE; -} - - -/* HAL.KdPortInitializeEx */ -BOOLEAN -NTAPI -KdPortInitializeEx( - IN PKD_PORT_INFORMATION PortInformation, - IN ULONG Unknown1, - IN ULONG Unknown2) -{ - ULONG ComPortBase; - CHAR buffer[80]; - ULONG divisor; - UCHAR lcr; - -#ifdef _ARM_ - UNIMPLEMENTED; - return FALSE; -#endif - - if (PortInformation->BaudRate == 0) - PortInformation->BaudRate = DEFAULT_BAUD_RATE; - - if (PortInformation->ComPort == 0) - return FALSE; - - if (!KdpDoesComPortExist(BaseArray[PortInformation->ComPort])) - { - sprintf(buffer, - "\nKernel Debugger: Serial port not found!\n\n"); - HalDisplayString(buffer); - return FALSE; - } - - ComPortBase = BaseArray[PortInformation->ComPort]; - PortInformation->BaseAddress = ComPortBase; -#ifndef NDEBUG - sprintf(buffer, - "\nSerial port COM%ld found at 0x%lx\n", - PortInformation->ComPort, - ComPortBase); - HalDisplayString(buffer); -#endif /* NDEBUG */ - - /* set baud rate and data format (8N1) */ - - /* turn on DTR and RTS */ - WRITE_PORT_UCHAR(SER_MCR(ComPortBase), SR_MCR_DTR | SR_MCR_RTS); - - /* set DLAB */ - lcr = READ_PORT_UCHAR(SER_LCR(ComPortBase)) | SR_LCR_DLAB; - WRITE_PORT_UCHAR(SER_LCR(ComPortBase), lcr); - - /* set baud rate */ - divisor = 115200 / PortInformation->BaudRate; - WRITE_PORT_UCHAR(SER_DLL(ComPortBase), (UCHAR)(divisor & 0xff)); - WRITE_PORT_UCHAR(SER_DLM(ComPortBase), (UCHAR)((divisor >> 8) & 0xff)); - - /* reset DLAB and set 8N1 format */ - WRITE_PORT_UCHAR(SER_LCR(ComPortBase), - SR_LCR_CS8 | SR_LCR_ST1 | SR_LCR_PNO); - - /* read junk out of the RBR */ - lcr = READ_PORT_UCHAR(SER_RBR(ComPortBase)); - -#ifndef NDEBUG - /* print message to blue screen */ - sprintf(buffer, - "\nKernel Debugger: COM%ld (Port 0x%lx) BaudRate %ld\n\n", - PortInformation->ComPort, - ComPortBase, - PortInformation->BaudRate); - - HalDisplayString(buffer); -#endif /* NDEBUG */ - - return TRUE; -} - - -/* HAL.KdPortGetByte */ -BOOLEAN -NTAPI -KdPortGetByte( - OUT PUCHAR ByteReceived) -{ - if (!PortInitialized) - return FALSE; - return KdPortGetByteEx(&DefaultPort, ByteReceived); -} - - -/* HAL.KdPortGetByteEx */ -BOOLEAN -NTAPI -KdPortGetByteEx( - IN PKD_PORT_INFORMATION PortInformation, - OUT PUCHAR ByteReceived) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - if ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR)) - { - *ByteReceived = READ_PORT_UCHAR(SER_RBR(ComPortBase)); - return TRUE; - } - - return FALSE; -} - - -/* HAL.KdPortPollByte */ -BOOLEAN -NTAPI -KdPortPollByte( - OUT PUCHAR ByteReceived) -{ - if (!PortInitialized) - return FALSE; - return KdPortPollByteEx(&DefaultPort, ByteReceived); -} - - -/* HAL.KdPortPollByteEx */ -BOOLEAN -NTAPI -KdPortPollByteEx( - IN PKD_PORT_INFORMATION PortInformation, - OUT PUCHAR ByteReceived) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - while ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR) == 0) - ; - - *ByteReceived = READ_PORT_UCHAR(SER_RBR(ComPortBase)); - - return TRUE; -} - - -/* HAL.KdPortPutByte */ -VOID -NTAPI -KdPortPutByte( - IN UCHAR ByteToSend) -{ - if (!PortInitialized) - return; - KdPortPutByteEx(&DefaultPort, ByteToSend); -} - -/* HAL.KdPortPutByteEx */ -VOID -NTAPI -KdPortPutByteEx( - IN PKD_PORT_INFORMATION PortInformation, - IN UCHAR ByteToSend) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - while ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_TBE) == 0) - ; - - WRITE_PORT_UCHAR(SER_THR(ComPortBase), ByteToSend); -} - - -/* HAL.KdPortRestore */ -VOID -NTAPI -KdPortRestore(VOID) -{ - UNIMPLEMENTED; -} - - -/* HAL.KdPortSave */ -VOID -NTAPI -KdPortSave(VOID) -{ - UNIMPLEMENTED; -} - - -/* HAL.KdPortDisableInterrupts */ -BOOLEAN -NTAPI -KdPortDisableInterrupts(VOID) -{ - UCHAR ch; - - if (!PortInitialized) - return FALSE; - - ch = READ_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress)); - ch &= (~(SR_MCR_OUT1 | SR_MCR_OUT2)); - WRITE_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress), ch); - - ch = READ_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress)); - ch &= (~SR_IER_ALL); - WRITE_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress), ch); - - return TRUE; -} - - -/* HAL.KdPortEnableInterrupts */ -BOOLEAN -NTAPI -KdPortEnableInterrupts(VOID) -{ - UCHAR ch; - - if (PortInitialized == FALSE) - return FALSE; - - ch = READ_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress)); - ch &= (~SR_IER_ALL); - ch |= SR_IER_ERDA; - WRITE_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress), ch); - - ch = READ_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress)); - ch &= (~SR_MCR_LOOP); - ch |= (SR_MCR_OUT1 | SR_MCR_OUT2); - WRITE_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress), ch); - - return TRUE; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -KdDebuggerInitialize0( - IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -KdDebuggerInitialize1( - IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -KdSave( - IN BOOLEAN SleepTransition) -{ - /* Nothing to do on COM ports */ - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -KdRestore( - IN BOOLEAN SleepTransition) -{ - /* Nothing to do on COM ports */ - return STATUS_SUCCESS; -} - -/* - * @unimplemented - */ -VOID -NTAPI -KdSendPacket( - IN ULONG PacketType, - IN PSTRING MessageHeader, - IN PSTRING MessageData, - IN OUT PKD_CONTEXT Context) -{ - UNIMPLEMENTED; - return; -} - -/* - * @unimplemented - */ -KDSTATUS -NTAPI -KdReceivePacket( - IN ULONG PacketType, - OUT PSTRING MessageHeader, - OUT PSTRING MessageData, - OUT PULONG DataLength, - IN OUT PKD_CONTEXT Context) -{ - UNIMPLEMENTED; - return 0; -} - -/* EOF */ Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.rbuild [iso-8859-1] Sun Jul 13 03:47:07 2008 @@ -6,6 +6,15 @@ <include base="kdcom">.</include> <library>ntoskrnl</library> <library>hal</library> - <file>kdbg.c</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>kdbg.c</file> + </directory> + </if> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>kdbg.c</file> + </directory> + </if> <file>kdcom.spec</file> </module>

16 years, 2 months

[ros-arm-bringup] 34455: - Does now fire off a DPC when quantum has ended this works good now after have the major trap fixes been done earlier.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jul 13 03:28:05 2008 New Revision: 34455 URL: http://svn.reactos.org/svn/reactos?rev=34455&view=rev Log: - Does now fire off a DPC when quantum has ended this works good now after have the major trap fixes been done earlier. Modified: trunk/reactos/ntoskrnl/ke/arm/time.c Modified: trunk/reactos/ntoskrnl/ke/arm/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/time.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/time.c [iso-8859-1] Sun Jul 13 03:28:05 2008 @@ -290,6 +290,6 @@ // Schedule a quantum end // Prcb->QuantumEnd = 1; - //HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); } }

16 years, 2 months

[ros-arm-bringup] 34454: - Make sure this is XIP (Execute in Place) boot and not ramdisk boot before warning the user. Silences an incorrect debug print during ramdisk boot.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jul 13 03:20:02 2008 New Revision: 34454 URL: http://svn.reactos.org/svn/reactos?rev=34454&view=rev Log: - Make sure this is XIP (Execute in Place) boot and not ramdisk boot before warning the user. Silences an incorrect debug print during ramdisk boot. Modified: trunk/reactos/ntoskrnl/ex/xipdisp.c Modified: trunk/reactos/ntoskrnl/ex/xipdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/xipdisp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/xipdisp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/xipdisp.c [iso-8859-1] Sun Jul 13 03:20:02 2008 @@ -42,7 +42,7 @@ NTAPI XIPInit(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - PCHAR CommandLine, XipBoot, XipRom, XipMegs, XipVerbose; + PCHAR CommandLine, XipBoot, XipRom, XipMegs, XipVerbose, XipRam; PMEMORY_ALLOCATION_DESCRIPTOR XipDescriptor; /* Get the command line */ @@ -51,6 +51,7 @@ /* Get XIP settings */ XipBoot = strstr(CommandLine, "XIPBOOT"); + XipRam = strstr(CommandLine, "XIPRAM="); XipRom = strstr(CommandLine, "XIPROM="); XipMegs = strstr(CommandLine, "XIPMEGS="); XipVerbose = strstr(CommandLine, "XIPVERBOSE"); @@ -69,6 +70,12 @@ /* Find the XIP memory descriptor */ XipDescriptor = XIPpFindMemoryDescriptor(LoaderBlock); if (!XipDescriptor) return; + + // + // Make sure this is really XIP, and not RAM Disk -- also validate XIP + // Basically, either this is a ROM boot or a RAM boot, but not both nor none + // + if (!((ULONG_PTR)XipRom ^ (ULONG_PTR)XipRam)) return; /* FIXME: TODO */ DPRINT1("ReactOS does not yet support eXecute In Place boot technology\n");

16 years, 2 months

[ros-arm-bringup] 34453: - Implement RamdiskCreateRamdisk which validates parameters before calling RamdiskCreateDiskDevice (stub). - Implement RamdiskDeviceControl which only supports FSCTL_CREATE_RAM_DISK for now (the kernel's attempt to create the RAM disk). - Need to implement RamdiskCreateDiskDevice.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jul 13 02:37:36 2008 New Revision: 34453 URL: http://svn.reactos.org/svn/reactos?rev=34453&view=rev Log: - Implement RamdiskCreateRamdisk which validates parameters before calling RamdiskCreateDiskDevice (stub). - Implement RamdiskDeviceControl which only supports FSCTL_CREATE_RAM_DISK for now (the kernel's attempt to create the RAM disk). - Need to implement RamdiskCreateDiskDevice. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sun Jul 13 02:37:36 2008 @@ -257,12 +257,208 @@ NTSTATUS NTAPI -RamdiskDeviceControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +RamdiskCreateDiskDevice(IN PRAMDISK_EXTENSION DeviceExtension, + IN PRAMDISK_CREATE_INPUT Input, + IN BOOLEAN ValidateOnly, + OUT PDEVICE_OBJECT *DeviceObject) { UNIMPLEMENTED; while (TRUE); return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RamdiskCreateRamdisk(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN BOOLEAN ValidateOnly) +{ + PRAMDISK_CREATE_INPUT Input; + ULONG Length; + PRAMDISK_EXTENSION DeviceExtension; + ULONG DiskType; + PWCHAR FileNameStart, FileNameEnd; + NTSTATUS Status; + PIO_STACK_LOCATION IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + // + // Get the device extension and our input data + // + DeviceExtension = (PRAMDISK_EXTENSION)DeviceObject->DeviceExtension; + Length = IoStackLocation->Parameters.DeviceIoControl.InputBufferLength; + Input = (PRAMDISK_CREATE_INPUT)Irp->AssociatedIrp.SystemBuffer; + + // + // Validate input parameters + // + if ((Length < sizeof(RAMDISK_CREATE_INPUT)) || + (Input->Version != sizeof(RAMDISK_CREATE_INPUT))) + { + // + // Invalid input + // + return STATUS_INVALID_PARAMETER; + } + + // + // Validate the disk type + // + DiskType = Input->DiskType; + if (DiskType == FILE_DEVICE_CONTROLLER) return STATUS_INVALID_PARAMETER; + + // + // Look at the disk type + // + if (DiskType == FILE_DEVICE_CD_ROM_FILE_SYSTEM) + { + // + // We only allow this as an early-init boot + // + if (!KeLoaderBlock) return STATUS_INVALID_PARAMETER; + + // + // Save command-line flags + // + if (ExportBootDiskAsCd) Input->Options.ExportAsCd = TRUE; + if (IsWinPEBoot) Input->Options.NoDriveLetter = TRUE; + } + + // + // Validate the disk type + // + if ((Input->Options.ExportAsCd) && (DiskType != FILE_DEVICE_CD_ROM_FILE_SYSTEM)) + { + // + // If the type isn't CDFS, it has to at least be raw CD + // + if (DiskType != FILE_DEVICE_CD_ROM) return STATUS_INVALID_PARAMETER; + } + + // + // Check if this is an actual file + // + if (DiskType <= FILE_DEVICE_CD_ROM) + { + // + // Validate the file name + // + FileNameStart = (PWCHAR)((ULONG_PTR)Input + Length); + FileNameEnd = Input->FileName + 1; + while ((FileNameEnd < FileNameStart) && *(FileNameEnd)) FileNameEnd++; + if (FileNameEnd == FileNameStart) return STATUS_INVALID_PARAMETER; + } + + // + // Create the actual device + // + Status = RamdiskCreateDiskDevice(DeviceExtension, + Input, + ValidateOnly, + &DeviceObject); + if (NT_SUCCESS(Status)) + { + // + // Invalidate and set success + // + IoInvalidateDeviceRelations(DeviceExtension->PhysicalDeviceObject, 0); + Irp->IoStatus.Information = STATUS_SUCCESS; + } + + // + // We're done + // + return Status; +} + +NTSTATUS +NTAPI +RamdiskDeviceControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PIO_STACK_LOCATION IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + PRAMDISK_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + ULONG Information = 0; + + // + // Grab the remove lock + // + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, Irp); + if (!NT_SUCCESS(Status)) + { + // + // Fail the IRP + // + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + // + // Check if this is an FDO or PDO + // + if (DeviceExtension->Type == RamdiskFdo) + { + // + // Check what the request is + // + switch (IoStackLocation->Parameters.DeviceIoControl.IoControlCode) + { + // + // Request to create a ramdisk + // + case FSCTL_CREATE_RAM_DISK: + + // + // Do it + // + Status = RamdiskCreateRamdisk(DeviceObject, Irp, TRUE); + if (!NT_SUCCESS(Status)) goto CompleteRequest; + break; + + default: + + // + // We don't handle anything else yet + // + ASSERT(FALSE); + while (TRUE); + } + } + else + { + // + // PDO code not yet done + // + ASSERT(FALSE); + } + + // + // Queue the request to our worker thread + // + UNIMPLEMENTED; + while (TRUE); + +CompleteRequest: + // + // Release the lock + // + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); + if (Status != STATUS_PENDING) + { + // + // Complete the request + // + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = Information; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + // + // Return status + // + return Status; } NTSTATUS

16 years, 2 months

[ros-arm-bringup] 34452: - Implement IRP_MN_QUERY_DEVICE_TEXT/BUS_INFORMATION/CAPABILITIES for FDOs (just forward to the attached device). - Implement IRP_MN_QUERY_RESOURCES/RESOURCE_REQUIREMENTS for FDOs and PDOs (immediately complete the IRP and exit). - We now get to RamdiskDeviceControl -- the kernel is attempting to create the ramdisk.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jul 13 02:33:31 2008 New Revision: 34452 URL: http://svn.reactos.org/svn/reactos?rev=34452&view=rev Log: - Implement IRP_MN_QUERY_DEVICE_TEXT/BUS_INFORMATION/CAPABILITIES for FDOs (just forward to the attached device). - Implement IRP_MN_QUERY_RESOURCES/RESOURCE_REQUIREMENTS for FDOs and PDOs (immediately complete the IRP and exit). - We now get to RamdiskDeviceControl -- the kernel is attempting to create the ramdisk. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sun Jul 13 02:33:31 2008 @@ -379,13 +379,19 @@ { DPRINT1("PnP IRP: %lx\n", Minor); while (TRUE); - } + } break; case IRP_MN_QUERY_BUS_INFORMATION: - DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + // + // Are we a PDO? + // + if (DeviceExtension->Type == RamdiskPdo) + { + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + } break; case IRP_MN_EJECT: @@ -396,8 +402,14 @@ case IRP_MN_QUERY_DEVICE_TEXT: - DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + // + // Are we a PDO? + // + if (DeviceExtension->Type == RamdiskPdo) + { + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + } break; case IRP_MN_QUERY_DEVICE_RELATIONS: @@ -408,9 +420,24 @@ case IRP_MN_QUERY_CAPABILITIES: - DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); - break; + // + // Are we a PDO? + // + if (DeviceExtension->Type == RamdiskPdo) + { + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + } + break; + + case IRP_MN_QUERY_RESOURCES: + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: + + // + // Complete immediately without touching it + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); + goto ReleaseAndReturn; default: @@ -439,6 +466,7 @@ // // Release the lock and return status // +ReleaseAndReturn: IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); return Status; }

16 years, 2 months

[ros-arm-bringup] 34451: - Remove incorrect check in RamdiskPnp -- we should only early-quit if the device is removed, not uninitialized, otherwise we'll never get initialized. - Add support for IRP_MN_SURPRISE_REMOVAL. - Handle IRP_MN_QUERY_ID for FDO (it is the first IRP we receive). - Handle IRP completion for FDOs and forward if necessary.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jul 13 02:16:24 2008 New Revision: 34451 URL: http://svn.reactos.org/svn/reactos?rev=34451&view=rev Log: - Remove incorrect check in RamdiskPnp -- we should only early-quit if the device is removed, not uninitialized, otherwise we'll never get initialized. - Add support for IRP_MN_SURPRISE_REMOVAL. - Handle IRP_MN_QUERY_ID for FDO (it is the first IRP we receive). - Handle IRP completion for FDOs and forward if necessary. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sun Jul 13 02:16:24 2008 @@ -36,8 +36,10 @@ { RamdiskStateUninitialized, RamdiskStateStarted, + RamdiskStatePaused, RamdiskStateStopped, - RamdiskStateRemoved + RamdiskStateRemoved, + RamdiskStateBusRemoved, } RAMDISK_DEVICE_STATE; DEFINE_GUID(RamdiskBusInterface, @@ -281,9 +283,9 @@ Minor = IoStackLocation->MinorFunction; // - // Check if the device is initialized - // - if (DeviceExtension->State == RamdiskStateUninitialized) + // Check if the bus is removed + // + if (DeviceExtension->State == RamdiskStateBusRemoved) { // // Only remove-device and query-id are allowed @@ -361,11 +363,23 @@ DPRINT1("PnP IRP: %lx\n", Minor); while (TRUE); break; + + case IRP_MN_SURPRISE_REMOVAL: + + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + break; case IRP_MN_QUERY_ID: - DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); + // + // Are we a PDO? + // + if (DeviceExtension->Type == RamdiskPdo) + { + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + } break; case IRP_MN_QUERY_BUS_INFORMATION: @@ -405,10 +419,27 @@ } // + // Are we an FDO? + // + if (DeviceExtension->Type == RamdiskFdo) + { + // + // Do we have an attached device? + // + if (DeviceExtension->AttachedDevice) + { + // + // Forward the IRP + // + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(DeviceExtension->AttachedDevice, Irp); + } + } + + // // Release the lock and return status // IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); - while (TRUE); return Status; }

16 years, 2 months

[ros-arm-bringup] 34450: - Add device state information. - Start implementing RamdiskPnp -- enough to fail requests until our device state is appropriate. - Implement RamdiskOpenClose.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jul 13 02:02:48 2008 New Revision: 34450 URL: http://svn.reactos.org/svn/reactos?rev=34450&view=rev Log: - Add device state information. - Start implementing RamdiskPnp -- enough to fail requests until our device state is appropriate. - Implement RamdiskOpenClose. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sun Jul 13 02:02:48 2008 @@ -32,6 +32,14 @@ RamdiskPdo } RAMDISK_DEVICE_TYPE; +typedef enum _RAMDISK_DEVICE_STATE +{ + RamdiskStateUninitialized, + RamdiskStateStarted, + RamdiskStateStopped, + RamdiskStateRemoved +} RAMDISK_DEVICE_STATE; + DEFINE_GUID(RamdiskBusInterface, 0x5DC52DF0, 0x2F8A, @@ -41,6 +49,7 @@ typedef struct _RAMDISK_EXTENSION { RAMDISK_DEVICE_TYPE Type; + RAMDISK_DEVICE_STATE State; PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT PhysicalDeviceObject; PDEVICE_OBJECT AttachedDevice; @@ -223,7 +232,21 @@ NTSTATUS NTAPI RamdiskOpenClose(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PIRP Irp) +{ + // + // Complete the IRP + // + Irp->IoStatus.Information = 1; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RamdiskReadWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { UNIMPLEMENTED; while (TRUE); @@ -232,8 +255,8 @@ NTSTATUS NTAPI -RamdiskReadWrite(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) +RamdiskDeviceControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { UNIMPLEMENTED; while (TRUE); @@ -242,22 +265,151 @@ NTSTATUS NTAPI -RamdiskDeviceControl(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - UNIMPLEMENTED; - while (TRUE); - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI RamdiskPnp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; + PIO_STACK_LOCATION IoStackLocation; + PRAMDISK_EXTENSION DeviceExtension; + NTSTATUS Status; + UCHAR Minor; + + // + // Get the device extension and stack location + // + DeviceExtension = DeviceObject->DeviceExtension; + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + Minor = IoStackLocation->MinorFunction; + + // + // Check if the device is initialized + // + if (DeviceExtension->State == RamdiskStateUninitialized) + { + // + // Only remove-device and query-id are allowed + // + if ((Minor != IRP_MN_REMOVE_DEVICE) || (Minor != IRP_MN_QUERY_ID)) + { + // + // Fail anything else + // + Status = STATUS_NO_SUCH_DEVICE; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + } + + // + // Acquire the remove lock + // + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, Irp); + if (!NT_SUCCESS(Status)) + { + // + // Fail the IRP + // + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + // + // Query the IRP type + // + switch (Minor) + { + case IRP_MN_START_DEVICE: + + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + break; + + case IRP_MN_QUERY_STOP_DEVICE: + + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + break; + + case IRP_MN_CANCEL_STOP_DEVICE: + + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + break; + + case IRP_MN_STOP_DEVICE: + + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + break; + + case IRP_MN_QUERY_REMOVE_DEVICE: + + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + break; + + case IRP_MN_CANCEL_REMOVE_DEVICE: + + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + break; + + case IRP_MN_REMOVE_DEVICE: + + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + break; + + case IRP_MN_QUERY_ID: + + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + break; + + case IRP_MN_QUERY_BUS_INFORMATION: + + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + break; + + case IRP_MN_EJECT: + + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + break; + + case IRP_MN_QUERY_DEVICE_TEXT: + + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + break; + + case IRP_MN_QUERY_DEVICE_RELATIONS: + + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + break; + + case IRP_MN_QUERY_CAPABILITIES: + + DPRINT1("PnP IRP: %lx\n", Minor); + while (TRUE); + break; + + default: + + DPRINT1("Illegal IRP: %lx\n", Minor); + break; + } + + // + // Release the lock and return status + // + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); while (TRUE); - return STATUS_SUCCESS; + return Status; } NTSTATUS

16 years, 2 months

← Newer
1
...
51
52
53
54
55
56
57
...
77
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008