Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[dreimer] 32182: Fix typo
by dreimer＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: dreimer Date: Thu Feb 7 12:41:26 2008 New Revision: 32182 URL: http://svn.reactos.org/svn/reactos?rev=32182&view=rev Log: Fix typo Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Thu Feb 7 12:41:26 2008 @@ -73,6 +73,7 @@ ) goto :EOF -:EOCif defined _ROSBE_VERSION ( +:EOC +if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% )

1 0

[navaraf] 32181: Fix one more bug in adding subkeys.
by navaraf＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: navaraf Date: Thu Feb 7 11:22:24 2008 New Revision: 32181 URL: http://svn.reactos.org/svn/reactos?rev=32181&view=rev Log: Fix one more bug in adding subkeys. Modified: trunk/reactos/tools/mkhive/cmi.c Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=321… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c (original) +++ trunk/reactos/tools/mkhive/cmi.c Thu Feb 7 11:22:24 2008 @@ -176,7 +176,7 @@ { RtlMoveMemory(HashCell->List + i + 1, HashCell->List + i, - (HashCell->Count - 1 - i) * + (HashCell->Count - i) * sizeof(HashCell->List[0])); }

1 0

[navaraf] 32180: Fix hash table generating.
by navaraf＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: navaraf Date: Thu Feb 7 11:04:17 2008 New Revision: 32180 URL: http://svn.reactos.org/svn/reactos?rev=32180&view=rev Log: Fix hash table generating. Modified: trunk/reactos/tools/mkhive/cmi.c Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=321… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c (original) +++ trunk/reactos/tools/mkhive/cmi.c Thu Feb 7 11:04:17 2008 @@ -151,13 +151,12 @@ CmiAddKeyToHashTable( IN PCMHIVE RegistryHive, IN OUT PCM_KEY_FAST_INDEX HashCell, - IN PCM_KEY_NODE KeyCell, - IN HSTORAGE_TYPE StorageType, + IN HCELL_INDEX HashCellIndex, IN PCM_KEY_NODE NewKeyCell, IN HCELL_INDEX NKBOffset) { - ULONG i = KeyCell->SubKeyCounts[StorageType]; - ULONG HashKey; + ULONG i; + ULONG HashKey = 0; if (NewKeyCell->Flags & KEY_COMP_NAME) { @@ -167,13 +166,13 @@ min(NewKeyCell->NameLength, sizeof(ULONG))); } - for (i = 0; i < KeyCell->SubKeyCounts[StorageType]; i++) + for (i = 0; i < HashCell->Count; i++) { if (HashCell->List[i].HashKey > HashKey) break; } - if (i < KeyCell->SubKeyCounts[StorageType]) + if (i < HashCell->Count) { RtlMoveMemory(HashCell->List + i + 1, HashCell->List + i, @@ -183,7 +182,8 @@ HashCell->List[i].Cell = NKBOffset; HashCell->List[i].HashKey = HashKey; - HvMarkCellDirty(&RegistryHive->Hive, KeyCell->SubKeyLists[StorageType], FALSE); + HashCell->Count++; + HvMarkCellDirty(&RegistryHive->Hive, HashCellIndex, FALSE); return STATUS_SUCCESS; } @@ -211,10 +211,9 @@ } else { - ASSERT(SubKeyCount <= USHORT_MAX); NewHashBlock = (PCM_KEY_FAST_INDEX)HvGetCell (&RegistryHive->Hive, *HBOffset); NewHashBlock->Signature = CM_KEY_FAST_LEAF; - NewHashBlock->Count = SubKeyCount; + NewHashBlock->Count = 0; *HashBlock = NewHashBlock; } @@ -353,7 +352,8 @@ ParentKeyCell->SubKeyLists[Storage]); ASSERT(HashBlock->Signature == CM_KEY_FAST_LEAF); - if (((ParentKeyCell->SubKeyCounts[Storage] + 1) >= HashBlock->Count)) + if (HashBlock->Count == + ((HvGetCellSize(&RegistryHive->Hive, HashBlock) - FIELD_OFFSET(CM_KEY_FAST_INDEX, List)) / sizeof(CM_INDEX))) { PCM_KEY_FAST_INDEX NewHashBlock; HCELL_INDEX HTOffset; @@ -370,14 +370,11 @@ { return Status; } - - RtlZeroMemory( - &NewHashBlock->List[0], - sizeof(NewHashBlock->List[0]) * NewHashBlock->Count); RtlCopyMemory( &NewHashBlock->List[0], &HashBlock->List[0], sizeof(NewHashBlock->List[0]) * HashBlock->Count); + NewHashBlock->Count = HashBlock->Count; HvFreeCell (&RegistryHive->Hive, ParentKeyCell->SubKeyLists[Storage]); ParentKeyCell->SubKeyLists[Storage] = HTOffset; HashBlock = NewHashBlock; @@ -387,8 +384,7 @@ Status = CmiAddKeyToHashTable( RegistryHive, HashBlock, - ParentKeyCell, - Storage, + ParentKeyCell->SubKeyLists[Storage], NewKeyCell, NKBOffset); if (NT_SUCCESS(Status)) @@ -635,7 +631,6 @@ } else { - ASSERT(NameLength <= USHORT_MAX); NewValueCell = (PCM_KEY_VALUE)HvGetCell (&RegistryHive->Hive, *VBOffset); NewValueCell->Signature = CM_KEY_VALUE_SIGNATURE; NewValueCell->NameLength = (USHORT)NameLength;

1 0

