Changeset e94f730 in mainline for kernel/arch/mips32/src

Timestamp:

2009-02-17T00:49:50Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

85156d3

Parents:

06da55b

Message:

eliminate non-standard -D$(MACHINE)

Location:

kernel/arch/mips32/src

Files:

• mips32.c (modified) (1 diff)
• mm/frame.c (modified) (3 diffs)

kernel/arch/mips32/src/mips32.c

@@ -138 +138 @@
 #endif
 
-#ifdef msim
+#ifdef MACHINE_msim
         sysinfo_set_item_val("machine.msim", NULL, 1);
 #endif
 
-#ifdef simics
+#ifdef MACHINE_simics
         sysinfo_set_item_val("machine.simics", NULL, 1);
 #endif
 
-#ifdef bgxemul
+#ifdef MACHINE_bgxemul
         sysinfo_set_item_val("machine.bgxemul", NULL, 1);
 #endif
 
-#ifdef lgxemul
+#ifdef MACHINE_lgxemul
         sysinfo_set_item_val("machine.lgxemul", NULL, 1);
 #endif

kernel/arch/mips32/src/mm/frame.c

@@ -78 +78 @@
 static bool frame_available(pfn_t frame)
 {
-#ifdef msim
+#ifdef MACHINE_msim
         /* MSIM device (dprinter) */
         if (frame == (KA2PA(MSIM_VIDEORAM) >> ZERO_PAGE_WIDTH))
@@ -88 +88 @@
 #endif
 
-#ifdef simics
+#ifdef MACHINE_simics
         /* Simics device (serial line) */
         if (frame == (KA2PA(SERIAL_ADDRESS) >> ZERO_PAGE_WIDTH))
@@ -94 +94 @@
 #endif
 
-#if defined(lgxemul) || defined(bgxemul)
+#if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)
         /* gxemul devices */
         if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,