Ros-diffs February 2010

ros-diffs@reactos.org

22 participants
365 discussions

[cgutman] 45531: - Fix the LARGE_SIZE constant so it uses the lookaside list for mbuf ext buffers allocations again - We added one byte to each ext buffer as a ref count for oskit_buffer_* functions so we need to compensate for that by adding one byte to the LARGE_SIZE constant - This should boost performance too because we allocate one ext buffer for each incoming and outgoing TCP packet

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Feb 9 18:58:11 2010 New Revision: 45531 URL: http://svn.reactos.org/svn/reactos?rev=45531&view=rev Log: - Fix the LARGE_SIZE constant so it uses the lookaside list for mbuf ext buffers allocations again - We added one byte to each ext buffer as a ref count for oskit_buffer_* functions so we need to compensate for that by adding one byte to the LARGE_SIZE constant - This should boost performance too because we allocate one ext buffer for each incoming and outgoing TCP packet Modified: branches/aicom-network-branch/lib/drivers/ip/transport/tcp/event.c Modified: branches/aicom-network-branch/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Tue Feb 9 18:58:11 2010 @@ -119,7 +119,7 @@ #define MEM_PROFILE 0 #define SMALL_SIZE 128 -#define LARGE_SIZE 2048 +#define LARGE_SIZE 2049 #define SIGNATURE_LARGE 'LLLL' #define SIGNATURE_SMALL 'SSSS'

14 years, 7 months

[janderwald] 45530: [DSOUND_NEW] - Add more parameter checks - Implement a few more functions for the primary sound buffer

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 9 15:24:50 2010 New Revision: 45530 URL: http://svn.reactos.org/svn/reactos?rev=45530&view=rev Log: [DSOUND_NEW] - Add more parameter checks - Implement a few more functions for the primary sound buffer Modified: trunk/reactos/dll/directx/dsound_new/directsound.c trunk/reactos/dll/directx/dsound_new/precomp.h trunk/reactos/dll/directx/dsound_new/primary.c Modified: trunk/reactos/dll/directx/dsound_new/directsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dir… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/directsound.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/directsound.c [iso-8859-1] Tue Feb 9 15:24:50 2010 @@ -121,6 +121,12 @@ return DSERR_INVALIDPARAM; } + if (lpcDSBufferDesc->dwBufferBytes != 0) + { + /* buffer size must be zero for primary sound buffer */ + return DSERR_INVALIDPARAM; + } + if (This->PrimaryBuffer) { /* primary buffer already exists */ @@ -129,7 +135,7 @@ return S_OK; } - hResult = NewPrimarySoundBuffer((LPLPDIRECTSOUNDBUFFER8)lplpDirectSoundBuffer, This->Filter, This->dwLevel); + hResult = NewPrimarySoundBuffer((LPLPDIRECTSOUNDBUFFER8)lplpDirectSoundBuffer, This->Filter, This->dwLevel, lpcDSBufferDesc->dwFlags); if (SUCCEEDED(hResult)) { /* store primary buffer */ @@ -145,9 +151,15 @@ return DSERR_INVALIDPARAM; } + if (lpcDSBufferDesc->dwBufferBytes < DSBSIZE_MIN || lpcDSBufferDesc->dwBufferBytes > DSBSIZE_MAX) + { + /* buffer size must be within bounds for secondary sound buffer*/ + return DSERR_INVALIDPARAM; + } + if (!This->PrimaryBuffer) { - hResult = NewPrimarySoundBuffer((LPLPDIRECTSOUNDBUFFER8)lplpDirectSoundBuffer, This->Filter, This->dwLevel); + hResult = NewPrimarySoundBuffer((LPLPDIRECTSOUNDBUFFER8)lplpDirectSoundBuffer, This->Filter, This->dwLevel, lpcDSBufferDesc->dwFlags); if (SUCCEEDED(hResult)) { /* store primary buffer */ Modified: trunk/reactos/dll/directx/dsound_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pre… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/precomp.h [iso-8859-1] Tue Feb 9 15:24:50 2010 @@ -201,7 +201,8 @@ NewPrimarySoundBuffer( LPDIRECTSOUNDBUFFER8 *OutBuffer, LPFILTERINFO Filter, - DWORD dwLevel); + DWORD dwLevel, + DWORD dwFlags); HRESULT PrimaryDirectSoundBuffer_SetFormat( Modified: trunk/reactos/dll/directx/dsound_new/primary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pri… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/primary.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/primary.c [iso-8859-1] Tue Feb 9 15:24:50 2010 @@ -17,6 +17,10 @@ LPFILTERINFO Filter; DWORD dwLevel; + DWORD dwFlags; + DWORD dwFrequency; + LONG Volume; + LONG VolumePan; WAVEFORMATEX Format; HANDLE hPin; CRITICAL_SECTION Lock; @@ -94,8 +98,27 @@ LPDIRECTSOUNDBUFFER8 iface, LPDSBCAPS pDSBufferCaps) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (!pDSBufferCaps) + { + /* invalid parameter */ + return DSERR_INVALIDPARAM; + } + + if (pDSBufferCaps->dwSize < sizeof(DSBCAPS)) + { + /* invalid buffer size */ + return DSERR_INVALIDPARAM; + } + + /* get buffer details */ + pDSBufferCaps->dwUnlockTransferRate = 0; + pDSBufferCaps->dwPlayCpuOverhead = 0; + pDSBufferCaps->dwSize = 0; //FIXME + pDSBufferCaps->dwFlags = This->dwFlags; + + return DS_OK; } HRESULT @@ -105,7 +128,21 @@ LPDWORD pdwCurrentPlayCursor, LPDWORD pdwCurrentWriteCursor) { - UNIMPLEMENTED + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (This->dwLevel < DSSCL_PRIORITY) + { + /* needs priority level */ + return DSERR_PRIOLEVELNEEDED; + } + + if (!pdwCurrentPlayCursor && !pdwCurrentWriteCursor) + { + /* all parameters are null */ + return DSERR_INVALIDPARAM; + } + + UNIMPLEMENTED; return DSERR_INVALIDPARAM; } @@ -160,8 +197,18 @@ LPDIRECTSOUNDBUFFER8 iface, LPLONG plVolume) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (!plVolume) + { + /* invalid parameter */ + return DSERR_INVALIDPARAM; + } + + /* get volume */ + *plVolume = This->Volume; + + return DS_OK; } HRESULT @@ -170,8 +217,18 @@ LPDIRECTSOUNDBUFFER8 iface, LPLONG plPan) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (!plPan) + { + /* invalid parameter */ + return DSERR_INVALIDPARAM; + } + + /* get frequency */ + *plPan = This->VolumePan; + + return DS_OK; } HRESULT @@ -180,8 +237,18 @@ LPDIRECTSOUNDBUFFER8 iface, LPDWORD pdwFrequency) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (!pdwFrequency) + { + /* invalid parameter */ + return DSERR_INVALIDPARAM; + } + + /* get frequency */ + *pdwFrequency = This->dwFrequency; + + return DS_OK; } HRESULT @@ -190,8 +257,22 @@ LPDIRECTSOUNDBUFFER8 iface, LPDWORD pdwStatus) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (!pdwStatus) + { + /* invalid parameter */ + return DSERR_INVALIDPARAM; + } + + *pdwStatus = 0; + if (This->State == KSSTATE_RUN || This->State == KSSTATE_ACQUIRE) + { + /* buffer is playing */ + *pdwStatus |= DSBSTATUS_PLAYING | DSBSTATUS_LOOPING; + } + + return DS_OK; } HRESULT @@ -201,8 +282,8 @@ LPDIRECTSOUND pDirectSound, LPCDSBUFFERDESC pcDSBufferDesc) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + /* RTFM */ + return DSERR_ALREADYINITIALIZED; } HRESULT @@ -303,8 +384,20 @@ LPDIRECTSOUNDBUFFER8 iface, LONG lVolume) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (lVolume < DSBVOLUME_MIN || lVolume > DSBVOLUME_MAX) + { + /* invalid parameter */ + return DSERR_INVALIDPARAM; + } + + /* TODO: call volume node */ + + /* Store volume */ + This->Volume = lVolume; + + return DS_OK; } HRESULT @@ -313,8 +406,20 @@ LPDIRECTSOUNDBUFFER8 iface, LONG lPan) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (lPan < DSBPAN_LEFT || lPan > DSBPAN_RIGHT) + { + /* invalid parameter */ + return DSERR_INVALIDPARAM; + } + + /* TODO: call volume node */ + + /* Store volume pan */ + This->VolumePan = lPan; + + return DS_OK; } HRESULT @@ -323,8 +428,16 @@ LPDIRECTSOUNDBUFFER8 iface, DWORD dwFrequency) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (This->dwLevel < DSSCL_PRIORITY) + { + /* needs priority level */ + return DSERR_PRIOLEVELNEEDED; + } + + /* invalid request */ + return DSERR_CONTROLUNAVAIL; } HRESULT @@ -372,8 +485,6 @@ UNIMPLEMENTED return DSERR_INVALIDPARAM; } - - HRESULT @@ -593,7 +704,10 @@ Result = OpenPin(This->Filter->hFilter, PinId, (LPWAVEFORMATEX)pcfxFormat, &This->hPin, bLooped); DPRINT("PinId %u Result %u\n", PinId, Result); if (Result == ERROR_SUCCESS) + { + This->dwFrequency = pcfxFormat->nSamplesPerSec; break; + } This->hPin = NULL; DeviceId++; @@ -635,7 +749,8 @@ NewPrimarySoundBuffer( LPDIRECTSOUNDBUFFER8 *OutBuffer, LPFILTERINFO Filter, - DWORD dwLevel) + DWORD dwLevel, + DWORD dwFlags) { LPCDirectSoundBuffer This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CDirectSoundBuffer)); @@ -649,6 +764,10 @@ This->lpVtbl = &vt_DirectSoundBuffer8; This->Filter = Filter; This->dwLevel = dwLevel; + This->dwFlags = dwFlags; + This->dwFrequency = 0; + This->Volume = DSBVOLUME_MAX; + This->VolumePan = DSBPAN_CENTER; This->hPin = NULL; InitializeCriticalSection(&This->Lock);

14 years, 7 months

[janderwald] 45529: [DSOUND_NEW] - Implement getting volume, volume pan, and frequency for secondary sound buffer - Semi-stub setting volume, volume pan and frequency for secondary...

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 9 14:14:19 2010 New Revision: 45529 URL: http://svn.reactos.org/svn/reactos?rev=45529&view=rev Log: [DSOUND_NEW] - Implement getting volume, volume pan, and frequency for secondary sound buffer - Semi-stub setting volume, volume pan and frequency for secondary... Modified: trunk/reactos/dll/directx/dsound_new/secondary.c Modified: trunk/reactos/dll/directx/dsound_new/secondary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/sec… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/secondary.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/secondary.c [iso-8859-1] Tue Feb 9 14:14:19 2010 @@ -18,6 +18,9 @@ LPFILTERINFO Filter; DWORD dwLevel; DWORD dwFlags; + DWORD dwFrequency; + LONG Volume; + LONG VolumePan; LPWAVEFORMATEX Format; PUCHAR Buffer; DWORD BufferSize; @@ -139,8 +142,8 @@ WINAPI SecondaryDirectSoundBuffer8Impl_fnGetFormat( LPDIRECTSOUNDBUFFER8 iface, - LPWAVEFORMATEX pwfxFormat, - DWORD dwSizeAllocated, + LPWAVEFORMATEX pwfxFormat, + DWORD dwSizeAllocated, LPDWORD pdwSizeWritten) { DWORD FormatSize; @@ -186,8 +189,18 @@ LPDIRECTSOUNDBUFFER8 iface, LPLONG plVolume) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (!plVolume) + { + /* invalid parameter */ + return DSERR_INVALIDPARAM; + } + + /* get volume */ + *plVolume = This->Volume; + + return DS_OK; } HRESULT @@ -196,8 +209,18 @@ LPDIRECTSOUNDBUFFER8 iface, LPLONG plPan) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (!plPan) + { + /* invalid parameter */ + return DSERR_INVALIDPARAM; + } + + /* get frequency */ + *plPan = This->VolumePan; + + return DS_OK; } HRESULT @@ -206,8 +229,18 @@ LPDIRECTSOUNDBUFFER8 iface, LPDWORD pdwFrequency) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (!pdwFrequency) + { + /* invalid parameter */ + return DSERR_INVALIDPARAM; + } + + /* get frequency */ + *pdwFrequency = This->dwFrequency; + + return DS_OK; } HRESULT @@ -243,8 +276,8 @@ LPDIRECTSOUND pDirectSound, LPCDSBUFFERDESC pcDSBufferDesc) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + /* RTFM */ + return DSERR_ALREADYINITIALIZED; } HRESULT @@ -361,6 +394,7 @@ LPDIRECTSOUNDBUFFER8 iface, LPCWAVEFORMATEX pcfxFormat) { + /* RTFM */ return DSERR_INVALIDCALL; } @@ -370,8 +404,19 @@ LPDIRECTSOUNDBUFFER8 iface, LONG lVolume) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (lVolume < DSBVOLUME_MIN || lVolume > DSBVOLUME_MAX) + { + /* invalid parameter */ + return DSERR_INVALIDPARAM; + } + + + /* Store volume */ + This->Volume = lVolume; + + return DS_OK; } HRESULT @@ -380,8 +425,18 @@ LPDIRECTSOUNDBUFFER8 iface, LONG lPan) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (lPan < DSBPAN_LEFT || lPan > DSBPAN_RIGHT) + { + /* invalid parameter */ + return DSERR_INVALIDPARAM; + } + + /* Store volume pan */ + This->VolumePan = lPan; + + return DS_OK; } HRESULT @@ -390,8 +445,29 @@ LPDIRECTSOUNDBUFFER8 iface, DWORD dwFrequency) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (dwFrequency == DSBFREQUENCY_ORIGINAL) + { + /* restore original frequency */ + dwFrequency = This->Format->nSamplesPerSec; + } + + if (dwFrequency < DSBFREQUENCY_MIN || dwFrequency > DSBFREQUENCY_MAX) + { + /* invalid frequency */ + return DSERR_INVALIDPARAM; + } + + if (dwFrequency != This->dwFrequency) + { + /* FIXME handle frequency change */ + } + + /* store frequency */ + This->dwFrequency = dwFrequency; + + return DS_OK; } HRESULT @@ -549,7 +625,10 @@ This->Filter = Filter; This->dwLevel = dwLevel; This->dwFlags = lpcDSBufferDesc->dwFlags; + This->dwFrequency = lpcDSBufferDesc->lpwfxFormat->nSamplesPerSec; This->State = KSSTATE_STOP; + This->Volume = DSBVOLUME_MAX; + This->VolumePan = DSBPAN_CENTER; This->Flags = 0; This->Position = 0; This->BufferSize = lpcDSBufferDesc->dwBufferBytes;

14 years, 7 months

[dreimer] 45528: Evil hack for Computers where NSIS fails to write the right Execution Settings for PS. Now it shows a Message Box while installing, telling you to use the generated REG File with Admin rights. Tested on such a PC and confirmed working. Time to switch to a better Install System... NSIS and UAC is fun

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Feb 9 13:30:49 2010 New Revision: 45528 URL: http://svn.reactos.org/svn/reactos?rev=45528&view=rev Log: Evil hack for Computers where NSIS fails to write the right Execution Settings for PS. Now it shows a Message Box while installing, telling you to use the generated REG File with Admin rights. Tested on such a PC and confirmed working. Time to switch to a better Install System... NSIS and UAC is fun Added: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE PS - PostInstall.reg (with props) Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Added: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE PS - PostInstall.reg URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE PS - PostInstall.reg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Tue Feb 9 13:30:49 2010 @@ -290,6 +290,11 @@ File /r Components\Powershell\update.ps1 WriteRegStr HKLM "SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" WriteRegStr HKLM "SOFTWARE\Wow6432Node\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" + SetOutPath "$DESKTOP" + SetOverwrite try + File /r "Components\Powershell\RosBE PS - PostInstall.reg" + MessageBox MB_ICONINFORMATION|MB_OK \ + "A REG-File was generated on your desktop. Please use it with Admin Rights to set Powershell's execution rights correctly if your RosBE Powershell Version fails to run after install. Otherwise, just delete it." SectionEnd Section -StartMenuShortcuts SEC12

14 years, 7 months

