Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[ros-arm-bringup] 34479: - Prefetch aborts behave like other exceptions, not like data aborts, in terms of the PC offset due to the pipeline behavior. So call TRAP_PROLOG with 0, not 1

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

Author: ros-arm-bringup Date: Sun Jul 13 18:32:38 2008 New Revision: 34479 URL: http://svn.reactos.org/svn/reactos?rev=34479&view=rev Log: - Prefetch aborts behave like other exceptions, not like data aborts, in terms of the PC offset due to the pipeline behavior. So call TRAP_PROLOG with 0, not 1 Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] Sun Jul 13 18:32:38 2008 @@ -69,7 +69,7 @@ // // Handle trap entry // - TRAP_PROLOG 1 // FromAbort + TRAP_PROLOG 0 // NotFromAbort // // Call the C handler

16 years, 5 months

[silverblade] 34478: Partially implemented wave output reset (WODM_RESET) which sends a request to the device to stop playing and (for now) drops the current buffer, which stops the streaming mechanism from doing anything further. This will need to be done more cleanly later. Think I've also fixed the bug where it was crashing on exit.

by silverblade＠svn.reactos.org

Author: silverblade Date: Sun Jul 13 18:32:00 2008 New Revision: 34478 URL: http://svn.reactos.org/svn/reactos?rev=34478&view=rev Log: Partially implemented wave output reset (WODM_RESET) which sends a request to the device to stop playing and (for now) drops the current buffer, which stops the streaming mechanism from doing anything further. This will need to be done more cleanly later. Think I've also fixed the bug where it was crashing on exit. Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.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 branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Sun Jul 13 18:32:00 2008 @@ -222,6 +222,9 @@ POPUP("Click for WODM_RESTART"); Result = wodMessage(0, WODM_RESTART, (DWORD) InstanceData, (DWORD) 0, 0); + POPUP("Click for WODM_RESET"); + Result = wodMessage(0, WODM_RESET, (DWORD) InstanceData, (DWORD) 0, 0); + POPUP("Click for WODM_CLOSE test"); Result = wodMessage(0, WODM_CLOSE, (DWORD) InstanceData, (DWORD) 0, 0); /* SOUND_DEBUG_HEX(Result); */ 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 18:32:00 2008 @@ -235,6 +235,7 @@ MMGETWAVESTATE_FUNC GetWaveDeviceState; MMSETWAVESTATE_FUNC PauseWaveDevice; MMSETWAVESTATE_FUNC RestartWaveDevice; + MMSETWAVESTATE_FUNC ResetWaveDevice; } MMFUNCTION_TABLE, *PMMFUNCTION_TABLE; @@ -664,6 +665,14 @@ DefaultRestartWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); +MMRESULT +ResetWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); + +MMRESULT +DefaultResetWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); + /* wave/wodMessage.c Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] Sun Jul 13 18:32:00 2008 @@ -66,6 +66,7 @@ Device->Functions.GetWaveDeviceState = DefaultGetWaveDeviceState; Device->Functions.PauseWaveDevice = DefaultPauseWaveDevice; Device->Functions.RestartWaveDevice = DefaultRestartWaveDevice; + Device->Functions.ResetWaveDevice = DefaultResetWaveDevice; if ( ! SourceFunctionTable ) { @@ -121,6 +122,12 @@ { Device->Functions.RestartWaveDevice = SourceFunctionTable->RestartWaveDevice; + } + + if ( SourceFunctionTable->ResetWaveDevice ) + { + Device->Functions.ResetWaveDevice = + SourceFunctionTable->ResetWaveDevice; } TRACE_EXIT(0); @@ -226,6 +233,7 @@ PSOUND_DEVICE PreviousDevice = NULL; /*TRACE_("Removing a sound device from list %d\n", DeviceType);*/ + TRACE_ENTRY(); VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); @@ -234,11 +242,13 @@ /* Clean up any instances */ if ( SoundDevice->FirstInstance != NULL ) { + TRACE_("About to destroy all instances of this sound device\n"); DestroyAllInstancesOfSoundDevice(SoundDevice); } if ( SoundDeviceLists[TypeIndex] == SoundDevice ) { + TRACE_("Removing head of list\n"); SoundDeviceLists[TypeIndex] = SoundDevice->Next; Done = TRUE; } @@ -247,6 +257,8 @@ /* Remove from list */ CurrentDevice = SoundDeviceLists[TypeIndex]; PreviousDevice = NULL; + + TRACE_("Removing from list\n"); while ( CurrentDevice ) { @@ -266,8 +278,11 @@ ASSERT(Done); + TRACE_("Freeing path at %p\n", SoundDevice->DevicePath); /* Free the memory associated with the device info */ FreeMemory(SoundDevice->DevicePath); + + TRACE_("Freeing struct\n"); FreeMemory(SoundDevice); TRACE_EXIT(MMSYSERR_NOERROR); Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] Sun Jul 13 18:32:00 2008 @@ -20,6 +20,7 @@ static HANDLE ProcessHeapHandle = INVALID_HANDLE_VALUE; static DWORD CurrentAllocations = 0; +#if 0 typedef struct _ALLOCATION { DWORD Tag; @@ -68,6 +69,40 @@ ZeroMemory(AllocationInfo, AllocationInfo->Size + sizeof(ALLOCATION)); HeapFree(ProcessHeapHandle, 0, AllocationInfo); + + -- CurrentAllocations; +} +#endif + +PVOID +AllocateTaggedMemory( + IN DWORD Tag, + IN DWORD Size) +{ + PVOID Pointer = NULL; + + if ( ProcessHeapHandle == INVALID_HANDLE_VALUE ) + ProcessHeapHandle = GetProcessHeap(); + + Pointer = HeapAlloc(ProcessHeapHandle, HEAP_ZERO_MEMORY, Size); + + if ( ! Pointer ) + return NULL; + + ++ CurrentAllocations; + + return Pointer; +} + +VOID +FreeTaggedMemory( + IN DWORD Tag, + IN PVOID Pointer) +{ + ASSERT(ProcessHeapHandle != INVALID_HANDLE_VALUE); + ASSERT(Pointer); + + HeapFree(ProcessHeapHandle, 0, Pointer); -- CurrentAllocations; } 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 18:32:00 2008 @@ -47,14 +47,21 @@ VALIDATE_MMSYS_PARAMETER( BufferHeader ); VALIDATE_MMSYS_PARAMETER( BufferHeader->lpData ); VALIDATE_MMSYS_PARAMETER( BufferHeader->dwBufferLength > 0 ); - /* TODO: Check anything more about this buffer? */ - - if ( ! (BufferHeader->dwFlags & WHDR_PREPARED ) ) + + /* Make sure the buffer flags are sane */ + BufferHeader->dwFlags &= WHDR_INQUEUE | WHDR_DONE | WHDR_PREPARED | + WHDR_BEGINLOOP | WHDR_ENDLOOP; + + if ( ! ( BufferHeader->dwFlags & WHDR_PREPARED ) ) return WAVERR_UNPREPARED; - /* TODO: WHDR_INQUEUE */ - + if ( ( BufferHeader->dwFlags & WHDR_INQUEUE ) ) + return WAVERR_STILLPLAYING; + + /* Clear the "done" flag */ BufferHeader->dwFlags &= ~WHDR_DONE; + + /* ...and at present there's nothing after this buffer, so we do this: */ BufferHeader->lpNext = NULL; return CallUsingSoundThread(SoundDeviceInstance, @@ -172,3 +179,36 @@ TRACE_EXIT(Result); return Result; } + +MMRESULT +ResetWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + + return CallUsingSoundThread(SoundDeviceInstance, + ResetWaveDevice_Request, + NULL); +} + +MMRESULT +DefaultResetWaveDevice( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + ULONG RequestedState = WAVE_DD_RESET; + MMRESULT Result; + + TRACE_ENTRY(); + + Result = SendToSoundDevice(SoundDeviceInstance, + IOCTL_WAVE_SET_STATE, + &RequestedState, + sizeof(RequestedState), + NULL); + + ASSERT( Result == MMSYSERR_NOERROR ); + + Result = TranslateInternalMmResult(Result); + TRACE_EXIT(Result); + return Result; +} 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 18:32:00 2008 @@ -334,3 +334,29 @@ return Functions->RestartWaveDevice(SoundDeviceInstance); } + +/* This is quite horribly broken */ +MMRESULT +ResetWaveDevice_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE Functions; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, + &SoundDevice); + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceFunctionTable(SoundDevice, + &Functions); + ASSERT(Result == MMSYSERR_NOERROR); + + /* ugly HACK to stop sound playback... FIXME */ + SoundDeviceInstance->Streaming.Wave.CurrentBuffer = NULL; + + return Functions->ResetWaveDevice(SoundDeviceInstance); +} 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 18:32:00 2008 @@ -32,4 +32,9 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter); +MMRESULT +ResetWaveDevice_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter); + #endif Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sun Jul 13 18:32:00 2008 @@ -144,6 +144,12 @@ } case WODM_RESET : + { + ASSERT(Instance != NULL); + + return ResetWaveDevice(Instance); + } + case WODM_BREAKLOOP : return MMSYSERR_INVALHANDLE;

