- Add new configuration option "SARCH" to define the sub-architecture. Examples include i386-xbox, ppc-be/le (little/bigendian), or any other sub-types of the specified ARCH.

- Use SARCH option to isolate XBOX architecture code in freeldr. 
- Only build rs232.c if DEBUG is on, because the code is only used in DEBUG mode.

svn path=/trunk/; revision=19196

reactos/boot/freeldr/freeldr/arch/i386/archmach.c

@@ -32,7 +32,9 @@ MachInit(const char *CmdLine)
   PciId = READ_PORT_ULONG((ULONG*) 0xcfc);
   if (0x02a510de == PciId)
     {
+#ifdef XBOX
       XboxMachInit(CmdLine);
+#endif
     }
   else
     {

reactos/boot/freeldr/freeldr/comm/rs232.c

@@ -23,6 +23,8 @@
 
 /* MACROS *******************************************************************/
 
+#ifndef DEBUG
+
 #define DEFAULT_BAUD_RATE    19200
 
 #define   SER_RBR(x)   ((x)+0)
@@ -272,3 +274,5 @@ VOID Rs232PortPutByte(UCHAR ByteToSend)
 
 	WRITE_PORT_UCHAR (SER_THR(Rs232PortBase), ByteToSend);
 }
+
+#endif

reactos/boot/freeldr/freeldr/freeldr_base.xml

@@ -22,20 +22,22 @@
 				<file>i386rtl.c</file>
 				<file>i386vid.c</file>
 				<file>machpc.c</file>
-				<file>machxbox.c</file>
 				<file>pccons.c</file>
 				<file>pcdisk.c</file>
 				<file>pcmem.c</file>
 				<file>pcrtc.c</file>
 				<file>pcvideo.c</file>
 				<file>portio.c</file>
-				<file>xboxcons.c</file>
-				<file>xboxdisk.c</file>
-				<file>xboxfont.c</file>
-				<file>xboxhw.c</file>
-				<file>xboxmem.c</file>
-				<file>xboxrtc.c</file>
-				<file>xboxvideo.c</file>
+				<if property="SARCH" value="xbox">
+					<file>machxbox.c</file>
+					<file>xboxcons.c</file>
+					<file>xboxdisk.c</file>
+					<file>xboxfont.c</file>
+					<file>xboxhw.c</file>
+					<file>xboxmem.c</file>
+					<file>xboxrtc.c</file>
+					<file>xboxvideo.c</file>
+				</if>
 			</directory>
 		</if>
 	</directory>

reactos/config.template.xml

@@ -15,6 +15,12 @@
 -->
 <property name="ARCH" value="i386" />
 
+<!--
+  Sub-architecture to build for. Specify one of:
+    xbox
+-->
+<property name="SARCH" value="" />
+
 
 <!--
   Which CPU ReactOS should be optimized for. Specify one of: