[ros-diffs] [fireball] 26874: - Merge 25417 by hpoussin (Disable some boot options on non-x86 platforms. You can enable them again for specific platforms if needed). - Minor: Add debug_filesystem into DEBUG_CUSTOM, but commented out.

Author: fireball
Date: Thu May 24 01:11:35 2007
New Revision: 26874

URL: http://svn.reactos.org/svn/reactos?rev=26874&view=rev
Log:
- Merge 25417 by hpoussin (Disable some boot options on non-x86 platforms. You can enable
them again for specific platforms if needed).
- Minor: Add debug_filesystem into DEBUG_CUSTOM, but commented out.

Modified:
    branches/winldr/bootmgr.c
    branches/winldr/custom.c
    branches/winldr/debug.c
    branches/winldr/drivemap.c
    branches/winldr/include/drivemap.h
    branches/winldr/include/linux.h
    branches/winldr/include/miscboot.h
    branches/winldr/include/options.h
    branches/winldr/linuxboot.c
    branches/winldr/miscboot.c

Modified: branches/winldr/bootmgr.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/bootmgr.c?rev=26874&…
==============================================================================
--- branches/winldr/bootmgr.c (original)
+++ branches/winldr/bootmgr.c Thu May 24 01:11:35 2007
@@ -119,11 +119,14 @@
 		}
 
 		// Install the drive mapper according to this sections drive mappings
+#ifdef __i386__
 		DriveMapMapDrivesInSection(OperatingSystemSectionNames[SelectedOperatingSystem]);
+#endif
 		if (_stricmp(SettingValue, "ReactOS") == 0)
 		{
 			LoadAndBootReactOS(OperatingSystemSectionNames[SelectedOperatingSystem]);
 		}
+#ifdef __i386__
 		else if (_stricmp(SettingValue, "WindowsNT40") == 0)
 		{
 			LoadAndBootWindows(OperatingSystemSectionNames[SelectedOperatingSystem],
_WIN32_WINNT_NT4);
@@ -156,6 +159,7 @@
 		{
 			LoadAndBootDrive(OperatingSystemSectionNames[SelectedOperatingSystem]);
 		}
+#endif
 	}
 
 

Modified: branches/winldr/custom.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/custom.c?rev=26874&r…
==============================================================================
--- branches/winldr/custom.c (original)
+++ branches/winldr/custom.c Thu May 24 01:11:35 2007
@@ -33,7 +33,15 @@
 
 VOID OptionMenuCustomBoot(VOID)
 {
-	PCSTR	CustomBootMenuList[] = { "Disk", "Partition", "Boot
Sector File", "ReactOS", "Linux" };
+	PCSTR	CustomBootMenuList[] = {
+#ifdef __i386__
+		"Disk",
+		"Partition",
+		"Boot Sector File",
+		"ReactOS",
+		"Linux"
+#endif /* __i386__ */
+		};
 	ULONG		CustomBootMenuCount = sizeof(CustomBootMenuList) /
sizeof(CustomBootMenuList[0]);
 	ULONG		SelectedMenuItem;
 
@@ -45,6 +53,7 @@
 
 	switch (SelectedMenuItem)
 	{
+#ifdef __i386__
 	case 0: // Disk
 		OptionMenuCustomBootDisk();
 		break;
@@ -60,9 +69,11 @@
 	case 4: // Linux
 		OptionMenuCustomBootLinux();
 		break;
-	}
-}
-
+#endif /* __i386__ */
+	}
+}
+
+#ifdef __i386__
 VOID OptionMenuCustomBootDisk(VOID)
 {
 	CHAR	SectionName[100];
@@ -397,3 +408,4 @@
 
 	LoadAndBootLinux(SectionName, "Custom Linux Setup");
 }
+#endif /* __i386__ */

Modified: branches/winldr/debug.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/debug.c?rev=26874&r1…
==============================================================================
--- branches/winldr/debug.c (original)
+++ branches/winldr/debug.c Thu May 24 01:11:35 2007
@@ -38,7 +38,7 @@
 #elif defined (DEBUG_REACTOS)
 ULONG		DebugPrintMask = DPRINT_REACTOS | DPRINT_REGISTRY;
 #elif defined (DEBUG_CUSTOM)
-ULONG		DebugPrintMask = DPRINT_WARNING | DPRINT_MEMORY |
+ULONG		DebugPrintMask = DPRINT_WARNING | DPRINT_MEMORY | /*DPRINT_FILESYSTEM |*/
 		                 DPRINT_REACTOS | DPRINT_WINDOWS | DPRINT_HWDETECT;
 #else //#elif defined (DEBUG_NONE)
 ULONG		DebugPrintMask = 0;

Modified: branches/winldr/drivemap.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/drivemap.c?rev=26874&…
==============================================================================
--- branches/winldr/drivemap.c (original)
+++ branches/winldr/drivemap.c Thu May 24 01:11:35 2007
@@ -22,6 +22,7 @@
 #define NDEBUG
 #include <debug.h>
 