16 years, 5 months

[ros-arm-bringup] 34477: - Implement KeArmInstructionFaultStatusRegisterGet

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

Author: ros-arm-bringup Date: Sun Jul 13 18:31:46 2008 New Revision: 34477 URL: http://svn.reactos.org/svn/reactos?rev=34477&view=rev Log: - Implement KeArmInstructionFaultStatusRegisterGet Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h [iso-8859-1] Sun Jul 13 18:31:46 2008 @@ -35,6 +35,15 @@ { ULONG Value; __asm__ __volatile__ ("mrc p15, 0, %0, c5, c0, 0" : "=r"(Value) : : "cc"); + return Value; +} + +FORCEINLINE +ULONG +KeArmInstructionFaultStatusRegisterGet(VOID) +{ + ULONG Value; + __asm__ __volatile__ ("mrc p15, 0, %0, c5, c0, 1" : "=r"(Value) : : "cc"); return Value; }

16 years, 5 months

[jimtabor] 34476: Separate Default Window proc from messages.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jul 13 18:31:00 2008 New Revision: 34476 URL: http://svn.reactos.org/svn/reactos?rev=34476&view=rev Log: Separate Default Window proc from messages. Added: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c (with props) Modified: trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Sun Jul 13 18:31:00 2008 @@ -164,6 +164,9 @@ BOOL FASTCALL IntShowOwnedPopups( PWINDOW_OBJECT owner, BOOL fShow ); +LRESULT FASTCALL +IntDefWindowProc( PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam); + #endif /* _WIN32K_WINDOW_H */ /* EOF */ Added: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c (added) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Sun Jul 13 18:31:00 2008 @@ -1,0 +1,61 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Misc User funcs + * FILE: subsystem/win32/win32k/ntuser/defwnd.c + * PROGRAMER: + * REVISION HISTORY: + * 2003/05/22 Created + */ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + + +/* + Win32k counterpart of User DefWindowProc + */ +LRESULT FASTCALL +IntDefWindowProc( + PWINDOW_OBJECT Window, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + PWINDOW Wnd; + + if (Msg > WM_USER) return 0; + + Wnd = Window->Wnd; + if (!Wnd) return 0; + + switch (Msg) + { + case WM_SHOWWINDOW: + { + if ((Wnd->Style & WS_VISIBLE) && wParam) break; + if (!(Wnd->Style & WS_VISIBLE) && !wParam) break; + if (!Window->hOwner) break; + if (LOWORD(lParam)) + { + if (wParam) + { + if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) break; + Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP; + } + else + Window->Flags |= WIN_NEEDS_SHOW_OWNEDPOPUP; + + co_WinPosShowWindow(Window, wParam ? SW_SHOWNOACTIVATE : SW_HIDE); + } + } + break; + } + + return 0; +} + + +/* EOF */ Propchange: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Jul 13 18:31:00 2008 @@ -1832,49 +1832,6 @@ return FALSE; } -/* - Win32k counterpart of User DefWindowProc - */ -LRESULT FASTCALL -IntDefWindowProc( - PWINDOW_OBJECT Window, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - PWINDOW Wnd; - - if (Msg > WM_USER) return 0; - - Wnd = Window->Wnd; - if (!Wnd) return 0; - - switch (Msg) - { - case WM_SHOWWINDOW: - { - if ((Wnd->Style & WS_VISIBLE) && wParam) break; - if (!(Wnd->Style & WS_VISIBLE) && !wParam) break; - if (!Window->hOwner) break; - if (LOWORD(lParam)) - { - if (wParam) - { - if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) break; - Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP; - } - else - Window->Flags |= WIN_NEEDS_SHOW_OWNEDPOPUP; - - co_WinPosShowWindow(Window, wParam ? SW_SHOWNOACTIVATE : SW_HIDE); - } - } - break; - } - - return 0; -} - LRESULT STDCALL NtUserMessageCall( Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sun Jul 13 18:31:00 2008 @@ -110,6 +110,7 @@ <file>clipboard.c</file> <file>csr.c</file> <file>cursoricon.c</file> + <file>defwnd.c</file> <file>desktop.c</file> <file>display.c</file> <file>event.c</file>

