summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2013-07-10 02:50:36 (GMT)
committerChristian Pointner <equinox@spreadspace.org>2013-07-10 02:50:36 (GMT)
commitcc4ffd25829e22c122aec269184688ce6bd36865 (patch)
tree22ad45693240efaf5921261682ba1621e2e7c84a
parenta50be01eb4442e10064b39f9291c9f140d0d5b5c (diff)
cleanups
git-svn-id: https://svn.spreadspace.org/pic/trunk@69 a09c6847-51d9-44de-8ef2-e725cf50f3c7
-rw-r--r--bootloader/bootloader-887.asm28
-rw-r--r--bootloader/generic-defines.inc3
2 files changed, 5 insertions, 26 deletions
diff --git a/bootloader/bootloader-887.asm b/bootloader/bootloader-887.asm
index dbe2fac..13106cb 100644
--- a/bootloader/bootloader-887.asm
+++ b/bootloader/bootloader-887.asm
@@ -60,18 +60,11 @@ SUPPORTED_L EQU b'00000110' ; only read/write flash is supported by no
;; Variables
combuff EQU H'0020'
-combuff_end EQU H'006F'
-
current_cmdlen EQU H'0070'
csum EQU H'0071'
-
flags EQU H'007D'
-#define F_CMD_STARTED flags,0
-
-cnt2 EQU H'007E'
cnt EQU H'007F'
-
;; -------------------------------------
;; DEFINES (defines)
#include "generic-defines.inc"
@@ -82,7 +75,7 @@ cnt EQU H'007F'
;; -------------------------------------
;; Bootloader (com specific subroutines and init)
-#include "com-887-uart.inc"
+#include "com-16f887-uart.inc"
;; -------------------------------------
;; Bootloader (generic init/body)
@@ -96,24 +89,7 @@ cnt EQU H'007F'
;; -------------------------------------
;; dummy user code
org USERVECT
- ;; goto USERVECT
- bsf STATUS,RP0
- bcf TRISD,0
- bcf STATUS,RP0
-userloop
- movlw b'00000001'
- xorwf PORTD,f
- movlw .255
- movwf cnt
-usercnt
- movlw .255
- movwf cnt2
-usercnt2
- decfsz cnt2,f
- goto usercnt2
- decfsz cnt,f
- goto usercnt
- goto userloop
+ goto USERVECT
;; -------------------------------------
;; END
diff --git a/bootloader/generic-defines.inc b/bootloader/generic-defines.inc
index daed57a..54ca01b 100644
--- a/bootloader/generic-defines.inc
+++ b/bootloader/generic-defines.inc
@@ -45,3 +45,6 @@ CMD_W_CONFIG EQU .9
CMD_MAX EQU .9
CMD_MIN_LEN EQU .3
+
+ ;; Flags
+#define F_CMD_STARTED flags,0