[ros-arm-bringup] 32179: We now generate the correct ARM syscall stub code for system calls with IDs > 0x100. We never call KfRaise/LowerIrql in portable code anymore, isntead, we use Ke. We now have correctly defined IRQL routines for ARM, much more of the kernel builds as a result.
by ros-arm-bringup＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: ros-arm-bringup Date: Thu Feb 7 10:10:13 2008 New Revision: 32179 URL: http://svn.reactos.org/svn/reactos?rev=32179&view=rev Log: We now generate the correct ARM syscall stub code for system calls with IDs > 0x100. We never call KfRaise/LowerIrql in portable code anymore, isntead, we use Ke. We now have correctly defined IRQL routines for ARM, much more of the kernel builds as a result. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/reactos/armddk.h trunk/reactos/ntoskrnl/ex/fmutex.c trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/ke/apc.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/ipi.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/tools/nci/ncitool.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu Feb 7 10:10:13 2008 @@ -9561,6 +9561,10 @@ DDKAPI KeRaiseIrqlToSynchLevel( VOID); + +#elif defined(_M_ARM) + +#include <armddk.h> #else Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h (original) +++ trunk/reactos/include/reactos/armddk.h Thu Feb 7 10:10:13 2008 @@ -100,4 +100,24 @@ return (struct _TEB*)USERPCR->Teb; } +// +// IRQL Support on ARM is similar to MIPS/ALPHA +// +NTKERNELAPI +KIRQL +DDKAPI +KeSwapIrql( + IN KIRQL NewIrql +); + +NTKERNELAPI +KIRQL +NTAPI +KeRaiseIrqlToDpcLevel( + VOID +); + +#define KeLowerIrql(NewIrql) KeSwapIrql(NewIrql) +#define KeRaiseIrql(NewIrql, OldIrql) *(OldIrql) = KeSwapIrql(NewIrql) + #endif Modified: trunk/reactos/ntoskrnl/ex/fmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fmutex.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fmutex.c (original) +++ trunk/reactos/ntoskrnl/ex/fmutex.c Thu Feb 7 10:10:13 2008 @@ -109,7 +109,7 @@ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); /* Raise IRQL to APC */ - OldIrql = KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); /* Decrease the count */ if (InterlockedDecrement(&FastMutex->Count) != 0) @@ -145,7 +145,7 @@ } /* Lower IRQL back */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); } /* @@ -181,7 +181,7 @@ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); /* Raise to APC_LEVEL */ - OldIrql = KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); /* Check if we can quickly acquire it */ if (InterlockedCompareExchange(&FastMutex->Count, 0, 1) == 1) @@ -194,7 +194,7 @@ else { /* Acquire attempt failed */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); return FALSE; } } Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c Thu Feb 7 10:10:13 2008 @@ -29,13 +29,14 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2) { + KIRQL OldIrql; if (DeferredContext) { ExFreePool(DeferredContext); } while (TRUE) { - KfRaiseIrql(SYNCH_LEVEL); + KeRaiseIrql(SYNCH_LEVEL, &OldIrql); #if defined(_M_X86) Ke386HaltProcessor(); #else Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c Thu Feb 7 10:10:13 2008 @@ -157,7 +157,7 @@ if (InbvOldIrql < DISPATCH_LEVEL) { /* Raise IRQL to dispatch level */ - InbvOldIrql = KfRaiseIrql(DISPATCH_LEVEL); + KeRaiseIrql(DISPATCH_LEVEL, &InbvOldIrql); } /* Acquire the lock */ @@ -172,7 +172,7 @@ KiReleaseSpinLock(&BootDriverLock); /* If we were below dispatch level, lower IRQL back */ - if (InbvOldIrql < DISPATCH_LEVEL) KfLowerIrql(InbvOldIrql); + if (InbvOldIrql < DISPATCH_LEVEL) KeLowerIrql(InbvOldIrql); } VOID Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Thu Feb 7 10:10:13 2008 @@ -2748,7 +2748,7 @@ if (!NT_SUCCESS(Status)) return Status; /* IRP cancellations are synchronized at APC_LEVEL. */ - OldIrql = KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); /* Get the current thread */ Thread = PsGetCurrentThread(); @@ -2775,7 +2775,7 @@ } /* Lower the IRQL */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); /* Check if we had found an IRP */ if (OurIrpsInList) @@ -2791,7 +2791,7 @@ OurIrpsInList = FALSE; /* Raise IRQL */ - OldIrql = KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); /* Now loop the list again */ NextEntry = ListHead->Flink; @@ -2811,7 +2811,7 @@ } /* Lower the IRQL */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); } } Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c Thu Feb 7 10:10:13 2008 @@ -1021,7 +1021,7 @@ Thread); /* Raise to APC to protect the IrpList */ - OldIrql = KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); /* Start by cancelling all the IRPs in the current thread queue. */ ListHead = &Thread->IrpList; @@ -1045,7 +1045,7 @@ while (!IsListEmpty(&Thread->IrpList)) { /* Now we can lower */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); /* Wait a short while and then look if all our IRPs were completed. */ KeDelayExecutionThread(KernelMode, FALSE, &Interval); @@ -1057,11 +1057,11 @@ if (!(Retries--)) IopRemoveThreadIrp(); /* Raise the IRQL Again */ - OldIrql = KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); } /* We're done, lower the IRQL */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); } /* Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3217… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c (original) +++ trunk/reactos/ntoskrnl/ke/apc.c Thu Feb 7 10:10:13 2008 @@ -35,13 +35,15 @@ NTAPI KiCheckForKernelApcDelivery(VOID) { + KIRQL OldIrql; + /* We should only deliver at passive */ if (KeGetCurrentIrql() == PASSIVE_LEVEL) { /* Raise to APC and Deliver APCs, then lower back to Passive */ - KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); KiDeliverApc(KernelMode, 0, 0); - KfLowerIrql(PASSIVE_LEVEL); + KeLowerIrql(PASSIVE_LEVEL); } else { Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=3217… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Thu Feb 7 10:10:13 2008 @@ -769,6 +769,7 @@ PVOID DriverBase; PLDR_DATA_TABLE_ENTRY LdrEntry; PULONG_PTR HardErrorParameters; + KIRQL OldIrql; #ifdef CONFIG_SMP LONG i = 0; #endif @@ -1115,7 +1116,7 @@ /* Raise IRQL to HIGH_LEVEL */ _disable(); - KfRaiseIrql(HIGH_LEVEL); + KeRaiseIrql(HIGH_LEVEL, &OldIrql); /* Avoid recursion */ if (!InterlockedDecrement((PLONG)&KeBugCheckCount)) @@ -1137,13 +1138,13 @@ #endif /* Display the BSOD */ - KfLowerIrql(APC_LEVEL); // This is a nastier hack than any ever before + KeLowerIrql(APC_LEVEL); // This is a nastier hack than any ever before KiDisplayBlueScreen(MessageId, IsHardError, HardErrCaption, HardErrMessage, AnsiName); - KfRaiseIrql(HIGH_LEVEL); + KeRaiseIrql(HIGH_LEVEL, &OldIrql); /* Check if the debugger is disabled but we can enable it */ if (!(KdDebuggerEnabled) && !(KdPitchDebugger)) Modified: trunk/reactos/ntoskrnl/ke/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/ipi.c?rev=3217… ============================================================================== --- trunk/reactos/ntoskrnl/ke/ipi.c (original) +++ trunk/reactos/ntoskrnl/ke/ipi.c Thu Feb 7 10:10:13 2008 @@ -145,17 +145,17 @@ #error Not yet implemented! #else ULONG_PTR Status; - KIRQL OldIrql; + KIRQL OldIrql, OldIrql2; /* Raise to DPC level if required */ OldIrql = KeGetCurrentIrql(); - if (OldIrql < DISPATCH_LEVEL) OldIrql = KfRaiseIrql(DISPATCH_LEVEL); + if (OldIrql < DISPATCH_LEVEL) KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); /* Acquire the IPI lock */ KefAcquireSpinLockAtDpcLevel(&KiIpiLock); /* Raise to IPI level */ - KfRaiseIrql(IPI_LEVEL); + KeRaiseIrql(IPI_LEVEL, &OldIrql2); /* Call the function */ Status = Function(Argument); @@ -164,7 +164,7 @@ KefReleaseSpinLockFromDpcLevel(&KiIpiLock); /* Lower IRQL back */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); return Status; #endif } Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Thu Feb 7 10:10:13 2008 @@ -29,6 +29,7 @@ PETHREAD Thread; PTEB Teb; BOOLEAN DeadThread = FALSE; + KIRQL OldIrql; PAGED_CODE(); PSTRACE(PS_THREAD_DEBUG, "StartRoutine: %p StartContext: %p\n", StartRoutine, StartContext); @@ -68,7 +69,7 @@ } /* Raise to APC */ - KfRaiseIrql(APC_LEVEL); + KeRaiseIrql(APC_LEVEL, &OldIrql); /* Queue the User APC */ KiInitializeUserApc(NULL, Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?rev=32… ============================================================================== --- trunk/reactos/tools/nci/ncitool.c (original) +++ trunk/reactos/tools/nci/ncitool.c Thu Feb 7 10:10:13 2008 @@ -71,7 +71,7 @@ // // For now, only supports 0-4 arguments // -#define UserModeStub_arm " mov r12, #0x%x\n" \ +#define UserModeStub_arm " ldr r12, =%x\n" \ " swi #0x2E\n" \ " bx lr\n\n" @@ -104,7 +104,7 @@ #define KernelModeStub_mips " j KiSystemService\n" \ " nop\n" -#define KernelModeStub_arm " mov r12, #0x%x\n" \ +#define KernelModeStub_arm " ldr r12, =x%x\n" \ " swi #0x2E\n" \ " bx lr\n\n"

1 0