16 years, 5 months

[silverblade] 34475: Implemented functions required to make wave playback pause and resume function (WODM_PAUSE and WODM_RESTART) using IOCTL_WAVE_SET_STATE. Modified internal I/O control routine to deal with the fact the device does overlapped I/O. Verified pause/resume functions, however there is a crash on exit if all audio buffers are exhausted by the time WODM_CLOSE is issued.

by silverblade＠svn.reactos.org

Author: silverblade Date: Sun Jul 13 17:53:53 2008 New Revision: 34475 URL: http://svn.reactos.org/svn/reactos?rev=34475&view=rev Log: Implemented functions required to make wave playback pause and resume function (WODM_PAUSE and WODM_RESTART) using IOCTL_WAVE_SET_STATE. Modified internal I/O control routine to deal with the fact the device does overlapped I/O. Verified pause/resume functions, however there is a crash on exit if all audio buffers are exhausted by the time WODM_CLOSE is issued. Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.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/wodMessage.c Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -216,6 +216,12 @@ // SOUND_DEBUG_HEX(Result); + POPUP("Click for WODM_PAUSE"); + Result = wodMessage(0, WODM_PAUSE, (DWORD) InstanceData, (DWORD) 0, 0); + + POPUP("Click for WODM_RESTART"); + Result = wodMessage(0, WODM_RESTART, (DWORD) InstanceData, (DWORD) 0, 0); + POPUP("Click for WODM_CLOSE test"); Result = wodMessage(0, WODM_CLOSE, (DWORD) InstanceData, (DWORD) 0, 0); /* SOUND_DEBUG_HEX(Result); */ 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 17:53:53 2008 @@ -217,7 +217,7 @@ typedef MMRESULT (*MMGETWAVESTATE_FUNC)( IN struct _SOUND_DEVICE_INSTANCE* Instance, - OUT PUCHAR State); + OUT PULONG State); typedef MMRESULT (*MMSETWAVESTATE_FUNC)( IN struct _SOUND_DEVICE_INSTANCE* Instance); @@ -262,8 +262,6 @@ typedef struct _WAVE_STREAM_INFO { - /* Current wave stream state */ - WORD State; /* Buffer queue head and tail */ PWAVEHDR BufferQueueHead; PWAVEHDR BufferQueueTail; @@ -446,7 +444,7 @@ IN LPOVERLAPPED Overlapped); MMRESULT -ReadFromDeviceHandle( +RetrieveFromDeviceHandle( IN HANDLE Handle, IN DWORD IoControlCode, OUT LPVOID OutBuffer, @@ -455,7 +453,7 @@ IN LPOVERLAPPED Overlapped); MMRESULT -WriteToDeviceHandle( +SendToDeviceHandle( IN HANDLE Handle, IN DWORD IoControlCode, IN LPVOID InBuffer, @@ -471,26 +469,23 @@ IN DWORD InBufferSize, OUT LPVOID OutBuffer, IN DWORD OutBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped); - -MMRESULT -ReadFromSoundDevice( + OUT LPDWORD BytesReturned); + +MMRESULT +RetrieveFromSoundDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN DWORD IoControlCode, OUT LPVOID OutBuffer, IN DWORD OutBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped); - -MMRESULT -WriteToSoundDevice( + OUT LPDWORD BytesReturned); + +MMRESULT +SendToSoundDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN DWORD IoControlCode, IN LPVOID InBuffer, IN DWORD InBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped); + OUT LPDWORD BytesReturned); MMRESULT WriteSoundDeviceBuffer( @@ -646,12 +641,12 @@ MMRESULT GetWaveDeviceState( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PUCHAR State); + OUT PULONG State); MMRESULT DefaultGetWaveDeviceState( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PUCHAR State); + OUT PULONG State); MMRESULT PauseWaveDevice( Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -95,7 +95,7 @@ } /* Call the driver */ - Result = ReadFromDeviceHandle( + Result = RetrieveFromDeviceHandle( Handle, Ioctl, (LPVOID) RawCapsPtr, Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -94,15 +94,15 @@ IN LPOVERLAPPED Overlapped) { BOOLEAN IoResult = FALSE; - DWORD AccessRights = GENERIC_READ; VALIDATE_MMSYS_PARAMETER( Handle != INVALID_HANDLE_VALUE ); - /* Determine if we actually need to write stuff */ - if ( InBuffer != NULL ) - AccessRights |= GENERIC_WRITE; - - MessageBox(0, L"Doing IO", L"Info", MB_OK | MB_TASKMODAL); + /*MessageBox(0, L"Doing IO", L"Info", MB_OK | MB_TASKMODAL);*/ + + TRACE_("IoCtl on handle %d - in %p (%d), out %p (%d)\n", + (int) Handle, InBuffer, (int) InBufferSize, OutBuffer, + (int) OutBufferSize); + IoResult = DeviceIoControl( Handle, IoControlCode, @@ -113,8 +113,10 @@ BytesReturned, Overlapped); + if ( ! IoResult ) { + TRACE_("IoCtl result %d\n", (int) GetLastError()); return Win32ErrorToMmResult(GetLastError()); } @@ -122,7 +124,7 @@ } MMRESULT -ReadFromDeviceHandle( +RetrieveFromDeviceHandle( IN HANDLE Handle, IN DWORD IoControlCode, OUT LPVOID OutBuffer, @@ -141,7 +143,7 @@ } MMRESULT -WriteToDeviceHandle( +SendToDeviceHandle( IN HANDLE Handle, IN DWORD IoControlCode, IN LPVOID InBuffer, @@ -167,33 +169,75 @@ IN DWORD InBufferSize, OUT LPVOID OutBuffer, IN DWORD OutBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped) -{ + OUT LPDWORD BytesTransferred) +{ + /* + NOTE: This will always do overlapped I/O, which we wait for. + */ + + OVERLAPPED Overlapped; + BOOLEAN IoResult; + MMRESULT Result; + DWORD Transferred; + if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) return MMSYSERR_INVALPARAM; if ( SoundDeviceInstance->Handle == INVALID_HANDLE_VALUE ) return MMSYSERR_ERROR; - return PerformDeviceIo(SoundDeviceInstance->Handle, - IoControlCode, - InBuffer, - InBufferSize, - OutBuffer, - OutBufferSize, - BytesReturned, - Overlapped); -} - -MMRESULT -ReadFromSoundDevice( + ZeroMemory(&Overlapped, sizeof(OVERLAPPED)); + + /* This event is used for announcing the I/O operation completed */ + Overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( Overlapped.hEvent == INVALID_HANDLE_VALUE ) + return Win32ErrorToMmResult(GetLastError()); + + TRACE_("** Overlapped at %p\n", &Overlapped); + + Result = PerformDeviceIo(SoundDeviceInstance->Handle, + IoControlCode, + InBuffer, + InBufferSize, + OutBuffer, + OutBufferSize, + NULL, + &Overlapped); + + if ( Result != MMSYSERR_NOERROR ) + { + return Result; + } + + /* Wait for I/O completion */ + IoResult = GetOverlappedResult(SoundDeviceInstance->Handle, + &Overlapped, + &Transferred, + TRUE); + + CloseHandle(Overlapped.hEvent); + + if ( ! IoResult ) + { + return Win32ErrorToMmResult(GetLastError()); + } + + if ( BytesTransferred ) + { + *BytesTransferred = Transferred; + } + + return Result; +} + +MMRESULT +RetrieveFromSoundDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN DWORD IoControlCode, OUT LPVOID OutBuffer, IN DWORD OutBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped) + OUT LPDWORD BytesReturned) { return PerformSoundDeviceIo(SoundDeviceInstance, IoControlCode, @@ -201,18 +245,16 @@ 0, OutBuffer, OutBufferSize, - BytesReturned, - Overlapped); -} - -MMRESULT -WriteToSoundDevice( + BytesReturned); +} + +MMRESULT +SendToSoundDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN DWORD IoControlCode, IN LPVOID InBuffer, IN DWORD InBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped) + OUT LPDWORD BytesReturned) { return PerformSoundDeviceIo(SoundDeviceInstance, IoControlCode, @@ -220,8 +262,7 @@ InBufferSize, NULL, 0, - BytesReturned, - Overlapped); + BytesReturned); } Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -44,6 +44,7 @@ PSOUND_THREAD_OVERLAPPED SoundOverlapped; TRACE_("** I/O has completed\n"); + TRACE_("** Returned overlapped at %p\n", lpOverlapped); SoundOverlapped = (PSOUND_THREAD_OVERLAPPED) lpOverlapped; ASSERT(SoundOverlapped); @@ -155,14 +156,18 @@ /* Wait for a request, or an I/O completion */ WaitResult = WaitForSingleObjectEx(RequestEvent, INFINITE, TRUE); + TRACE_("Came out of waiting\n"); if ( WaitResult == WAIT_OBJECT_0 ) { /* Process the request */ + TRACE_("Processing request\n"); + ASSERT(CurrentRequest.RequestHandler); if ( CurrentRequest.RequestHandler ) { + TRACE_("Calling function %p\n", CurrentRequest.RequestHandler); CurrentRequest.ReturnValue = CurrentRequest.RequestHandler( CurrentRequest.SoundDeviceInstance, CurrentRequest.Parameter); Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -79,12 +79,11 @@ if ( Result != MMSYSERR_NOERROR ) return Result; - Result = WriteToSoundDevice(Handle, - IOCTL_WAVE_QUERY_FORMAT, - (LPVOID) WaveFormat, - WaveFormatSize, - &BytesReturned, - NULL); + Result = SendToSoundDevice(Handle, + IOCTL_WAVE_QUERY_FORMAT, + (LPVOID) WaveFormat, + WaveFormatSize, + &BytesReturned); CloseKernelSoundDevice(Handle); @@ -153,12 +152,11 @@ /* Make sure we have a wave device */ VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) ); - Result = WriteToSoundDevice(SoundDeviceInstance, - IOCTL_WAVE_SET_FORMAT, - (LPVOID) WaveFormat, - WaveFormatSize, - &BytesReturned, - NULL); + Result = SendToSoundDevice(SoundDeviceInstance, + IOCTL_WAVE_SET_FORMAT, + (LPVOID) WaveFormat, + WaveFormatSize, + &BytesReturned); return Result; } 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 17:53:53 2008 @@ -27,7 +27,7 @@ StreamInfo = &SoundDeviceInstance->Streaming.Wave; - StreamInfo->State = WAVE_DD_IDLE; + /*StreamInfo->State = WAVE_DD_IDLE;*/ StreamInfo->BufferQueueHead = NULL; StreamInfo->BufferQueueTail = NULL; @@ -65,7 +65,7 @@ MMRESULT GetWaveDeviceState( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PUCHAR State) + OUT PULONG State) { VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); VALIDATE_MMSYS_PARAMETER( State ); @@ -78,45 +78,66 @@ MMRESULT DefaultGetWaveDeviceState( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PUCHAR State) + OUT PULONG State) { -// MMRESULT Result; + MMRESULT Result; + + TRACE_ENTRY(); ASSERT(SoundDeviceInstance); ASSERT(State); -/* - Result = WriteSoundDevice(S -MMRESULT -WriteSoundDevice( - PSOUND_DEVICE SoundDevice, - DWORD IoControlCode, - LPVOID InBuffer, - DWORD InBufferSize, - LPDWORD BytesReturned, - LPOVERLAPPED Overlapped) -*/ - return MMSYSERR_NOERROR; + Result = RetrieveFromSoundDevice(SoundDeviceInstance, + IOCTL_WAVE_GET_STATE, + State, + sizeof(ULONG), + NULL); + + ASSERT( Result == MMSYSERR_NOERROR ); + + Result = TranslateInternalMmResult(Result); + TRACE_EXIT(Result); + + return Result; } MMRESULT PauseWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { + MMRESULT Result; + TRACE_ENTRY(); + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); - return CallUsingSoundThread(SoundDeviceInstance, - PauseWaveDevice_Request, - NULL); + Result = CallUsingSoundThread(SoundDeviceInstance, + PauseWaveDevice_Request, + NULL); + + TRACE_EXIT(Result); + return Result; } MMRESULT DefaultPauseWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { - TRACE_("Pausing device\n"); - /* TODO */ - return MMSYSERR_NOERROR; + ULONG RequestedState = WAVE_DD_STOP; + MMRESULT Result; + + TRACE_ENTRY(); + + Result = SendToSoundDevice(SoundDeviceInstance, + IOCTL_WAVE_SET_STATE, + &RequestedState, + sizeof(RequestedState), + NULL); + + ASSERT( Result == MMSYSERR_NOERROR ); + + Result = TranslateInternalMmResult(Result); + TRACE_EXIT(Result); + return Result; } MMRESULT @@ -134,7 +155,20 @@ DefaultRestartWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { - TRACE_("Restarting device\n"); - /* TODO */ - return MMSYSERR_NOERROR; + ULONG RequestedState = WAVE_DD_PLAY; + MMRESULT Result; + + TRACE_ENTRY(); + + Result = SendToSoundDevice(SoundDeviceInstance, + IOCTL_WAVE_SET_STATE, + &RequestedState, + sizeof(RequestedState), + NULL); + + ASSERT( Result == MMSYSERR_NOERROR ); + + Result = TranslateInternalMmResult(Result); + TRACE_EXIT(Result); + return Result; } 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 17:53:53 2008 @@ -82,10 +82,10 @@ /* If we're out of buffers, mark stream as stopped and do nothing */ if ( ! StreamInfo->CurrentBuffer ) { - TRACE_("*** NOTHING TO DO - state is now WAVE_DD_IDLE ***\n"); + TRACE_("*** NOTHING TO DO ***\n"); /* The stream is idle */ - StreamInfo->State = WAVE_DD_IDLE; + /*StreamInfo->State = WAVE_DD_IDLE;*/ return 0; } @@ -120,8 +120,10 @@ /* 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 { @@ -270,7 +272,7 @@ MMRESULT Result; PSOUND_DEVICE SoundDevice; PMMFUNCTION_TABLE Functions; - PUCHAR State = (PUCHAR) Parameter; + PULONG State = (PULONG) Parameter; VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); VALIDATE_MMSYS_PARAMETER( State ); @@ -316,13 +318,19 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter) { + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE Functions; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); - if ( SoundDeviceInstance->Streaming.Wave.State != WAVE_DD_STOPPED ) - { - WARN_("Nothing to do\n"); - return MMSYSERR_NOERROR; - } - - return MMSYSERR_NOERROR; -} + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, + &SoundDevice); + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceFunctionTable(SoundDevice, + &Functions); + ASSERT(Result == MMSYSERR_NOERROR); + + return Functions->RestartWaveDevice(SoundDeviceInstance); +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -131,11 +131,15 @@ case WODM_PAUSE : { + ASSERT(Instance != NULL); + return PauseWaveDevice(Instance); } case WODM_RESTART : { + ASSERT(Instance != NULL); + return RestartWaveDevice(Instance); }

