update

[l4.git] / kernel / fiasco / src / kern / arm / bsp / sa1100 / mem_layout-arm-sa1100.cpp

diff --git a/kernel/fiasco/src/kern/arm/bsp/sa1100/mem_layout-arm-sa1100.cpp b/kernel/fiasco/src/kern/arm/bsp/sa1100/mem_layout-arm-sa1100.cpp
index 578c6607cd24d62bc901d5decb98ce318feb38e8..d9cc6c0783238edfb2f83f17f48505476dfcbdfe 100644 (file)
--- a/kernel/fiasco/src/kern/arm/bsp/sa1100/mem_layout-arm-sa1100.cpp
+++ b/kernel/fiasco/src/kern/arm/bsp/sa1100/mem_layout-arm-sa1100.cpp
@@ -4,20 +4,16 @@ INTERFACE [arm-sa1100]:
 EXTENSION class Mem_layout
 {
 public:
-  enum Virt_layout_sa1100 {
-    Uart_map_base        = 0xef100000,
-    Timer_map_base       = 0xef200000,
-    Pic_map_base         = 0xef250000,
-    Uart_base            = Uart_map_base + 0x50000,
+  enum Virt_layout_sa1100 : Address {
+    Uart_base            = Devices0_map_base + 0x50000,
+    Timer_map_base       = Devices1_map_base,
+    Pic_map_base         = Devices1_map_base + 0x50000,
   };
 
-  enum Phys_layout {
-    Uart_phys_base       = 0x80050000,
-    Timer_phys_base      = 0x90000000,
-    Pic_phys_base        = 0x90050000,
+  enum Phys_layout : Address {
+    Devices0_phys_base   = 0x80000000,
+    Devices1_phys_base   = 0x90000000,
     Sdram_phys_base      = 0xc0000000,
     Flush_area_phys_base = 0xe0000000,
   };
 };
-
-