[ros-arm-bringup] 32178: We don't define types which are usually documented on "real" NT platforms in the NDK aynmore, but instead in the ARMDDK.h. This also avoids many ndk-from-ddk cross-header issues. Added x86-only guards around certain structures and functions which are non-portable. Also guarded certain inline functions. Added some more ARM structures, and filled out the KPRCB. Created ARM-specific headers when required. We can now have a buildable ARM kernel, minus a couple of compile err
by ros-arm-bringup＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: ros-arm-bringup Date: Thu Feb 7 09:40:42 2008 New Revision: 32178 URL: http://svn.reactos.org/svn/reactos?rev=32178&view=rev Log: We don't define types which are usually documented on "real" NT platforms in the NDK aynmore, but instead in the ARMDDK.h. This also avoids many ndk-from-ddk cross-header issues. Added x86-only guards around certain structures and functions which are non-portable. Also guarded certain inline functions. Added some more ARM structures, and filled out the KPRCB. Created ARM-specific headers when required. We can now have a buildable ARM kernel, minus a couple of compile errors. Added: trunk/reactos/include/reactos/armddk.h (with props) trunk/reactos/ntoskrnl/include/internal/arm/ trunk/reactos/ntoskrnl/include/internal/arm/ke.h (with props) trunk/reactos/ntoskrnl/include/internal/arm/mm.h (with props) Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/include/ndk/kefuncs.h trunk/reactos/include/psdk/winnt.h trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h trunk/reactos/ntoskrnl/include/internal/arch/ke.h trunk/reactos/ntoskrnl/include/internal/arch/mm.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=32… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Thu Feb 7 09:40:42 2008 @@ -297,9 +297,6 @@ #ifdef _X86_ #define HARDWARE_PTE HARDWARE_PTE_X86 #define PHARDWARE_PTE PHARDWARE_PTE_X86 -#else -#define HARDWARE_PTE ULONG -#define PHARDWARE_PTE PULONG #endif #define IO_CHECK_CREATE_PARAMETERS 0x0200 Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu Feb 7 09:40:42 2008 @@ -5570,9 +5570,9 @@ #elif defined(_M_ARM) // -// NT-ARM is not documented, need NDK +// NT-ARM is not documented, need DDK-ARM // -#include <arm/ketypes.h> +#include <armddk.h> #else #error Unknown architecture Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h (original) +++ trunk/reactos/include/ndk/arm/ketypes.h Thu Feb 7 09:40:42 2008 @@ -22,19 +22,6 @@ // // Dependencies // - -// -// IRQLs -// -#define PASSIVE_LEVEL 0 -#define LOW_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define IPI_LEVEL 7 -#define POWER_LEVEL 7 -#define PROFILE_LEVEL 8 -#define HIGH_LEVEL 8 -#define SYNCH_LEVEL (IPI_LEVEL - 1) // // IPI Types @@ -61,19 +48,6 @@ // Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual) // #define KSEG0_BASE 0x80000000 - -// -// FIXME: mmtypes.h? -// -#define KIPCR 0xFFFFF000 -#define USPCR 0x7FFF0000 -#define PCR ((volatile KPCR * const)USPCR) -#define USERPCR ((volatile KPCR * const)KIPCR) - -// -// Synchronization-level IRQL -// -#define SYNCH_LEVEL DISPATCH_LEVEL // // Trap Frame Definition @@ -106,75 +80,23 @@ ULONG FpExtra[8]; } KTRAP_FRAME, *PKTRAP_FRAME; -// -// Processor Control Region -// On ARM, it's actually readable from user-mode, much like KUSER_SHARED_DATA -// -#ifdef NTOS_MODE_USER -#define PKINTERRUPT_ROUTINE PVOID // Hack! -#endif -typedef struct _KPCR -{ - ULONG MinorVersion; - ULONG MajorVersion; - PKINTERRUPT_ROUTINE InterruptRoutine[64]; - PVOID XcodeDispatch; - ULONG FirstLevelDcacheSize; - ULONG FirstLevelDcacheFillSize; - ULONG FirstLevelIcacheSize; - ULONG FirstLevelIcacheFillSize; - ULONG SecondLevelDcacheSize; - ULONG SecondLevelDcacheFillSize; - ULONG SecondLevelIcacheSize; - ULONG SecondLevelIcacheFillSize; - struct _KPRCB *Prcb; - struct _TEB *Teb; - PVOID TlsArray; - ULONG DcacheFillSize; - ULONG IcacheAlignment; - ULONG IcacheFillSize; - ULONG ProcessorId; - ULONG ProfileInterval; - ULONG ProfileCount; - ULONG StallExecutionCount; - ULONG StallScaleFactor; - CCHAR Number; - PVOID DataBusError; - PVOID InstructionBusError; - ULONG CachePolicy; - UCHAR IrqlMask[64]; - UCHAR IrqlTable[64]; - UCHAR CurrentIrql; - KAFFINITY SetMember; - struct _KTHREAD *CurrentThread; - KAFFINITY NotMember; - ULONG SystemReserved[6]; - ULONG DcacheAlignment; - ULONG HalReserved[64]; - BOOLEAN FirstLevelActive; - BOOLEAN DpcRoutineActive; - ULONG CurrentPid; - BOOLEAN OnInterruptStack; - PVOID SavedInitialStack; - PVOID SavedStackLimit; - PVOID SystemServiceDispatchStart; - PVOID SystemServiceDispatchEnd; - PVOID InterruptStack; - PVOID PanicStack; - PVOID BadVaddr; - PVOID InitialStack; - PVOID StackLimit; - ULONG QuantumEnd; -} KPCR, *PKPCR; - #ifndef NTOS_MODE_USER -// -// Stub -// -typedef struct _KFLOATING_SAVE -{ - ULONG Reserved; -} KFLOATING_SAVE, *PKFLOATING_SAVE; + +// +// Exception Frame Definition +// +typedef struct _KEXCEPTION_FRAME +{ + ULONG PlaceHolder; +} KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; + +// +// Processor State +// +typedef struct _KPROCESSOR_STATE +{ + struct _CONTEXT ContextFrame; +} KPROCESSOR_STATE, *PKPROCESSOR_STATE; // // Processor Region Control Block @@ -187,9 +109,110 @@ struct _KTHREAD *NextThread; struct _KTHREAD *IdleThread; UCHAR Number; - // - // TODO - // + UCHAR Reserved; + USHORT BuildType; + KAFFINITY SetMember; + KPROCESSOR_STATE ProcessorState; + ULONG KernelReserved[16]; + ULONG HalReserved[16]; + KSPIN_LOCK_QUEUE LockQueue[LockQueueMaximumLock]; + struct _KTHREAD *NpxThread; + ULONG InterruptCount; + ULONG KernelTime; + ULONG UserTime; + ULONG DpcTime; + ULONG DebugDpcTime; + ULONG InterruptTime; + ULONG AdjustDpcThreshold; + ULONG PageColor; + UCHAR SkipTick; + UCHAR DebuggerSavedIRQL; + UCHAR NodeColor; + UCHAR Spare1; + ULONG NodeShiftedColor; + struct _KNODE *ParentNode; + ULONG MultiThreadProcessorSet; + struct _KPRCB *MultiThreadSetMaster; + ULONG SecondaryColorMask; + LONG Sleeping; + ULONG CcFastReadNoWait; + ULONG CcFastReadWait; + ULONG CcFastReadNotPossible; + ULONG CcCopyReadNoWait; + ULONG CcCopyReadWait; + ULONG CcCopyReadNoWaitMiss; + ULONG KeAlignmentFixupCount; + ULONG SpareCounter0; + ULONG KeDcacheFlushCount; + ULONG KeExceptionDispatchCount; + ULONG KeFirstLevelTbFills; + ULONG KeIcacheFlushCount; + ULONG KeSecondLevelTbFills; + ULONG KeSystemCalls; + volatile ULONG IoReadOperationCount; + volatile ULONG IoWriteOperationCount; + volatile ULONG IoOtherOperationCount; + LARGE_INTEGER IoReadTransferCount; + LARGE_INTEGER IoWriteTransferCount; + LARGE_INTEGER IoOtherTransferCount; + PP_LOOKASIDE_LIST PPLookasideList[16]; + PP_LOOKASIDE_LIST PPNPagedLookasideList[32]; + PP_LOOKASIDE_LIST PPPagedLookasideList[32]; + volatile ULONG PacketBarrier; + volatile ULONG ReverseStall; + PVOID IpiFrame; + volatile PVOID CurrentPacket[3]; + volatile ULONG TargetSet; + volatile PKIPI_WORKER WorkerRoutine; + volatile ULONG IpiFrozen; + volatile ULONG RequestSummary; + volatile struct _KPRCB *SignalDone; + struct _KDPC_DATA DpcData[2]; + PVOID DpcStack; + ULONG MaximumDpcQueueDepth; + ULONG DpcRequestRate; + ULONG MinimumDpcRate; + volatile UCHAR DpcInterruptRequested; + volatile UCHAR DpcThreadRequested; + volatile UCHAR DpcRoutineActive; + volatile UCHAR DpcThreadActive; + ULONG PrcbLock; + ULONG DpcLastCount; + volatile ULONG TimerHand; + volatile ULONG TimerRequest; + PVOID DpcThread; + KEVENT DpcEvent; + UCHAR ThreadDpcEnable; + volatile BOOLEAN QuantumEnd; + volatile UCHAR IdleSchedule; + LONG DpcSetEventRequest; + LONG TickOffset; + KDPC CallDpc; + LIST_ENTRY WaitListHead; + ULONG ReadySummary; + ULONG QueueIndex; + LIST_ENTRY DispatcherReadyListHead[32]; + SINGLE_LIST_ENTRY DeferredReadyListHead; + PVOID ChainedInterruptList; + LONG LookasideIrpFloat; + volatile LONG MmPageFaultCount; + volatile LONG MmCopyOnWriteCount; + volatile LONG MmTransitionCount; + volatile LONG MmCacheTransitionCount; + volatile LONG MmDemandZeroCount; + volatile LONG MmPageReadCount; + volatile LONG MmPageReadIoCount; + volatile LONG MmCacheReadCount; + volatile LONG MmCacheIoCount; + volatile LONG MmDirtyPagesWriteCount; + volatile LONG MmDirtyWriteIoCount; + volatile LONG MmMappedPagesWriteCount; + volatile LONG MmMappedWriteIoCount; + CHAR VendorString[13]; + ULONG MHz; + ULONG FeatureBits; + volatile LARGE_INTEGER IsrTime; + PROCESSOR_POWER_STATE PowerState; } KPRCB, *PKPRCB; // Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h (original) +++ trunk/reactos/include/ndk/kefuncs.h Thu Feb 7 09:40:42 2008 @@ -453,19 +453,21 @@ NTSTATUS NTAPI NtSetIntervalProfile( - ULONG Interval, - KPROFILE_SOURCE ClockSource -); - + IN ULONG Interval, + IN KPROFILE_SOURCE ClockSource +); + +#ifdef _M_IX86 NTSYSCALLAPI NTSTATUS NTAPI NtSetLdtEntries( - ULONG Selector1, - LDT_ENTRY LdtEntry1, - ULONG Selector2, - LDT_ENTRY LdtEntry2 -); + IN ULONG Selector1, + IN LDT_ENTRY LdtEntry1, + IN ULONG Selector2, + IN LDT_ENTRY LdtEntry2 +); +#endif NTSYSCALLAPI NTSTATUS @@ -659,19 +661,21 @@ NTSTATUS NTAPI ZwSetIntervalProfile( - ULONG Interval, - KPROFILE_SOURCE ClockSource -); - + IN ULONG Interval, + IN KPROFILE_SOURCE ClockSource +); + +#ifdef _M_IX86 NTSYSAPI NTSTATUS NTAPI ZwSetLdtEntries( - ULONG Selector1, - LDT_ENTRY LdtEntry1, - ULONG Selector2, - LDT_ENTRY LdtEntry2 -); + IN ULONG Selector1, + IN LDT_ENTRY LdtEntry1, + IN ULONG Selector2, + IN LDT_ENTRY LdtEntry2 +); +#endif NTSYSAPI NTSTATUS Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Thu Feb 7 09:40:42 2008 @@ -4106,21 +4106,10 @@ #elif _M_ARM // -// NT-ARM is not documented, need NDK +// NT-ARM is not documented // -#define NTOS_MODE_USER -#include <arm/ketypes.h> +#include <armddk.h> -// -// FIXME: Move _M_ARM stuff away from here -// *** AND NOT IN THE NDK! NDK IS ONLY FOR OFFICIALLY OBTAINABLE/EXISTING NT -// -FORCEINLINE -struct _TEB* NtCurrentTeb(VOID) -{ - return (struct _TEB*)USERPCR->Teb; -} - #else static __inline__ struct _TEB * NtCurrentTeb(void) { Added: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h (added) +++ trunk/reactos/include/reactos/armddk.h Thu Feb 7 09:40:42 2008 @@ -1,0 +1,103 @@ +#ifndef _ARMDDK_ +#define _ARMDDK_ + +// +// IRQLs +// +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define IPI_LEVEL 7 +#define POWER_LEVEL 7 +#define PROFILE_LEVEL 8 +#define HIGH_LEVEL 8 +#define SYNCH_LEVEL (IPI_LEVEL - 1) + +// +// FIXME: mmtypes.h? +// +#define KIPCR 0xFFFFF000 +#define USPCR 0x7FFF0000 +#define PCR ((volatile KPCR * const)USPCR) +#define USERPCR ((volatile KPCR * const)KIPCR) + +// +// Stub +// +typedef struct _KFLOATING_SAVE +{ + ULONG Reserved; +} KFLOATING_SAVE, *PKFLOATING_SAVE; + +// +// Processor Control Region +// On ARM, it's actually readable from user-mode, much like KUSER_SHARED_DATA +// +#ifdef _WINNT_H +#define PKINTERRUPT_ROUTINE PVOID // Hack! +#endif +typedef struct _KPCR +{ + ULONG MinorVersion; + ULONG MajorVersion; + PKINTERRUPT_ROUTINE InterruptRoutine[64]; + PVOID XcodeDispatch; + ULONG FirstLevelDcacheSize; + ULONG FirstLevelDcacheFillSize; + ULONG FirstLevelIcacheSize; + ULONG FirstLevelIcacheFillSize; + ULONG SecondLevelDcacheSize; + ULONG SecondLevelDcacheFillSize; + ULONG SecondLevelIcacheSize; + ULONG SecondLevelIcacheFillSize; + struct _KPRCB *Prcb; + struct _TEB *Teb; + PVOID TlsArray; + ULONG DcacheFillSize; + ULONG IcacheAlignment; + ULONG IcacheFillSize; + ULONG ProcessorId; + ULONG ProfileInterval; + ULONG ProfileCount; + ULONG StallExecutionCount; + ULONG StallScaleFactor; + CCHAR Number; + PVOID DataBusError; + PVOID InstructionBusError; + ULONG CachePolicy; + UCHAR IrqlMask[64]; + UCHAR IrqlTable[64]; + UCHAR CurrentIrql; + KAFFINITY SetMember; + struct _KTHREAD *CurrentThread; + KAFFINITY NotMember; + ULONG SystemReserved[6]; + ULONG DcacheAlignment; + ULONG HalReserved[64]; + BOOLEAN FirstLevelActive; + BOOLEAN DpcRoutineActive; + ULONG CurrentPid; + BOOLEAN OnInterruptStack; + PVOID SavedInitialStack; + PVOID SavedStackLimit; + PVOID SystemServiceDispatchStart; + PVOID SystemServiceDispatchEnd; + PVOID InterruptStack; + PVOID PanicStack; + PVOID BadVaddr; + PVOID InitialStack; + PVOID StackLimit; + ULONG QuantumEnd; +} KPCR, *PKPCR; + +// +// Get the current TEB +// +FORCEINLINE +struct _TEB* NtCurrentTeb(VOID) +{ + return (struct _TEB*)USERPCR->Teb; +} + +#endif Propchange: trunk/reactos/include/reactos/armddk.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/armddk.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h Thu Feb 7 09:40:42 2008 @@ -25,6 +25,10 @@ #include "../powerpc/intrin_i.h" #elif defined(_M_MIPS) #include "../mips/intrin_i.h" +#elif defined(_M_ARM) +// +// Not sure we'll need ARM internal intrinsics +// #else #error "Unknown processor" #endif Modified: trunk/reactos/ntoskrnl/include/internal/arch/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arch/ke.h Thu Feb 7 09:40:42 2008 @@ -25,6 +25,8 @@ #include "../powerpc/ke.h" #elif defined(_M_MIPS) #include "../mips/ke.h" +#elif defined(_M_ARM) +#include "../arm/ke.h" #else #error "Unknown processor" #endif Modified: trunk/reactos/ntoskrnl/include/internal/arch/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arch/mm.h Thu Feb 7 09:40:42 2008 @@ -22,9 +22,11 @@ #ifdef _M_IX86 #include <internal/i386/mm.h> #elif defined(_M_PPC) -#include <internal/powerpc/ke.h> +#include <internal/powerpc/mm.h> #elif defined(_M_MIPS) -#include <internal/mips/ke.h> +#include <internal/mips/mm.h> +#elif defined(_M_ARM) +#include <internal/arm/mm.h> #else #error "Unknown processor" #endif Added: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h (added) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h Thu Feb 7 09:40:42 2008 @@ -1,0 +1,1 @@ + Propchange: trunk/reactos/ntoskrnl/include/internal/arm/ke.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/include/internal/arm/ke.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: 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 (added) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h Thu Feb 7 09:40:42 2008 @@ -1,0 +1,1 @@ + Propchange: trunk/reactos/ntoskrnl/include/internal/arm/mm.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/include/internal/arm/mm.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Thu Feb 7 09:40:42 2008 @@ -837,11 +837,16 @@ VOID ); +// +// We need to do major portability work +// +#ifdef _M_IX86 VOID NTAPI KiFlushNPXState( IN FLOATING_SAVE_AREA *SaveArea ); +#endif VOID NTAPI Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Thu Feb 7 09:40:42 2008 @@ -350,6 +350,7 @@ VOID KiRundownThread(IN PKTHREAD Thread) { +#if defined(_M_IX86) || defined(_M_AMD64) /* Check if this is the NPX Thread */ if (KeGetCurrentPrcb()->NpxThread == Thread) { @@ -357,6 +358,7 @@ KeGetCurrentPrcb()->NpxThread = NULL; KeArchFnInit(); } +#endif } FORCEINLINE @@ -1552,6 +1554,11 @@ /* Flush the TLB by resetting CR3 */ #ifdef _M_PPC __asm__("sync\n\tisync\n\t"); +#elif _M_ARM + // + // We need to implement this! + // + ASSERTMSG("Need ARM flush routine\n", FALSE); #else __writecr3(__readcr3()); #endif Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Thu Feb 7 09:40:42 2008 @@ -280,7 +280,7 @@ * Use IsPointerOffset to test whether a pointer should be interpreted as an offset * or as a pointer */ -#if defined(_X86_) || defined(_M_AMD64) || defined(_MIPS_) || defined(_PPC_) +#if defined(_X86_) || defined(_M_AMD64) || defined(_MIPS_) || defined(_PPC_) || defined(_ARM_) /* for x86 and x86-64 the MSB is 1 so we can simply test on that */ #define IsPointerOffset(Ptr) ((LONG_PTR)(Ptr) >= 0) @@ -310,10 +310,10 @@ C_ASSERT(FIELD_OFFSET(KPROCESS, DirectoryTableBase) == KPROCESS_DIRECTORY_TABLE_BASE); //C_ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); //C_ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); +#ifdef _M_IX86 C_ASSERT(FIELD_OFFSET(KPCR, IRR) == KPCR_IRR); C_ASSERT(FIELD_OFFSET(KPCR, IDR) == KPCR_IDR); C_ASSERT(FIELD_OFFSET(KPCR, Irql) == KPCR_IRQL); -#ifdef _M_IX86 C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, NextThread) == KPCR_PRCB_NEXT_THREAD); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, NpxThread) == KPCR_NPX_THREAD);