16 years, 5 months

[ros-arm-bringup] 34474: - Write a DebugService routine for ARM in the RTL library and get rid of the hack in ntoskrnl. - Just like on x86, this routine generates a breakpoint -- on ARM this is done with BKPT followed by an index. - We use the BREAKPOINT_PRINT index just like on x86. - This generates a prefetch abort -- so now we implement the prefetch abort handler. Thanks to the trap macros, this was 10 lines of code. - This calls into the real C handler, which is now unimplemented and hangs t

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

Author: ros-arm-bringup Date: Sun Jul 13 17:40:36 2008 New Revision: 34474 URL: http://svn.reactos.org/svn/reactos?rev=34474&view=rev Log: - Write a DebugService routine for ARM in the RTL library and get rid of the hack in ntoskrnl. - Just like on x86, this routine generates a breakpoint -- on ARM this is done with BKPT followed by an index. - We use the BREAKPOINT_PRINT index just like on x86. - This generates a prefetch abort -- so now we implement the prefetch abort handler. Thanks to the trap macros, this was 10 lines of code. - This calls into the real C handler, which is now unimplemented and hangs the whole system, so we've regressed way back (on purpose). Modified: trunk/reactos/lib/rtl/arm/debug_asm.S trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/lib/rtl/arm/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/arm/debug_asm.S?re… ============================================================================== --- trunk/reactos/lib/rtl/arm/debug_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/arm/debug_asm.S [iso-8859-1] Sun Jul 13 17:40:36 2008 @@ -17,9 +17,19 @@ // // Do a breakpoint and return // - bkpt 3 + bkpt BREAKPOINT_BREAK bx lr ENTRY_END DbgBreakPoint + + NESTED_ENTRY DebugService + PROLOG_END DebugService + + // + // Do a breakpoint and return + // + bkpt BREAKPOINT_PRINT // Could also be PROMPT -- we check later in a1 + bx lr + ENTRY_END DebugService NESTED_ENTRY RtlCaptureContext PROLOG_END RtlCaptureContext Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] Sun Jul 13 17:40:36 2008 @@ -102,6 +102,16 @@ .equ CsPc, 0x40 .equ CsPsr, 0x44 +/* + * DebugService Control Types + */ +.equ BREAKPOINT_BREAK, 0 +.equ BREAKPOINT_PRINT, 1 +.equ BREAKPOINT_PROMPT, 2 +.equ BREAKPOINT_LOAD_SYMBOLS, 3 +.equ BREAKPOINT_UNLOAD_SYMBOLS, 4 +.equ BREAKPOINT_COMMAND_STRING, 5 + #else /* Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Sun Jul 13 17:40:36 2008 @@ -30,24 +30,6 @@ KiIdleLoop( VOID ); - -VOID -STDCALL -KdpSerialDebugPrint(LPSTR Message, - ULONG Length); - -VOID -DebugService(IN ULONG ServiceType, - IN PCHAR Buffer, - IN ULONG Length, - IN ULONG Component, - IN ULONG Level) -{ - // - // FIXME: ARM Bring-up Hack - // - KdpSerialDebugPrint(Buffer, Length); -} VOID DebugService2(IN ULONG Arg1, Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] Sun Jul 13 17:40:36 2008 @@ -67,9 +67,22 @@ PROLOG_END KiPrefetchAbortException // - // FIXME: TODO + // Handle trap entry // - b . + TRAP_PROLOG 1 // FromAbort + + // + // Call the C handler + // + adr lr, 1f + mov r0, sp + ldr pc, =KiPrefetchAbortHandler + +1: + // + // Handle trap exit + // + TRAP_EPILOG 0 // NotFromSystemCall ENTRY_END KiPrefetchAbortException Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Sun Jul 13 17:40:36 2008 @@ -432,6 +432,14 @@ } NTSTATUS +KiPrefetchAbortHandler(IN PKTRAP_FRAME TrapFrame) +{ + ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS KiDataAbortHandler(IN PKTRAP_FRAME TrapFrame) { NTSTATUS Status;

