move externs/globals to final.inc

diff --git a/detpic/Makefile b/detpic/Makefile
index e9981fef3cb379a8a89cd9281f360c3860155e49..de5b04696b62217dc071e143518ff23e576eddab 100644 (file)
--- 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 (file)
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 d5b0465cac0464307bf021102fbd773c27b95271..69ff7a7a4c3dc329430dd0fd605ddc6184ebf168 100644 (file)
--- 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 c405e05ebdf3c72a6349eb5ae48e6bc5a079e99d..35621bfa79919c2cd529ae8bcb79d6d89da5e3ae 100644 (file)
--- 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