1 0

[ros-arm-bringup] 32177: We now only compile the ELF loader if _ELF_ is defined (both because this isn't a standard Windows feature, and because the current code is completely not portable with ARM)
by ros-arm-bringup＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: ros-arm-bringup Date: Thu Feb 7 09:36:31 2008 New Revision: 32177 URL: http://svn.reactos.org/svn/reactos?rev=32177&view=rev Log: We now only compile the ELF loader if _ELF_ is defined (both because this isn't a standard Windows feature, and because the current code is completely not portable with ARM) Modified: trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Thu Feb 7 09:36:31 2008 @@ -2631,7 +2631,9 @@ static PEXEFMT_LOADER ExeFmtpLoaders[] = { PeFmtCreateSection, +#ifdef __ELF ElfFmtCreateSection +#endif }; static Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu Feb 7 09:36:31 2008 @@ -12,6 +12,9 @@ <define name="_IN_KERNEL_" /> <if property="_WINKD_" value="1"> <define name="_WINKD_" /> + </if> + <if property="_ELF" value="1"> + <define name="_ELF_" /> </if> <include base="cmlib">.</include> <include base="ntoskrnl">include</include> @@ -357,8 +360,10 @@ <file>verifier.c</file> <file>virtual.c</file> <file>wset.c</file> - <file>elf32.c</file> - <file>elf64.c</file> + <if property="_ELF_" value="1"> + <file>elf32.c</file> + <file>elf64.c</file> + </if> </directory> <directory name="ob"> <file>obdir.c</file>

1 0

[ros-arm-bringup] 32176: We now return failed in FrLdrMapImage if the file could not be read. FreeLDR ARM now loads properly, however, we need to start building the ARM kernel and ARM boot drivers, otherwise their relocations will have byte offsets which will lead to alignment errors (on ARM relocaitons are DWORD-aligned). Next steps are to get the kernel building, then the HAL, then bootvid/kdcom.
by ros-arm-bringup＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: ros-arm-bringup Date: Thu Feb 7 08:25:37 2008 New Revision: 32176 URL: http://svn.reactos.org/svn/reactos?rev=32176&view=rev Log: We now return failed in FrLdrMapImage if the file could not be read. FreeLDR ARM now loads properly, however, we need to start building the ARM kernel and ARM boot drivers, otherwise their relocations will have byte offsets which will lead to alignment errors (on ARM relocaitons are DWORD-aligned). Next steps are to get the kernel building, then the HAL, then bootvid/kdcom. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c 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 (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c Thu Feb 7 08:25:37 2008 @@ -13,6 +13,7 @@ /* GLOBALS ********************************************************************/ PARM_BOARD_CONFIGURATION_BLOCK ArmBoardBlock; +ULONG BootDrive, BootPartition; /* FUNCTIONS ******************************************************************/ 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 (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c Thu Feb 7 08:25:37 2008 @@ -492,13 +492,18 @@ /* Allocate a temporary buffer for the read */ ReadBuffer = MmHeapAlloc(ImageSize); - + /* Load the file image */ - FsReadFile(Image, ImageSize, NULL, ReadBuffer); - + if (!FsReadFile(Image, ImageSize, NULL, ReadBuffer)) + { + /* Fail */ + DbgPrint("Failed to read image: %s\n", Name); + return NULL; + } + /* Map it into virtual memory */ ImageSize = FrLdrReMapImage(ReadBuffer, LoadBase); - + /* Free the temporary buffer */ MmHeapFree(ReadBuffer);

1 0

[navaraf] 32175: Make HvIsCellAllocated working.
by navaraf＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: navaraf Date: Thu Feb 7 06:32:47 2008 New Revision: 32175 URL: http://svn.reactos.org/svn/reactos?rev=32175&view=rev Log: Make HvIsCellAllocated working. Modified: trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hivedata.h Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=3… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c (original) +++ trunk/reactos/lib/cmlib/hivecell.c Thu Feb 7 06:32:47 2008 @@ -46,26 +46,24 @@ HvIsCellAllocated(IN PHHIVE RegistryHive, IN HCELL_INDEX CellIndex) { - ULONG Type, Block; - - /* If it's a flat hive, the cell is always allocated */ - if (RegistryHive->Flat) return TRUE; - - /* Otherwise, get the type and make sure it's valid */ - Type = HvGetCellType(CellIndex); - if (((CellIndex % ~HCELL_TYPE_MASK) > RegistryHive->Storage[Type].Length) || - (CellIndex % (RegistryHive->Version >= 2 ? 8 : 16))) - { - /* Invalid cell index */ - return FALSE; - } - - /* Try to get the cell block */ - Block = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - if (RegistryHive->Storage[Type].BlockList[Block].BlockAddress) return TRUE; - - /* No valid block, fail */ - return FALSE; + ULONG Type, Block; + + /* If it's a flat hive, the cell is always allocated */ + if (RegistryHive->Flat) + return TRUE; + + /* Otherwise, get the type and make sure it's valid */ + Type = HvGetCellType(CellIndex); + Block = HvGetCellBlock(CellIndex); + if (Block >= RegistryHive->Storage[Type].Length) + return FALSE; + + /* Try to get the cell block */ + if (RegistryHive->Storage[Type].BlockList[Block].BlockAddress) + return TRUE; + + /* No valid block, fail */ + return FALSE; } PVOID CMAPI @@ -88,13 +86,13 @@ HvGetCellSize(IN PHHIVE Hive, IN PVOID Address) { - PHCELL CellHeader; - LONG Size; - - CellHeader = (PHCELL)Address - 1; - Size = CellHeader->Size * -1; - Size -= sizeof(HCELL); - return Size; + PHCELL CellHeader; + LONG Size; + + CellHeader = (PHCELL)Address - 1; + Size = CellHeader->Size * -1; + Size -= sizeof(HCELL); + return Size; } BOOLEAN CMAPI @@ -126,14 +124,15 @@ HvIsCellDirty(IN PHHIVE Hive, IN HCELL_INDEX Cell) { - /* Sanity checks */ - ASSERT(Hive->ReadOnly == FALSE); - - /* Volatile cells are always "dirty" */ - if (HvGetCellType(Cell) == Volatile) return TRUE; - - /* Check if the dirty bit is set */ - return RtlCheckBit(&Hive->DirtyVector, Cell / HV_BLOCK_SIZE); + /* Sanity checks */ + ASSERT(Hive->ReadOnly == FALSE); + + /* Volatile cells are always "dirty" */ + if (HvGetCellType(Cell) == Volatile) + return TRUE; + + /* Check if the dirty bit is set */ + return RtlCheckBit(&Hive->DirtyVector, Cell / HV_BLOCK_SIZE); } static ULONG __inline CMAPI Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=3… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h (original) +++ trunk/reactos/lib/cmlib/hivedata.h Thu Feb 7 06:32:47 2008 @@ -92,6 +92,8 @@ #define HvGetCellType(Cell) \ ((ULONG)((Cell & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT)) +#define HvGetCellBlock(Cell) \ + ((ULONG)((Cell & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT)) typedef enum {

1 0

[tkreuzer] 32174: make the table smaller
by tkreuzer＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: tkreuzer Date: Thu Feb 7 05:36:20 2008 New Revision: 32174 URL: http://svn.reactos.org/svn/reactos?rev=32174&view=rev Log: make the table smaller Modified: trunk/reactos/base/setup/usetup/mui.c Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Thu Feb 7 05:36:20 2008 @@ -47,273 +47,34 @@ static const MUI_LANGUAGE LanguageList[] = { - { - L"00000409", /* The Language ID */ - L"00000409", /* Default Keyboard Layout for this language */ - L"1252", /* ANSI Codepage */ - L"437", /* OEM Codepage */ - L"10000", /* MAC Codepage */ - L"English", /* Language Name , not used just to make things easier when updating this file */ - enUSPages, /* Translated page strings */ - enUSErrorEntries /* Translated error strings */ - }, - { - L"00000402", - L"00000402", - L"1251", - L"866", - L"10007", - L"Bulgarian", - bgBGPages, - bgBGErrorEntries - }, - { - L"00000403", - L"00000403", - L"1252", - L"850", - L"10000", - L"Catalan", - enUSPages, - enUSErrorEntries - }, - { - L"00000804", - L"00000804", - L"936", - L"936", - L"10008", - L"Chinese (PRC)", - enUSPages, - enUSErrorEntries - }, - { - L"00000406", - L"00000406", - L"1252", - L"850", - L"10000", - L"Danish", - enUSPages, - enUSErrorEntries - }, - { - L"00000413", - L"00000813", - L"1252", - L"850", - L"10000", - L"Dutch", - enUSPages, - enUSErrorEntries - }, - { - L"0000040B", - L"0000040B", - L"1252", - L"850", - L"10000", - L"Finnish", - enUSPages, - enUSErrorEntries - }, - { - L"0000040C", - L"0000040C", - L"1252", - L"850", - L"10000", - L"French", - frFRPages, - frFRErrorEntries - }, - { - L"00000407", - L"00000407", - L"1252", - L"850", - L"10000", - L"German", - deDEPages, - deDEErrorEntries - }, - { - L"00000408", - L"00000408", - L"1253", - L"737", - L"10006", - L"Greek", - elGRPages, - elGRErrorEntries - }, - { - L"0000040D", - L"0000040D", - L"1255", - L"862", - L"10005", - L"Hebrew", - enUSPages, - enUSErrorEntries - }, - { - L"0000040E", - L"0000040E", - L"1250", - L"852", - L"10029", - L"Hungarian", - enUSPages, - enUSErrorEntries - }, - { - L"00000410", - L"00000410", - L"1252", - L"850", - L"10000", - L"Italian", - itITPages, - itITErrorEntries - }, - { - L"00000411", - L"00000411", - L"932", - L"932", - L"10001", - L"Japanese", - enUSPages, - enUSErrorEntries - }, - { - L"00000412", - L"00000412", - L"949", - L"949", - L"10003", - L"Korean", - enUSPages, - enUSErrorEntries - }, - { - L"00000427", - L"00000427", - L"1257", - L"775", - L"10029", - L"Lithuanian", - ltLTPages, - ltLTErrorEntries - }, - { - L"00000414", - L"00000414", - L"1252", - L"850", - L"10000", - L"Norwegian", - enUSPages, - enUSErrorEntries - }, - { - L"00000419", - L"00000419", - L"1251", - L"866", - L"10007", - L"Russian", - ruRUPages, - ruRUErrorEntries - }, - { - L"0000041B", - L"0000041B", - L"1250", - L"852", - L"10029", - L"Slovak", - skSKPages, - skSKErrorEntries - }, - { - L"0000040A", - L"0000040A", - L"1252", - L"850", - L"10000", - L"Spanish", - esESPages, - esESErrorEntries - }, - { - L"00000415", - L"00000415", - L"1250", - L"852", - L"10029", - L"Polish", - plPLPages, - plPLErrorEntries - }, - { - L"00000816", - L"00000816", - L"1252", - L"850", - L"10000", - L"Portuguese", - enUSPages, - enUSErrorEntries - }, - { - L"0000041D", - L"0000041D", - L"1252", - L"850", - L"10000", - L"Swedish", - svSEPages, - svSEErrorEntries - }, - { - L"0000041E", - L"0000041E", - L"874", - L"874", - L"10021", - L"Thai", - enUSPages, - enUSErrorEntries - }, - { - L"0000041F", - L"0000041F", - L"1254", - L"857", - L"10081", - L"Turkish", - enUSPages, - enUSErrorEntries - }, - { - L"00000422", - L"00000422", - L"1251", - L"866", - L"10017", - L"Ukrainian", - ukUAPages, - ukUAErrorEntries - }, - { - NULL, - NULL, - NULL, - NULL, - NULL - } + /* Lang ID, DefKbdLayout,ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings */ + {L"00000409", L"00000409", L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries }, + {L"00000402", L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries }, + {L"00000403", L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries }, + {L"00000804", L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries }, + {L"00000406", L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries }, + {L"00000413", L"00000813", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries }, + {L"0000040B", L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries }, + {L"0000040C", L"0000040C", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries }, + {L"00000407", L"00000407", L"1252", L"850", L"10000", L"German", deDEPages, deDEErrorEntries }, + {L"00000408", L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries }, + {L"0000040D", L"0000040D", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries }, + {L"0000040E", L"0000040E", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries }, + {L"00000410", L"00000410", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries }, + {L"00000411", L"00000411", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries }, + {L"00000412", L"00000412", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries }, + {L"00000427", L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries }, + {L"00000414", L"00000414", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries }, + {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries }, + {L"0000041B", L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries }, + {L"0000040A", L"0000040A", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries }, + {L"00000415", L"00000415", L"1250", L"852", L"10029", L"Polish", plPLPages, plPLErrorEntries }, + {L"00000816", L"00000816", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries }, + {L"0000041D", L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries }, + {L"0000041E", L"0000041E", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries }, + {L"0000041F", L"0000041F", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries }, + {L"00000422", L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries }, + {NULL, NULL, NULL, NULL, NULL} }; extern

1 0

[ros-arm-bringup] 32173: There was no reason to have most of the i386Disk routines as i386-only routines, since they are quite generic and portable assuming MBR-based disks. GPT disks are another matter, but in either case, any architecture should support both, and that's the real distinction. Made the ARM code use the shared disk routines, which allowed us to remove some hacks -> we now detect the boot/system volume just like on x86. FreeLDR now loads NTOSKRNL.EXE on ARM. Also made the DiskIsBo
by ros-arm-bringup＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: ros-arm-bringup Date: Thu Feb 7 03:43:09 2008 New Revision: 32173 URL: http://svn.reactos.org/svn/reactos?rev=32173&view=rev Log: There was no reason to have most of the i386Disk routines as i386-only routines, since they are quite generic and portable assuming MBR-based disks. GPT disks are another matter, but in either case, any architecture should support both, and that's the real distinction. Made the ARM code use the shared disk routines, which allowed us to remove some hacks -> we now detect the boot/system volume just like on x86. FreeLDR now loads NTOSKRNL.EXE on ARM. Also made the DiskIsBootDeviceFloppy return FALSE for ramdisks. Finally, note that the disk routines were still kept as Machine-specific routines in the Mach Table, so other architectures can still override them if they really need to (for example, the XBOX port overrides one of them for a specific XBOX hack). Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h trunk/reactos/boot/freeldr/freeldr/include/disk.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Thu Feb 7 03:43:09 2008 @@ -24,7 +24,6 @@ // } - BOOLEAN ArmDiskGetDriveGeometry(IN ULONG DriveNumber, OUT PGEOMETRY Geometry) @@ -50,58 +49,6 @@ return FALSE; } -BOOLEAN -ArmDiskGetBootVolume(IN PULONG DriveNumber, - IN PULONGLONG StartSector, - IN PULONGLONG SectorCount, - OUT PINT FsType) -{ - // - // We only support RAM disk for now -- add support for NAND later - // - ASSERT(gRamDiskBase); - ASSERT(gRamDiskSize); - - // - // Use magic ramdisk drive number and count the number of 512-byte sectors - // - *DriveNumber = 0x49; - *StartSector = 63; - *SectorCount = gRamDiskSize * 512; - - // - // Ramdisk support is FAT-only for now - // - *FsType = FS_FAT; - - // - // Now that ramdisk is enabled, use ramdisk routines - // - RamDiskSwitchFromBios(); - return TRUE; -} - -BOOLEAN -ArmDiskGetSystemVolume(IN PCHAR SystemPath, - OUT PCHAR RemainingPath, - OUT PULONG Device, - OUT PULONG DriveNumber, - OUT PULONGLONG StartSector, - OUT PULONGLONG SectorCount, - OUT PINT FsType) -{ - while (TRUE); - return FALSE; -} - -BOOLEAN -ArmDiskNormalizeSystemPath(IN PCHAR SystemPath, - IN unsigned Size) -{ - while (TRUE); - return FALSE; -} - VOID ArmPrepareForReactOS(IN BOOLEAN Setup) { @@ -111,8 +58,32 @@ PCONFIGURATION_COMPONENT_DATA ArmHwDetect(VOID) { - while (TRUE); - return NULL; + PCONFIGURATION_COMPONENT_DATA RootNode; + + // + // Create the root node + // + FldrCreateSystemKey(&RootNode); + + // + // Write null component information + // + FldrSetComponentInformation(RootNode, + 0x0, + 0x0, + 0xFFFFFFFF); + + // + // 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. + // + + // + // Return the root node + // + return RootNode; } ULONG @@ -155,18 +126,31 @@ } // - // Setup generic ARM routines + // Setup generic ARM routines for all boards // MachVtbl.PrepareForReactOS = ArmPrepareForReactOS; MachVtbl.GetMemoryMap = ArmMemGetMemoryMap; - MachVtbl.DiskGetBootVolume = ArmDiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = ArmDiskGetSystemVolume; - MachVtbl.DiskNormalizeSystemPath = ArmDiskNormalizeSystemPath; + MachVtbl.HwDetect = ArmHwDetect; + + // + // Setup disk I/O routines, switch to ramdisk ones for non-NAND boot + // MachVtbl.DiskReadLogicalSectors = ArmDiskReadLogicalSectors; MachVtbl.DiskGetDriveGeometry = ArmDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = ArmDiskGetCacheableBlockCount; - MachVtbl.HwDetect = ArmHwDetect; - + RamDiskSwitchFromBios(); + + // + // Now set default disk handling routines -- we don't need to override + // + MachVtbl.DiskGetBootVolume = DiskGetBootVolume; + MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; + MachVtbl.DiskGetBootPath = DiskGetBootPath; + MachVtbl.DiskGetBootDevice = DiskGetBootDevice; + MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; + MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; + MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; + // // We can now print to the console // Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S Thu Feb 7 03:43:09 2008 @@ -46,16 +46,16 @@ .code32 - /* Zero i386BootDrive and i386BootPartition */ + /* Zero BootDrive and BootPartition */ xorl %eax,%eax - movl %eax,(_i386BootDrive) - movl %eax,(_i386BootPartition) + movl %eax,(_BootDrive) + movl %eax,(_BootPartition) /* Store the boot drive */ - movb %dl,(_i386BootDrive) + movb %dl,(_BootDrive) /* Store the boot partition */ - movb %dh,(_i386BootPartition) + movb %dh,(_BootPartition) /* GO! */ pushl %eax @@ -395,12 +395,12 @@ movl MB_INFO_BOOT_DEVICE_OFFSET(%ebx),%eax shrl $16,%eax incb %al - movb %al,_i386BootPartition - movb %ah,_i386BootDrive + movb %al,_BootPartition + movb %ah,_BootDrive jmp mb6 mb5: /* No boot device known, assume first partition of first harddisk */ - movb $0x80,_i386BootDrive - movb $1,_i386BootPartition + movb $0x80,_BootDrive + movb $1,_BootPartition mb6: /* Check for command line */ mov $cmdline,%eax @@ -484,14 +484,14 @@ .word 0x3ff /* Limit */ .long 0 /* Base Address */ -EXTERN(_i386BootDrive) - .long 0 - -EXTERN(_i386BootPartition) - .long 0 - mb_info: .fill MB_INFO_SIZE, 1, 0 cmdline: .fill CMDLINE_SIZE, 1, 0 + +EXTERN(_BootDrive) + .long 0 + +EXTERN(_BootPartition) + .long 0 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S Thu Feb 7 03:43:09 2008 @@ -31,7 +31,7 @@ .code16 /* Set the boot drive */ - movb (_i386BootDrive),%dl + movb (_BootDrive),%dl /* Load segment registers */ cli Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c Thu Feb 7 03:43:09 2008 @@ -198,309 +198,6 @@ return TRUE; } -BOOLEAN i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) -{ - PARTITION_TABLE_ENTRY PartitionTableEntry; - UCHAR VolumeType; - ULONG ActivePartition; - - DbgPrint((DPRINT_FILESYSTEM, "FsOpenVolume() DriveNumber: 0x%x PartitionNumber: 0x%x\n", i386BootDrive, i386BootPartition)); - - // Check and see if it is a floppy drive - // If so then just assume FAT12 file system type - if (DiskIsDriveRemovable(i386BootDrive)) - { - DbgPrint((DPRINT_FILESYSTEM, "Drive is a floppy diskette drive. Assuming FAT12 file system.\n")); - - *DriveNumber = i386BootDrive; - *StartSector = 0; - *SectorCount = 2 * 80 * 18; /* FIXME hardcoded for 1.44 Mb */ - *FsType = FS_FAT; - return TRUE; - } - - // Check for ISO9660 file system type - if (i386BootDrive >= 0x80 && FsRecIsIso9660(i386BootDrive)) - { - DbgPrint((DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n")); - - *DriveNumber = i386BootDrive; - *StartSector = 0; - *SectorCount = 0; - *FsType = FS_ISO9660; - return TRUE; - } - - // Get the requested partition entry - if (i386BootPartition == 0) - { - // Partition requested was zero which means the boot partition - if (! DiskGetActivePartitionEntry(i386BootDrive, &PartitionTableEntry, &ActivePartition)) - { - /* Try partition-less disk */ - *StartSector = 0; - *SectorCount = 0; - } - /* Check for valid partition */ - else if (PartitionTableEntry.SystemIndicator == PARTITION_ENTRY_UNUSED) - { - return FALSE; - } - else - { - *StartSector = PartitionTableEntry.SectorCountBeforePartition; - *SectorCount = PartitionTableEntry.PartitionSectorCount; - } - } - else if (0xff == i386BootPartition) - { - /* Partition-less disk */ - *StartSector = 0; - *SectorCount = 0; - } - else - { - // Get requested partition - if (! MachDiskGetPartitionEntry(i386BootDrive, i386BootPartition, &PartitionTableEntry)) - { - return FALSE; - } - /* Check for valid partition */ - else if (PartitionTableEntry.SystemIndicator == PARTITION_ENTRY_UNUSED) - { - return FALSE; - } - else - { - *StartSector = PartitionTableEntry.SectorCountBeforePartition; - *SectorCount = PartitionTableEntry.PartitionSectorCount; - } - } - - // Try to recognize the file system - if (!FsRecognizeVolume(i386BootDrive, *StartSector, &VolumeType)) - { - return FALSE; - } - - *DriveNumber = i386BootDrive; - - switch (VolumeType) - { - case PARTITION_FAT_12: - case PARTITION_FAT_16: - case PARTITION_HUGE: - case PARTITION_XINT13: - case PARTITION_FAT32: - case PARTITION_FAT32_XINT13: - *FsType = FS_FAT; - return TRUE; - case PARTITION_EXT2: - *FsType = FS_EXT2; - return TRUE; - case PARTITION_NTFS: - *FsType = FS_NTFS; - return TRUE; - default: - *FsType = 0; - return FALSE; - } - - return TRUE; -} - -VOID -i386DiskGetBootDevice(PULONG BootDevice) -{ - ((char *)BootDevice)[0] = (char)i386BootDrive; - ((char *)BootDevice)[1] = (char)i386BootPartition; -} - -BOOLEAN -i386DiskBootingFromFloppy(VOID) -{ - return i386BootDrive < 0x80; -} - -#define IsRecognizedPartition(P) \ - ((P) == PARTITION_FAT_12 || \ - (P) == PARTITION_FAT_16 || \ - (P) == PARTITION_HUGE || \ - (P) == PARTITION_IFS || \ - (P) == PARTITION_EXT2 || \ - (P) == PARTITION_FAT32 || \ - (P) == PARTITION_FAT32_XINT13 || \ - (P) == PARTITION_XINT13) - -#define IsContainerPartition(P) \ - ((P) == PARTITION_EXTENDED || \ - (P) == PARTITION_XINT13_EXTENDED) - -BOOLEAN i386DiskGetSystemVolume(char *SystemPath, - char *RemainingPath, - PULONG Device, - PULONG DriveNumber, - PULONGLONG StartSector, - PULONGLONG SectorCount, - int *FsType) -{ - ULONG PartitionNumber; - PARTITION_TABLE_ENTRY PartitionTableEntry; - UCHAR VolumeType; - CHAR BootPath[256]; - unsigned i, RosPartition; - - /* - * Verify system path - */ - if (!DissectArcPath(SystemPath, BootPath, DriveNumber, &PartitionNumber)) - { - return FALSE; - } - if (NULL != RemainingPath) - { - strcpy(RemainingPath, BootPath); - } - - /* 0xff -> no partition table present, use whole device */ - if (0xff == PartitionNumber) - { - PartitionTableEntry.SectorCountBeforePartition = 0; - i = 0xff; - } - else - { - /* recalculate the boot partition for freeldr */ - i = 0; - RosPartition = 0; - while (1) - { - if (!MachDiskGetPartitionEntry(*DriveNumber, ++i, &PartitionTableEntry)) - { - return FALSE; - } - if (!IsContainerPartition(PartitionTableEntry.SystemIndicator) && - PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) - { - if (++RosPartition == PartitionNumber) - { - break; - } - } - } - } - - /* Check for ISO9660 file system type */ - if (*DriveNumber >= 0x80 && FsRecIsIso9660(*DriveNumber)) - { - DbgPrint((DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n")); - - if (NULL != Device) - { - ((char *)Device)[0] = (char)(*DriveNumber); - ((char *)Device)[1] = (char)i; - } - *StartSector = 0; - *SectorCount = 0; - *FsType = FS_ISO9660; - return TRUE; - } - - if (!FsRecognizeVolume(*DriveNumber, PartitionTableEntry.SectorCountBeforePartition, &VolumeType)) - { - return FALSE; - } - - if (NULL != Device) - { - ((char *)Device)[0] = (char)(*DriveNumber); - ((char *)Device)[1] = (char)i; - } - *StartSector = PartitionTableEntry.SectorCountBeforePartition; - *SectorCount = PartitionTableEntry.PartitionSectorCount; - - switch (VolumeType) - { - case PARTITION_FAT_12: - case PARTITION_FAT_16: - case PARTITION_HUGE: - case PARTITION_XINT13: - case PARTITION_FAT32: - case PARTITION_FAT32_XINT13: - *FsType = FS_FAT; - return TRUE; - case PARTITION_EXT2: - *FsType = FS_EXT2; - return TRUE; - case PARTITION_NTFS: - *FsType = FS_NTFS; - return TRUE; - default: - *FsType = 0; - return FALSE; - } - - return FALSE; -} - -BOOLEAN -i386DiskGetBootPath(char *BootPath, unsigned Size) -{ - static char Path[] = "multi(0)disk(0)"; - char Device[4]; - - _itoa(i386BootDrive, Device, 10); - if (Size <= sizeof(Path) + 6 + strlen(Device)) - { - return FALSE; - } - strcpy(BootPath, Path); - strcat(BootPath, MachDiskBootingFromFloppy() ? "fdisk" : "cdrom"); - strcat(strcat(strcat(BootPath, "("), Device), ")"); - - return TRUE; -} - -BOOLEAN -i386DiskNormalizeSystemPath(char *SystemPath, unsigned Size) -{ - CHAR BootPath[256]; - ULONG PartitionNumber; - ULONG DriveNumber; - PARTITION_TABLE_ENTRY PartEntry; - char *p; - - if (!DissectArcPath(SystemPath, BootPath, &DriveNumber, &PartitionNumber)) - { - return FALSE; - } - - if (0 != PartitionNumber) - { - return TRUE; - } - - if (! DiskGetActivePartitionEntry(DriveNumber, - &PartEntry, - &PartitionNumber) || - PartitionNumber < 1 || 9 < PartitionNumber) - { - return FALSE; - } - - p = SystemPath; - while ('\0' != *p && 0 != _strnicmp(p, "partition(", 10)) { - p++; - } - p = strchr(p, ')'); - if (NULL == p || '0' != *(p - 1)) { - return FALSE; - } - *(p - 1) = '0' + PartitionNumber; - - return TRUE; -} - #endif /* defined __i386__ */ /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S Thu Feb 7 03:43:09 2008 @@ -30,7 +30,7 @@ .code16 /* Set the boot drive */ - movb (_i386BootDrive),%dl + movb (_BootDrive),%dl /* Load segment registers */ cli @@ -66,7 +66,7 @@ .code16 /* Set the boot drive */ - movb (_i386BootDrive),%dl + movb (_BootDrive),%dl /* Load segment registers */ cli Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Thu Feb 7 03:43:09 2008 @@ -44,14 +44,14 @@ MachVtbl.Beep = PcBeep; MachVtbl.PrepareForReactOS = PcPrepareForReactOS; MachVtbl.GetMemoryMap = PcMemGetMemoryMap; - MachVtbl.DiskGetBootVolume = i386DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = i386DiskGetSystemVolume; - MachVtbl.DiskGetBootPath = i386DiskGetBootPath; - MachVtbl.DiskGetBootDevice = i386DiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = i386DiskBootingFromFloppy; - MachVtbl.DiskNormalizeSystemPath = i386DiskNormalizeSystemPath; + MachVtbl.DiskGetBootVolume = DiskGetBootVolume; + MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; + MachVtbl.DiskGetBootPath = DiskGetBootPath; + MachVtbl.DiskGetBootDevice = DiskGetBootDevice; + MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; + MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = PcDiskReadLogicalSectors; - MachVtbl.DiskGetPartitionEntry = PcDiskGetPartitionEntry; + MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount; MachVtbl.RTCGetCurrentDateTime = PcRTCGetCurrentDateTime; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Thu Feb 7 03:43:09 2008 @@ -47,12 +47,12 @@ MachVtbl.Beep = PcBeep; MachVtbl.PrepareForReactOS = XboxPrepareForReactOS; MachVtbl.GetMemoryMap = XboxMemGetMemoryMap; - MachVtbl.DiskGetBootVolume = i386DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = i386DiskGetSystemVolume; - MachVtbl.DiskGetBootPath = i386DiskGetBootPath; - MachVtbl.DiskGetBootDevice = i386DiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = i386DiskBootingFromFloppy; - MachVtbl.DiskNormalizeSystemPath = i386DiskNormalizeSystemPath; + MachVtbl.DiskGetBootVolume = DiskGetBootVolume; + MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; + MachVtbl.DiskGetBootPath = DiskGetBootPath; + MachVtbl.DiskGetBootDevice = DiskGetBootDevice; + MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; + MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = XboxDiskReadLogicalSectors; MachVtbl.DiskGetPartitionEntry = XboxDiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = XboxDiskGetDriveGeometry; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c Thu Feb 7 03:43:09 2008 @@ -379,13 +379,6 @@ } BOOLEAN -PcDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry) -{ - /* Just use the standard routine */ - return DiskGetPartitionEntry(DriveNumber, PartitionNumber, PartitionTableEntry); -} - -BOOLEAN PcDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY Geometry) { REGS RegsIn; Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c Thu Feb 7 03:43:09 2008 @@ -91,7 +91,8 @@ // Hard disks use drive numbers >= 0x80 // So if the drive number indicates a hard disk // then return FALSE - if (DriveNumber >= 0x80) + // 0x49 is our magic ramdisk drive, so return FALSE for that too + if ((DriveNumber >= 0x80) || (DriveNumber == 0x49)) { return FALSE; } @@ -100,6 +101,310 @@ return TRUE; } +BOOLEAN DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) +{ + PARTITION_TABLE_ENTRY PartitionTableEntry; + UCHAR VolumeType; + ULONG ActivePartition; + + DbgPrint((DPRINT_FILESYSTEM, "FsOpenVolume() DriveNumber: 0x%x PartitionNumber: 0x%x\n", BootDrive, BootPartition)); + + // Check and see if it is a floppy drive + // If so then just assume FAT12 file system type + if (DiskIsDriveRemovable(BootDrive)) + { + DbgPrint((DPRINT_FILESYSTEM, "Drive is a floppy diskette drive. Assuming FAT12 file system.\n")); + + *DriveNumber = BootDrive; + *StartSector = 0; + *SectorCount = 2 * 80 * 18; /* FIXME hardcoded for 1.44 Mb */ + *FsType = FS_FAT; + return TRUE; + } + + // Check for ISO9660 file system type + if (BootDrive >= 0x80 && FsRecIsIso9660(BootDrive)) + { + DbgPrint((DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n")); + + *DriveNumber = BootDrive; + *StartSector = 0; + *SectorCount = 0; + *FsType = FS_ISO9660; + return TRUE; + } + + // Get the requested partition entry + if (BootPartition == 0) + { + // Partition requested was zero which means the boot partition + if (! DiskGetActivePartitionEntry(BootDrive, &PartitionTableEntry, &ActivePartition)) + { + /* Try partition-less disk */ + *StartSector = 0; + *SectorCount = 0; + } + /* Check for valid partition */ + else if (PartitionTableEntry.SystemIndicator == PARTITION_ENTRY_UNUSED) + { + return FALSE; + } + else + { + *StartSector = PartitionTableEntry.SectorCountBeforePartition; + *SectorCount = PartitionTableEntry.PartitionSectorCount; + } + } + else if (0xff == BootPartition) + { + /* Partition-less disk */ + *StartSector = 0; + *SectorCount = 0; + } + else + { + // Get requested partition + if (! MachDiskGetPartitionEntry(BootDrive, BootPartition, &PartitionTableEntry)) + { + return FALSE; + } + /* Check for valid partition */ + else if (PartitionTableEntry.SystemIndicator == PARTITION_ENTRY_UNUSED) + { + return FALSE; + } + else + { + *StartSector = PartitionTableEntry.SectorCountBeforePartition; + *SectorCount = PartitionTableEntry.PartitionSectorCount; + } + } + + // Try to recognize the file system + if (!FsRecognizeVolume(BootDrive, *StartSector, &VolumeType)) + { + return FALSE; + } + + *DriveNumber = BootDrive; + + switch (VolumeType) + { + case PARTITION_FAT_12: + case PARTITION_FAT_16: + case PARTITION_HUGE: + case PARTITION_XINT13: + case PARTITION_FAT32: + case PARTITION_FAT32_XINT13: + *FsType = FS_FAT; + return TRUE; + case PARTITION_EXT2: + *FsType = FS_EXT2; + return TRUE; + case PARTITION_NTFS: + *FsType = FS_NTFS; + return TRUE; + default: + *FsType = 0; + return FALSE; + } + + return TRUE; +} + +VOID +DiskGetBootDevice(PULONG BootDevice) +{ + ((char *)BootDevice)[0] = (char)BootDrive; + ((char *)BootDevice)[1] = (char)BootPartition; +} + +BOOLEAN +DiskBootingFromFloppy(VOID) +{ + return BootDrive < 0x80; +} + +#define IsRecognizedPartition(P) \ + ((P) == PARTITION_FAT_12 || \ + (P) == PARTITION_FAT_16 || \ + (P) == PARTITION_HUGE || \ + (P) == PARTITION_IFS || \ + (P) == PARTITION_EXT2 || \ + (P) == PARTITION_FAT32 || \ + (P) == PARTITION_FAT32_XINT13 || \ + (P) == PARTITION_XINT13) + +#define IsContainerPartition(P) \ + ((P) == PARTITION_EXTENDED || \ + (P) == PARTITION_XINT13_EXTENDED) + +BOOLEAN DiskGetSystemVolume(char *SystemPath, + char *RemainingPath, + PULONG Device, + PULONG DriveNumber, + PULONGLONG StartSector, + PULONGLONG SectorCount, + int *FsType) +{ + ULONG PartitionNumber; + PARTITION_TABLE_ENTRY PartitionTableEntry; + UCHAR VolumeType; + CHAR BootPath[256]; + unsigned i, RosPartition; + + /* + * Verify system path + */ + if (!DissectArcPath(SystemPath, BootPath, DriveNumber, &PartitionNumber)) + { + return FALSE; + } + if (NULL != RemainingPath) + { + strcpy(RemainingPath, BootPath); + } + + /* 0xff -> no partition table present, use whole device */ + if (0xff == PartitionNumber) + { + PartitionTableEntry.SectorCountBeforePartition = 0; + i = 0xff; + } + else + { + /* recalculate the boot partition for freeldr */ + i = 0; + RosPartition = 0; + while (1) + { + if (!MachDiskGetPartitionEntry(*DriveNumber, ++i, &PartitionTableEntry)) + { + return FALSE; + } + if (!IsContainerPartition(PartitionTableEntry.SystemIndicator) && + PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) + { + if (++RosPartition == PartitionNumber) + { + break; + } + } + } + } + + /* Check for ISO9660 file system type */ + if (*DriveNumber >= 0x80 && FsRecIsIso9660(*DriveNumber)) + { + DbgPrint((DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n")); + + if (NULL != Device) + { + ((char *)Device)[0] = (char)(*DriveNumber); + ((char *)Device)[1] = (char)i; + } + *StartSector = 0; + *SectorCount = 0; + *FsType = FS_ISO9660; + return TRUE; + } + + if (!FsRecognizeVolume(*DriveNumber, PartitionTableEntry.SectorCountBeforePartition, &VolumeType)) + { + return FALSE; + } + + if (NULL != Device) + { + ((char *)Device)[0] = (char)(*DriveNumber); + ((char *)Device)[1] = (char)i; + } + *StartSector = PartitionTableEntry.SectorCountBeforePartition; + *SectorCount = PartitionTableEntry.PartitionSectorCount; + + switch (VolumeType) + { + case PARTITION_FAT_12: + case PARTITION_FAT_16: + case PARTITION_HUGE: + case PARTITION_XINT13: + case PARTITION_FAT32: + case PARTITION_FAT32_XINT13: + *FsType = FS_FAT; + return TRUE; + case PARTITION_EXT2: + *FsType = FS_EXT2; + return TRUE; + case PARTITION_NTFS: + *FsType = FS_NTFS; + return TRUE; + default: + *FsType = 0; + return FALSE; + } + + return FALSE; +} + +BOOLEAN +DiskGetBootPath(char *BootPath, unsigned Size) +{ + static char Path[] = "multi(0)disk(0)"; + char Device[4]; + + _itoa(BootDrive, Device, 10); + if (Size <= sizeof(Path) + 6 + strlen(Device)) + { + return FALSE; + } + strcpy(BootPath, Path); + strcat(BootPath, MachDiskBootingFromFloppy() ? "fdisk" : "cdrom"); + strcat(strcat(strcat(BootPath, "("), Device), ")"); + + return TRUE; +} + +BOOLEAN +DiskNormalizeSystemPath(char *SystemPath, unsigned Size) +{ + CHAR BootPath[256]; + ULONG PartitionNumber; + ULONG DriveNumber; + PARTITION_TABLE_ENTRY PartEntry; + char *p; + + if (!DissectArcPath(SystemPath, BootPath, &DriveNumber, &PartitionNumber)) + { + return FALSE; + } + + if (0 != PartitionNumber) + { + return TRUE; + } + + if (! DiskGetActivePartitionEntry(DriveNumber, + &PartEntry, + &PartitionNumber) || + PartitionNumber < 1 || 9 < PartitionNumber) + { + return FALSE; + } + + p = SystemPath; + while ('\0' != *p && 0 != _strnicmp(p, "partition(", 10)) { + p++; + } + p = strchr(p, ')'); + if (NULL == p || '0' != *(p - 1)) { + return FALSE; + } + *(p - 1) = '0' + PartitionNumber; + + return TRUE; +} + + // This function is in arch/i386/i386disk.c //VOID DiskStopFloppyMotor(VOID) Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c Thu Feb 7 03:43:09 2008 @@ -38,6 +38,7 @@ // // Allow 32KB transfers (64 sectors), emulating BIOS LBA // + ASSERT(Reserved == 0x49); return 64; } @@ -48,6 +49,7 @@ // // Should never be called when the caller expects valid Geometry! // + ASSERT(Reserved == 0x49); return TRUE; } @@ -59,7 +61,8 @@ { PVOID StartAddress; ULONG Length; - + ASSERT(Reserved == 0x49); + // // Get actual pointers and lengths // @@ -145,6 +148,8 @@ NTAPI RamDiskSwitchFromBios(VOID) { + extern ULONG BootDrive, BootPartition; + // // Check if we have a ramdisk, in which case we need to switch routines // @@ -161,5 +166,11 @@ // Also disable cached FAT reads // gCacheEnabled = FALSE; + + // + // Switch to ramdisk boot partition + // + BootDrive = 0x49; + BootPartition = 0; } } Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h Thu Feb 7 03:43:09 2008 @@ -22,19 +22,6 @@ #define __I386_I386_H_ -extern ULONG i386BootDrive; -extern ULONG i386BootPartition; - -extern BOOLEAN i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, - PULONGLONG SectorCount, int *FsType); -extern BOOLEAN i386DiskGetSystemVolume(char *SystemPath, char *RemainingPath, - PULONG Device, PULONG DriveNumber, - PULONGLONG StartSector, - PULONGLONG SectorCount, int *FsType); -extern BOOLEAN i386DiskGetBootPath(char *BootPath, unsigned Size); -extern VOID i386DiskGetBootDevice(PULONG BootDevice); -extern BOOLEAN i386DiskBootingFromFloppy(VOID); -extern BOOLEAN i386DiskNormalizeSystemPath(char *SystemPath, unsigned Size); #endif /* __I386_I386_H_ */ Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/disk.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h Thu Feb 7 03:43:09 2008 @@ -124,6 +124,20 @@ BOOLEAN DiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); // Implemented in i386disk.c BOOLEAN DiskIsDriveRemovable(ULONG DriveNumber); VOID DiskStopFloppyMotor(VOID); // Implemented in i386disk.c +extern ULONG BootDrive; +extern ULONG BootPartition; + +BOOLEAN DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, + PULONGLONG SectorCount, int *FsType); +BOOLEAN DiskGetSystemVolume(char *SystemPath, char *RemainingPath, + PULONG Device, PULONG DriveNumber, + PULONGLONG StartSector, + PULONGLONG SectorCount, int *FsType); +BOOLEAN DiskGetBootPath(char *BootPath, unsigned Size); +VOID DiskGetBootDevice(PULONG BootDevice); +BOOLEAN DiskBootingFromFloppy(VOID); +BOOLEAN DiskNormalizeSystemPath(char *SystemPath, unsigned Size); + /////////////////////////////////////////////////////////////////////////////////////// //

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
46
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2008