From: ian <ian>
Date: Sat, 29 Oct 2005 16:30:20 +0000 (+0000)
Subject: move externs/globals to final.inc
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=f26b93976a94409ab51fd28c26a7fa3b96b2074a;p=trains.git

move externs/globals to final.inc
---

diff --git a/detpic/Makefile b/detpic/Makefile
index e9981fe..de5b046 100644
--- a/detpic/Makefile
+++ b/detpic/Makefile
@@ -1,5 +1,6 @@
 PROGRAMS=	detect
-INCLUDES=	common.inc morse-auto.inc ../iwjpictest/insn-aliases.inc
+INCLUDES=	common.inc final.inc morse-auto.inc \
+		../iwjpictest/insn-aliases.inc
 LIBS=		panic.o routines-led.o variables.o
 PICNOS=		0 1 3
 CEBPIC=		../cebpic/
diff --git a/detpic/final.inc b/detpic/final.inc
new file mode 100644
index 0000000..102997f
--- /dev/null
+++ b/detpic/final.inc
@@ -0,0 +1,9 @@
+; from routines-led.asm
+	extern	led_green
+	extern	led_red
+	extern	led_black
+
+; from panic.asm
+	extern	informative_panic
+
+	end
diff --git a/detpic/panic.asm b/detpic/panic.asm
index d5b0465..69ff7a7 100644
--- a/detpic/panic.asm
+++ b/detpic/panic.asm
@@ -10,13 +10,6 @@
 
 	include common.inc
 
-	extern	led_green
-	extern	led_red
-	extern	led_black
-
-	extern	informative_panic
-
-
 ;---------------------------------------------------------------------------
 ; reserved access bank locations
 
@@ -132,4 +125,4 @@ loop
 
 ;****************************************************************************
 
-	end
+	include	final.inc
diff --git a/detpic/routines-led.asm b/detpic/routines-led.asm
index c405e05..35621bf 100644
--- a/detpic/routines-led.asm
+++ b/detpic/routines-led.asm
@@ -4,10 +4,6 @@
 
 	include		common.inc
 
-	global	led_green
-	global	led_red
-	global	led_black
-
 	code
 
 ;----------------------------------------
@@ -36,4 +32,4 @@ led_black
 	bsf		TRISD, 2, 0		; disable flasher output
 	return
 
-	end
+	include		final.inc