16 years, 5 months

[ros-arm-bringup] 34473: - Now that KDCOM works for printing on the serial port, get rid of the arm_kprintf file, function and hack, and use KdpSerialPrint instead (still a hack, but at least uses our components)

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

Author: ros-arm-bringup Date: Sun Jul 13 17:17:28 2008 New Revision: 34473 URL: http://svn.reactos.org/svn/reactos?rev=34473&view=rev Log: - Now that KDCOM works for printing on the serial port, get rid of the arm_kprintf file, function and hack,and use KdpSerialPrint instead (still a hack, but at least uses our components) Removed: trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Removed: trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/arm_kprint… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c (removed) @@ -1,84 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/ke/arm/arm_kprintf.c - * PURPOSE: Early serial printf-style kernel debugging (ARM bringup) - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -/* INCLUDES *******************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS ********************************************************************/ - -// -// UART Registers -// -#define UART_BASE (void*)0xe00f1000 /* HACK: freeldr mapped it here */ - -#define UART_PL01x_DR (UART_BASE + 0x00) -#define UART_PL01x_RSR (UART_BASE + 0x04) -#define UART_PL01x_ECR (UART_BASE + 0x04) -#define UART_PL01x_FR (UART_BASE + 0x18) -#define UART_PL011_IBRD (UART_BASE + 0x24) -#define UART_PL011_FBRD (UART_BASE + 0x28) -#define UART_PL011_LCRH (UART_BASE + 0x2C) -#define UART_PL011_CR (UART_BASE + 0x30) -#define UART_PL011_IMSC (UART_BASE + 0x38) - -// -// LCR Values -// -#define UART_PL011_LCRH_WLEN_8 0x60 -#define UART_PL011_LCRH_FEN 0x10 - -// -// FCR Values -// -#define UART_PL011_CR_UARTEN 0x01 -#define UART_PL011_CR_TXE 0x100 -#define UART_PL011_CR_RXE 0x200 - -// -// LSR Values -// -#define UART_PL01x_FR_RXFE 0x10 -#define UART_PL01x_FR_TXFF 0x20 - -#define READ_REGISTER_ULONG(r) (*(volatile ULONG * const)(r)) -#define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG *)(r) = (v)) - -/* FUNCTIONS ******************************************************************/ - -VOID -ArmVersaPutChar(IN INT Char) -{ - // - // Properly support new-lines - // - if (Char == '\n') ArmVersaPutChar('\r'); - - // - // Wait for ready - // - while ((READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_TXFF) != 0); - - // - // Send the character - // - WRITE_REGISTER_ULONG(UART_PL01x_DR, Char); -} - -void arm_kprintf(const char *fmt, ...) { - char buf[1024], *s; - va_list args; - - va_start(args, fmt); - _vsnprintf(buf,sizeof(buf),fmt,args); - va_end(args); - for (s = buf; *s; s++) - ArmVersaPutChar(*s); -} Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Sun Jul 13 17:17:28 2008 @@ -32,6 +32,11 @@ ); VOID +STDCALL +KdpSerialDebugPrint(LPSTR Message, + ULONG Length); + +VOID DebugService(IN ULONG ServiceType, IN PCHAR Buffer, IN ULONG Length, @@ -41,8 +46,7 @@ // // FIXME: ARM Bring-up Hack // - void arm_kprintf(const char *fmt, ...); - arm_kprintf("%s", Buffer); + KdpSerialDebugPrint(Buffer, Length); } VOID @@ -51,10 +55,9 @@ IN ULONG Service) { // - // FIXME: ARM Bring-up Hack - // - void arm_kprintf(const char *fmt, ...); - arm_kprintf("Loading symbols for %Z...\n", (PCHAR)Arg1); + // FIXME: TODO + // + return; } VOID @@ -79,8 +82,6 @@ LARGE_INTEGER PageDirectory; PKPCR Pcr; ULONG i; - DPRINT1("[INIT] Process: %p Thread: %p Stack: %p PRCB: %p Number: %d LoaderBlock: %p\n", - InitProcess, InitThread, IdleStack, Prcb, Number, LoaderBlock); // // Initialize the platform @@ -330,13 +331,6 @@ ARM_PTE Pte; PKPCR Pcr; ARM_CONTROL_REGISTER ControlRegister; - DPRINT1("-----------------------------------------------------\n"); - DPRINT1("ReactOS-ARM "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); - DPRINT1("Command Line: %s\n", LoaderBlock->LoadOptions); - DPRINT1("ARC Paths: %s %s %s %s\n", LoaderBlock->ArcBootDeviceName, - LoaderBlock->NtHalPathName, - LoaderBlock->ArcHalDeviceName, - LoaderBlock->NtBootPathName); // // Detect ARM version (Architecture 6 is the ARMv5TE-J, go figure!) Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jul 13 17:17:28 2008 @@ -61,7 +61,6 @@ <if property="ARCH" value="arm"> <directory name="arm"> <file first="true">boot.s</file> - <file>arm_kprintf.c</file> <file>cpu.c</file> <file>ctxswtch.s</file> <file>exp.c</file>