[janderwald] 45527: [DSOUND_NEW] - Implement starting / stopping primary sound buffer - Implement retrieving capabilities for secondary sound buffer - Import sound mixing routines from wine, not yet used

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 9 13:03:59 2010 New Revision: 45527 URL: http://svn.reactos.org/svn/reactos?rev=45527&view=rev Log: [DSOUND_NEW] - Implement starting / stopping primary sound buffer - Implement retrieving capabilities for secondary sound buffer - Import sound mixing routines from wine, not yet used Added: trunk/reactos/dll/directx/dsound_new/dsound_convert.c (props changed) - copied unchanged from r45494, trunk/reactos/dll/directx/dsound/dsound_convert.c Modified: trunk/reactos/dll/directx/dsound_new/primary.c trunk/reactos/dll/directx/dsound_new/secondary.c Propchange: trunk/reactos/dll/directx/dsound_new/dsound_convert.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/dsound_new/dsound_convert.c ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Feb 9 13:03:59 2010 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound_convert.c:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 Modified: trunk/reactos/dll/directx/dsound_new/primary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pri… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/primary.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/primary.c [iso-8859-1] Tue Feb 9 13:03:59 2010 @@ -229,8 +229,37 @@ DWORD dwPriority, DWORD dwFlags) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (dwReserved1 != 0 || !(dwFlags & DSBPLAY_LOOPING)) + { + /* invalid parameter */ + return DSERR_INVALIDPARAM; + } + + PrimaryDirectSoundBuffer_AcquireLock(iface); + + if (This->State == KSSTATE_STOP) + { + PrimaryDirectSoundBuffer_SetState(iface, KSSTATE_ACQUIRE); + ASSERT(This->State == KSSTATE_ACQUIRE); + } + + if (This->State == KSSTATE_ACQUIRE) + { + PrimaryDirectSoundBuffer_SetState(iface, KSSTATE_PAUSE); + ASSERT(This->State == KSSTATE_PAUSE); + } + + if (This->State == KSSTATE_PAUSE) + { + PrimaryDirectSoundBuffer_SetState(iface, KSSTATE_RUN); + ASSERT(This->State == KSSTATE_RUN); + } + + PrimaryDirectSoundBuffer_ReleaseLock(iface); + + return DS_OK; } HRESULT @@ -239,8 +268,8 @@ LPDIRECTSOUNDBUFFER8 iface, DWORD dwNewPosition) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + /* The position of a primary buffer can't be set */ + return DSERR_INVALIDCALL; } HRESULT @@ -303,8 +332,31 @@ PrimaryDirectSoundBuffer8Impl_fnStop( LPDIRECTSOUNDBUFFER8 iface) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + PrimaryDirectSoundBuffer_AcquireLock(iface); + + if (This->State == KSSTATE_RUN) + { + PrimaryDirectSoundBuffer_SetState(iface, KSSTATE_PAUSE); + ASSERT(This->State == KSSTATE_PAUSE); + } + + if (This->State == KSSTATE_PAUSE) + { + PrimaryDirectSoundBuffer_SetState(iface, KSSTATE_ACQUIRE); + ASSERT(This->State == KSSTATE_ACQUIRE); + } + + if (This->State == KSSTATE_ACQUIRE) + { + PrimaryDirectSoundBuffer_SetState(iface, KSSTATE_STOP); + ASSERT(This->State == KSSTATE_STOP); + } + + PrimaryDirectSoundBuffer_ReleaseLock(iface); + + return DS_OK; } Modified: trunk/reactos/dll/directx/dsound_new/secondary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/sec… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/secondary.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/secondary.c [iso-8859-1] Tue Feb 9 13:03:59 2010 @@ -17,6 +17,7 @@ LPFILTERINFO Filter; DWORD dwLevel; + DWORD dwFlags; LPWAVEFORMATEX Format; PUCHAR Buffer; DWORD BufferSize; @@ -97,8 +98,27 @@ LPDIRECTSOUNDBUFFER8 iface, LPDSBCAPS pDSBufferCaps) { - UNIMPLEMENTED - return DSERR_INVALIDPARAM; + LPCDirectSoundBuffer This = (LPCDirectSoundBuffer)CONTAINING_RECORD(iface, CDirectSoundBuffer, lpVtbl); + + if (!pDSBufferCaps) + { + /* invalid parameter */ + return DSERR_INVALIDPARAM; + } + + if (pDSBufferCaps->dwSize < sizeof(DSBCAPS)) + { + /* invalid buffer size */ + return DSERR_INVALIDPARAM; + } + + /* get buffer details */ + pDSBufferCaps->dwUnlockTransferRate = 0; + pDSBufferCaps->dwPlayCpuOverhead = 0; + pDSBufferCaps->dwSize = This->BufferSize; + pDSBufferCaps->dwFlags = This->dwFlags; + + return DS_OK; } HRESULT @@ -528,6 +548,7 @@ This->lpVtbl = &vt_DirectSoundBuffer8; This->Filter = Filter; This->dwLevel = dwLevel; + This->dwFlags = lpcDSBufferDesc->dwFlags; This->State = KSSTATE_STOP; This->Flags = 0; This->Position = 0;

14 years, 7 months

