- Add new configuration option "SARCH" to define the sub-architecture. Examples inclu...
authorAlex Ionescu <aionescu@gmail.com>
Sun, 13 Nov 2005 06:34:51 +0000 (06:34 +0000)
committerAlex Ionescu <aionescu@gmail.com>
Sun, 13 Nov 2005 06:34:51 +0000 (06:34 +0000)
- 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
reactos/boot/freeldr/freeldr/comm/rs232.c
reactos/boot/freeldr/freeldr/freeldr_base.xml
reactos/config.template.xml

index 2400029..be3982b 100644 (file)
@@ -32,7 +32,9 @@ MachInit(const char *CmdLine)
   PciId = READ_PORT_ULONG((ULONG*) 0xcfc);
   if (0x02a510de == PciId)
     {
+#ifdef XBOX
       XboxMachInit(CmdLine);
+#endif
     }
   else
     {
index 364bc0d..34a2abb 100644 (file)
@@ -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
index ab8277b..4abcd66 100644 (file)
                                <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>
index d2031db..340f3e9 100644 (file)
 -->
 <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: