summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2013-07-20 13:09:11 (GMT)
committerChristian Pointner <equinox@spreadspace.org>2013-07-20 13:09:11 (GMT)
commitaf8feeb684d4242aabce4652d1386181be5920e6 (patch)
tree06fd8cc0223ae76445216f8fce3a4f2d2a1eeb24
parentcecbb110ca8cd4124ae24f359548c14abf37597b (diff)
introduced boot macro
git-svn-id: https://svn.spreadspace.org/pic/trunk@88 a09c6847-51d9-44de-8ef2-e725cf50f3c7
-rw-r--r--bootloader/bootloader-887.asm11
-rw-r--r--bootloader/bootloader-947.asm7
-rw-r--r--bootloader/generic-init.inc4
3 files changed, 17 insertions, 5 deletions
diff --git a/bootloader/bootloader-887.asm b/bootloader/bootloader-887.asm
index 521ad18..9d1f564 100644
--- a/bootloader/bootloader-887.asm
+++ b/bootloader/bootloader-887.asm
@@ -66,6 +66,13 @@ csum EQU H'0071'
flags EQU H'007D'
cnt EQU H'007F'
+ ;; Boot Macro
+bootmacro macro
+ ;; btfsc BOOTPIN
+ ;; goto USERVECT
+ goto com_init
+ endm
+
;; -------------------------------------
;; DEFINES (defines)
#include "generic-defines.inc"
@@ -76,8 +83,8 @@ cnt EQU H'007F'
;; -------------------------------------
;; Bootloader (com specific subroutines and init)
-;; #include "com-16f887-uart.inc"
-#include "com-16f887-spi.inc"
+#include "com-16f887-uart.inc"
+;; #include "com-16f887-spi.inc"
;; -------------------------------------
;; Bootloader (generic init/body)
diff --git a/bootloader/bootloader-947.asm b/bootloader/bootloader-947.asm
index 9337431..6c24b29 100644
--- a/bootloader/bootloader-947.asm
+++ b/bootloader/bootloader-947.asm
@@ -67,6 +67,13 @@ csum EQU H'0071'
flags EQU H'007D'
cnt EQU H'007F'
+ ;; Boot Macro
+bootmacro macro
+ ;; btfsc BOOTPIN
+ ;; goto USERVECT
+ goto com_init
+ endm
+
;; for compatibility with older MCUs
#define FSR FSR0L
#define INDF INDF0
diff --git a/bootloader/generic-init.inc b/bootloader/generic-init.inc
index 2cf1253..bc790ac 100644
--- a/bootloader/generic-init.inc
+++ b/bootloader/generic-init.inc
@@ -21,9 +21,7 @@
;;
org .0
- ;; btfsc BOOTPIN
- ;; goto USERVECT
- goto com_init
+ bootmacro
;; -------------------------------------
;; goto user ISR