From 36e8078b3fa3012d0a3bb78d328fc3625be9e03b Mon Sep 17 00:00:00 2001
From: Matt Mullins <mmullins@mmlx.us>
Date: Sat, 22 Dec 2012 22:57:32 -0800
Subject: [PATCH] Rename to main.c, prepare for other testing

---
 Makefile              |  8 ++++----
 isr_table.c           |  4 ++--
 led_blink.c => main.c | 44 +-------------------------------------------
 led_blink.h => main.h |  1 -
 4 files changed, 7 insertions(+), 50 deletions(-)
 rename led_blink.c => main.c (57%)
 rename led_blink.h => main.h (75%)

diff --git a/Makefile b/Makefile
index 53c72f6..8a93d1a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,17 +8,17 @@ LDFLAGS=-Tstellaris.t
 
 STELLARISWARE=/home/mmullins/projects/stellaris/StellarisWare
 
-all: led_blink.bin
+all: main.bin
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $^
 
-led_blink: isr_table.o led_blink.o
+main: isr_table.o main.o
 	$(LD) $(LDFLAGS) -o $@ $^
 
-led_blink.bin: led_blink
+main.bin: main
 	$(OBJCOPY) -O binary $< $@
 
 .PHONY: clean
 clean:
-	rm -f led_blink led_blink.bin *.o
+	rm -f main main.bin *.o
diff --git a/isr_table.c b/isr_table.c
index 33306c8..2912762 100644
--- a/isr_table.c
+++ b/isr_table.c
@@ -1,4 +1,4 @@
-#include "led_blink.h"
+#include "main.h"
 
 static void infinite_loop_isr();
 
@@ -19,7 +19,7 @@ void (*reset_vectors[])() = {
 	infinite_loop_isr,
 	infinite_loop_isr,
 	infinite_loop_isr,
-	systick_isr,
+	infinite_loop_isr,
 	infinite_loop_isr,
 	infinite_loop_isr,
 	infinite_loop_isr,
diff --git a/led_blink.c b/main.c
similarity index 57%
rename from led_blink.c
rename to main.c
index ddf5325..c118300 100644
--- a/led_blink.c
+++ b/main.c
@@ -1,4 +1,4 @@
-#include "led_blink.h"
+#include "main.h"
 #include <lm4f120h5qr.h>
 
 static void spin(int);
@@ -34,40 +34,9 @@ void main_isr() {
 	        (2 << SYSCTL_RCC2_SYSDIV2_S);
 	SYSCTL_RCC2_R = rcc2;
 
-	// Enable Port F
-	SYSCTL_RCGCGPIO_R = 0x20;
-
-	// Wait for a few clocks to let GPIO module stabilize
-	spin(10);
-
-	// RGB pins (PF1, 2, 3) as outputs
-	GPIO_PORTF_DIR_R = 0xE;
-
-	// deliver 2mA of current
-	GPIO_PORTF_DR2R_R = 0xE;
-
-	// set to digital mode
-	GPIO_PORTF_DEN_R = 0xE;
-
-	// Set RGB pins to 1
-	*(GPIO_PORTF_DATA_BITS_R + 0xE) = 0xF;
-
-	// Initialize our SysTick prescaler
-	systick_count = initial_systick_count;
-
-	// Initialize the SysTick module
-	NVIC_ST_RELOAD_R = 10000000; // produce 8Hz from 80MHz clock
-	NVIC_ST_CURRENT_R = 0;
-	NVIC_ST_CTRL_R |= 0x7;
-
 	// infinite loop
 	for (;;) { 
 		asm("wfi");
-
-		// flip the green LED on every WFI, as an experiment to see if the
-		// CPU is really sleeping.
-		// Answer: it is.
-		// *(GPIO_PORTF_DATA_BITS_R + 0x8) ^= 0xFF;
 	}
 }
 
@@ -78,14 +47,3 @@ void spin(int cycles) {
 		asm("");
 	}
 }
-
-__attribute__((isr))
-void systick_isr() {
-	if (systick_count) {
-		systick_count--;
-		return;
-	}
-
-	systick_count = initial_systick_count;
-	*(GPIO_PORTF_DATA_BITS_R + 0xE) ^= 0xF;
-}
diff --git a/led_blink.h b/main.h
similarity index 75%
rename from led_blink.h
rename to main.h
index ed70066..24c4feb 100644
--- a/led_blink.h
+++ b/main.h
@@ -2,6 +2,5 @@
 #define __led_blink_H__
 
 extern void main_isr();
-extern void systick_isr();
 
 #endif
-- 
2.11.0