16 years, 5 months

[ros-arm-bringup] 34472: - Implement KdPortPutByteEx and KdPortInitializeEx in KDCOM. Only supports Versatile for now, we can make this more portable later.

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

Author: ros-arm-bringup Date: Sun Jul 13 17:16:48 2008 New Revision: 34472 URL: http://svn.reactos.org/svn/reactos?rev=34472&view=rev Log: - Implement KdPortPutByteEx and KdPortInitializeEx in KDCOM. Only supports Versatile for now, we can make this more portable later. Modified: trunk/reactos/drivers/base/kdcom/arm/kdbg.c Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/arm/kdbg.c [iso-8859-1] Sun Jul 13 17:16:48 2008 @@ -18,6 +18,7 @@ #include "windbgkd.h" #include <kddll.h> #include <ioaccess.h> +#include <arm/peripherals/pl011.h> /* GLOBALS ********************************************************************/ @@ -30,7 +31,65 @@ KD_PORT_INFORMATION DefaultPort = {0, 0, 0}; +// +// We need to build this in the configuration root and use KeFindConfigurationEntry +// to recover it later. +// +#define HACK 24000000 + /* REACTOS FUNCTIONS **********************************************************/ + +BOOLEAN +NTAPI +KdPortInitializeEx(IN PKD_PORT_INFORMATION PortInformation, + IN ULONG Unknown1, + IN ULONG Unknown2) +{ + ULONG Divider, Remainder, Fraction; + ULONG Baudrate = PortInformation->BaudRate; + + // + // Calculate baudrate clock divider and remainder + // + Divider = HACK / (16 * Baudrate); + Remainder = HACK % (16 * Baudrate); + + // + // Calculate the fractional part + // + Fraction = (8 * Remainder / Baudrate) >> 1; + Fraction += (8 * Remainder / Baudrate) & 1; + + // + // Disable interrupts + // + WRITE_REGISTER_ULONG(UART_PL011_CR, 0); + + // + // Set the baud rate + // + WRITE_REGISTER_ULONG(UART_PL011_IBRD, Divider); + WRITE_REGISTER_ULONG(UART_PL011_FBRD, Fraction); + + // + // Set 8 bits for data, 1 stop bit, no parity, FIFO enabled + // + WRITE_REGISTER_ULONG(UART_PL011_LCRH, + UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN); + + // + // Clear and enable FIFO + // + WRITE_REGISTER_ULONG(UART_PL011_CR, + UART_PL011_CR_UARTEN | + UART_PL011_CR_TXE | + UART_PL011_CR_RXE); + + // + // Done + // + return TRUE; +} BOOLEAN NTAPI @@ -38,19 +97,10 @@ 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; + // + // Call the extended version + // + return KdPortInitializeEx(PortInformation, Unknown1, Unknown2); } BOOLEAN @@ -67,6 +117,9 @@ NTAPI KdPortGetByte(OUT PUCHAR ByteReceived) { + // + // Call the extended version + // return KdPortGetByteEx(&DefaultPort, ByteReceived); } @@ -84,6 +137,9 @@ NTAPI KdPortPollByte(OUT PUCHAR ByteReceived) { + // + // Call the extended version + // return KdPortPollByteEx(&DefaultPort, ByteReceived); } @@ -92,14 +148,24 @@ KdPortPutByteEx(IN PKD_PORT_INFORMATION PortInformation, IN UCHAR ByteToSend) { - UNIMPLEMENTED; - while (TRUE); + // + // Wait for ready + // + while ((READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_TXFF) != 0); + + // + // Send the character + // + WRITE_REGISTER_ULONG(UART_PL01x_DR, ByteToSend); } VOID NTAPI KdPortPutByte(IN UCHAR ByteToSend) { + // + // Call the extended version + // KdPortPutByteEx(&DefaultPort, ByteToSend); }

