Use register macros instead of volatile addresses

2 files changed, 27 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index ffc2e77..bd715d2 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,10 @@ help :
 	@echo " run_openocd [BOARD=$(DEFAULT_BOARD)]:"
 	@echo " run_gdb     [PROGRAM=$(DEFAULT_PROGRAM) BOARD=$(DEFAULT_BOARD)]:"
 	@echo "     Launch OpenOCD or GDB seperately"
-	@echo "" 
+	@echo ""
+	@echo " dasm [PROGRAM=$(DEFAULT_BOARD)]:"
+	@echo "     Generates the dissassembly output of objdump -D to stdout."
+	@echo ""
 	@echo " For more information, visit dev.sifive.com"
 
 
@@ -88,13 +91,14 @@ PROGRAM ?= $(DEFAULT_PROGRAM)
 PROGRAM_DIR = $(srcdir)/software/$(PROGRAM)
 PROGRAM_ELF = $(srcdir)/software/$(PROGRAM)/$(PROGRAM)
 
-.PHONY: software
-software:
-	$(MAKE) -C $(PROGRAM_DIR)
-
+.PHONY: software_clean
 software_clean:
 	$(MAKE) -C $(PROGRAM_DIR) clean
 
+.PHONY: software
+software: software_clean
+	$(MAKE) -C $(PROGRAM_DIR)
+
 dasm: software	
 	$(toolchain_dest)/bin/riscv32-unknown-elf-objdump -D $(PROGRAM_ELF)
 
diff --git a/software/demo_gpio/demo_gpio.c b/software/demo_gpio/demo_gpio.c
index dec91b5..c780cbe 100644
--- a/software/demo_gpio/demo_gpio.c
+++ b/software/demo_gpio/demo_gpio.c
@@ -25,12 +25,6 @@ function_ptr_t g_ext_interrupt_handlers[PLIC_NUM_INTERRUPTS];
 
 plic_instance_t g_plic;
 
