[ros-diffs] [ros-arm-bringup] 32171: Removed certain ARM Machine Callbacks which we shouldn't need at all until much later for SetupLDR. Kept the ArmDisk ones though since they'll be needed for NAND boot, but improved the assertions.

Author: ros-arm-bringup
Date: Wed Feb  6 23:47:53 2008
New Revision: 32171

URL: http://svn.reactos.org/svn/reactos?rev=32171&view=rev
Log:
Removed certain ARM Machine Callbacks which we shouldn't need at all until much later
for SetupLDR.
Kept the ArmDisk ones though since they'll be needed for NAND boot, but improved the
assertions.

Modified:
    trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c

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 Wed Feb  6 23:47:53 2008
@@ -22,6 +22,32 @@
     //
     // Start the OS
     //
+}
+
+
+BOOLEAN
+ArmDiskGetDriveGeometry(IN ULONG DriveNumber,
+                        OUT PGEOMETRY Geometry)
+{
+    ASSERT(gRamDiskBase == NULL);
+    return FALSE;
+}
+
+BOOLEAN
+ArmDiskReadLogicalSectors(IN ULONG DriveNumber,
+                          IN ULONGLONG SectorNumber,
+                          IN ULONG SectorCount,
+                          IN PVOID Buffer)
+{
+    ASSERT(gRamDiskBase == NULL);
+    return FALSE;
+}
+
+ULONG
+ArmDiskGetCacheableBlockCount(IN ULONG DriveNumber)
+{
+    ASSERT(gRamDiskBase == NULL);
+    return FALSE;
 }
 
 BOOLEAN
@@ -55,19 +81,6 @@
     return TRUE;
 }
 
-VOID
-ArmDiskGetBootDevice(OUT PULONG BootDevice)
-{
-    while (TRUE);
-}
-
-BOOLEAN
-ArmDiskBootingFromFloppy(VOID)
-{
-    while (TRUE);
-    return FALSE;
-}
-
 BOOLEAN
 ArmDiskGetSystemVolume(IN PCHAR SystemPath,
                        OUT PCHAR RemainingPath,
@@ -82,52 +95,10 @@
 }
 
 BOOLEAN
-ArmDiskGetBootPath(IN PCHAR BootPath,
-                   IN unsigned Size)
-{
-    while (TRUE);
-    return FALSE;
-}
-
-BOOLEAN
 ArmDiskNormalizeSystemPath(IN PCHAR SystemPath,
                            IN unsigned Size)
 {
     while (TRUE);
-    return FALSE;
-}
-
-BOOLEAN
-ArmDiskGetDriveGeometry(IN ULONG DriveNumber,
-                        OUT PGEOMETRY Geometry)
-{
-    ASSERT(FALSE);
-    return FALSE;
-}
-
-BOOLEAN
-ArmDiskGetPartitionEntry(IN ULONG DriveNumber,
-                         IN ULONG PartitionNumber,
-                         OUT PPARTITION_TABLE_ENTRY PartitionTableEntry)
-{
-    while (TRUE);
-    return FALSE;
-}
-
-BOOLEAN
-ArmDiskReadLogicalSectors(IN ULONG DriveNumber,
-                          IN ULONGLONG SectorNumber,
-                          IN ULONG SectorCount,
-                          IN PVOID Buffer)
-{
-    ASSERT(FALSE);
-    return FALSE;
-}
-
-ULONG
-ArmDiskGetCacheableBlockCount(IN ULONG DriveNumber)
-{
-    ASSERT(FALSE);
     return FALSE;
 }
 
@@ -190,12 +161,8 @@
     MachVtbl.GetMemoryMap = ArmMemGetMemoryMap;
     MachVtbl.DiskGetBootVolume = ArmDiskGetBootVolume;
     MachVtbl.DiskGetSystemVolume = ArmDiskGetSystemVolume;
-    MachVtbl.DiskGetBootPath = ArmDiskGetBootPath;
-    MachVtbl.DiskGetBootDevice = ArmDiskGetBootDevice;
-    MachVtbl.DiskBootingFromFloppy = ArmDiskBootingFromFloppy;
     MachVtbl.DiskNormalizeSystemPath = ArmDiskNormalizeSystemPath;
     MachVtbl.DiskReadLogicalSectors = ArmDiskReadLogicalSectors;
-    MachVtbl.DiskGetPartitionEntry = ArmDiskGetPartitionEntry;
     MachVtbl.DiskGetDriveGeometry = ArmDiskGetDriveGeometry;
     MachVtbl.DiskGetCacheableBlockCount = ArmDiskGetCacheableBlockCount;
     MachVtbl.HwDetect = ArmHwDetect;