[sir_richard] 45526: [FREELDR]: Use WinLDR-style booting exclusively for ARM. Remove thousands of lines of old code where we basically did the same thing. [FREELDR]: Build WinLDR for ARM too, and implement the required portability functions to get it working. Don't build "ros-style" loading on ARM. [FREELDR]: Redo from scratch the entire paging setup for ARM. Instead of using 20MB of physical RAM, we now only use 1MB that's passed on to the kernel. [FREELDR]: Fix loads of bugs in the ARM loader

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Feb 9 04:10:07 2010 New Revision: 45526 URL: http://svn.reactos.org/svn/reactos?rev=45526&view=rev Log: [FREELDR]: Use WinLDR-style booting exclusively for ARM. Remove thousands of lines of old code where we basically did the same thing. [FREELDR]: Build WinLDR for ARM too, and implement the required portability functions to get it working. Don't build "ros-style" loading on ARM. [FREELDR]: Redo from scratch the entire paging setup for ARM. Instead of using 20MB of physical RAM, we now only use 1MB that's passed on to the kernel. [FREELDR]: Fix loads of bugs in the ARM loader code (ha-ha!). [FREELDR]: Cleanup compiler and linker flags in the rbuild files. [ARMLLB]: Remove all deprecated video machine routines that are not used anymore. If all went well, the ARM port should now boot on Versatile platforms up until the ARM3 initialization code. Added: trunk/reactos/boot/freeldr/freeldr/windows/arm/ trunk/reactos/boot/freeldr/freeldr/windows/arm/wlmemory.c (with props) Removed: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c Modified: trunk/reactos/boot/armllb/fw.c trunk/reactos/boot/armllb/os/loader.c trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/armllb/fw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/fw.c?rev=45526… ============================================================================== --- trunk/reactos/boot/armllb/fw.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/fw.c [iso-8859-1] Tue Feb 9 04:10:07 2010 @@ -7,6 +7,26 @@ */ #include "precomp.h" + +USHORT ColorPalette[16][3] = +{ + {0x00, 0x00, 0x00}, + {0x00, 0x00, 0xAA}, + {0x00, 0xAA, 0x00}, + {0x00, 0xAA, 0xAA}, + {0xAA, 0x00, 0x00}, + {0xAA, 0x00, 0xAA}, + {0xAA, 0x55, 0x00}, + {0xAA, 0xAA, 0xAA}, + {0x55, 0x55, 0x55}, + {0x55, 0x55, 0xFF}, + {0x55, 0xFF, 0x55}, + {0x55, 0xFF, 0xFF}, + {0xFF, 0x55, 0x55}, + {0xFF, 0x55, 0xFF}, + {0xFF, 0xFF, 0x55}, + {0xFF, 0xFF, 0xFF}, +}; VOID LlbFwPutChar(INT Ch) @@ -53,55 +73,6 @@ *Depth = 16; } -ULONG -LlbFwVideoGetBufferSize(VOID) -{ - /* X * Y * BPP */ - return LlbHwGetScreenWidth() * LlbHwGetScreenHeight() * 2; -} - -VOID -LlbFwVideoSetTextCursorPosition(IN ULONG X, - IN ULONG Y) -{ - printf("%s is UNIMPLEMENTED", __FUNCTION__); - while (TRUE); -} - -VOID -LlbFwVideoHideShowTextCursor(IN BOOLEAN Show) -{ - /* Nothing to do */ - return; -} - -USHORT ColorPalette[16][3] = -{ - {0x00, 0x00, 0x00}, - {0x00, 0x00, 0xAA}, - {0x00, 0xAA, 0x00}, - {0x00, 0xAA, 0xAA}, - {0xAA, 0x00, 0x00}, - {0xAA, 0x00, 0xAA}, - {0xAA, 0x55, 0x00}, - {0xAA, 0xAA, 0xAA}, - {0x55, 0x55, 0x55}, - {0x55, 0x55, 0xFF}, - {0x55, 0xFF, 0x55}, - {0x55, 0xFF, 0xFF}, - {0xFF, 0x55, 0x55}, - {0xFF, 0x55, 0xFF}, - {0xFF, 0xFF, 0x55}, - {0xFF, 0xFF, 0xFF}, -}; - -VOID -LlbFwVideoCopyOffScreenBufferToVRAM(IN PVOID Buffer) -{ - /* No double-buffer is used on ARM */ - return; -} - VOID LlbFwVideoClearScreen(IN UCHAR Attr) { @@ -133,43 +104,6 @@ LlbVideoDrawChar(c, Buffer, Color, BackColor); } -BOOLEAN -LlbFwVideoIsPaletteFixed(VOID) -{ - printf("%s is UNIMPLEMENTED", __FUNCTION__); - while (TRUE); - return TRUE; -} - -VOID -LlbFwVideoSetPaletteColor(IN UCHAR Color, - IN UCHAR Red, - IN UCHAR Green, - IN UCHAR Blue) -{ - printf("%s is UNIMPLEMENTED", __FUNCTION__); - while (TRUE); - return; -} - -VOID -LlbFwVideoGetPaletteColor(IN UCHAR Color, - OUT PUCHAR Red, - OUT PUCHAR Green, - OUT PUCHAR Blue) -{ - printf("%s is UNIMPLEMENTED", __FUNCTION__); - while (TRUE); - return; -} - -VOID -LlbFwVideoSync(VOID) -{ - printf("%s is UNIMPLEMENTED", __FUNCTION__); - while (TRUE); - return; -} TIMEINFO* LlbFwGetTime(VOID) Modified: trunk/reactos/boot/armllb/os/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/os/loader.c?re… ============================================================================== --- trunk/reactos/boot/armllb/os/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/os/loader.c [iso-8859-1] Tue Feb 9 04:10:07 2010 @@ -76,16 +76,7 @@ ArmBlock.VideoClearScreen = LlbFwVideoClearScreen; ArmBlock.VideoSetDisplayMode = LlbFwVideoSetDisplayMode; ArmBlock.VideoGetDisplaySize = LlbFwVideoGetDisplaySize; - ArmBlock.VideoGetBufferSize = LlbFwVideoGetBufferSize; - ArmBlock.VideoSetTextCursorPosition = LlbFwVideoSetTextCursorPosition; - ArmBlock.VideoSetTextCursorPosition = LlbFwVideoSetTextCursorPosition; - ArmBlock.VideoHideShowTextCursor = LlbFwVideoHideShowTextCursor; ArmBlock.VideoPutChar = LlbFwVideoPutChar; - ArmBlock.VideoCopyOffScreenBufferToVRAM = LlbFwVideoCopyOffScreenBufferToVRAM; - ArmBlock.VideoIsPaletteFixed = LlbFwVideoIsPaletteFixed; - ArmBlock.VideoSetPaletteColor = LlbFwVideoSetPaletteColor; - ArmBlock.VideoGetPaletteColor = LlbFwVideoGetPaletteColor; - ArmBlock.VideoSync = LlbFwVideoSync; ArmBlock.GetTime = LlbFwGetTime; } Removed: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c (removed) @@ -1,1431 +1,0 @@ -/* - * PROJECT: ReactOS Boot Loader - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/freeldr/arch/arm/loader.c - * PURPOSE: ARM Kernel Loader - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -/* INCLUDES *******************************************************************/ - -#include <freeldr.h> -#include <internal/arm/ke.h> -#include <internal/arm/mm.h> -#include <internal/arm/intrin_i.h> - -#define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)x &~ KSEG0_BASE) >> PAGE_SHIFT) - -/* GLOBALS ********************************************************************/ - -typedef struct _BIOS_MEMORY_DESCRIPTOR -{ - ULONG BlockBase; - ULONG BlockSize; -} BIOS_MEMORY_DESCRIPTOR, *PBIOS_MEMORY_DESCRIPTOR; - -ULONG PageDirectoryStart, PageDirectoryEnd; -PLOADER_PARAMETER_BLOCK ArmLoaderBlock; -CHAR ArmCommandLine[256]; -CHAR ArmArcBootPath[64]; -CHAR ArmArcHalPath[64]; -CHAR ArmNtHalPath[64]; -CHAR ArmNtBootPath[64]; -PNLS_DATA_BLOCK ArmNlsDataBlock; -PLOADER_PARAMETER_EXTENSION ArmExtension; -BIOS_MEMORY_DESCRIPTOR ArmBoardMemoryDescriptors[16] = {{0}}; -PBIOS_MEMORY_DESCRIPTOR ArmBoardMemoryList = ArmBoardMemoryDescriptors; -ULONG NumberDescriptors = 0; -MEMORY_DESCRIPTOR MDArray[16] = {{0}}; -ULONG ArmSharedHeapSize; -PCHAR ArmSharedHeap; - -extern PAGE_DIRECTORY_ARM startup_pagedirectory; -extern PAGE_TABLE_ARM kernel_pagetable; -extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; -extern ULONG_PTR KernelBase; - -extern ADDRESS_RANGE ArmBoardMemoryMap[16]; -extern ULONG ArmBoardMemoryMapRangeCount; -extern ULONG_PTR AnsiData, OemData, UnicodeData, RegistryData, KernelData, HalData, DriverData[16]; -extern ULONG RegistrySize, AnsiSize, OemSize, UnicodeSize, KernelSize, HalSize, DriverSize[16]; -extern PCHAR DriverName[16]; -extern ULONG Drivers; -extern ULONG BootStack; - -ULONG SizeBits[] = -{ - -1, // INVALID - -1, // INVALID - 1 << 12, // 4KB - 1 << 13, // 8KB - 1 << 14, // 16KB - 1 << 15, // 32KB - 1 << 16, // 64KB - 1 << 17 // 128KB -}; - -ULONG AssocBits[] = -{ - -1, // INVALID - -1, // INVALID - 4 // 4-way associative -}; - -ULONG LenBits[] = -{ - -1, // INVALID - -1, // INVALID - 8 // 8 words per line (32 bytes) -}; - -// -// Where to map the serial port -// -#define UART_VIRTUAL 0xE0000000 - -/* FUNCTIONS ******************************************************************/ - -PVOID -ArmAllocateFromSharedHeap(IN ULONG Size) -{ - PVOID Buffer; - - // - // Allocate from the shared heap - // - Buffer = &ArmSharedHeap[ArmSharedHeapSize]; - ArmSharedHeapSize += Size; - return Buffer; -} - -PMEMORY_ALLOCATION_DESCRIPTOR -NTAPI -ArmAllocateMemoryDescriptor(VOID) -{ - // - // Allocate a descriptor from the heap - // - return ArmAllocateFromSharedHeap(sizeof(MEMORY_ALLOCATION_DESCRIPTOR)); -} - -VOID -NTAPI -ArmAddBoardMemoryDescriptor(IN ULONG Address, - IN ULONG Size) -{ - PBIOS_MEMORY_DESCRIPTOR BiosBlock = ArmBoardMemoryList; - - // - // Loop board DRAM configuration - // - while (BiosBlock->BlockSize > 0) - { - /* Check if we've found a matching head block */ - if (Address + Size == BiosBlock->BlockBase) - { - /* Simply enlarge and rebase it */ - BiosBlock->BlockBase = Address; - BiosBlock->BlockSize += Size; - break; - } - - /* Check if we've found a matching tail block */ - if (Address == (BiosBlock->BlockBase + BiosBlock->BlockSize)) - { - /* Simply enlarge it */ - BiosBlock->BlockSize += Size; - break; - } - - /* Nothing suitable found, try the next block */ - BiosBlock++; - } - - /* No usable blocks found, found a free block instead */ - if (!BiosBlock->BlockSize) - { - /* Write our data */ - BiosBlock->BlockBase = Address; - BiosBlock->BlockSize = Size; - - /* Create a new block and mark it as the end of the array */ - BiosBlock++; - BiosBlock->BlockBase = BiosBlock->BlockSize = 0L; - } -} - -VOID -NTAPI -ArmBuildBoardMemoryMap(VOID) -{ - ULONG BlockBegin, BlockEnd; - ULONG j; - - /* Loop the BIOS Memory Map */ - for (j = 0; j < ArmBoardMemoryMapRangeCount; j++) - { - /* Get the start and end addresses */ - BlockBegin = ArmBoardMemoryMap[j].BaseAddrLow; - BlockEnd = ArmBoardMemoryMap[j].BaseAddrLow + ArmBoardMemoryMap[j].LengthLow - 1; - - /* Make sure this isn't a > 4GB descriptor */ - if (!ArmBoardMemoryMap[j].BaseAddrHigh) - { - /* Make sure we don't overflow */ - if (BlockEnd < BlockBegin) BlockEnd = 0xFFFFFFFF; - - /* Check if this is free memory */ - if (ArmBoardMemoryMap[j].Type == 1) - { - /* Add it to our BIOS descriptors */ - ArmAddBoardMemoryDescriptor(BlockBegin, BlockEnd - BlockBegin + 1); - } - } - } -} - -NTSTATUS -NTAPI -ArmConfigureArcDescriptor(IN ULONG PageBegin, - IN ULONG PageEnd, - IN TYPE_OF_MEMORY MemoryType) -{ - ULONG i; - ULONG BlockBegin, BlockEnd; - MEMORY_TYPE BlockType; - BOOLEAN Combined = FALSE; - - /* If this descriptor seems bogus, just return */ - if (PageEnd <= PageBegin) return STATUS_SUCCESS; - - /* Loop every ARC descriptor, trying to find one we can modify */ - for (i = 0; i < NumberDescriptors; i++) - { - /* Get its settings */ - BlockBegin = MDArray[i].BasePage; - BlockEnd = MDArray[i].BasePage + MDArray[i].PageCount; - BlockType = MDArray[i].MemoryType; - - /* Check if we can fit inside this block */ - if (BlockBegin < PageBegin) - { - /* Check if we are larger then it */ - if ((BlockEnd > PageBegin) && (BlockEnd <= PageEnd)) - { - /* Make it end where we start */ - BlockEnd = PageBegin; - } - - /* Check if it ends after we do */ - if (BlockEnd > PageEnd) - { - /* Make sure we can allocate a descriptor */ - if (NumberDescriptors == 60) return ENOMEM; - - /* Create a descriptor for whatever memory we're not part of */ - MDArray[NumberDescriptors].MemoryType = BlockType; - MDArray[NumberDescriptors].BasePage = PageEnd; - MDArray[NumberDescriptors].PageCount = BlockEnd - PageEnd; - NumberDescriptors++; - - /* The next block ending is now where we begin */ - BlockEnd = PageBegin; - } - } - else - { - /* Check if the blog begins inside our range */ - if (BlockBegin < PageEnd) - { - /* Check if it ends before we do */ - if (BlockEnd < PageEnd) - { - /* Then make it disappear */ - BlockEnd = BlockBegin; - } - else - { - /* Otherwise make it start where we end */ - BlockBegin = PageEnd; - } - } - } - - /* Check if the block matches us, and we haven't tried combining yet */ - if ((BlockType == MemoryType) && !(Combined)) - { - /* Check if it starts where we end */ - if (BlockBegin == PageEnd) - { - /* Make it start with us, and combine us */ - BlockBegin = PageBegin; - Combined = TRUE; - } - else if (BlockEnd == PageBegin) - { - /* Otherwise, it ends where we begin, combine its ending */ - BlockEnd = PageEnd; - Combined = TRUE; - } - } - - /* Check the original block data matches with what we came up with */ - if ((MDArray[i].BasePage == BlockBegin) && - (MDArray[i].PageCount == BlockEnd - BlockBegin)) - { - /* Then skip it */ - continue; - } - - /* Otherwise, set our new settings for this block */ - MDArray[i].BasePage = BlockBegin; - MDArray[i].PageCount = BlockEnd - BlockBegin; - - /* Check if we are killing the block */ - if (BlockBegin == BlockEnd) - { - /* Delete this block and restart the loop properly */ - NumberDescriptors--; - if (i < NumberDescriptors) MDArray[i] = MDArray[NumberDescriptors]; - i--; - } - } - - /* If we got here without combining, we need to allocate a new block */ - if (!(Combined) && (MemoryType < LoaderMaximum)) - { - /* Make sure there's enough descriptors */ - if (NumberDescriptors == 60) return ENOMEM; - - /* Allocate a new block with our data */ - MDArray[NumberDescriptors].MemoryType = MemoryType; - MDArray[NumberDescriptors].BasePage = PageBegin; - MDArray[NumberDescriptors].PageCount = PageEnd - PageBegin; - NumberDescriptors++; - } - - /* Changes complete, return success */ - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -ArmBuildOsMemoryMap(VOID) -{ - PBIOS_MEMORY_DESCRIPTOR MdBlock; - ULONG BlockStart, BlockEnd, BiasedStart, BiasedEnd, PageStart, PageEnd; - NTSTATUS Status = STATUS_SUCCESS; - - /* Loop the BIOS Memory Descriptor List */ - MdBlock = ArmBoardMemoryList; - while (MdBlock->BlockSize) - { - /* Get the statrt and end addresses */ - BlockStart = MdBlock->BlockBase; - BlockEnd = BlockStart + MdBlock->BlockSize - 1; - - /* Align them to page boundaries */ - BiasedStart = BlockStart & (PAGE_SIZE - 1); - if (BiasedStart) BlockStart = BlockStart + PAGE_SIZE - BiasedStart; - BiasedEnd = (BlockEnd + 1) & (ULONG)(PAGE_SIZE - 1); - if (BiasedEnd) BlockEnd -= BiasedEnd; - - /* Get the actual page numbers */ - PageStart = BlockStart >> PAGE_SHIFT; - PageEnd = (BlockEnd + 1) >> PAGE_SHIFT; - - /* Check if we did any alignment */ - if (BiasedStart) - { - /* Mark that region as reserved */ - Status = ArmConfigureArcDescriptor(PageStart - 1, - PageStart, - MemorySpecialMemory); - if (Status != STATUS_SUCCESS) break; - } - - /* Check if we did any alignment */ - if (BiasedEnd) - { - /* Mark that region as reserved */ - Status = ArmConfigureArcDescriptor(PageEnd - 1, - PageEnd, - MemorySpecialMemory); - if (Status != STATUS_SUCCESS) break; - } - - /* It is, mark the memory a free */ - Status = ArmConfigureArcDescriptor(PageStart, - PageEnd, - LoaderFree); - - /* If we failed, break out, otherwise, go to the next BIOS block */ - if (Status != STATUS_SUCCESS) break; - MdBlock++; - } - - /* Return error code */ - return Status; -} - -VOID -NTAPI -ArmInsertMemoryDescriptor(IN PMEMORY_ALLOCATION_DESCRIPTOR NewDescriptor) -{ - PLIST_ENTRY ListHead, PreviousEntry, NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR Descriptor = NULL, NextDescriptor = NULL; - - /* Loop the memory descriptor list */ - ListHead = &ArmLoaderBlock->MemoryDescriptorListHead; - PreviousEntry = ListHead; - NextEntry = ListHead->Flink; - while (NextEntry != ListHead) - { - /* Get the current descriptor and check if it's below ours */ - NextDescriptor = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - if (NewDescriptor->BasePage < NextDescriptor->BasePage) break; - - /* It isn't, save the previous entry and descriptor, and try again */ - PreviousEntry = NextEntry; - Descriptor = NextDescriptor; - NextEntry = NextEntry->Flink; - } - - /* So we found the right spot to insert. Is this free memory? */ - if (NewDescriptor->MemoryType != LoaderFree) - { - /* It isn't, so insert us before the last descriptor */ - InsertHeadList(PreviousEntry, &NewDescriptor->ListEntry); - } - else - { - /* We're free memory. Check if the entry we found is also free memory */ - if ((PreviousEntry != ListHead) && - ((Descriptor->MemoryType == LoaderFree) || - (Descriptor->MemoryType == LoaderReserve)) && - ((Descriptor->BasePage + Descriptor->PageCount) == - NewDescriptor->BasePage)) - { - /* It's free memory, and we're right after it. Enlarge that block */ - Descriptor->PageCount += NewDescriptor->PageCount; - NewDescriptor = Descriptor; - } - else - { - /* Our range scan't be combined, so just insert us separately */ - InsertHeadList(PreviousEntry, &NewDescriptor->ListEntry); - } - - /* Check if we merged with an existing free memory block */ - if ((NextEntry != ListHead) && - ((NextDescriptor->MemoryType == LoaderFree) || - (NextDescriptor->MemoryType == LoaderReserve)) && - ((NewDescriptor->BasePage + NewDescriptor->PageCount) == - NextDescriptor->BasePage)) - { - /* Update our own block */ - NewDescriptor->PageCount += NextDescriptor->PageCount; - - /* Remove the next block */ - RemoveEntryList(&NextDescriptor->ListEntry); - } - } -} - -NTSTATUS -NTAPI -ArmBuildMemoryDescriptor(IN PMEMORY_ALLOCATION_DESCRIPTOR MemoryDescriptor, - IN MEMORY_TYPE MemoryType, - IN ULONG BasePage, - IN ULONG PageCount) -{ - PMEMORY_ALLOCATION_DESCRIPTOR Descriptor, NextDescriptor = NULL; - LONG Delta; - TYPE_OF_MEMORY CurrentType; - BOOLEAN UseNext; - - /* Check how many pages we'll be consuming */ - Delta = BasePage - MemoryDescriptor->BasePage; - if (!(Delta) && (PageCount == MemoryDescriptor->PageCount)) - { - /* We can simply convert the current descriptor into our new type */ - MemoryDescriptor->MemoryType = MemoryType; - } - else - { - /* Get the current memory type of the descriptor, and reserve it */ - CurrentType = MemoryDescriptor->MemoryType; - MemoryDescriptor->MemoryType = LoaderSpecialMemory; - - /* Check if we'll need another descriptor for what's left of memory */ - UseNext = ((BasePage != MemoryDescriptor->BasePage) && - (Delta + PageCount != MemoryDescriptor->PageCount)); - - /* Get a descriptor */ - Descriptor = ArmAllocateMemoryDescriptor(); - if (!Descriptor) return STATUS_INSUFFICIENT_RESOURCES; - - /* Check if we are using another descriptor */ - if (UseNext) - { - /* Allocate that one too */ - NextDescriptor = ArmAllocateMemoryDescriptor(); - if (!NextDescriptor) return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Build the descriptor we got */ - Descriptor->MemoryType = MemoryType; - Descriptor->BasePage = BasePage; - Descriptor->PageCount = PageCount; - - /* Check if we're starting at the same place as the old one */ - if (BasePage == MemoryDescriptor->BasePage) - { - /* Simply decrease the old descriptor and rebase it */ - MemoryDescriptor->BasePage += PageCount; - MemoryDescriptor->PageCount -= PageCount; - MemoryDescriptor->MemoryType = CurrentType; - } - else if (Delta + PageCount == MemoryDescriptor->PageCount) - { - /* We finish where the old one did, shorten it */ - MemoryDescriptor->PageCount -= PageCount; - MemoryDescriptor->MemoryType = CurrentType; - } - else - { - /* We're inside the current block, mark our free region */ - NextDescriptor->MemoryType = LoaderFree; - NextDescriptor->BasePage = BasePage + PageCount; - NextDescriptor->PageCount = MemoryDescriptor->PageCount - - (PageCount + Delta); - - /* And cut down the current descriptor */ - MemoryDescriptor->PageCount = Delta; - MemoryDescriptor->MemoryType = CurrentType; - - /* Finally, insert our new free descriptor into the list */ - ArmInsertMemoryDescriptor(NextDescriptor); - } - - /* Insert the descriptor we allocated */ - ArmInsertMemoryDescriptor(Descriptor); - } - - /* Return success */ - return STATUS_SUCCESS; -} - -PMEMORY_ALLOCATION_DESCRIPTOR -NTAPI -ArmFindMemoryDescriptor(IN ULONG BasePage) -{ - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock = NULL; - PLIST_ENTRY NextEntry, ListHead; - - /* Scan the memory descriptor list */ - ListHead = &ArmLoaderBlock->MemoryDescriptorListHead; - NextEntry = ListHead->Flink; - while (NextEntry != ListHead) - { - /* Get the current descriptor */ - MdBlock = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* Check if it can contain our memory range */ - if ((MdBlock->BasePage <= BasePage) && - (MdBlock->BasePage + MdBlock->PageCount > BasePage)) - { - /* It can, break out */ - break; - } - - /* Go to the next descriptor */ - NextEntry = NextEntry->Flink; - } - - /* Return the descriptor we found, if any */ - return MdBlock; -} - -NTSTATUS -NTAPI -ArmCreateMemoryDescriptor(IN TYPE_OF_MEMORY MemoryType, - IN ULONG BasePage, - IN ULONG PageCount, - IN ULONG Alignment, - OUT PULONG ReturnedBase) -{ - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; - ULONG AlignedBase, AlignedLimit; - PMEMORY_ALLOCATION_DESCRIPTOR ActiveMdBlock; - ULONG ActiveAlignedBase = 0; - PLIST_ENTRY NextEntry, ListHead; - - /* If no information was given, make some assumptions */ - if (!Alignment) Alignment = 1; - if (!PageCount) PageCount = 1; - - /* Start looking for a matching descvriptor */ - do - { - /* Calculate the limit of the range */ - AlignedLimit = PageCount + BasePage; - - /* Find a descriptor that already contains our base address */ - MdBlock = ArmFindMemoryDescriptor(BasePage); - if (MdBlock) - { - /* If it contains our limit as well, break out early */ - if ((MdBlock->PageCount + MdBlock->BasePage) >= AlignedLimit) break; - } - - /* Loop the memory list */ - AlignedBase = 0; - ActiveMdBlock = NULL; - ListHead = &ArmLoaderBlock->MemoryDescriptorListHead; - NextEntry = ListHead->Flink; - while (NextEntry != ListHead) - { - /* Get the current descriptors */ - MdBlock = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* Align the base address and our limit */ - AlignedBase = (MdBlock->BasePage + (Alignment - 1)) &~ Alignment; - AlignedLimit = MdBlock->PageCount - - AlignedBase + - MdBlock->BasePage; - - /* Check if this is a free block that can satisfy us */ - if ((MdBlock->MemoryType == LoaderFree) && - (AlignedLimit <= MdBlock->PageCount) && - (PageCount <= AlignedLimit)) - { - /* It is, stop searching */ - ActiveMdBlock = MdBlock; - ActiveAlignedBase = AlignedBase; - break; - } - - /* Try the next block */ - NextEntry = NextEntry->Flink; - } - - /* See if we came up with an adequate block */ - if (ActiveMdBlock) - { - /* Generate a descriptor in it */ - *ReturnedBase = AlignedBase; - return ArmBuildMemoryDescriptor(ActiveMdBlock, - MemoryType, - ActiveAlignedBase, - PageCount); - } - } while (TRUE); - - /* We found a matching block, generate a descriptor with it */ - *ReturnedBase = BasePage; - return ArmBuildMemoryDescriptor(MdBlock, MemoryType, BasePage, PageCount); -} - -NTSTATUS -NTAPI -ArmBuildLoaderMemoryList(VOID) -{ - PMEMORY_ALLOCATION_DESCRIPTOR Descriptor; - MEMORY_DESCRIPTOR *Memory; - ULONG i; - - /* Loop all BIOS Memory Descriptors */ - for (i = 0; i < NumberDescriptors; i++) - { - /* Get the current descriptor */ - Memory = &MDArray[i]; - - /* Allocate an NT Memory Descriptor */ - Descriptor = ArmAllocateMemoryDescriptor(); - if (!Descriptor) return ENOMEM; - - /* Copy the memory type */ - Descriptor->MemoryType = Memory->MemoryType; - if (Memory->MemoryType == MemoryFreeContiguous) - { - /* Convert this to free */ - Descriptor->MemoryType = LoaderFree; - } - else if (Memory->MemoryType == MemorySpecialMemory) - { - /* Convert this to special memory */ - Descriptor->MemoryType = LoaderSpecialMemory; - } - - /* Copy the range data */ - Descriptor->BasePage = Memory->BasePage; - Descriptor->PageCount = Memory->PageCount; - - /* Insert the descriptor */ - if (Descriptor->PageCount) ArmInsertMemoryDescriptor(Descriptor); - } - - /* All went well */ - return STATUS_SUCCESS; -} - -#define PFN_SHIFT 12 -#define LARGE_PFN_SHIFT 20 - -#define PTE_BASE 0xC0000000 -#define PDE_BASE 0xC0400000 -#define HAL_BASE 0xFFC00000 -#define MMIO_BASE 0x10000000 - -#define LowMemPageTableIndex 0 -#define StartupPtePageTableIndex (PTE_BASE >> PDE_SHIFT) -#define StartupPdePageTableIndex (PDE_BASE >> PDE_SHIFT) -#define MmioPageTableIndex (MMIO_BASE >> PDE_SHIFT) -#define HalPageTableIndex (HAL_BASE >> PDE_SHIFT) - -/* Converts a Physical Address into a Page Frame Number */ -#define PaToPfn(p) ((p) >> PFN_SHIFT) -#define PaToLargePfn(p) ((p) >> LARGE_PFN_SHIFT) -#define PaPtrToPfn(p) (((ULONG_PTR)(p)) >> PFN_SHIFT) - -/* Converts a Physical Address into a Coarse Page Table PFN */ -#define PaPtrToPdePfn(p) (((ULONG_PTR)(p)) >> CPT_SHIFT) - -HARDWARE_PTE_ARMV6 TempPte; -HARDWARE_LARGE_PTE_ARMV6 TempLargePte; -HARDWARE_PDE_ARMV6 TempPde; - -PVOID -ArmSetupPageDirectory(VOID) -{ - PPAGE_DIRECTORY_ARM PageDir; - PPAGE_TABLE_ARM PageTable, KernelPageTable; - ULONG KernelPageTableIndex; - ULONG i; - PHARDWARE_PTE_ARMV6 PointerPte; - PHARDWARE_PDE_ARMV6 PointerPde; - PHARDWARE_LARGE_PTE_ARMV6 LargePte; - PFN_NUMBER Pfn; - - /* Setup templates */ - TempPte.Accessed = TempPte.Valid = TempLargePte.LargePage = TempLargePte.Accessed = TempPde.Valid = 1; - - /* Get the Kernel Table Index */ - KernelPageTableIndex = KernelBase >> PDE_SHIFT; - - /* Allocate 1MB PDE_BASE and HYPER_SPACE. This will be improved later. Must be 1MB aligned */ - PageDir = MmAllocateMemoryAtAddress(1 * 1024 * 1024, (PVOID)0x700000, LoaderMemoryData); - - /* Setup the Low Memory PDE as an identity-mapped Large Page (1MB) */ - LargePte = &PageDir->Pte[LowMemPageTableIndex]; - *LargePte = TempLargePte; - - /* Setup the MMIO PDE as two identity mapped large pages -- the kernel will blow these away later */ - LargePte = &PageDir->Pte[MmioPageTableIndex]; - Pfn = PaToLargePfn(0x10000000); - for (i = 0; i < 2; i++) - { - TempLargePte.PageFrameNumber = Pfn++; - *LargePte++ = TempLargePte; - } - - /* Allocate 8 page tables (8KB) to describe the 8MB initial kernel region */ - KernelPageTable = MmAllocateMemoryWithType(8192, LoaderMemoryData); - - /* Setup the Kernel PDEs */ - PointerPde = &PageDir->Pde[KernelPageTableIndex]; - Pfn = PaPtrToPdePfn(KernelPageTable); - for (i = 0; i < 8; i++) - { - TempPde.PageFrameNumber = Pfn; - *PointerPde++ = TempPde; - Pfn++; - } - - /* Setup the Kernel PTEs */ - PointerPte = KernelPageTable->Pte; - Pfn = PaPtrToPfn(KERNEL_BASE_PHYS); - for (i = 0; i < 1536; i++) - { - TempPte.PageFrameNumber = Pfn++; - *PointerPte++ = TempPte; - } - - /* Setup the Startup PDE */ - LargePte = &PageDir->Pte[StartupPdePageTableIndex]; - TempLargePte.PageFrameNumber = PaToLargePfn((ULONG_PTR)PageDir); - *LargePte = TempLargePte; - - /* After this point, any MiAddressToPde is guaranteed not to fault */ - - /* Allocate 4 page tables (4KB) to describe the 4MB PTE_BASE region */ - PageTable = MmAllocateMemoryWithType(4096, LoaderMemoryData); - - /* - * Link them in the Startup PDE. - * Note these are the entries in the PD at (MiAddressToPde(PTE_BASE)). - */ - PointerPde = &PageDir->Pde[StartupPtePageTableIndex]; - Pfn = PaPtrToPdePfn(PageTable); - for (i = 0; i < 4; i++) - { - TempPde.PageFrameNumber = Pfn++; - *PointerPde++ = TempPde; - } - - /* - * Now map these page tables in PTE space (MiAddressToPte(PTE_BASE)). - * Note that they all live on a single page, since each is 1KB. - */ - PointerPte = &PageTable->Pte[0x300]; - TempPte.PageFrameNumber = PaPtrToPfn(PageTable); - *PointerPte = TempPte; - - /* - * After this point, MiAddressToPte((PDE_BASE) to MiAddressToPte(PDE_TOP)) - * is guaranteed not to fault. - * Any subsequent page allocation will first need its page table created - * and mapped in the PTE_BASE first, then the page table itself will be - * editable through its flat PTE address. - */ - return PageDir; -} - -VOID -ArmSetupPagingAndJump(IN PVOID PageDirectoryBaseAddress) -{ - ARM_CONTROL_REGISTER ControlRegister; - ARM_TTB_REGISTER TtbRegister; - ARM_DOMAIN_REGISTER DomainRegister; - - /* Set the TTBR */ - TtbRegister.AsUlong = (ULONG_PTR)PageDirectoryBaseAddress; - ASSERT(TtbRegister.Reserved == 0); - KeArmTranslationTableRegisterSet(TtbRegister); - - /* Disable domains and simply use access bits on PTEs */ - DomainRegister.AsUlong = 0; - DomainRegister.Domain0 = ClientDomain; - KeArmDomainRegisterSet(DomainRegister); - - /* Enable ARMv6+ paging (MMU), caches and the access bit */ - ControlRegister = KeArmControlRegisterGet(); - ControlRegister.MmuEnabled = TRUE; - ControlRegister.ICacheEnabled = TRUE; - ControlRegister.DCacheEnabled = TRUE; - ControlRegister.ForceAp = TRUE; - ControlRegister.ExtendedPageTables = TRUE; - KeArmControlRegisterSet(ControlRegister); - - /* Jump to Kernel */ - (*KernelEntryPoint)((PVOID)((ULONG_PTR)ArmLoaderBlock | KSEG0_BASE)); -} - -VOID -ArmPrepareForReactOS(IN BOOLEAN Setup) -{ - ARM_CACHE_REGISTER CacheReg; - PVOID Base, MemBase; - PCHAR BootPath, HalPath; - NTSTATUS Status; - ULONG Dummy, i; - PLDR_DATA_TABLE_ENTRY LdrEntry; - PLIST_ENTRY NextEntry, OldEntry; - PARC_DISK_INFORMATION ArcDiskInformation; - PARC_DISK_SIGNATURE ArcDiskSignature; - ULONG ArcDiskCount = 0; -#if 0 - ULONG Checksum = 0; - PMASTER_BOOT_RECORD Mbr; - PULONG Buffer; -#endif - PWCHAR ArmModuleName; - - // - // Allocate the ARM Shared Heap - // - ArmSharedHeap = MmAllocateMemoryWithType(PAGE_SIZE, LoaderOsloaderHeap); - ArmSharedHeapSize = 0; - if (!ArmSharedHeap) return; - - // - // Allocate the loader block and extension - // - ArmLoaderBlock = ArmAllocateFromSharedHeap(sizeof(LOADER_PARAMETER_BLOCK)); - if (!ArmLoaderBlock) return; - ArmExtension = ArmAllocateFromSharedHeap(sizeof(LOADER_PARAMETER_EXTENSION)); - if (!ArmExtension) return; - - // - // Initialize the loader block - // - InitializeListHead(&ArmLoaderBlock->BootDriverListHead); - InitializeListHead(&ArmLoaderBlock->LoadOrderListHead); - InitializeListHead(&ArmLoaderBlock->MemoryDescriptorListHead); - - // - // Setup the extension and setup block - // - ArmLoaderBlock->Extension = (PVOID)((ULONG_PTR)ArmExtension | KSEG0_BASE); - ArmLoaderBlock->SetupLdrBlock = NULL; - - // - // Add the Board Memory Map from U-Boot into the STARTUP.COM-style - // BIOS descriptor format -- this needs to be removed later. - // - ArmBuildBoardMemoryMap(); - - // - // Now basically convert these entries to the ARC format, so that we can - // get a good map of free (usable) memory - // - ArmBuildOsMemoryMap(); - - // - // NT uses an extended ARC format, with slightly different memory types. - // We also want to link the ARC descriptors together into a linked list, - // instead of the array, and allocate the semi-permanent storage in which - // these entries will be stored so that the kernel can read them. - // - ArmBuildLoaderMemoryList(); - - // - // Setup descriptor for the shared heap - // - Status = ArmCreateMemoryDescriptor(LoaderOsloaderHeap, - (ULONG_PTR)ArmSharedHeap >> PAGE_SHIFT, - ADDRESS_AND_SIZE_TO_SPAN_PAGES(ArmSharedHeap, - ArmSharedHeapSize), - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; - - // - // Setup descriptor for the boot stack - // - Status = ArmCreateMemoryDescriptor(LoaderOsloaderStack, - (ULONG_PTR)&BootStack >> PAGE_SHIFT, - 4, - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; -#if 0 - // - // Setup descriptor for the boot page tables - // - Status = ArmCreateMemoryDescriptor(LoaderMemoryData, - (ULONG_PTR)&TranslationTableStart >> PAGE_SHIFT, - ((ULONG_PTR)&TranslationTableEnd - - (ULONG_PTR)&TranslationTableStart) / PAGE_SIZE, - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; -#endif - // - // Setup descriptor for the kernel - // - Status = ArmCreateMemoryDescriptor(LoaderSystemCode, - KernelData >> PAGE_SHIFT, - ADDRESS_AND_SIZE_TO_SPAN_PAGES(KernelData, - KernelSize), - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; - - // - // Setup descriptor for the HAL - // - Status = ArmCreateMemoryDescriptor(LoaderHalCode, - HalData >> PAGE_SHIFT, - ADDRESS_AND_SIZE_TO_SPAN_PAGES(HalData, - HalSize), - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; - - // - // Setup registry data - // - ArmLoaderBlock->RegistryBase = (PVOID)((ULONG_PTR)RegistryData | KSEG0_BASE); - ArmLoaderBlock->RegistryLength = RegistrySize; - - // - // Create an MD for it - // - Status = ArmCreateMemoryDescriptor(LoaderRegistryData, - RegistryData >> PAGE_SHIFT, - ADDRESS_AND_SIZE_TO_SPAN_PAGES(RegistryData, - RegistrySize), - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; - - // - // TODO: Setup ARC Hardware tree data - // - - // - // Setup NLS data - // - ArmNlsDataBlock = ArmAllocateFromSharedHeap(sizeof(NLS_DATA_BLOCK)); - ArmLoaderBlock->NlsData = ArmNlsDataBlock; - ArmLoaderBlock->NlsData->AnsiCodePageData = (PVOID)(AnsiData | KSEG0_BASE); - ArmLoaderBlock->NlsData->OemCodePageData = (PVOID)(OemData | KSEG0_BASE); - ArmLoaderBlock->NlsData->UnicodeCodePageData = (PVOID)(UnicodeData | KSEG0_BASE); - ArmLoaderBlock->NlsData = (PVOID)((ULONG_PTR)ArmLoaderBlock->NlsData | KSEG0_BASE); - - // - // Setup ANSI NLS Memory Descriptor - // - Status = ArmCreateMemoryDescriptor(LoaderNlsData, - AnsiData >> PAGE_SHIFT, - ADDRESS_AND_SIZE_TO_SPAN_PAGES(AnsiData, - AnsiSize), - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; - - // - // Setup OEM NLS Memory Descriptor - // - Status = ArmCreateMemoryDescriptor(LoaderNlsData, - OemData >> PAGE_SHIFT, - ADDRESS_AND_SIZE_TO_SPAN_PAGES(OemData, - OemSize), - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; - - // - // Setup Unicode NLS Memory Descriptor - // - Status = ArmCreateMemoryDescriptor(LoaderNlsData, - UnicodeData >> PAGE_SHIFT, - ADDRESS_AND_SIZE_TO_SPAN_PAGES(UnicodeData, - UnicodeSize), - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; - - // - // Setup loader entry for the kernel - // - ArmModuleName = ArmAllocateFromSharedHeap(64 * sizeof(WCHAR)); - wcscpy(ArmModuleName, L"ntoskrnl.exe"); - LdrEntry = ArmAllocateFromSharedHeap(sizeof(LDR_DATA_TABLE_ENTRY)); - RtlZeroMemory(LdrEntry, sizeof(LDR_DATA_TABLE_ENTRY)); - LdrEntry->DllBase = (PVOID)KernelBase; - LdrEntry->SizeOfImage = KernelSize; - LdrEntry->EntryPoint = KernelEntryPoint; - LdrEntry->LoadCount = 1; - LdrEntry->Flags = LDRP_IMAGE_DLL | LDRP_ENTRY_PROCESSED; - RtlInitUnicodeString(&LdrEntry->FullDllName, ArmModuleName); - RtlInitUnicodeString(&LdrEntry->BaseDllName, ArmModuleName); - LdrEntry->FullDllName.Buffer = (PVOID)((ULONG_PTR)LdrEntry->FullDllName.Buffer | KSEG0_BASE); - LdrEntry->BaseDllName.Buffer = (PVOID)((ULONG_PTR)LdrEntry->BaseDllName.Buffer | KSEG0_BASE); - InsertTailList(&ArmLoaderBlock->LoadOrderListHead, &LdrEntry->InLoadOrderLinks); - - // - // Setup loader entry for the HAL - // - ArmModuleName = ArmAllocateFromSharedHeap(64 * sizeof(WCHAR)); - wcscpy(ArmModuleName, L"hal.dll"); - LdrEntry = ArmAllocateFromSharedHeap(sizeof(LDR_DATA_TABLE_ENTRY)); - RtlZeroMemory(LdrEntry, sizeof(LDR_DATA_TABLE_ENTRY)); - LdrEntry->DllBase = (PVOID)(HalData | KSEG0_BASE); - LdrEntry->SizeOfImage = HalSize; - LdrEntry->EntryPoint = (PVOID)RtlImageNtHeader((PVOID)HalData)-> - OptionalHeader.AddressOfEntryPoint; - LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)LdrEntry->EntryPoint | KSEG0_BASE); - LdrEntry->LoadCount = 1; - LdrEntry->Flags = LDRP_IMAGE_DLL | LDRP_ENTRY_PROCESSED; - RtlInitUnicodeString(&LdrEntry->FullDllName, ArmModuleName); - RtlInitUnicodeString(&LdrEntry->BaseDllName, ArmModuleName); - LdrEntry->FullDllName.Buffer = (PVOID)((ULONG_PTR)LdrEntry->FullDllName.Buffer | KSEG0_BASE); - LdrEntry->BaseDllName.Buffer = (PVOID)((ULONG_PTR)LdrEntry->BaseDllName.Buffer | KSEG0_BASE); - InsertTailList(&ArmLoaderBlock->LoadOrderListHead, &LdrEntry->InLoadOrderLinks); - - // - // Build descriptors for the drivers loaded - // - for (i = 0; i < Drivers; i++) - { - // - // Setup loader entry for the driver - // - LdrEntry = ArmAllocateFromSharedHeap(sizeof(LDR_DATA_TABLE_ENTRY)); - RtlZeroMemory(LdrEntry, sizeof(LDR_DATA_TABLE_ENTRY)); - LdrEntry->DllBase = (PVOID)(DriverData[i] | KSEG0_BASE); - LdrEntry->SizeOfImage = DriverSize[i]; - LdrEntry->EntryPoint = (PVOID)RtlImageNtHeader((PVOID)DriverData[i])-> - OptionalHeader.AddressOfEntryPoint; - LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)LdrEntry->EntryPoint | KSEG0_BASE); - LdrEntry->LoadCount = 1; - LdrEntry->Flags = LDRP_IMAGE_DLL | LDRP_ENTRY_PROCESSED; - ArmModuleName = ArmAllocateFromSharedHeap(64 * sizeof(WCHAR)); - RtlZeroMemory(ArmModuleName, 64 * sizeof(WCHAR)); - LdrEntry->FullDllName.Length = strlen(DriverName[i]) * sizeof(WCHAR); - LdrEntry->FullDllName.MaximumLength = LdrEntry->FullDllName.Length; - LdrEntry->FullDllName.Buffer = ArmModuleName; - LdrEntry->BaseDllName = LdrEntry->FullDllName; - while (*DriverName[i]) *ArmModuleName++ = *DriverName[i]++; - LdrEntry->FullDllName.Buffer = (PVOID)((ULONG_PTR)LdrEntry->FullDllName.Buffer | KSEG0_BASE); - LdrEntry->BaseDllName.Buffer = (PVOID)((ULONG_PTR)LdrEntry->BaseDllName.Buffer | KSEG0_BASE); - InsertTailList(&ArmLoaderBlock->LoadOrderListHead, &LdrEntry->InLoadOrderLinks); - - // - // Build a descriptor for the driver - // - Status = ArmCreateMemoryDescriptor(LoaderBootDriver, - DriverData[i] >> PAGE_SHIFT, - ADDRESS_AND_SIZE_TO_SPAN_PAGES(DriverData[i], - DriverSize[i]), - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; - } - - // - // Loop driver list - // - NextEntry = ArmLoaderBlock->LoadOrderListHead.Flink; - while (NextEntry != &ArmLoaderBlock->LoadOrderListHead) - { - // - // Remember the physical entry - // - OldEntry = NextEntry->Flink; - - // - // Edit the data - // - NextEntry->Flink = (PVOID)((ULONG_PTR)NextEntry->Flink | KSEG0_BASE); - NextEntry->Blink = (PVOID)((ULONG_PTR)NextEntry->Blink | KSEG0_BASE); - - // - // Keep looping - // - NextEntry = OldEntry; - } - - // - // Now edit the root itself - // - NextEntry->Flink = (PVOID)((ULONG_PTR)NextEntry->Flink | KSEG0_BASE); - NextEntry->Blink = (PVOID)((ULONG_PTR)NextEntry->Blink | KSEG0_BASE); - - // - // Setup extension parameters - // - ArmExtension->Size = sizeof(LOADER_PARAMETER_EXTENSION); - ArmExtension->MajorVersion = 5; - ArmExtension->MinorVersion = 2; - - // - // Make a copy of the command line - // - ArmLoaderBlock->LoadOptions = ArmCommandLine; - strcpy(ArmCommandLine, reactos_kernel_cmdline); - - // - // Find the first \, separating the ARC path from NT path - // - BootPath = strchr(ArmCommandLine, '\\'); - *BootPath = ANSI_NULL; - - // - // Set the ARC Boot Path - // - strncpy(ArmArcBootPath, ArmCommandLine, 63); - ArmLoaderBlock->ArcBootDeviceName = (PVOID)((ULONG_PTR)ArmArcBootPath | KSEG0_BASE); - - // - // The rest of the string is the NT path - // - HalPath = strchr(BootPath + 1, ' '); - *HalPath = ANSI_NULL; - ArmNtBootPath[0] = '\\'; - strncat(ArmNtBootPath, BootPath + 1, 63); - strcat(ArmNtBootPath,"\\"); - ArmLoaderBlock->NtBootPathName = (PVOID)((ULONG_PTR)ArmNtBootPath | KSEG0_BASE); - - // - // Set the HAL paths - // - strncpy(ArmArcHalPath, ArmArcBootPath, 63); - ArmLoaderBlock->ArcHalDeviceName = (PVOID)((ULONG_PTR)ArmArcHalPath | KSEG0_BASE); - strcpy(ArmNtHalPath, "\\"); - ArmLoaderBlock->NtHalPathName = (PVOID)((ULONG_PTR)ArmNtHalPath | KSEG0_BASE); - - // - // Use this new command line - // - strncpy(ArmLoaderBlock->LoadOptions, HalPath + 2, 255); - - // - // Parse it and change every slash to a space - // - BootPath = ArmLoaderBlock->LoadOptions; - do {if (*BootPath == '/') *BootPath = ' ';} while (*BootPath++); - - // - // Fixup command-line pointer - // - ArmLoaderBlock->LoadOptions = (PVOID)((ULONG_PTR)ArmLoaderBlock->LoadOptions | KSEG0_BASE); - - // - // Setup cache information - // - CacheReg = KeArmCacheRegisterGet(); - ArmLoaderBlock->u.Arm.FirstLevelDcacheSize = SizeBits[CacheReg.DSize]; - ArmLoaderBlock->u.Arm.FirstLevelDcacheFillSize = LenBits[CacheReg.DLength]; - ArmLoaderBlock->u.Arm.FirstLevelDcacheFillSize <<= 2; - ArmLoaderBlock->u.Arm.FirstLevelIcacheSize = SizeBits[CacheReg.ISize]; - ArmLoaderBlock->u.Arm.FirstLevelIcacheFillSize = LenBits[CacheReg.ILength]; - ArmLoaderBlock->u.Arm.FirstLevelIcacheFillSize <<= 2; - ArmLoaderBlock->u.Arm.SecondLevelDcacheSize = - ArmLoaderBlock->u.Arm.SecondLevelDcacheFillSize = - ArmLoaderBlock->u.Arm.SecondLevelIcacheSize = - ArmLoaderBlock->u.Arm.SecondLevelIcacheFillSize = 0; - - // - // Allocate the Interrupt stack - // - Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupDpcStack); - ArmLoaderBlock->u.Arm.InterruptStack = KSEG0_BASE | (ULONG)Base; - ArmLoaderBlock->u.Arm.InterruptStack += KERNEL_STACK_SIZE; - - // - // Build an entry for it - // - Status = ArmCreateMemoryDescriptor(LoaderStartupDpcStack, - (ULONG_PTR)Base >> PAGE_SHIFT, - KERNEL_STACK_SIZE / PAGE_SIZE, - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; - - // - // Allocate the Kernel Boot stack - // - Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupKernelStack); - ArmLoaderBlock->KernelStack = KSEG0_BASE | (ULONG)Base; - ArmLoaderBlock->KernelStack += KERNEL_STACK_SIZE; - - // - // Build an entry for it - // - Status = ArmCreateMemoryDescriptor(LoaderStartupKernelStack, - (ULONG_PTR)Base >> PAGE_SHIFT, - KERNEL_STACK_SIZE / PAGE_SIZE, - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; - - // - // Allocate the Abort stack - // - Base = MmAllocateMemoryWithType(KERNEL_STACK_SIZE, LoaderStartupPanicStack); - ArmLoaderBlock->u.Arm.PanicStack = KSEG0_BASE | (ULONG)Base; - ArmLoaderBlock->u.Arm.PanicStack += KERNEL_STACK_SIZE; - - // - // Build an entry for it - // - Status = ArmCreateMemoryDescriptor(LoaderStartupPanicStack, - (ULONG_PTR)Base >> PAGE_SHIFT, - KERNEL_STACK_SIZE / PAGE_SIZE, - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; - - // - // Allocate the PCR/KUSER_SHARED page -- align it to 1MB (we only need 2x4KB) - // - Base = MmAllocateMemoryWithType(2 * 1024 * 1024, LoaderStartupPcrPage); - MemBase = Base; - Base = (PVOID)ROUND_UP(Base, 1 * 1024 * 1024); - ArmLoaderBlock->u.Arm.PcrPage = (ULONG)Base >> PDE_SHIFT; - - // - // Build an entry for the KPCR and KUSER_SHARED_DATA - // - Status = ArmCreateMemoryDescriptor(LoaderStartupPcrPage, - (ULONG_PTR)MemBase >> PAGE_SHIFT, - (2 * 1024 * 1024) / PAGE_SIZE, - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; - - // - // Allocate PDR pages -- align them to 1MB (we only need 3x4KB) - // - Base = MmAllocateMemoryWithType(4 * 1024 * 1024, LoaderStartupPdrPage); - MemBase = Base; - Base = (PVOID)ROUND_UP(Base, 1 * 1024 * 1024); - ArmLoaderBlock->u.Arm.PdrPage = (ULONG)Base >> PDE_SHIFT; - - // - // Build an entry for the PDR, PRCB and initial KPROCESS/KTHREAD - // - Status = ArmCreateMemoryDescriptor(LoaderStartupPdrPage, - (ULONG_PTR)MemBase >> PAGE_SHIFT, - (4 * 1024 * 1024) / PAGE_SIZE, - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; - - // - // Set initial PRCB, Thread and Process on the last PDR page - // - Base = (PVOID)((ULONG)Base + 2 * 1024 * 1024); - ArmLoaderBlock->Prcb = KSEG0_BASE | (ULONG)Base; - ArmLoaderBlock->Process = ArmLoaderBlock->Prcb + sizeof(KPRCB); - ArmLoaderBlock->Thread = ArmLoaderBlock->Process + sizeof(EPROCESS); - - // - // Check if we're booting from RAM disk - // - if ((gRamDiskBase) && (gRamDiskSize)) - { - // - // Allocate a descriptor to describe it - // - Status = ArmCreateMemoryDescriptor(LoaderXIPRom, - (ULONG_PTR)gRamDiskBase >> PAGE_SHIFT, - gRamDiskSize / PAGE_SIZE, - 0, - &Dummy); - if (Status != STATUS_SUCCESS) return; - } - - // - // Loop memory list - // - NextEntry = ArmLoaderBlock->MemoryDescriptorListHead.Flink; - while (NextEntry != &ArmLoaderBlock->MemoryDescriptorListHead) - { - // - // Remember the physical entry - // - OldEntry = NextEntry->Flink; - - // - // Edit the data - // - NextEntry->Flink = (PVOID)((ULONG_PTR)NextEntry->Flink | KSEG0_BASE); - NextEntry->Blink = (PVOID)((ULONG_PTR)NextEntry->Blink | KSEG0_BASE); - - // - // Keep looping - // - NextEntry = OldEntry; - } - - // - // Now edit the root itself - // - NextEntry->Flink = (PVOID)((ULONG_PTR)NextEntry->Flink | KSEG0_BASE); - NextEntry->Blink = (PVOID)((ULONG_PTR)NextEntry->Blink | KSEG0_BASE); - - // - // Allocate ARC disk structure - // - ArcDiskInformation = ArmAllocateFromSharedHeap(sizeof(ARC_DISK_INFORMATION)); - InitializeListHead(&ArcDiskInformation->DiskSignatureListHead); - ArmLoaderBlock->ArcDiskInformation = (PVOID)((ULONG_PTR)ArcDiskInformation | KSEG0_BASE); - -#if 0 - // - // Read the MBR - // - MachDiskReadLogicalSectors(0x49, 0ULL, 1, (PVOID)DISKREADBUFFER); - Buffer = (ULONG*)DISKREADBUFFER; - Mbr = (PMASTER_BOOT_RECORD)DISKREADBUFFER; - - // - // Calculate the MBR checksum - // - for (i = 0; i < 128; i++) Checksum += Buffer[i]; - Checksum = ~Checksum + 1; - -#endif - // - // Allocate a disk signature and fill it out - // - ArcDiskSignature = ArmAllocateFromSharedHeap(sizeof(ARC_DISK_SIGNATURE)); - ArcDiskSignature->Signature = 0xBADAB00B;// Mbr->Signature; - ArcDiskSignature->CheckSum = 0xFAB4BEEF; //Checksum; - - // - // Allocare a string for the name and fill it out - // - ArcDiskSignature->ArcName = ArmAllocateFromSharedHeap(256); - sprintf(ArcDiskSignature->ArcName, "multi(0)disk(0)rdisk(%lu)", ArcDiskCount++); - ArcDiskSignature->ArcName = (PVOID)((ULONG_PTR)ArcDiskSignature->ArcName | KSEG0_BASE); - - // - // Insert the descriptor into the list - // - InsertTailList(&ArcDiskInformation->DiskSignatureListHead, - &ArcDiskSignature->ListEntry); - - // - // Loop ARC disk list - // - NextEntry = ArcDiskInformation->DiskSignatureListHead.Flink; - while (NextEntry != &ArcDiskInformation->DiskSignatureListHead) - { - // - // Remember the physical entry - // - OldEntry = NextEntry->Flink; - - // - // Edit the data - // - NextEntry->Flink = (PVOID)((ULONG_PTR)NextEntry->Flink | KSEG0_BASE); - NextEntry->Blink = (PVOID)((ULONG_PTR)NextEntry->Blink | KSEG0_BASE); - - // - // Keep looping - // - NextEntry = OldEntry; - } - - // - // Now edit the root itself - // - NextEntry->Flink = (PVOID)((ULONG_PTR)NextEntry->Flink | KSEG0_BASE); - NextEntry->Blink = (PVOID)((ULONG_PTR)NextEntry->Blink | KSEG0_BASE); -} - -VOID -FrLdrStartup(IN ULONG Magic) -{ - PVOID PageDir; - // - // Disable interrupts (already done) - // - - // - // Set proper CPSR (already done) - // - - // - // Initialize the page directory - // - PageDir = ArmSetupPageDirectory(); - - // - // Initialize paging and load NTOSKRNL - // - ArmSetupPagingAndJump(PageDir); -} Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Tue Feb 9 04:10:07 2010 @@ -9,73 +9,79 @@ /* INCLUDES *******************************************************************/ #include <freeldr.h> -#define RGB565(r, g, b) (((r >> 3) << 11)| ((g >> 2) << 5)| ((b >> 3) << 0)) +#include <internal/arm/intrin_i.h> /* GLOBALS ********************************************************************/ -UCHAR BootStack[0x4000]; -PUCHAR BootStackEnd = &BootStack[0x3FFF]; PARM_BOARD_CONFIGURATION_BLOCK ArmBoardBlock; -ULONG BootDrive, BootPartition; -VOID ArmPrepareForReactOS(IN BOOLEAN Setup); -ADDRESS_RANGE ArmBoardMemoryMap[16]; -ULONG ArmBoardMemoryMapRangeCount; ULONG gDiskReadBuffer, gFileSysBuffer; +BOOLEAN ArmHwDetectRan; +PCONFIGURATION_COMPONENT_DATA RootNode; + +ULONG FirstLevelDcacheSize; +ULONG FirstLevelDcacheFillSize; +ULONG FirstLevelIcacheSize; +ULONG FirstLevelIcacheFillSize; +ULONG SecondLevelDcacheSize; +ULONG SecondLevelDcacheFillSize; +ULONG SecondLevelIcacheSize; +ULONG SecondLevelIcacheFillSize; + +ARC_DISK_SIGNATURE reactos_arc_disk_info; +ULONG reactos_disk_count; +CHAR reactos_arc_hardware_data[256]; + +ULONG SizeBits[] = +{ + -1, // INVALID + -1, // INVALID + 1 << 12, // 4KB + 1 << 13, // 8KB + 1 << 14, // 16KB + 1 << 15, // 32KB + 1 << 16, // 64KB + 1 << 17 // 128KB +}; + +ULONG AssocBits[] = +{ + -1, // INVALID + -1, // INVALID + 4 // 4-way associative +}; + +ULONG LenBits[] = +{ + -1, // INVALID + -1, // INVALID + 8 // 8 words per line (32 bytes) +}; /* FUNCTIONS ******************************************************************/ VOID ArmInit(IN PARM_BOARD_CONFIGURATION_BLOCK BootContext) { - ULONG i; - - // - // Remember the pointer - // + /* Remember the pointer */ ArmBoardBlock = BootContext; - // - // Let's make sure we understand the LLB - // + /* Let's make sure we understand the LLB */ ASSERT(ArmBoardBlock->MajorVersion == ARM_BOARD_CONFIGURATION_MAJOR_VERSION); ASSERT(ArmBoardBlock->MinorVersion == ARM_BOARD_CONFIGURATION_MINOR_VERSION); - // - // This should probably go away once we support more boards - // + /* This should probably go away once we support more boards */ ASSERT((ArmBoardBlock->BoardType == MACH_TYPE_FEROCEON) || (ArmBoardBlock->BoardType == MACH_TYPE_VERSATILE_PB) || (ArmBoardBlock->BoardType == MACH_TYPE_OMAP3_BEAGLE)); - // - // Save data required for memory initialization - // - ArmBoardMemoryMapRangeCount = ArmBoardBlock->MemoryMapEntryCount; - ASSERT(ArmBoardMemoryMapRangeCount != 0); - ASSERT(ArmBoardMemoryMapRangeCount < 16); - for (i = 0; i < ArmBoardMemoryMapRangeCount; i++) - { - // - // Copy each entry - // - RtlCopyMemory(&ArmBoardMemoryMap[i], - &ArmBoardBlock->MemoryMap[i], - sizeof(ADDRESS_RANGE)); - } - - // - // Call FreeLDR's portable entrypoint with our command-line - // + /* Call FreeLDR's portable entrypoint with our command-line */ BootMain(ArmBoardBlock->CommandLine); } -BOOLEAN -ArmDiskNormalizeSystemPath(IN OUT PCHAR SystemPath, - IN unsigned Size) -{ - /* Only RAMDISK supported for now */ - if (!strstr(SystemPath, "ramdisk(0)")) return FALSE; - return TRUE; +VOID +ArmPrepareForReactOS(IN BOOLEAN Setup) +{ + return; } BOOLEAN @@ -95,28 +101,42 @@ PCONFIGURATION_COMPONENT_DATA ArmHwDetect(VOID) { - PCONFIGURATION_COMPONENT_DATA RootNode; - - // - // Create the root node - // + ARM_CACHE_REGISTER CacheReg; + + /* Create the root node */ + if (ArmHwDetectRan++) return RootNode; FldrCreateSystemKey(&RootNode); - // - // TODO: - // There's no such thing as "PnP" on embedded hardware. - // The boot loader will send us a device tree, similar to ACPI - // or OpenFirmware device trees, and we will convert it to ARC. - // - - // - // Register RAMDISK Device - // + /* + * TODO: + * There's no such thing as "PnP" on embedded hardware. + * The boot loader will send us a device tree, similar to ACPI + * or OpenFirmware device trees, and we will convert it to ARC. + */ + + /* Get cache information */ + CacheReg = KeArmCacheRegisterGet(); + FirstLevelDcacheSize = SizeBits[CacheReg.DSize]; + FirstLevelDcacheFillSize = LenBits[CacheReg.DLength]; + FirstLevelDcacheFillSize <<= 2; + FirstLevelIcacheSize = SizeBits[CacheReg.ISize]; + FirstLevelIcacheFillSize = LenBits[CacheReg.ILength]; + FirstLevelIcacheFillSize <<= 2; + SecondLevelDcacheSize = + SecondLevelDcacheFillSize = + SecondLevelIcacheSize = + SecondLevelIcacheFillSize = 0; + + /* Register RAMDISK Device */ RamDiskInitialize(); - // - // Return the root node - // + /* Fill out the ARC disk block */ + reactos_arc_disk_info.Signature = 0xBADAB00F; + reactos_arc_disk_info.CheckSum = 0xDEADBABE; + reactos_arc_disk_info.ArcName = "ramdisk(0)"; + reactos_disk_count = 1; + + /* Return the root node */ return RootNode; } @@ -124,34 +144,26 @@ ArmMemGetMemoryMap(OUT PBIOS_MEMORY_MAP BiosMemoryMap, IN ULONG MaxMemoryMapSize) { - // - // Return whatever the board returned to us (CS0 Base + Size and FLASH0) - // - RtlCopyMemory(BiosMemoryMap, - ArmBoardBlock->MemoryMap, - ArmBoardBlock->MemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP)); + /* Return whatever the board returned to us (CS0 Base + Size and FLASH0) */ + memcpy(BiosMemoryMap, + ArmBoardBlock->MemoryMap, + ArmBoardBlock->MemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP)); return ArmBoardBlock->MemoryMapEntryCount; } VOID MachInit(IN PCCH CommandLine) { - // - // Setup board-specific ARM routines - // + /* Setup board-specific ARM routines */ switch (ArmBoardBlock->BoardType) { - // - // Check for Feroceon-base boards - // + /* Check for Feroceon-base boards */ case MACH_TYPE_FEROCEON: TuiPrintf("Not implemented\n"); while (TRUE); break; - // - // Check for ARM Versatile PB boards - // + /* Check for ARM Versatile PB boards */ case MACH_TYPE_VERSATILE_PB: /* Copy Machine Routines from Firmware Table */ @@ -161,16 +173,7 @@ MachVtbl.VideoClearScreen = ArmBoardBlock->VideoClearScreen; MachVtbl.VideoSetDisplayMode = ArmBoardBlock->VideoSetDisplayMode; MachVtbl.VideoGetDisplaySize = ArmBoardBlock->VideoGetDisplaySize; - MachVtbl.VideoGetBufferSize = ArmBoardBlock->VideoGetBufferSize; - MachVtbl.VideoSetTextCursorPosition = ArmBoardBlock->VideoSetTextCursorPosition; - MachVtbl.VideoSetTextCursorPosition = ArmBoardBlock->VideoSetTextCursorPosition; - MachVtbl.VideoHideShowTextCursor = ArmBoardBlock->VideoHideShowTextCursor; MachVtbl.VideoPutChar = ArmBoardBlock->VideoPutChar; - MachVtbl.VideoCopyOffScreenBufferToVRAM = ArmBoardBlock->VideoCopyOffScreenBufferToVRAM; - MachVtbl.VideoIsPaletteFixed = ArmBoardBlock->VideoIsPaletteFixed; - MachVtbl.VideoSetPaletteColor = ArmBoardBlock->VideoSetPaletteColor; - MachVtbl.VideoGetPaletteColor = ArmBoardBlock->VideoGetPaletteColor; - MachVtbl.VideoSync = ArmBoardBlock->VideoSync; MachVtbl.GetTime = ArmBoardBlock->GetTime; /* Setup the disk and file system buffers */ @@ -178,10 +181,10 @@ gFileSysBuffer = 0x00090000; break; - // - // Check for TI OMAP3 boards - // For now that means only Beagle, but ZOOM and others should be ok too - // + /* + * Check for TI OMAP3 boards + * For now that means only Beagle, but ZOOM and others should be ok too + */ case MACH_TYPE_OMAP3_BEAGLE: TuiPrintf("Not implemented\n"); while (TRUE); @@ -191,22 +194,9 @@ ASSERT(FALSE); } - // - // Setup generic ARM routines for all boards - // + /* Setup generic ARM routines for all boards */ MachVtbl.PrepareForReactOS = ArmPrepareForReactOS; MachVtbl.GetMemoryMap = ArmMemGetMemoryMap; MachVtbl.HwDetect = ArmHwDetect; - - // - // Setup disk I/O routines - // MachVtbl.DiskGetBootPath = ArmDiskGetBootPath; - MachVtbl.DiskNormalizeSystemPath = ArmDiskNormalizeSystemPath; - - // - // We can now print to the console - // - TuiPrintf("%s for ARM\n", GetFreeLoaderVersionString()); - TuiPrintf("Bootargs: %s\n\n", CommandLine); -} +} Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Tue Feb 9 04:10:07 2010 @@ -218,6 +218,7 @@ IniOpenSection("Operating Systems", &SectionId); IniReadSettingByName(SectionId, SectionName, SettingValue, sizeof(SettingValue)); +#ifndef _M_ARM // Install the drive mapper according to this sections drive mappings #ifdef __i386__ DriveMapMapDrivesInSection(SectionName); @@ -271,6 +272,9 @@ LoadAndBootDrive(SectionName); } #endif +#else + LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_WS03); +#endif } Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Tue Feb 9 04:10:07 2010 @@ -7,19 +7,6 @@ <include base="ReactOS">include/reactos/libs</include> <include base="ReactOS">include/reactos/elf</include> <define name="_NTHAL_" /> - <group compilerset="gcc"> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - </group> - - <if property="ARCH" value="arm"> - <group compilerset="gcc"> - <compilerflag>-ffreestanding</compilerflag> - <compilerflag>-fno-builtin</compilerflag> - <compilerflag>-Os</compilerflag> - </group> - </if> - <directory name="arch"> <directory name="i386"> <if property="ARCH" value="i386"> @@ -73,7 +60,6 @@ <directory name="arm"> <if property="ARCH" value="arm"> <file first="true">boot.s</file> - <file>loader.c</file> <file>macharm.c</file> </if> </directory> @@ -102,6 +88,11 @@ </directory> <directory name="windows"> + <if property="ARCH" value="arm"> + <directory name="arm"> + <file>wlmemory.c</file> + </directory> + </if> <if property="ARCH" value="i386"> <directory name="i386"> <file>ntsetup.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Tue Feb 9 04:10:07 2010 @@ -7,10 +7,6 @@ <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <define name="_NTSYSTEM_" /> - <group compilerset="gcc"> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - </group> <directory name="arcemul"> <file>mm.c</file> <file>time.c</file> @@ -56,6 +52,7 @@ <file>libsupp.c</file> </directory> <directory name="ui"> + <file>directui.c</file> <file>gui.c</file> <file>minitui.c</file> <file>noui.c</file> @@ -68,24 +65,13 @@ <file>palette.c</file> <file>video.c</file> </directory> - <if property="ARCH" value="i386"> - <directory name="windows"> - <file>conversion.c</file> - <file>peloader.c</file> - <file>winldr.c</file> - <file>wlmemory.c</file> - <file>wlregistry.c</file> - </directory> - </if> - <if property="ARCH" value="amd64"> - <directory name="windows"> - <file>conversion.c</file> - <file>peloader.c</file> - <file>winldr.c</file> - <file>wlmemory.c</file> - <file>wlregistry.c</file> - </directory> - </if> + <directory name="windows"> + <file>conversion.c</file> + <file>peloader.c</file> + <file>winldr.c</file> + <file>wlmemory.c</file> + <file>wlregistry.c</file> + </directory> <file>freeldr.c</file> <file>debug.c</file> <file>version.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild [iso-8859-1] Tue Feb 9 04:10:07 2010 @@ -4,10 +4,6 @@ <include base="freeldr_base64k">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> - <group compilerset="gcc"> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - </group> <directory name="arch"> <if property="ARCH" value="i386"> <directory name="i386"> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] Tue Feb 9 04:10:07 2010 @@ -4,9 +4,5 @@ <include base="freeldr_main">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> - <group compilerset="gcc"> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - </group> <file>bootmgr.c</file> </module> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild [iso-8859-1] Tue Feb 9 04:10:07 2010 @@ -3,10 +3,6 @@ <module name="freeldr_startup" type="objectlibrary"> <include base="freeldr_startup">include</include> <include base="ntoskrnl">include</include> - <group compilerset="gcc"> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - </group> <directory name="arch"> <if property="ARCH" value="i386"> <directory name="i386"> Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] Tue Feb 9 04:10:07 2010 @@ -17,12 +17,6 @@ #include "../../../../../armllb/inc/machtype.h" // -// Static heap for ARC Hardware Component Tree -// 16KB oughta be enough for anyone. -// -#define HW_MAX_ARC_HEAP_SIZE 16 * 1024 - -// // ARC Component Configuration Routines // VOID @@ -31,21 +25,16 @@ OUT PCONFIGURATION_COMPONENT_DATA *SystemKey ); -VOID -NTAPI -FldrCreateComponentKey( - IN PCONFIGURATION_COMPONENT_DATA SystemKey, - IN CONFIGURATION_CLASS Class, - IN CONFIGURATION_TYPE Type, - IN IDENTIFIER_FLAG Flags, - IN ULONG Key, - IN ULONG Affinity, - IN PCHAR IdentifierString, - IN PCM_PARTIAL_RESOURCE_LIST ResourceList, - IN ULONG Size, - OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey -); +#define HW_MAX_ARC_HEAP_SIZE 256 extern PARM_BOARD_CONFIGURATION_BLOCK ArmBoardBlock; +extern ULONG FirstLevelDcacheSize; +extern ULONG FirstLevelDcacheFillSize; +extern ULONG FirstLevelIcacheSize; +extern ULONG FirstLevelIcacheFillSize; +extern ULONG SecondLevelDcacheSize; +extern ULONG SecondLevelDcacheFillSize; +extern ULONG SecondLevelIcacheSize; +extern ULONG SecondLevelIcacheFillSize; #endif Modified: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] Tue Feb 9 04:10:07 2010 @@ -1,3 +1,4 @@ +#ifndef _M_ARM #include <freeldr.h> #include <debug.h> @@ -780,5 +781,5 @@ /* Return the final mapped address */ return LoadBase; } - +#endif /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Tue Feb 9 04:10:07 2010 @@ -18,6 +18,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef _M_ARM #include <freeldr.h> #include <debug.h> @@ -889,6 +890,7 @@ * Load boot drivers */ FrLdrLoadBootDrivers(szBootPath, 40); + UiDrawProgressBarCenter(100, 100, szLoadingMsg); //UiUnInitialize("Booting ReactOS..."); // @@ -901,5 +903,6 @@ // FrLdrStartup(0x2badb002); } +#endif /* EOF */ Added: trunk/reactos/boot/freeldr/freeldr/windows/arm/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/arm/wlmemory.c (added) +++ trunk/reactos/boot/freeldr/freeldr/windows/arm/wlmemory.c [iso-8859-1] Tue Feb 9 04:10:07 2010 @@ -1,0 +1,256 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/freeldr/arch/arm/loader.c + * PURPOSE: ARM Kernel Loader + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES ***************************************************************/ + +#include <freeldr.h> +#include <debug.h> +#include <internal/arm/mm.h> +#include <internal/arm/intrin_i.h> + +#define PFN_SHIFT 12 +#define LARGE_PFN_SHIFT 20 + +#define PTE_BASE 0xC0000000 +#define PDE_BASE 0xC0400000 +#define PDR_BASE 0xFFD00000 +#define MMIO_BASE 0x10000000 +#define VECTOR_BASE 0xFFFF0000 + +#define LowMemPageTableIndex 0 +#define KernelPageTableIndex (KSEG0_BASE >> PDE_SHIFT) +#define StartupPtePageTableIndex (PTE_BASE >> PDE_SHIFT) +#define StartupPdePageTableIndex (PDE_BASE >> PDE_SHIFT) +#define MmioPageTableIndex (MMIO_BASE >> PDE_SHIFT) +#define PdrPageTableIndex (PDR_BASE >> PDE_SHIFT) +#define VectorPageTableIndex (VECTOR_BASE >> PDE_SHIFT) + +/* Converts a Physical Address into a Page Frame Number */ +#define PaToPfn(p) ((p) >> PFN_SHIFT) +#define PaToLargePfn(p) ((p) >> LARGE_PFN_SHIFT) +#define PaPtrToPfn(p) (((ULONG_PTR)(p)) >> PFN_SHIFT) + +/* Converts a Physical Address into a Coarse Page Table PFN */ +#define PaPtrToPdePfn(p) (((ULONG_PTR)(p)) >> CPT_SHIFT) + +typedef struct _KPDR_PAGE +{ + PAGE_DIRECTORY_ARM PageDir; // 0xC0400000 [0xFFD00000] + CHAR HyperSpace[233 * PAGE_SIZE]; // 0xC0404000 [0xFFD04000] + PAGE_TABLE_ARM KernelPageTable[3]; // 0xC04ED000 [0xFFDED000] + CHAR SharedData[PAGE_SIZE]; // 0xC04F0000 [0xFFDF0000] + CHAR KernelStack[KERNEL_STACK_SIZE]; // 0xC04F1000 [0xFFDF1000] + CHAR PanicStack[KERNEL_STACK_SIZE]; // 0xC04F4000 [0xFFDF4000] + CHAR InterruptStack[KERNEL_STACK_SIZE]; // 0xC04F7000 [0xFFDF7000] + CHAR InitialProcess[PAGE_SIZE]; // 0xC04FA000 [0xFFDFA000] + CHAR InitialThread[PAGE_SIZE]; // 0xC04FB000 [0xFFDFB000] + CHAR Prcb[PAGE_SIZE]; // 0xC04FC000 [0xFFDFC000] + PAGE_TABLE_ARM PageDirPageTable; // 0xC04FD000 [0xFFDFD000] + PAGE_TABLE_ARM VectorPageTable; // 0xC04FE000 [0xFFDFE000] + CHAR Pcr[PAGE_SIZE]; // 0xC04FF000 [0xFFDFF000] +} KPDR_PAGE, *PKPDR_PAGE; + +C_ASSERT(sizeof(KPDR_PAGE) == (1 * 1024 * 1024)); + +HARDWARE_PTE_ARMV6 TempPte; +HARDWARE_LARGE_PTE_ARMV6 TempLargePte; +HARDWARE_PDE_ARMV6 TempPde; +PKPDR_PAGE PdrPage; + +/* FUNCTIONS **************************************************************/ + +BOOLEAN +MempSetupPaging(IN ULONG StartPage, + IN ULONG NumberOfPages) +{ + return TRUE; +} + +VOID +MempUnmapPage(IN ULONG Page) +{ + return; +} + +VOID +MempDump(VOID) +{ + return; +} + +BOOLEAN +WinLdrMapSpecialPages(ULONG PcrBasePage) +{ + ULONG i; + PHARDWARE_PTE_ARMV6 PointerPte; + PHARDWARE_PDE_ARMV6 PointerPde; + PHARDWARE_LARGE_PTE_ARMV6 LargePte; + PFN_NUMBER Pfn; + + /* Setup the Startup PDE */ + LargePte = &PdrPage->PageDir.Pte[StartupPdePageTableIndex]; + TempLargePte.PageFrameNumber = PaToLargePfn((ULONG_PTR)&PdrPage->PageDir); + *LargePte = TempLargePte; + + /* Map-in the PDR */ + LargePte = &PdrPage->PageDir.Pte[PdrPageTableIndex]; + *LargePte = TempLargePte; + + /* After this point, any MiAddressToPde is guaranteed not to fault */ + + /* + * Link them in the Startup PDE. + * Note these are the entries in the PD at (MiAddressToPde(PTE_BASE)). + */ + PointerPde = &PdrPage->PageDir.Pde[StartupPtePageTableIndex]; + Pfn = PaPtrToPdePfn(&PdrPage->PageDirPageTable); + for (i = 0; i < 4; i++) + { + TempPde.PageFrameNumber = Pfn++; + *PointerPde++ = TempPde; + } + + /* + * Now map these page tables in PTE space (MiAddressToPte(PTE_BASE)). + * Note that they all live on a single page, since each is 1KB. + */ + PointerPte = &PdrPage->PageDirPageTable.Pte[0x300]; + TempPte.PageFrameNumber = PaPtrToPfn(&PdrPage->PageDirPageTable); + *PointerPte = TempPte; + + /* + * After this point, MiAddressToPte((PDE_BASE) to MiAddressToPte(PDE_TOP)) + * is guaranteed not to fault. + * Any subsequent page allocation will first need its page table created + * and mapped in the PTE_BASE first, then the page table itself will be + * editable through its flat PTE address. + */ + + /* Setup the Vector PDE */ + PointerPde = &PdrPage->PageDir.Pde[VectorPageTableIndex]; + TempPde.PageFrameNumber = PaPtrToPdePfn(&PdrPage->VectorPageTable); + *PointerPde = TempPde; + + /* Setup the Vector PTEs */ + PointerPte = &PdrPage->VectorPageTable.Pte[0xF0]; + TempPte.PageFrameNumber = 0; + *PointerPte = TempPte; + + /* TODO: Map in the kernel CPTs */ + return TRUE; +} + +VOID +WinLdrSetupForNt(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PVOID *GdtIdt, + IN ULONG *PcrBasePage, + IN ULONG *TssBasePage) +{ + PKPDR_PAGE PdrPage = (PVOID)0xFFD00000; + + /* Load cache information */ + LoaderBlock->u.Arm.FirstLevelDcacheSize = FirstLevelDcacheSize; + LoaderBlock->u.Arm.FirstLevelDcacheFillSize = FirstLevelDcacheFillSize; + LoaderBlock->u.Arm.FirstLevelIcacheSize = FirstLevelIcacheSize; + LoaderBlock->u.Arm.FirstLevelIcacheFillSize = FirstLevelIcacheFillSize; + LoaderBlock->u.Arm.SecondLevelDcacheSize = SecondLevelDcacheSize; + LoaderBlock->u.Arm.SecondLevelDcacheFillSize = SecondLevelDcacheFillSize; + LoaderBlock->u.Arm.SecondLevelIcacheSize = SecondLevelIcacheSize; + LoaderBlock->u.Arm.SecondLevelIcacheFillSize = SecondLevelIcacheSize; + + /* Write initial context information */ + LoaderBlock->KernelStack = (ULONG_PTR)PdrPage->KernelStack; + LoaderBlock->KernelStack += KERNEL_STACK_SIZE; + LoaderBlock->u.Arm.PanicStack = (ULONG_PTR)PdrPage->PanicStack; + LoaderBlock->u.Arm.PanicStack += KERNEL_STACK_SIZE; + LoaderBlock->u.Arm.InterruptStack = (ULONG_PTR)PdrPage->InterruptStack; + LoaderBlock->u.Arm.InterruptStack += KERNEL_STACK_SIZE; + LoaderBlock->Prcb = (ULONG_PTR)PdrPage->Prcb; + LoaderBlock->Process = (ULONG_PTR)PdrPage->InitialProcess; + LoaderBlock->Thread = (ULONG_PTR)PdrPage->InitialThread; +} + +BOOLEAN +MempAllocatePageTables(VOID) +{ + ULONG i; + PHARDWARE_PTE_ARMV6 PointerPte; + PHARDWARE_PDE_ARMV6 PointerPde; + PHARDWARE_LARGE_PTE_ARMV6 LargePte; + PFN_NUMBER Pfn; + + /* Setup templates */ + TempPte.Accessed = TempPte.Valid = TempLargePte.LargePage = TempLargePte.Accessed = TempPde.Valid = 1; + + /* Allocate the 1MB "PDR" (Processor Data Region). Must be 1MB aligned */ + PdrPage = MmAllocateMemoryAtAddress(sizeof(KPDR_PAGE), (PVOID)0x700000, LoaderMemoryData); + + /* Setup the Low Memory PDE as an identity-mapped Large Page (1MB) */ + LargePte = &PdrPage->PageDir.Pte[LowMemPageTableIndex]; + *LargePte = TempLargePte; + + /* Setup the MMIO PDE as two identity mapped large pages -- the kernel will blow these away later */ + LargePte = &PdrPage->PageDir.Pte[MmioPageTableIndex]; + Pfn = PaToLargePfn(0x10000000); + for (i = 0; i < 2; i++) + { + TempLargePte.PageFrameNumber = Pfn++; + *LargePte++ = TempLargePte; + } + + /* Setup the Kernel PDEs */ + PointerPde = &PdrPage->PageDir.Pde[KernelPageTableIndex]; + Pfn = PaPtrToPdePfn(PdrPage->KernelPageTable); + for (i = 0; i < 12; i++) + { + TempPde.PageFrameNumber = Pfn; + *PointerPde++ = TempPde; + Pfn++; + } + + /* Setup the Kernel PTEs */ + PointerPte = PdrPage->KernelPageTable[0].Pte; + Pfn = 0; + for (i = 0; i < 3072; i++) + { + TempPte.PageFrameNumber = Pfn++; + *PointerPte++ = TempPte; + } + + /* Done */ + return TRUE; +} + +VOID +WinLdrSetProcessorContext(PVOID GdtIdt, + IN ULONG Pcr, + IN ULONG Tss) +{ + ARM_CONTROL_REGISTER ControlRegister; + ARM_TTB_REGISTER TtbRegister; + ARM_DOMAIN_REGISTER DomainRegister; + + /* Set the TTBR */ + TtbRegister.AsUlong = (ULONG_PTR)&PdrPage->PageDir; + ASSERT(TtbRegister.Reserved == 0); + KeArmTranslationTableRegisterSet(TtbRegister); + + /* Disable domains and simply use access bits on PTEs */ + DomainRegister.AsUlong = 0; + DomainRegister.Domain0 = ClientDomain; + KeArmDomainRegisterSet(DomainRegister); + + /* Enable ARMv6+ paging (MMU), caches and the access bit */ + ControlRegister = KeArmControlRegisterGet(); + ControlRegister.MmuEnabled = TRUE; + ControlRegister.ICacheEnabled = TRUE; + ControlRegister.DCacheEnabled = TRUE; + ControlRegister.ForceAp = TRUE; + ControlRegister.ExtendedPageTables = TRUE; + KeArmControlRegisterSet(ControlRegister); +} Propchange: trunk/reactos/boot/freeldr/freeldr/windows/arm/wlmemory.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Tue Feb 9 04:10:07 2010 @@ -198,6 +198,10 @@ } } +#ifdef _M_ARM +#define PKTSS PVOID +#endif + BOOLEAN WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, ULONG PcrBasePage,

