Move bootloader to payload

8 files changed, 28 insertions, 410 deletions

diff --git a/Makefile b/Makefile
index 9311c3e..b1b2c0d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,7 @@ CPP=sdcpp
 ASM=crt0.asm\
 	isr.asm\
 	delay.asm
-SRC=crc16.c\
-	bootloader.c\
-	font.c\
+SRC=font.c\
 	i2c.c\
 	input.c\
 	main.c\
@@ -22,6 +20,7 @@ OBJ=$(ASM:%.asm=build/%.rel)\
 
 IHX=build/$(PROJECT).ihx
 TARGET=build/$(PROJECT).hex
+BOOTLOADER=build/boot/bootloader.hex
 
 INCLUDE=include
 CFLAGS=-mz80 -I$(INCLUDE) --Werror
@@ -53,8 +52,12 @@ $(IHX) : $(OBJ)
 	@echo '  (LD)' $(OBJ)
 	@$(CC) $(LDFLAGS) -o $@ $(OBJ)
 
-$(TARGET) : $(IHX)
-	@hex2bin.py $< $@
+$(TARGET) : $(IHX) $(BOOTLOADER)
+	@hex2bin.py -l 32768 $< $@
+	@dd if=$(BOOTLOADER) of=$@ obs=1024 seek=28 conv=notrunc
+
+$(BOOTLOADER) :
+	make -C boot
 
 .PHONE : flash
 flash :
diff --git a/asm/crt0.asm b/asm/crt0.asm
index 6f92149..523c39e 100644
--- a/asm/crt0.asm
+++ b/asm/crt0.asm
@@ -10,7 +10,22 @@ start:
     ld      i, a
     ld      sp, #0x0000
     di
-
+    ;; Init PIO and check for KEY2
+    ld      a, #PIO_MODE_3
+    out     (PORT_B_CTRL), a
+    ld      a, #0x7F
+    out     (PORT_B_CTRL), a
+    in      a, (PORT_B_DATA)
+    and     #0x02               ; is KEY2 pressed? If so, start booloader
+    jr      NZ, main
+    ;; Load payload (bootloader)
+    ld      HL, #0x7000
+    ld      DE, #0x8000
+    ld      BC, #0x1000
+    ldir
+    ;; Start bootloader
+    jp      0x8000
+main:
     call	gsinit
 	call	_main
 1$:
diff --git a/asm/isr.asm b/asm/isr.asm
index ad810e5..4a160a0 100644
--- a/asm/isr.asm
+++ b/asm/isr.asm
@@ -4,7 +4,7 @@
 _ctc0_isr_ptr::
     .dw     #0
 _ctc1_isr_ptr::
-    .dw     #_ctc1_isr
+    .dw     #0
 _ctc2_isr_ptr::
     .dw     #_timer
 _ctc3_isr_ptr::
@@ -14,4 +14,4 @@ _port_a_isr_ptr::
 _port_b_isr_ptr::
     .dw     #_input_event
 _rx_isr_ptr::
-    .dw     #_rx_isr
+    .dw     #0
diff --git a/include/zeta.h b/include/zeta.h
index 291a2ff..2890199 100644
--- a/include/zeta.h
+++ b/include/zeta.h
@@ -32,12 +32,6 @@ extern void *port_a_isr_ptr;
 extern void *port_b_isr_ptr;
 
 void
-bootloader(void);
-
-uint16_t
-crc16(const void *buf, size_t len);
-
-void
 _menu(void);
 
 static inline int
@@ -58,8 +52,8 @@ clamp(int v, int low, int high)
 	return min(max(v, low), high);
 }
 
-static inline uint8_t
-bcd(uint8_t x)
+static inline u8
+bcd(u8 x)
 {
 	return ((x / 10) << 4) | (x % 10);
 }
