Flash multiple pages. Eliminate off-by-one error in hex_image length.

[fw/altos] / ccdbg.c

diff --git a/ccdbg.c b/ccdbg.c
index b682372a96ba5a1d4615908aaf202add8a1a7488..c144a06afa7cac350fcd543308ee2e5dc041843c 100644 (file)
--- a/ccdbg.c
+++ b/ccdbg.c
@@ -18,32 +18,55 @@
 
 #include "ccdbg.h"
 
-#define MOV    0x75
-
+#if 0
 static uint8_t instructions[] = {
-       3, MOV, 0xfe, 0x02,
-       3, MOV, 0x90, 0xff,
+       3, MOV_direct_data, 0xfe, 0x02,
+       3, MOV_direct_data, 0x90, 0xff,
        0
 };
+#endif
 
-static void
-ccdbg_instructions(struct ccdbg *dbg, uint8_t *inst)
+#if 0
+static uint8_t mem_instr[] = {
+       MOV_direct_data, 0xfe, 0x02,
+       MOV_Rn_data(0), 0x00,
+       MOV_Rn_data(1), 0x00,
+       MOV_direct_data, 0x90, 0xff,
+       MOV_Rn_data(2), 0x10,
+       DJNZ_Rn_rel(1), 0xfe,
+       DJNZ_Rn_rel(0), 0xfc,
+       DJNZ_Rn_rel(2), 0xfa,
+       MOV_direct_data, 0x90, 0xfd,
+       MOV_Rn_data(2), 0x10,
+       DJNZ_Rn_rel(1), 0xfe,
+       DJNZ_Rn_rel(0), 0xfc,
+       DJNZ_Rn_rel(2), 0xfa,
+       SJMP, 0xe7,
+};
+#endif
+
+#if 0
+static struct hex_image *
+make_hex_image(uint16_t addr, uint8_t *data, uint16_t length)
 {
-       while(inst[0] != 0) {
-               uint8_t len = inst[0];
-               uint8_t status;
-               status = ccdbg_debug_instr(dbg, inst+1, len);
-               printf ("inst status 0x%02x\n", status);
-               inst += len + 1;
-       }
+       struct hex_image        *image;
+
+       image = malloc(sizeof (struct hex_image) + length);
+       image->address = addr;
+       image->length = length;
+       memcpy(image->data, data, length);
+       return image;
 }
+#endif
 
 int
 main (int argc, char **argv)
 {
        struct ccdbg    *dbg;
        uint8_t         status;
-       uint16_t        chip_id;
+       uint16_t        pc;
+       struct hex_file *hex;
+       struct hex_image *image;
 
        dbg = ccdbg_open("/dev/ttyUSB0");
        if (!dbg)
@@ -52,15 +75,38 @@ main (int argc, char **argv)
        ccdbg_manual(dbg, stdin);
 #endif
 #if 1
+       hex = ccdbg_hex_file_read(stdin, "<stdin>");
+       if (!hex)
+               exit (1);
+       image = ccdbg_hex_image_create(hex);
+       ccdbg_hex_file_free(hex);
+#else
+       image = make_hex_image(0xf000, mem_instr, sizeof (mem_instr));
+#endif
+       
        ccdbg_debug_mode(dbg);
-       status = ccdbg_read_status(dbg);
-       printf("Status: 0x%02x\n", status);
-       chip_id = ccdbg_get_chip_id(dbg);
-       printf("Chip id: 0x%04x\n", chip_id);
-       status = ccdbg_halt(dbg);
-       printf ("halt status: 0x%02x\n", status);
-       ccdbg_instructions(dbg, instructions);
+       
+#if 1
+       if (!image) {
+               fprintf(stderr, "image create failed\n");
+               exit (1);
+       }
+       if (image->address == 0xf000) {
+               printf("Loading %d bytes to execute from RAM\n", image->length);
+               ccdbg_write_hex_image(dbg, image, 0);
+       } else if (image->address == 0x0000) {
+               printf("Loading code to execute from FLASH\n");
+               ccdbg_flash_hex_image(dbg, image);
+       } else {
+               printf("Cannot load code to 0x%04x\n",
+                      image->address);
+               ccdbg_hex_image_free(image);
+               ccdbg_close(dbg);
+               exit(1);
+       }
+       ccdbg_set_pc(dbg, image->address);
 #endif
+       ccdbg_resume(dbg);
        ccdbg_close(dbg);
        exit (0);
 }