14 years, 7 months

[sir_richard] 45525: [MISC]: Build fixes to sync up with latest changes. [SETUPLDR]: Do not build on ARM. On a side note, I offer a bountry for "if ARCH != ARM" support in .rbuild files, instead of only allowing ==.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Feb 9 04:05:49 2010 New Revision: 45525 URL: http://svn.reactos.org/svn/reactos?rev=45525&view=rev Log: [MISC]: Build fixes to sync up with latest changes. [SETUPLDR]: Do not build on ARM. On a side note, I offer a bountry for "if ARCH != ARM" support in .rbuild files, instead of only allowing ==. Modified: trunk/reactos/boot/freeldr/freeldr.rbuild trunk/reactos/include/reactos/arm/armddk.h trunk/reactos/ntoskrnl/include/internal/arm/mm.h Modified: trunk/reactos/boot/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr.rbuil… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr.rbuild [iso-8859-1] Tue Feb 9 04:05:49 2010 @@ -10,8 +10,18 @@ <xi:include href="freeldr/freeldr_base.rbuild" /> <xi:include href="freeldr/freeldr_arch.rbuild" /> <xi:include href="freeldr/freeldr_main.rbuild" /> - <xi:include href="freeldr/setupldr_main.rbuild" /> <xi:include href="freeldr/freeldr.rbuild" /> - <xi:include href="freeldr/setupldr.rbuild" /> + <if property="ARCH" value="i386"> + <xi:include href="freeldr/setupldr_main.rbuild" /> + <xi:include href="freeldr/setupldr.rbuild" /> + </if> + <if property="ARCH" value="ppc"> + <xi:include href="freeldr/setupldr_main.rbuild" /> + <xi:include href="freeldr/setupldr.rbuild" /> + </if> + <if property="ARCH" value="amd64"> + <xi:include href="freeldr/setupldr_main.rbuild" /> + <xi:include href="freeldr/setupldr.rbuild" /> + </if> </directory> </group> Modified: trunk/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk… ============================================================================== --- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Tue Feb 9 04:05:49 2010 @@ -122,9 +122,7 @@ // Processor Control Region // #ifdef _WINNT_H -typedef -VOID -(*PKINTERRUPT_ROUTINE)(VOID); +#define KIRQL ULONG #endif typedef struct _KPCR { Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Tue Feb 9 04:05:49 2010 @@ -111,12 +111,12 @@ #define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.NonGlobal = 1) #define MI_MAKE_DIRTY_PAGE(x) -#define MI_MAKE_OWNER_PAGE(x) ((x)->u.Hard.Access = 1) // FIXFIX -#define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.ExtendedAccess = 1) // FIXFIX +#define MI_MAKE_OWNER_PAGE(x) ((x)->u.Hard.Owner = 1) +#define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.ReadOnly = 0) #define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.Cached = 0) #define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.Buffered = 0) #define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.Buffered = 1) -#define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.ExtendedAccess == 0) +#define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.ReadOnly == 0) #define MI_IS_PAGE_COPY_ON_WRITE(x)FALSE #define MI_IS_PAGE_DIRTY(x) TRUE