+#ifdef __i386__
 BOOLEAN	DriveMapInstalled = FALSE;	// Tells us if we have already installed our drive map
int 13h handler code
 ULONG		OldInt13HandlerAddress = 0;	// Address of BIOS int 13h handler
 ULONG		DriveMapHandlerAddress = 0;	// Linear address of our drive map handler
@@ -222,3 +223,4 @@
 		DriveMapInstalled = FALSE;
 	}
 }
+#endif /* __i386__ */

Modified: branches/winldr/include/drivemap.h
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/include/drivemap.h?rev=2…
==============================================================================
--- branches/winldr/include/drivemap.h (original)
+++ branches/winldr/include/drivemap.h Thu May 24 01:11:35 2007
@@ -20,7 +20,7 @@
 #ifndef __DRIVEMAP_H
 #define __DRIVEMAP_H
 
-
+#ifdef __i386__
 typedef struct
 {
 	UCHAR		DriveMapCount;		// Count of drives currently mapped
@@ -39,5 +39,6 @@
 extern PVOID			DriveMapInt13HandlerEnd;
 extern ULONG				DriveMapOldInt13HandlerAddress;
 extern DRIVE_MAP_LIST	DriveMapInt13HandlerMapList;
+#endif /* __i386__ */
 
 #endif // #defined __DRIVEMAP_H

Modified: branches/winldr/include/linux.h
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/include/linux.h?rev=2687…
==============================================================================
--- branches/winldr/include/linux.h (original)
+++ branches/winldr/include/linux.h Thu May 24 01:11:35 2007
@@ -22,7 +22,7 @@
 #ifndef __LINUX_H
 #define __LINUX_H
 
-
+#ifdef __i386__
 #define LINUX_LOADER_TYPE_LILO			0x01
 #define LINUX_LOADER_TYPE_LOADLIN		0x11
 #define LINUX_LOADER_TYPE_BOOTSECT		0x21
@@ -135,5 +135,6 @@
 BOOLEAN	LinuxReadKernel(PFILE LinuxKernelFile);
 BOOLEAN	LinuxCheckKernelVersion(VOID);
 BOOLEAN	LinuxReadInitrd(PFILE LinuxInitrdFile);
+#endif /* __i386__ */
 
 #endif // defined __LINUX_H

Modified: branches/winldr/include/miscboot.h
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/include/miscboot.h?rev=2…
==============================================================================
--- branches/winldr/include/miscboot.h (original)
+++ branches/winldr/include/miscboot.h Thu May 24 01:11:35 2007
@@ -20,8 +20,10 @@
 #ifndef __BOOT_H
 #define __BOOT_H
 
+#ifdef __i386__
 VOID	LoadAndBootBootSector(PCSTR OperatingSystemName);
 VOID	LoadAndBootPartition(PCSTR OperatingSystemName);
 VOID	LoadAndBootDrive(PCSTR OperatingSystemName);
+#endif /* __i386__ */
 
 #endif // defined __BOOT_H

Modified: branches/winldr/include/options.h
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/include/options.h?rev=26…
==============================================================================
--- branches/winldr/include/options.h (original)
+++ branches/winldr/include/options.h Thu May 24 01:11:35 2007
@@ -25,10 +25,12 @@
 VOID	OptionMenuReboot(VOID);
 
 VOID	OptionMenuCustomBoot(VOID);
+#ifdef __i386__
 VOID	OptionMenuCustomBootDisk(VOID);
 VOID	OptionMenuCustomBootPartition(VOID);
 VOID	OptionMenuCustomBootBootSectorFile(VOID);
 VOID	OptionMenuCustomBootReactOS(VOID);
 VOID	OptionMenuCustomBootLinux(VOID);
+#endif /* __i386__ */
 
 #endif // #defined __OPTIONS_H

Modified: branches/winldr/linuxboot.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/linuxboot.c?rev=26874&am…
==============================================================================
--- branches/winldr/linuxboot.c (original)
+++ branches/winldr/linuxboot.c Thu May 24 01:11:35 2007
@@ -23,6 +23,7 @@
 #define NDEBUG
 #include <debug.h>
 
+#ifdef __i386__
 #define	LINUX_READ_CHUNK_SIZE	0x20000			// Read 128k at a time
 
 
@@ -491,3 +492,4 @@
 
 	return TRUE;
 }
+#endif /* __i386__ */

Modified: branches/winldr/miscboot.c
URL:
http://svn.reactos.org/svn/reactos/branches/winldr/miscboot.c?rev=26874&…
==============================================================================
--- branches/winldr/miscboot.c (original)
+++ branches/winldr/miscboot.c Thu May 24 01:11:35 2007
@@ -19,6 +19,7 @@
 
 #include <freeldr.h>
 
+#ifdef __i386__
 VOID LoadAndBootBootSector(PCSTR OperatingSystemName)
 {
 	PFILE	FilePointer;
@@ -213,3 +214,4 @@
 	//DisableA20();
 	ChainLoadBiosBootSectorCode();
 }
+#endif /* __i386__ */