16 years, 5 months

[ros-arm-bringup] 34471: - Fix FILE location in the header

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

Author: ros-arm-bringup Date: Sun Jul 13 17:15:56 2008 New Revision: 34471 URL: http://svn.reactos.org/svn/reactos?rev=34471&view=rev Log: - Fix FILE location in the header Modified: trunk/reactos/include/reactos/arm/peripherals/pl011.h Modified: trunk/reactos/include/reactos/arm/peripherals/pl011.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph… ============================================================================== --- trunk/reactos/include/reactos/arm/peripherals/pl011.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/peripherals/pl011.h [iso-8859-1] Sun Jul 13 17:15:56 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: include/reactos/arm/targets/pl011.h + * FILE: include/reactos/arm/peripherals/pl011.h * PURPOSE: PL011 Registers and Constants * PROGRAMMERS: ReactOS Portable Systems Group */

16 years, 5 months

[ros-arm-bringup] 34470: - Get rid of a really-early debug print, since it's done before KdInit and thus will never be seen.

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

Author: ros-arm-bringup Date: Sun Jul 13 17:15:23 2008 New Revision: 34470 URL: http://svn.reactos.org/svn/reactos?rev=34470&view=rev Log: - Get rid of a really-early debug print, since it's done before KdInit and thus will never be seen. Modified: trunk/reactos/ntoskrnl/ke/arm/cpu.c Modified: trunk/reactos/ntoskrnl/ke/arm/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/cpu.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/cpu.c [iso-8859-1] Sun Jul 13 17:15:23 2008 @@ -89,7 +89,6 @@ // // On these systems, we'll just keep the PTE mapped // - DPRINT1("TLB Lockdown Failure (%p). Running on QEMU?\n", Virtual); } else {

16 years, 5 months

← Newer
1
...
49
50
51
52
53
54
55
...
77
Older →

Jump to page:

2025

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