14 years, 7 months

[sir_richard] 45524: [FREELDR]: Remove C++ style indirected "UI" component from FreeLDR ARM, for several reasons that ought to be considered on x86 too: - It redraws the screen in two different ways (zero memory and character-by-character fill) over 15 times for a single boot. You notice these things on a little ARM chip! - It keeps coping data from/to an "off-screen buffer" way too much, instead of only when the video needs to be synced. - It makes assumptions about all Video Buffers supporting

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Feb 9 03:53:45 2010 New Revision: 45524 URL: http://svn.reactos.org/svn/reactos?rev=45524&view=rev Log: [FREELDR]: Remove C++ style indirected "UI" component from FreeLDR ARM, for several reasons that ought to be considered on x86 too: - It redraws the screen in two different ways (zero memory and character-by-character fill) over 15 times for a single boot. You notice these things on a little ARM chip! - It keeps coping data from/to an "off-screen buffer" way too much, instead of only when the video needs to be synced. - It makes assumptions about all Video Buffers supporting Character-Mode VGA. - It can be configured to draw cyan/yellow ponies, instead of a normal NT boot menu. The ARM build now uses a "directui.c" implementation which fixes all these issues and is efficient and to the point. It presents a normal Windows boot selection menu on ARM. [FREELDR]: Do not build any of the video routines, or the UI routines, on ARM. Added: trunk/reactos/boot/freeldr/freeldr/ui/directui.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/ui/gui.c trunk/reactos/boot/freeldr/freeldr/ui/minitui.c trunk/reactos/boot/freeldr/freeldr/ui/noui.c trunk/reactos/boot/freeldr/freeldr/ui/tui.c trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c trunk/reactos/boot/freeldr/freeldr/video/fade.c trunk/reactos/boot/freeldr/freeldr/video/palette.c trunk/reactos/boot/freeldr/freeldr/video/video.c Added: trunk/reactos/boot/freeldr/freeldr/ui/directui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/di… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/directui.c (added) +++ trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] Tue Feb 9 03:53:45 2010 @@ -1,0 +1,574 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/freeldr/freeldr/ui/directui.c + * PURPOSE: FreeLDR UI Routines + * PROGRAMMERS: ReactOS Portable Systems Group + */ +#ifdef _M_ARM + +/* INCLUDES *******************************************************************/ + +#include <freeldr.h> +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +ULONG UiScreenWidth; +ULONG UiScreenHeight; +UCHAR UiMenuFgColor = COLOR_GRAY; +UCHAR UiMenuBgColor = COLOR_BLACK; +UCHAR UiTextColor = COLOR_GRAY; +UCHAR UiSelectedTextColor = COLOR_BLACK; +UCHAR UiSelectedTextBgColor = COLOR_GRAY; +CHAR UiTimeText[260] = "Seconds until highlighted choice will be started automatically: "; + +INT +TuiPrintf(const char *Format, + ...) +{ + int i; + int Length; + va_list ap; + CHAR Buffer[512]; + + va_start(ap, Format); + Length = _vsnprintf(Buffer, sizeof(Buffer), Format, ap); + va_end(ap); + + if (Length == -1) Length = sizeof(Buffer); + + for (i = 0; i < Length; i++) + { + MachConsPutChar(Buffer[i]); + } + + return Length; +} + +BOOLEAN +UiInitialize(IN BOOLEAN ShowGui) +{ + ULONG Depth; + + /* Nothing to do */ + if (!ShowGui) return TRUE; + + /* Set mode and query size */ + MachVideoSetDisplayMode(NULL, TRUE); + MachVideoGetDisplaySize(&UiScreenWidth, &UiScreenHeight, &Depth); + return TRUE; +} + +VOID +UiUnInitialize(IN PCSTR BootText) +{ + /* Nothing to do */ + return; +} + +VOID +UiDrawBackdrop(VOID) +{ + /* Clear the screen */ + MachVideoClearScreen(ATTR(COLOR_WHITE, COLOR_BLACK)); +} + +VOID +UiDrawText(IN ULONG X, + IN ULONG Y, + IN PCSTR Text, + IN UCHAR Attr) +{ + ULONG i, j; + + /* Draw the text character by character, but don't exceed the width */ + for (i = X, j = 0; Text[j] && i < UiScreenWidth; i++, j++) + { + /* Write the character */ + MachVideoPutChar(Text[j], Attr, i, Y); + } +} + +VOID +UiDrawCenteredText(IN ULONG Left, + IN ULONG Top, + IN ULONG Right, + IN ULONG Bottom, + IN PCSTR TextString, + IN UCHAR Attr) +{ + ULONG TextLength, BoxWidth, BoxHeight, LineBreakCount, Index, LastIndex; + ULONG RealLeft, RealTop, X, Y; + CHAR Temp[2]; + + /* Query text length */ + TextLength = strlen(TextString); + + /* Count the new lines and the box width */ + LineBreakCount = 0; + BoxWidth = 0; + LastIndex = 0; + for (Index=0; Index < TextLength; Index++) + { + /* Scan for new lines */ + if (TextString[Index] == '\n') + { + /* Remember the new line */ + LastIndex = Index; + LineBreakCount++; + } + else + { + /* Check for new larger box width */ + if ((Index - LastIndex) > BoxWidth) + { + /* Update it */ + BoxWidth = (Index - LastIndex); + } + } + } + + /* Base the box height on the number of lines */ + BoxHeight = LineBreakCount + 1; + + /* Create the centered coordinates */ + RealLeft = (((Right - Left) - BoxWidth) / 2) + Left; + RealTop = (((Bottom - Top) - BoxHeight) / 2) + Top; + + /* Now go for a second scan */ + LastIndex = 0; + for (Index=0; Index < TextLength; Index++) + { + /* Look for new lines again */ + if (TextString[Index] == '\n') + { + /* Update where the text should start */ + RealTop++; + LastIndex = 0; + } + else + { + /* We've got a line of text to print, do it */ + X = RealLeft + LastIndex; + Y = RealTop; + LastIndex++; + Temp[0] = TextString[Index]; + Temp[1] = 0; + UiDrawText(X, Y, Temp, Attr); + } + } +} + +VOID +UiDrawStatusText(IN PCSTR StatusText) +{ + return; +} + +VOID +UiInfoBox(IN PCSTR MessageText) +{ + TuiPrintf(MessageText); +} + +VOID +UiMessageBox(IN PCSTR MessageText) +{ + TuiPrintf(MessageText); +} + +VOID +UiMessageBoxCritical(IN PCSTR MessageText) +{ + TuiPrintf(MessageText); +} + +VOID +UiDrawProgressBarCenter(IN ULONG Position, + IN ULONG Range, + IN PCHAR ProgressText) +{ + ULONG Left, Top, Right, Bottom, Width, Height; + + /* Build the coordinates and sizes */ + Height = 2; + Width = UiScreenWidth; + Left = 0; + Right = (Left + Width) - 1; + Top = UiScreenHeight - Height - 4; + Bottom = Top + Height + 1; + + /* Draw the progress bar */ + UiDrawProgressBar(Left, Top, Right, Bottom, Position, Range, ProgressText); +} + +VOID +UiDrawProgressBar(IN ULONG Left, + IN ULONG Top, + IN ULONG Right, + IN ULONG Bottom, + IN ULONG Position, + IN ULONG Range, + IN PCHAR ProgressText) +{ + ULONG i, ProgressBarWidth; + + /* Calculate the width of the bar proper */ + ProgressBarWidth = (Right - Left) - 3; + + /* First make sure the progress bar text fits */ + UiTruncateStringEllipsis(ProgressText, ProgressBarWidth - 4); + if (Position > Range) Position = Range; + + /* Draw the "Loading..." text */ + UiDrawCenteredText(Left + 2, Top + 1, Right - 2, Top + 1, ProgressText, ATTR(7, 0)); + + /* Draw the percent complete */ + for (i = 0; i < (Position * ProgressBarWidth) / Range; i++) + { + /* Use the fill character */ + UiDrawText(Left + 2 + i, Top + 2, "\xDB", ATTR(UiTextColor, UiMenuBgColor)); + } +} + +VOID +UiShowMessageBoxesInSection(IN PCSTR SectionName) +{ + return; +} + +VOID +UiTruncateStringEllipsis(IN PCHAR StringText, + IN ULONG MaxChars) +{ + /* If it's too large, just add some ellipsis past the maximum */ + if (strlen(StringText) > MaxChars) strcpy(&StringText[MaxChars - 3], "..."); +} + +VOID +NTAPI +UiDrawMenuBox(IN PUI_MENU_INFO MenuInfo) +{ + CHAR MenuLineText[80], TempString[80]; + ULONG i; + + /* If there is a timeout draw the time remaining */ + if (MenuInfo->MenuTimeRemaining >= 0) + { + /* Copy the integral time text string, and remove the last 2 chars */ + strcpy(TempString, UiTimeText); + i = strlen(TempString); + TempString[i - 2] = 0; + + /* Display the first part of the string and the remaining time */ + strcpy(MenuLineText, TempString); + _itoa(MenuInfo->MenuTimeRemaining, TempString, 10); + strcat(MenuLineText, TempString); + + /* Add the last 2 chars */ + strcat(MenuLineText, &UiTimeText[i - 2]); + + /* Display under the menu directly */ + UiDrawText(0, + MenuInfo->Bottom + 3, + MenuLineText, + ATTR(UiMenuFgColor, UiMenuBgColor)); + } + else + { + /* Erase the timeout string with spaces, and 0-terminate for sure */ + for (i=0; i<sizeof(MenuLineText)-1; i++) + { + MenuLineText[i] = ' '; + } + MenuLineText[sizeof(MenuLineText)-1] = 0; + + /* Draw this "empty" string to erase */ + UiDrawText(0, + MenuInfo->Bottom + 3, + MenuLineText, + ATTR(UiMenuFgColor, UiMenuBgColor)); + } + + /* Loop each item */ + for (i = 0; i < MenuInfo->MenuItemCount; i++) + { + /* Check if it's a separator */ + if (!(_stricmp(MenuInfo->MenuItemList[i], "SEPARATOR"))) + { + /* Draw the separator line */ + UiDrawText(MenuInfo->Left, + MenuInfo->Top + i + 1, + "\xC7", + ATTR(UiMenuFgColor, UiMenuBgColor)); + UiDrawText(MenuInfo->Right, + MenuInfo->Top + i + 1, + "\xB6", + ATTR(UiMenuFgColor, UiMenuBgColor)); + } + } +} + +VOID +NTAPI +UiDrawMenuItem(IN PUI_MENU_INFO MenuInfo, + IN ULONG MenuItemNumber) +{ + CHAR MenuLineText[80]; + UCHAR Attribute = ATTR(UiTextColor, UiMenuBgColor); + + /* Simply left-align it */ + MenuLineText[0] = '\0'; + strcat(MenuLineText, " "); + + /* Now append the text string */ + strcat(MenuLineText, MenuInfo->MenuItemList[MenuItemNumber]); + + /* If it is a separator */ + if (!(_stricmp(MenuInfo->MenuItemList[MenuItemNumber], "SEPARATOR"))) + { + /* Make it a separator line and use menu colors */ + memset(MenuLineText, 0, 80); + memset(MenuLineText, 0xC4, (MenuInfo->Right - MenuInfo->Left - 1)); + Attribute = ATTR(UiMenuFgColor, UiMenuBgColor); + } + else if (MenuItemNumber == MenuInfo->SelectedMenuItem) + { + /* If this is the selected item, use the selected colors */ + Attribute = ATTR(UiSelectedTextColor, UiSelectedTextBgColor); + } + + /* Draw the item */ + UiDrawText(MenuInfo->Left + 1, + MenuInfo->Top + 1 + MenuItemNumber, + MenuLineText, + Attribute); +} + +VOID +UiDrawMenu(IN PUI_MENU_INFO MenuInfo) +{ + ULONG i; + + /* No GUI status bar text, just minimal text. first to tell the user to choose */ + UiDrawText(0, + MenuInfo->Top - 2, + "Please select the operating system to start:", + ATTR(UiMenuFgColor, UiMenuBgColor)); + + /* Now tell him how to choose */ + UiDrawText(0, + MenuInfo->Bottom + 1, + "Use the up and down arrow keys to move the highlight to " + "your choice.", + ATTR(UiMenuFgColor, UiMenuBgColor)); + UiDrawText(0, + MenuInfo->Bottom + 2, + "Press ENTER to choose.", + ATTR(UiMenuFgColor, UiMenuBgColor)); + + /* And offer F8 options */ + UiDrawText(0, + UiScreenHeight - 4, + "For troubleshooting and advanced startup options for " + "ReactOS, press F8.", + ATTR(UiMenuFgColor, UiMenuBgColor)); + + /* Draw the menu box */ + UiDrawMenuBox(MenuInfo); + + /* Draw each line of the menu */ + for (i = 0; i < MenuInfo->MenuItemCount; i++) UiDrawMenuItem(MenuInfo, i); +} + +ULONG +NTAPI +UiProcessMenuKeyboardEvent(IN PUI_MENU_INFO MenuInfo, + IN UiMenuKeyPressFilterCallback KeyPressFilter) +{ + ULONG KeyEvent = 0, Selected, Count; + + /* Check for a keypress */ + if (MachConsKbHit()) + { + /* Check if the timeout is not already complete */ + if (MenuInfo->MenuTimeRemaining != -1) + { + // + // Cancel it and remove it + // + MenuInfo->MenuTimeRemaining = -1; + UiDrawMenuBox(MenuInfo); + } + + /* Get the key */ + KeyEvent = MachConsGetCh(); + + /* Is it extended? Then get the extended key */ + if (!KeyEvent) KeyEvent = MachConsGetCh(); + + /* Call the supplied key filter callback function to see if it is going to handle this keypress. */ + if ((KeyPressFilter) && (KeyPressFilter(KeyEvent))) + { + /* It processed the key character, so redraw and exit */ + UiDrawMenu(MenuInfo); + return 0; + } + + /* Process the key */ + if ((KeyEvent == KEY_UP) || (KeyEvent == KEY_DOWN)) + { + /* Get the current selected item and count */ + Selected = MenuInfo->SelectedMenuItem; + Count = MenuInfo->MenuItemCount - 1; + + /* Check if this was a key up and there's a selected menu item */ + if ((KeyEvent == KEY_UP) && (Selected)) + { + /* Update the menu (Deselect previous item) */ + MenuInfo->SelectedMenuItem--; + UiDrawMenuItem(MenuInfo, Selected); + Selected--; + + /* Skip past any separators */ + if ((Selected) && + !(_stricmp(MenuInfo->MenuItemList[Selected], "SEPARATOR"))) + { + MenuInfo->SelectedMenuItem--; + } + } + else if ((KeyEvent == KEY_DOWN) && (Selected < Count)) + { + /* Update the menu (deselect previous item) */ + MenuInfo->SelectedMenuItem++; + UiDrawMenuItem(MenuInfo, Selected); + Selected++; + + /* Skip past any separators */ + if ((Selected < Count) && + !(_stricmp(MenuInfo->MenuItemList[Selected], "SEPARATOR"))) + { + MenuInfo->SelectedMenuItem++; + } + } + + /* Select new item and update video buffer */ + UiDrawMenuItem(MenuInfo, MenuInfo->SelectedMenuItem); + } + } + + /* Return the pressed key */ + return KeyEvent; +} + +VOID +NTAPI +UiCalcMenuBoxSize(IN PUI_MENU_INFO MenuInfo) +{ + ULONG i, Width = 0, Height, Length; + + /* Height is the menu item count plus 2 (top border & bottom border) */ + Height = MenuInfo->MenuItemCount + 2; + Height -= 1; // Height is zero-based + + /* Loop every item */ + for (i = 0; i < MenuInfo->MenuItemCount; i++) + { + /* Get the string length and make it become the new width if necessary */ + Length = strlen(MenuInfo->MenuItemList[i]); + if (Length > Width) Width = Length; + } + + /* Allow room for left & right borders, plus 8 spaces on each side */ + Width += 18; + + /* Put the menu in the default left-corner position */ + MenuInfo->Left = -1; + MenuInfo->Top = 4; + + /* The other margins are the same */ + MenuInfo->Right = (MenuInfo->Left) + Width; + MenuInfo->Bottom = (MenuInfo->Top) + Height; +} + +BOOLEAN +UiDisplayMenu(IN PCSTR MenuItemList[], + IN ULONG MenuItemCount, + IN ULONG DefaultMenuItem, + IN LONG MenuTimeOut, + OUT PULONG SelectedMenuItem, + IN BOOLEAN CanEscape, + IN UiMenuKeyPressFilterCallback KeyPressFilter) +{ + UI_MENU_INFO MenuInformation; + ULONG LastClockSecond; + ULONG CurrentClockSecond; + ULONG KeyPress; + + /* Check if there's no timeout */ + if (!MenuTimeOut) + { + /* Return the default selected item */ + if (SelectedMenuItem) *SelectedMenuItem = DefaultMenuItem; + return TRUE; + } + + /* Setup the MENU_INFO structure */ + MenuInformation.MenuItemList = MenuItemList; + MenuInformation.MenuItemCount = MenuItemCount; + MenuInformation.MenuTimeRemaining = MenuTimeOut; + MenuInformation.SelectedMenuItem = DefaultMenuItem; + + /* Calculate the size of the menu box */ + UiCalcMenuBoxSize(&MenuInformation); + + /* Draw the menu */ + UiDrawMenu(&MenuInformation); + + /* Get the current second of time */ + LastClockSecond = ArcGetTime()->Second; + + /* Process keys */ + while (TRUE) + { + /* Process key presses */ + KeyPress = UiProcessMenuKeyboardEvent(&MenuInformation, + KeyPressFilter); + + /* Check for ENTER or ESC */ + if (KeyPress == KEY_ENTER) break; + if (CanEscape && KeyPress == KEY_ESC) return FALSE; + + /* Check if there is a countdown */ + if (MenuInformation.MenuTimeRemaining) + { + /* Get the updated time, seconds only */ + CurrentClockSecond = ArcGetTime()->Second; + + /* Check if more then a second has now elapsed */ + if (CurrentClockSecond != LastClockSecond) + { + /* Update the time information */ + LastClockSecond = CurrentClockSecond; + MenuInformation.MenuTimeRemaining--; + + /* Update the menu */ + UiDrawMenuBox(&MenuInformation); + } + } + else + { + /* A time out occurred, exit this loop and return default OS */ + break; + } + } + + /* Return the selected item */ + if (SelectedMenuItem) *SelectedMenuItem = MenuInformation.SelectedMenuItem; + return TRUE; +} + +#endif Propchange: trunk/reactos/boot/freeldr/freeldr/ui/directui.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/ui/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/gu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/gui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/gui.c [iso-8859-1] Tue Feb 9 03:53:45 2010 @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef _M_ARM #include <freeldr.h> VOID GuiDrawBackdrop(VOID) @@ -103,3 +104,4 @@ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; +#endif Modified: trunk/reactos/boot/freeldr/freeldr/ui/minitui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/mi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/minitui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/minitui.c [iso-8859-1] Tue Feb 9 03:53:45 2010 @@ -6,7 +6,7 @@ * PROGRAMMERS: Brian Palmer <brianp(a)sginet.com> * Hervé Poussineau */ - +#ifndef _M_ARM #include <freeldr.h> VOID MiniTuiDrawBackdrop(VOID) @@ -154,3 +154,4 @@ TuiDisplayMenu, MiniTuiDrawMenu, }; +#endif Modified: trunk/reactos/boot/freeldr/freeldr/ui/noui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/no… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/noui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/noui.c [iso-8859-1] Tue Feb 9 03:53:45 2010 @@ -5,7 +5,7 @@ * PURPOSE: No Text UI interface * PROGRAMMERS: Hervé Poussineau */ - +#ifndef _M_ARM #include <freeldr.h> BOOLEAN NoUiInitialize(VOID) @@ -118,3 +118,4 @@ VOID NoUiDrawMenu(PUI_MENU_INFO MenuInfo) { } +#endif Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Tue Feb 9 03:53:45 2010 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - +#ifndef _M_ARM #include <freeldr.h> PVOID TextVideoBuffer = NULL; @@ -325,13 +325,8 @@ // Draw the text for (i=X, j=0; Text[j] && i<UiScreenWidth; i++,j++) { -#ifndef _ARM_ ScreenMemory[((Y*2)*UiScreenWidth)+(i*2)] = (UCHAR)Text[j]; ScreenMemory[((Y*2)*UiScreenWidth)+(i*2)+1] = Attr; -#else - UNREFERENCED_PARAMETER(ScreenMemory); - MachVideoPutChar(Text[j], Attr, i, Y); -#endif } } @@ -985,3 +980,4 @@ TuiDisplayMenu, TuiDrawMenu, }; +#endif Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] Tue Feb 9 03:53:45 2010 @@ -8,7 +8,7 @@ */ /* INCLUDES ******************************************************************/ - +#ifndef _M_ARM #include <freeldr.h> /* FUNCTIONS *****************************************************************/ @@ -530,3 +530,4 @@ // return KeyEvent; } +#endif Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] Tue Feb 9 03:53:45 2010 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - +#ifndef _M_ARM #include <freeldr.h> #include <debug.h> @@ -496,3 +496,4 @@ { return UiVtbl.EditBox(MessageText, EditTextBuffer, Length); } +#endif Modified: trunk/reactos/boot/freeldr/freeldr/video/fade.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/video… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/video/fade.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/video/fade.c [iso-8859-1] Tue Feb 9 03:53:45 2010 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - +#ifndef _M_ARM #include <freeldr.h> #define RGB_MAX 64 @@ -130,3 +130,4 @@ } } } +#endif Modified: trunk/reactos/boot/freeldr/freeldr/video/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/video… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/video/palette.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/video/palette.c [iso-8859-1] Tue Feb 9 03:53:45 2010 @@ -16,9 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - +#ifndef _M_ARM #include <freeldr.h> - VOID VideoSavePaletteState(PPALETTE_ENTRY Palette, ULONG ColorCount) { ULONG Color; @@ -40,3 +39,4 @@ MachVideoSetPaletteColor(Color, Palette[Color].Red, Palette[Color].Green, Palette[Color].Blue); } } +#endif Modified: trunk/reactos/boot/freeldr/freeldr/video/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/video… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/video/video.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/video/video.c [iso-8859-1] Tue Feb 9 03:53:45 2010 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - +#ifndef _M_ARM #include <freeldr.h> PVOID VideoOffScreenBuffer = NULL; @@ -42,3 +42,4 @@ { MachVideoCopyOffScreenBufferToVRAM(VideoOffScreenBuffer); } +#endif

