Changes in kernel/arch/arm32/src/mach/integratorcp/integratorcp.c [adec5b45:c0699467] in mainline

File:

• kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (4 diffs)

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -45 +45 @@
 #include <mm/page.h>
 #include <mm/frame.h>
-#include <mm/km.h>
 #include <arch/mm/frame.h>
 #include <arch/mach/integratorcp/integratorcp.h>
@@ -129 +128 @@
 void icp_init(void)
 {
-        icp_hw_map.uart = km_map(ICP_UART, PAGE_SIZE,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
-        icp_hw_map.kbd_ctrl = km_map(ICP_KBD, PAGE_SIZE, PAGE_NOT_CACHEABLE);
+        icp_hw_map.uart = hw_map(ICP_UART, PAGE_SIZE);
+        icp_hw_map.kbd_ctrl = hw_map(ICP_KBD, PAGE_SIZE);
         icp_hw_map.kbd_stat = icp_hw_map.kbd_ctrl + ICP_KBD_STAT;
         icp_hw_map.kbd_data = icp_hw_map.kbd_ctrl + ICP_KBD_DATA;
         icp_hw_map.kbd_intstat = icp_hw_map.kbd_ctrl + ICP_KBD_INTR_STAT;
-        icp_hw_map.rtc = km_map(ICP_RTC, PAGE_SIZE,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        icp_hw_map.rtc = hw_map(ICP_RTC, PAGE_SIZE);
         icp_hw_map.rtc1_load = icp_hw_map.rtc + ICP_RTC1_LOAD_OFFSET;
         icp_hw_map.rtc1_read = icp_hw_map.rtc + ICP_RTC1_READ_OFFSET;
@@ -144 +141 @@
         icp_hw_map.rtc1_intrstat = icp_hw_map.rtc + ICP_RTC1_INTRSTAT_OFFSET;
 
-        icp_hw_map.irqc = km_map(ICP_IRQC, PAGE_SIZE,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        icp_hw_map.irqc = hw_map(ICP_IRQC, PAGE_SIZE);
         icp_hw_map.irqc_mask = icp_hw_map.irqc + ICP_IRQC_MASK_OFFSET;
         icp_hw_map.irqc_unmask = icp_hw_map.irqc + ICP_IRQC_UNMASK_OFFSET;
-        icp_hw_map.cmcr = km_map(ICP_CMCR, PAGE_SIZE,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        icp_hw_map.cmcr = hw_map(ICP_CMCR, PAGE_SIZE);
         icp_hw_map.sdramcr = icp_hw_map.cmcr + ICP_SDRAMCR_OFFSET;
-        icp_hw_map.vga = km_map(ICP_VGA, PAGE_SIZE,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        icp_hw_map.vga = hw_map(ICP_VGA, PAGE_SIZE);
 
         hw_map_init_called = true;
@@ -226 +220 @@
  * @param size          Place to store memory size.
  */
-void icp_get_memory_extents(uintptr_t *start, size_t *size)
+void icp_get_memory_extents(uintptr_t *start, uintptr_t *size)
 {
         *start = 0;