CVS: blob/src/blob ledasm.S,1.3,1.4

[Christopher H. <ch...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv24870

Modified Files:
	ledasm.S 
Log Message:
prefix register offsets with _ so as to not conflict with sa1100.h defines

Index: ledasm.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/ledasm.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ledasm.S	28 Oct 2001 20:29:05 -0000	1.3
+++ ledasm.S	25 Jul 2002 17:24:36 -0000	1.4
@@ -33,16 +33,15 @@
 #endif
 
 #include <blob/arch.h>
-
-
+#include <blob/sa1100.h>
 
 .text
 
 LED:		.long LED_GPIO
 GPIO_BASE:	.long 0x90040000
-#define	GPDR	0x00000004
-#define GPSR	0x00000008
-#define GPCR	0x0000000c
+#define	_GPDR	0x00000004
+#define _GPSR	0x00000008
+#define _GPCR	0x0000000c
 
 
 
@@ -54,8 +53,8 @@
 ledinit:
 	ldr	r0, GPIO_BASE
 	ldr	r1, LED
-	str	r1, [r0, #GPDR]		/* LED GPIO is output */
-	str	r1, [r0, #GPSR]		/* turn LED on */
+	str	r1, [r0, #_GPDR]		/* LED GPIO is output */
+	str	r1, [r0, #_GPSR]		/* turn LED on */
 	mov	pc, lr
 
 
@@ -66,7 +65,7 @@
 led_on:
 	ldr	r0, GPIO_BASE
 	ldr	r1, LED
-	str	r1, [r0, #GPSR]
+	str	r1, [r0, #_GPSR]
 	mov	pc, lr
 
 
@@ -77,7 +76,7 @@
 led_off:
 	ldr	r0, GPIO_BASE
 	ldr	r1, LED
-	str	r1, [r0, #GPCR]
+	str	r1, [r0, #_GPCR]
 	mov	pc, lr