14 years, 7 months

[sir_richard] 45523: [FREELDR]: No Linux support for ARM, no RS232 support for ARM, and no complex debug infrastructure for ARM either.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Feb 9 03:38:23 2010 New Revision: 45523 URL: http://svn.reactos.org/svn/reactos?rev=45523&view=rev Log: [FREELDR]: No Linux support for ARM, no RS232 support for ARM, and no complex debug infrastructure for ARM either. Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/include/debug.h trunk/reactos/boot/freeldr/freeldr/linuxboot.c Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Tue Feb 9 03:38:23 2010 @@ -18,6 +18,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#ifndef _M_ARM #include <freeldr.h> @@ -275,8 +277,6 @@ WRITE_PORT_UCHAR (SER_THR(Rs232PortBase), ByteToSend); } -#endif /* DBG */ - BOOLEAN Rs232PortInUse(ULONG Base) { #if DBG @@ -285,3 +285,6 @@ return FALSE; #endif } + +#endif /* DBG */ +#endif Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Tue Feb 9 03:38:23 2010 @@ -21,7 +21,7 @@ #include <debug.h> -#if DBG +#if defined(DBG) && !defined(_M_ARM) //#define DEBUG_ALL //#define DEBUG_INIFILE Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] Tue Feb 9 03:38:23 2010 @@ -39,7 +39,7 @@ extern char* g_file; extern int g_line; -#if DBG +#if defined(DBG) && !defined(_M_ARM) VOID DbgPrintMask(ULONG Mask, char *format, ...); VOID DebugInit(VOID); @@ -80,7 +80,7 @@ #else - #define DebugInit() + #define DebugInit(x) #define DPRINTM(_x_, ...) #define BugCheck(_x_) #define DbgDumpBuffer(_x_, _y_, _z_) Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] Tue Feb 9 03:38:23 2010 @@ -17,10 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - +#ifndef _M_ARM + #include <freeldr.h> #include <debug.h> - #ifdef __i386__ #define LINUX_READ_CHUNK_SIZE 0x20000 // Read 128k at a time @@ -516,3 +516,4 @@ return TRUE; } #endif /* __i386__ */ +#endif

14 years, 7 months

[tkreuzer] 45522: add setjmp/longjmp to libcntpr, just like in ms sdks

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 9 03:34:42 2010 New Revision: 45522 URL: http://svn.reactos.org/svn/reactos?rev=45522&view=rev Log: add setjmp/longjmp to libcntpr, just like in ms sdks Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Tue Feb 9 03:34:42 2010 @@ -81,6 +81,14 @@ <directory name="search"> <file>bsearch.c</file> <file>lfind.c</file> + </directory> + + <directory name="setjmp"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>setjmp.s</file> + </directory> + </if> </directory> <directory name="stdlib">

14 years, 7 months

← Newer
1
...
18
19
20
21
22
23
24
...
37
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 February 2010