-// Simple variables for LEDs, buttons, etc.
-volatile unsigned int* g_output_vals  = (unsigned int *) (GPIO_BASE_ADDR + GPIO_OUTPUT_VAL);
-volatile unsigned int* g_input_vals   = (unsigned int *) (GPIO_BASE_ADDR + GPIO_INPUT_VAL);
-volatile unsigned int* g_output_en    = (unsigned int *) (GPIO_BASE_ADDR + GPIO_OUTPUT_EN);
-volatile unsigned int* g_pullup_en    = (unsigned int *) (GPIO_BASE_ADDR + GPIO_PULLUP_EN);
-volatile unsigned int* g_input_en     = (unsigned int *) (GPIO_BASE_ADDR + GPIO_INPUT_EN);
 
 /*Entry Point for PLIC Interrupt Handler*/
 void handle_m_ext_interrupt(){
@@ -60,12 +54,12 @@ void handle_m_time_interrupt(){
   *mtimecmp = then;
 
   // read the current value of the LEDS and invert them.
-  uint32_t leds = *g_output_vals;
-
-  *g_output_vals ^= ((0x1 << RED_LED_OFFSET)   |
-		     (0x1 << GREEN_LED_OFFSET) |
-		     (0x1 << BLUE_LED_OFFSET));
+  uint32_t leds = GPIO_REG(GPIO_OUTPUT_VAL);
 
+  GPIO_REG(GPIO_OUTPUT_VAL) ^= ((0x1 << RED_LED_OFFSET)   |
+				(0x1 << GREEN_LED_OFFSET) |
+				(0x1 << BLUE_LED_OFFSET));
+  
   // Re-enable the timer interrupt.
   set_csr(mie, MIP_MTIP);
 
@@ -114,7 +108,7 @@ void print_instructions() {
 void button_0_handler(void) {
 
   // Red LED on
-  * g_output_vals |= (0x1 << RED_LED_OFFSET);
+  GPIO_REG(GPIO_OUTPUT_VAL) |= (0x1 << RED_LED_OFFSET);
 
   // Clear the GPIO Pending interrupt by writing 1.
   GPIO_REG(GPIO_RISE_IP) = (0x1 << BUTTON_0_OFFSET);
@@ -124,7 +118,7 @@ void button_0_handler(void) {
 void button_1_handler(void) {
 
   // Green LED On
-  * g_output_vals |= (1 << GREEN_LED_OFFSET);
+  GPIO_REG(GPIO_OUTPUT_VAL) |= (1 << GREEN_LED_OFFSET);
 
   // Clear the GPIO Pending interrupt by writing 1.
   GPIO_REG(GPIO_RISE_IP) = (0x1 << BUTTON_1_OFFSET);
@@ -135,7 +129,7 @@ void button_1_handler(void) {
 void button_2_handler(void) {
 
   // Blue LED On
-  * g_output_vals |= (1 << BLUE_LED_OFFSET);
+  GPIO_REG(GPIO_OUTPUT_VAL) |= (1 << BLUE_LED_OFFSET);
 
   GPIO_REG(GPIO_RISE_IP) = (0x1 << BUTTON_2_OFFSET);
 
@@ -204,15 +198,15 @@ int main(int argc, char **argv)
   // can be used as both Inputs and Outputs.
 
 #ifdef HAS_BOARD_BUTTONS
-  * g_output_en  &= ~((0x1 << BUTTON_0_OFFSET) | (0x1 << BUTTON_1_OFFSET) | (0x1 << BUTTON_2_OFFSET));
-  * g_pullup_en  &= ~((0x1 << BUTTON_0_OFFSET) | (0x1 << BUTTON_1_OFFSET) | (0x1 << BUTTON_2_OFFSET));
-  * g_input_en   |=  ((0x1 << BUTTON_0_OFFSET) | (0x1 << BUTTON_1_OFFSET) | (0x1 << BUTTON_2_OFFSET));
+  GPIO_REG(GPIO_OUTPUT_EN)  &= ~((0x1 << BUTTON_0_OFFSET) | (0x1 << BUTTON_1_OFFSET) | (0x1 << BUTTON_2_OFFSET));
+  GPIO_REG(GPIO_PULLUP_EN)  &= ~((0x1 << BUTTON_0_OFFSET) | (0x1 << BUTTON_1_OFFSET) | (0x1 << BUTTON_2_OFFSET));
+  GPIO_REG(GPIO_INPUT_EN)   |=  ((0x1 << BUTTON_0_OFFSET) | (0x1 << BUTTON_1_OFFSET) | (0x1 << BUTTON_2_OFFSET));
 #endif
 
-  * g_input_en    &= ~((0x1<< RED_LED_OFFSET) | (0x1<< GREEN_LED_OFFSET) | (0x1 << BLUE_LED_OFFSET)) ;
-  * g_output_en   |=  ((0x1<< RED_LED_OFFSET)| (0x1<< GREEN_LED_OFFSET) | (0x1 << BLUE_LED_OFFSET)) ;
-  * g_output_vals |=   (0x1 << BLUE_LED_OFFSET) ;
-  * g_output_vals &=  ~((0x1<< RED_LED_OFFSET) | (0x1<< GREEN_LED_OFFSET)) ;
+  GPIO_REG(GPIO_INPUT_EN)    &= ~((0x1<< RED_LED_OFFSET) | (0x1<< GREEN_LED_OFFSET) | (0x1 << BLUE_LED_OFFSET)) ;
+  GPIO_REG(GPIO_OUTPUT_EN)   |=  ((0x1<< RED_LED_OFFSET)| (0x1<< GREEN_LED_OFFSET) | (0x1 << BLUE_LED_OFFSET)) ;
+  GPIO_REG(GPIO_OUTPUT_VAL)  |=   (0x1 << BLUE_LED_OFFSET) ;
+  GPIO_REG(GPIO_OUTPUT_VAL)  &=  ~((0x1<< RED_LED_OFFSET) | (0x1<< GREEN_LED_OFFSET)) ;
 
   /**************************************************************************
    * Set up the PLIC
@@ -225,7 +219,9 @@ int main(int argc, char **argv)
 
   reset_demo();
 
-  while (1);
+  while (1){
+
+  }
 
   return 0;