From 2c1132012829d4eecc2ba085c6bace6c564138ba Mon Sep 17 00:00:00 2001
From: ReactOS Portable Systems Group <ros-arm-bringup@svn.reactos.org>
Date: Wed, 6 Feb 2008 20:47:53 +0000
Subject: [PATCH] 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.

svn path=/trunk/; revision=32171
---
 reactos/boot/freeldr/freeldr/arch/arm/stubs.c | 85 ++++++-------------
 1 file changed, 26 insertions(+), 59 deletions(-)

diff --git a/reactos/boot/freeldr/freeldr/arch/arm/stubs.c b/reactos/boot/freeldr/freeldr/arch/arm/stubs.c
index a2ab61a2b6c..70345a0f796 100644
--- a/reactos/boot/freeldr/freeldr/arch/arm/stubs.c
+++ b/reactos/boot/freeldr/freeldr/arch/arm/stubs.c
@@ -24,6 +24,32 @@ FrLdrStartup(IN ULONG Magic)
     //
 }
 
+
+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
 ArmDiskGetBootVolume(IN PULONG DriveNumber,
                      IN PULONGLONG StartSector,
@@ -55,19 +81,6 @@ ArmDiskGetBootVolume(IN PULONG DriveNumber,
     return TRUE;
 }
 
-VOID
-ArmDiskGetBootDevice(OUT PULONG BootDevice)
-{
-    while (TRUE);
-}
-
-BOOLEAN
-ArmDiskBootingFromFloppy(VOID)
-{
-    while (TRUE);
-    return FALSE;
-}
-
 BOOLEAN
 ArmDiskGetSystemVolume(IN PCHAR SystemPath,
                        OUT PCHAR RemainingPath,
@@ -81,14 +94,6 @@ ArmDiskGetSystemVolume(IN PCHAR SystemPath,
     return FALSE;
 }
 
-BOOLEAN
-ArmDiskGetBootPath(IN PCHAR BootPath,
-                   IN unsigned Size)
-{
-    while (TRUE);
-    return FALSE;
-}
-
 BOOLEAN
 ArmDiskNormalizeSystemPath(IN PCHAR SystemPath,
                            IN unsigned Size)
@@ -97,40 +102,6 @@ ArmDiskNormalizeSystemPath(IN PCHAR SystemPath,
     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;
-}
-
 VOID
 ArmPrepareForReactOS(IN BOOLEAN Setup)
 {
@@ -190,12 +161,8 @@ MachInit(IN PCCH CommandLine)
     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;