Changeset b76e51d in mainline

Timestamp:

2009-03-12T18:06:43Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1410f35

Parents:

99495b6

Message:

remove unmaintained Simics machine (might return later)
whitespace changes

File:

• kernel/arch/mips32/src/mm/frame.c (modified) (3 diffs)

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

@@ -41 +41 @@
 #include <config.h>
 #include <arch/drivers/msim.h>
-#include <arch/drivers/serial.h>
 #include <print.h>
 
-#define ZERO_PAGE_MASK          TLB_PAGE_MASK_256K
-#define ZERO_FRAMES                     2048
-#define ZERO_PAGE_WIDTH         18  /* 256K */
-#define ZERO_PAGE_SIZE          (1 << ZERO_PAGE_WIDTH)
-#define ZERO_PAGE_ASID          ASID_INVALID
-#define ZERO_PAGE_TLBI          0
-#define ZERO_PAGE_ADDR          0
-#define ZERO_PAGE_OFFSET        (ZERO_PAGE_SIZE / sizeof(uint32_t) - 1)
-#define ZERO_PAGE_VALUE         (((volatile uint32_t *) ZERO_PAGE_ADDR)[ZERO_PAGE_OFFSET])
-
-#define ZERO_PAGE_VALUE_KSEG1(frame) (((volatile uint32_t *) (0xa0000000 + (frame << ZERO_PAGE_WIDTH)))[ZERO_PAGE_OFFSET])
-
-#define MAX_REGIONS                     32
+#define ZERO_PAGE_MASK    TLB_PAGE_MASK_256K
+#define ZERO_FRAMES       2048
+#define ZERO_PAGE_WIDTH   18  /* 256K */
+#define ZERO_PAGE_SIZE    (1 << ZERO_PAGE_WIDTH)
+#define ZERO_PAGE_ASID    ASID_INVALID
+#define ZERO_PAGE_TLBI    0
+#define ZERO_PAGE_ADDR    0
+#define ZERO_PAGE_OFFSET  (ZERO_PAGE_SIZE / sizeof(uint32_t) - 1)
+#define ZERO_PAGE_VALUE   (((volatile uint32_t *) ZERO_PAGE_ADDR)[ZERO_PAGE_OFFSET])
+
+#define ZERO_PAGE_VALUE_KSEG1(frame) \
+        (((volatile uint32_t *) (0xa0000000 + (frame << ZERO_PAGE_WIDTH)))[ZERO_PAGE_OFFSET])
+
+#define MAX_REGIONS  32
 
 typedef struct {
@@ -66 +66 @@
 static phys_region_t phys_regions[MAX_REGIONS];
 
-
 /** Check whether frame is available
  *
@@ -85 +84 @@
                 return false;
 #endif
-
-#ifdef MACHINE_simics
-        /* Simics device (serial line) */
-        if (frame == (KA2PA(SERIAL_ADDRESS) >> ZERO_PAGE_WIDTH))
-                return false;
-#endif
-
+        
 #if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)
         /* gxemul devices */