summaryrefslogtreecommitdiff
path: root/bootloader/bootloader-887.asm
diff options
context:
space:
mode:
Diffstat (limited to 'bootloader/bootloader-887.asm')
-rw-r--r--bootloader/bootloader-887.asm36
1 files changed, 17 insertions, 19 deletions
diff --git a/bootloader/bootloader-887.asm b/bootloader/bootloader-887.asm
index 889a8ac..e29136b 100644
--- a/bootloader/bootloader-887.asm
+++ b/bootloader/bootloader-887.asm
@@ -29,15 +29,15 @@
;; -------------------------------------
;; DEFINES (chip/com specific)
-;; #define BOOTPIN PORTC,7 ; use this for com-uart
-#define BOOTPIN PORTA,5 ; use this for com-spi
-#define INTPIN PORTA,4 ; use this for com-spi
+#define BOOTPIN PORTC,7 ; use this for com-uart
+;; #define BOOTPIN PORTA,5 ; use this for com-spi
+;; #define INTPIN PORTA,4 ; use this for com-spi
USERVECT EQU H'100'
ISRVECT EQU USERVECT + H'4'
FLASH_BOUNDARY EQU b'00001111' ; flash write boundary is at 16 bytes boundaries
-VERSION_MAJ EQU .0
-VERSION_MIN EQU .1
+VERSION_MAJ EQU .1
+VERSION_MIN EQU .0
NAME_0 EQU '8'
NAME_1 EQU '8'
NAME_2 EQU '7'
@@ -50,8 +50,6 @@ EEPROM_SIZE_L EQU H'00'
EEPROM_SIZE_H EQU H'01' ; 0x0100 -> 256 Bytes of EEPROM
MESS EQU .64 ; this limit is because of to combuff size and single byte len field for messages
CFG EQU .2 ; anyway this is not read or writable for this chip
-SUPPORTED_H EQU .0
-SUPPORTED_L EQU b'00000110' ; only read/write flash is supported by now
#define HOOK_CMD_RESET cmd_not_impl
#define HOOK_CMD_R_FLASH cmd_r_flash
@@ -69,19 +67,19 @@ flags EQU H'007D'
cnt EQU H'007F'
;; Boot Macro
-;; bootmacro macro ; use this for com-uart
-;; btfsc BOOTPIN
-;; goto USERVECT
-;; goto com_init
-;; endm
-
-bootmacro macro ; use this for com-spi
- bsf STATUS,RP0
- bsf STATUS,RP1
- bcf ANSEL,ANS4 ; RA5/SS as digital input -> BOOTPIN
+bootmacro macro ; use this for com-uart
+ btfsc BOOTPIN
+ goto USERVECT
goto com_init
endm
+;; bootmacro macro ; use this for com-spi
+;; bsf STATUS,RP0
+;; bsf STATUS,RP1
+;; bcf ANSEL,ANS4 ; RA5/SS as digital input -> BOOTPIN
+;; goto com_init
+;; endm
+
;; -------------------------------------
;; DEFINES (defines)
#include "generic-defines.inc"
@@ -92,8 +90,8 @@ bootmacro macro ; use this for com-spi
;; -------------------------------------
;; 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)