diff --git a/src/bootloader.c b/src/bootloader.c
deleted file mode 100644
index 0f67269..0000000
--- a/src/bootloader.c
+++ /dev/null
@@ -1,310 +0,0 @@
-#include <zeta.h>
-#include <tty.h>
-#include <hardware.h>
-#include <fifo.h>
-
-#include <assert.h>
-#include <stddef.h>
-#include <string.h>
-
-#ifdef __GNUC__
-#define PACKED __attribute__((packed))
-#else
-#define PACKED
-#endif
-
-enum header_type {
-    CMD_PING,
-    CMD_INFO,
-    CMD_BOOT,
-    CMD_READ,
-    CMD_WRITE,
-    CMD_IO_READ,
-    CMD_IO_WRITE,
-    CMD_ECHO
-};
-
-struct header {
-    uint8_t type;
-    uint8_t bank;
-    uint16_t address;
-    uint16_t length;
-    uint16_t checksum;
-} PACKED;
-
-// static_assert(sizeof(struct header) == 8, "struct header is not PACKED");
-
-enum error {
-    ERR_TIMEOUT = -1
-};
-
-#define MAX_PACKET_SIZE 256
-#define TIMEOUT_MS 500
-#define MAX_ATTEMPTS 3
-#define MAX_TRANS_ATTEMPTS 5
-
-uint16_t
-crc16(const void *buf, size_t len);
-
-volatile struct fifo rx_fifo = {0, 0, {0}};
-
-enum ack {
-    ACK = 0x00,
-    NACK = 0xFF
-};
-
-void
-rx_isr(void) __critical __interrupt(0)
-{
-    fifo_push(&rx_fifo, sio_a_data);
-}
-
-static volatile uint32_t millis = 0;
-
-void
-ctc1_isr(void) __critical __interrupt(1)
-{
-    millis += 5;
-}
-
-uint32_t
-clock(void)
-{
-    volatile uint32_t ret;
-    DI;
-    ret = millis;
-    EI;
-    return ret;
-}
-
-void
-putbyte(unsigned char b)
-{
-    unsigned char ctrl = 0;
-
-    sio_a_data = b;
-
-    while (!(ctrl & 0x04)) {
-        sio_a_ctrl = 0;
-        ctrl = sio_a_ctrl;
-    }
-}
-
-static volatile int32_t errno = 0;
-
-uint8_t
-getbyte(void)
-{
-    uint8_t b;
-    uint32_t ms = clock();
-    errno = 0;
-    while (fifo_empty(&rx_fifo)) {
-        if (clock() - ms > TIMEOUT_MS) {
-            errno = ERR_TIMEOUT;
-            return 0;
-        }
-    }
-    DI;
-    b = fifo_pop(&rx_fifo);
-    EI;
-    return b;
-}
-
-void
-flush(void)
-{
-    DI;
-    fifo_clear(&rx_fifo);
-    EI;
-}
-
-
-// Hamming(7,4) encoding
-uint8_t
-encode(uint8_t x)
-{
-    uint8_t y = 0;
-    const uint8_t c[4] = {0x61, 0x52, 0x34, 0x78};
-
-    for (uint8_t i = 0; i < 4; ++i)
-        y ^= ((x >> i) & 1) ? c[i] : 0;
-
-    return y;
-}
-
-// Hamming(7,4) decoding
-uint8_t
-decode(uint8_t x)
-{
-    uint8_t p = 0;
-    const uint8_t r[7] = {6, 5, 3, 7, 1, 2, 4};
-
-    for (int i = 0; i < 7; ++i)
-        p ^= ((x >> i) & 1) ? r[i] : 0;
-
-    // Assume simple error, attempt correction
-    if (p) {
-        size_t i = 0;
-
-        for (i = 0; i < LENGTH(r); ++i) {
-            if (r[i] == x)
-                break;
-        }
-
-        x ^= (1 << i);
-    }
-
-    return x & 0x0F;
-}
-
-
-int
-read(void *buf, size_t count)
-{
-    uint8_t b;
-    uint8_t *p = buf;
-
-    for (int n = 0; n < count; ++n) {
-        b = decode(getbyte());
-        if (errno)
-            return errno;
-
-        b |= (decode(getbyte()) << 4);
-        if (errno)
-            return errno;
-
-        p[n] = b;
-    }
-
-    return 0;
-}
-
-int
-write(const void *buf, size_t count)
-{
-    const uint8_t *p = buf;
-
-    for (size_t i = 0; i < count; ++i) {
-        putbyte(encode(p[i] & 0x0F));
-        putbyte(encode((p[i] >> 4) & 0x0F));
-    }
-
-    return 0;
-}
-
-int
-read_header(struct header *header)
-{
-    int err;
-    uint8_t ack;
-    uint16_t checksum;
-
-    while (1) {
-        if ((err = read(header, sizeof(*header))))
-            return err;
-
-        checksum = header->checksum;
-        header->checksum = 0;
-
-        if (checksum == crc16(header, sizeof(*header))) {
-            header->checksum = checksum;
-            ack = ACK;
-            write(&ack, sizeof(ack));
-            return 0;
-        } else {
-            ack = NACK;
-            write(&ack, sizeof(ack));
-        }
-    }
-}
-
-int
-read_buf(size_t len, void *buf)
-{
-    int err;
-    uint8_t ack;
-    uint16_t checksum;
-
-    for (int i = 0; i < MAX_TRANS_ATTEMPTS; ++i) {
-        // TODO: reduce code?
-        if ((err = read(&checksum, sizeof(checksum)))
-            || (err = read(buf, len)))
-            break;
-
-        if (checksum == crc16(buf, len)) {
-            ack = ACK;
-            write(&ack, sizeof(ack));
-            return 0;
-        } else {
-            ack = NACK;
-            write(&ack, sizeof(ack));
-        }
-    }
-
-    return -1;
-}
-
-int
-write_buf(size_t len, const void *buf)
-{
-    int err;
-    uint8_t ack = NACK;
-    uint16_t checksum = crc16(buf, len);
-
-    for (int i = 0; i < MAX_TRANS_ATTEMPTS; ++i){
-        write(&checksum, sizeof(checksum));
-        write(buf, len);
-
-        // If TIMEOUT sending just give up
-        if ((err = read(&ack, sizeof(ack))))
-            return err;
-
-        if (ack == ACK)
-            return 0;
-    }
-
-    return -1;
-}
-
-// TODO: Restart after timeouts
-void
-bootloader(void)
-{
-    struct header header;
-    uint8_t buf[MAX_PACKET_SIZE];
-
-	const char *msg = "Bootloader ...\r\n";
-	addstr(msg);
-
-    while (1) {
-        if (read_header(&header)) {
-            flush();
-            continue;
-        }
-
-        switch (header.type) {
-        case CMD_BOOT:
-            ((void (*)(void))header.address)();
-            break;
-
-        case CMD_READ:
-            write_buf(header.length, (const void *)header.address);
-            break;
-
-        case CMD_WRITE:
-            if (!read_buf(header.length, buf))
-                memcpy((void *)header.address, buf, header.length);
-            break;
-
-        case CMD_ECHO:
-            if (!read_buf(header.length, buf))
-                write_buf(header.length, buf);
-            break;
-
-        default:
-            break;
-        }
-
-        flush();
-    }
-}
diff --git a/src/crc16.c b/src/crc16.c
deleted file mode 100644
index 6c80738..0000000
--- a/src/crc16.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <zeta.h>
-
-static const u16 crc_table[256] = {
-    0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
-    0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
-    0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6,
-    0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE,
-	0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485,
-    0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D,
-	0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4,
-    0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC,
-	0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823,
-    0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B,
-	0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12,
-    0xDBFD, 0xCBDC, 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A,
-	0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41,
-    0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49,
-	0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70,
-    0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, 0x8F78,
-	0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F,
-    0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067,
-	0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E,
-    0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256,
-	0xB5EA, 0xA5CB, 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D,
-    0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
-	0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C,
-    0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634,
-	0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, 0xA9AB,
-    0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3,
-	0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A,
-    0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92,
-	0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9,
-    0x7C26, 0x6C07, 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1,
-	0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8,
-    0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0
-};
-
-u16
-crc16(const void *buf, size_t len)
-{
-    const u8 *p = buf;
-
-    u16 crc = 0;
-    while (len--)
-        crc = crc_table[(crc >> 8) ^ (*p++)] ^ (crc << 8);
-
-    return crc;
-}
diff --git a/src/fifo.c b/src/fifo.c
deleted file mode 100644
index e69de29..0000000
--- a/src/fifo.c
+++ /dev/null
diff --git a/src/main.c b/src/main.c
index fe3da0e..aff1329 100644
--- a/src/main.c
+++ b/src/main.c
@@ -135,42 +135,6 @@ main(void)
     // Enable interrupts
     EI;
 
-	// Boot menu
-	addstr("1) Programming mode\r\n");
-	addstr("2) Normal boot (default)\r\n");
-	addstr("3) Boot address 0xC000\r\n");
-
-	for (int i = 5; i > 0; --i) {
-		addch('\r');
-		addch(i + '0');
-
-		while (!tick) {
-			u8 keys = poll_keys();
-
-			if (!(keys & KEY2)) {
-				addch('\r');
-				bootloader();
-			}
-
-			if (!(keys & KEY3)) {
-				goto boot;
-			}
-
-			if (!(keys & KEY4)) {
-				// Definitely safe looking C code ...
-				void (*ptr)(void) = (void (*)(void))0xC000;
-				ptr();
-			}
-		}
-
-		DI;
-		tick = 0;
-		EI;
-	}
-
-	addch('\r');
-
-boot:
 	addstr("Starting system ...\r\n");
 	// Load interrupt vector
 	port_b_ctrl = ISR_ADDRESS(port_b_isr_ptr);