Changeset adec5b45 in mainline for kernel/arch/arm32

Timestamp:

2012-01-27T22:19:12Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1ccd0aa

Parents:

d4673296

Message:

Rename hw_map() to km_map() and add protection flags argument
to make it more generic.

Location:

kernel/arch/arm32/src/mach

Files:

• gta02/gta02.c (modified) (1 diff)
• integratorcp/integratorcp.c (modified) (2 diffs)
• testarm/testarm.c (modified) (1 diff)

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

@@ -102 +102 @@
         s3c24xx_irqc_regs_t *irqc_regs;
 
-        gta02_timer = (void *) hw_map(S3C24XX_TIMER_ADDRESS, PAGE_SIZE);
-        irqc_regs = (void *) hw_map(S3C24XX_IRQC_ADDRESS, PAGE_SIZE);
+        gta02_timer = (void *) km_map(S3C24XX_TIMER_ADDRESS, PAGE_SIZE,
+            PAGE_NOT_CACHEABLE);
+        irqc_regs = (void *) km_map(S3C24XX_IRQC_ADDRESS, PAGE_SIZE,
+            PAGE_NOT_CACHEABLE);
 
         /* Initialize interrupt controller. */

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

@@ -129 +129 @@
 void icp_init(void)
 {
-        icp_hw_map.uart = hw_map(ICP_UART, PAGE_SIZE);
-        icp_hw_map.kbd_ctrl = hw_map(ICP_KBD, PAGE_SIZE);
+        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.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 = hw_map(ICP_RTC, PAGE_SIZE);
+        icp_hw_map.rtc = km_map(ICP_RTC, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
         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;
@@ -142 +144 @@
         icp_hw_map.rtc1_intrstat = icp_hw_map.rtc + ICP_RTC1_INTRSTAT_OFFSET;
 
-        icp_hw_map.irqc = hw_map(ICP_IRQC, PAGE_SIZE);
+        icp_hw_map.irqc = km_map(ICP_IRQC, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
         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 = hw_map(ICP_CMCR, PAGE_SIZE);
+        icp_hw_map.cmcr = km_map(ICP_CMCR, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
         icp_hw_map.sdramcr = icp_hw_map.cmcr + ICP_SDRAMCR_OFFSET;
-        icp_hw_map.vga = hw_map(ICP_VGA, PAGE_SIZE);
+        icp_hw_map.vga = km_map(ICP_VGA, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
 
         hw_map_init_called = true;

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

@@ -72 +72 @@
 void gxemul_init(void)
 {
-        gxemul_kbd = (void *) hw_map(GXEMUL_KBD_ADDRESS, PAGE_SIZE);
-        gxemul_rtc = (void *) hw_map(GXEMUL_RTC_ADDRESS, PAGE_SIZE);
-        gxemul_irqc = (void *) hw_map(GXEMUL_IRQC_ADDRESS, PAGE_SIZE);
+        gxemul_kbd = (void *) km_map(GXEMUL_KBD_ADDRESS, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        gxemul_rtc = (void *) km_map(GXEMUL_RTC_ADDRESS, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        gxemul_irqc = (void *) km_map(GXEMUL_IRQC_ADDRESS, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
 }