Switch to a ioXX_t type instead of using volatiles everywhere

tangrs · May 27, 2013 · 2e9271e · 2e9271e
1 parent 43c5946
commit 2e9271e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/common.c b/common.c
@@ -69,7 +69,7 @@ void peek(char * arg) {
         if (addr & 0b11) {
             printl("Warning: Address 0x%x is not word-aligned" NEWLINE, addr);
         } else {
-            printl("*0x%x = 0x%x" NEWLINE, addr, *(volatile unsigned*)addr);
+            printl("*0x%x = 0x%x" NEWLINE, addr, *(io32_t)addr);
         }
     } else {
         printl("Invalid address `%s'" NEWLINE, arg);
@@ -88,7 +88,7 @@ void poke(char *arg) {
 
     if ( endptr != nextarg ) {
         if (!(addr & 0b11)) {
-            *(volatile unsigned*)addr = value;
+            *(io32_t)addr = value;
         }
     } else {
         if (*nextarg == ' ') nextarg++;

diff --git a/common.h b/common.h
@@ -36,6 +36,10 @@
 
 #define NEWLINE "\r\n"
 
+typedef volatile uint32_t *io32_t;
+typedef volatile uint16_t *io16_t;
+typedef volatile uint8_t *io8_t;
+
 struct params {
     struct {
         void* addr;         /* Where the kernel is loaded (address should be in range of mem_block) */

diff --git a/trap.c b/trap.c
@@ -20,7 +20,7 @@
 #include "common.h"
 
 
-static volatile unsigned * const vectaddr_begin = (volatile unsigned*)0x00000020;
+static const io32_t vectaddr_begin = (io32_t)0x00000020;
 static unsigned vectaddr_orig[3];
 
 void trap_abt(void);
@@ -89,7 +89,7 @@ void trap_enter(struct trap_regs *regs) {
     wait_key_pressed();
 
     while (1) {
-        *(volatile unsigned*)0x900A0008 = 2;
+        *(io32_t)0x900A0008 = 2;
     }
 }