[FREELDR]

- Move architecture specific files all into arch/*
- Rename setupldr2.c to setupldr.c
- cleanup the mess in bootmgr.c

svn path=/trunk/; revision=53422

reactos/boot/freeldr/freeldr/CMakeLists.txt

@@ -107,8 +107,8 @@ if(ARCH MATCHES i386)
         arch/i386/xboxmem.c
         arch/i386/xboxrtc.c
         arch/i386/xboxvideo.c
-        windows/i386/ntsetup.c
-        windows/i386/wlmemory.c
+        arch/i386/ntsetup.c
+        arch/i386/wlmemory.c
         windows/headless.c
         disk/scsiport.c)
     if(NOT MSVC)
@@ -134,8 +134,8 @@ elseif(ARCH MATCHES amd64)
         arch/i386/pcmem.c
         arch/i386/pcrtc.c
         arch/i386/pcvideo.c
-        windows/amd64/ntsetup.c
-        windows/amd64/wlmemory.c)
+        arch/amd64/ntsetup.c
+        arch/amd64/wlmemory.c)
 else()
 #TBD
 endif()
@@ -191,7 +191,7 @@ list(APPEND SETUPLDR_SOURCE
     inffile/inffile.c)
 
 if(ARCH MATCHES i386 OR ARCH MATCHES amd64)
-    list(APPEND SETUPLDR_SOURCE windows/setupldr2.c)
+    list(APPEND SETUPLDR_SOURCE windows/setupldr.c)
 endif()
 
 if(NOT MSVC)

reactos/boot/freeldr/freeldr/bootmgr.c

@@ -213,7 +213,7 @@ VOID RunLoader(VOID)
 		if (BootType[0] == ANSI_NULL && SectionName[0] != ANSI_NULL)
 		{
 			// Try to infere boot type value
-#ifdef __i386__
+#ifdef _M_IX86
 			ULONG FileId;
 			if (ArcOpen((CHAR*)SectionName, OpenReadOnly, &FileId) == ESUCCESS)
 			{
@@ -231,20 +231,15 @@ VOID RunLoader(VOID)
 		IniOpenSection("Operating Systems", &SectionId);
 		IniReadSettingByName(SectionId, SectionName, SettingValue, sizeof(SettingValue));
 
-#ifndef _M_ARM
 		// Install the drive mapper according to this sections drive mappings
-#if defined(__i386__) && !defined(_MSC_VER)
+#if defined(_M_IX86) && !defined(_MSC_VER)
 		DriveMapMapDrivesInSection(SectionName);
 #endif
+
 #ifdef FREELDR_REACTOS_SETUP
-		if (_stricmp(BootType, "ReactOSSetup2") == 0)
-		{
-			// WinLdr-style boot
-			LoadReactOSSetup2();
-		}
-		else
-#endif
-#ifdef __i386__
+        // WinLdr-style boot
+        LoadReactOSSetup2();
+#elif defined(_M_IX86)
 		if (_stricmp(BootType, "Windows") == 0)
 		{
 			LoadAndBootWindows(SectionName, SettingValue, 0);
@@ -273,13 +268,11 @@ VOID RunLoader(VOID)
 		{
 			LoadAndBootDrive(SectionName);
 		}
-#endif
 #else
-        LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_WS03);
+		LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_WS03);
 #endif
 	}
 
-
 reboot:
 	UiUnInitialize("Rebooting...");
 	return;

reactos/boot/freeldr/freeldr/freeldr_arch.rbuild

@@ -41,6 +41,8 @@
 				<file>xboxmem.c</file>
 				<file>xboxrtc.c</file>
 				<file>xboxvideo.c</file>
+				<file>ntsetup.c</file>
+				<file>wlmemory.c</file>
 			</if>
 		</directory>
 		<directory name="powerpc">
@@ -69,6 +71,8 @@
 		<if property="ARCH" value="amd64">
 			<directory name="amd64">
 				<file>loader.c</file>
+				<file>ntsetup.c</file>
+				<file>wlmemory.c</file>
 			</directory>
 			<directory name="i386">
 				<file>hardware.c</file>
@@ -87,23 +91,8 @@
 			</directory>
 		</if>
 
-	</directory>
-
-	<directory name="windows">
-    	<if property="ARCH" value="arm">
-    		<directory name="arm">
-    			<file>wlmemory.c</file>
-    		</directory>
-    	</if>
-		<if property="ARCH" value="i386">
-			<directory name="i386">
-				<file>ntsetup.c</file>
-				<file>wlmemory.c</file>
-			</directory>
-		</if>
-		<if property="ARCH" value="amd64">
-			<directory name="amd64">
-				<file>ntsetup.c</file>
+		<if property="ARCH" value="arm">
+			<directory name="arm">
 				<file>wlmemory.c</file>
 			</directory>
 		</if>

reactos/boot/freeldr/freeldr/setupldr_main.rbuild

@@ -9,14 +9,7 @@
 	<directory name="inffile">
 		<file>inffile.c</file>
 	</directory>
-	<if property="ARCH" value="i386">
-		<directory name="windows">
-			<file>setupldr2.c</file>
-		</directory>
-	</if>
-	<if property="ARCH" value="amd64">
-		<directory name="windows">
-			<file>setupldr2.c</file>
-		</directory>
-	</if>
+	<directory name="windows">
+		<file>setupldr.c</file>
+	</directory>
 </module>