ao-tools/ao-load: Return status from 'rewrite'

[fw/altos] / ao-tools / ao-load / ao-load.c

diff --git a/ao-tools/ao-load/ao-load.c b/ao-tools/ao-load/ao-load.c
index 5accefc88e3f14995273df0aafcdda8aed57c7e7..a2de42bc02b3d0672907795c3dae0183dda5f511 100644 (file)
--- a/ao-tools/ao-load/ao-load.c
+++ b/ao-tools/ao-load/ao-load.c
@@ -26,20 +26,21 @@
 
 #define AO_USB_DESC_STRING             3
 
-struct sym {
+static struct sym {
        unsigned        addr;
        char            *name;
+       int             required;
 } ao_symbols[] = {
-       { 0,    "_ao_serial_number" },
+       { 0,    "_ao_serial_number", 1 },
 #define AO_SERIAL_NUMBER       (ao_symbols[0].addr)
-       { 0,    "_ao_usb_descriptors" },
+       { 0,    "_ao_usb_descriptors", 0 },
 #define AO_USB_DESCRIPTORS     (ao_symbols[1].addr)
-       { 0,    "_ao_radio_cal" },
+       { 0,    "_ao_radio_cal", 1 },
 #define AO_RADIO_CAL           (ao_symbols[2].addr)
 };
 
-#define NUM_SERIAL_SYMBOLS     2
 #define NUM_SYMBOLS            3
+#define NUM_REQUIRED_SYMBOLS   2
 
 static int
 find_symbols(FILE *map)
@@ -51,7 +52,7 @@ find_symbols(FILE *map)
        char    *colon;
        unsigned long   a;
        int     s;
-       int     found = 0;
+       int     required = 0;
 
        while (fgets(line, sizeof(line), map) != NULL) {
                line[sizeof(line)-1] = '\0';
@@ -70,15 +71,16 @@ find_symbols(FILE *map)
                for (s = 0; s < NUM_SYMBOLS; s++)
                        if (!strcmp(ao_symbols[s].name, name)) {
                                ao_symbols[s].addr = (unsigned) a;
-                               ++found;
+                               if (ao_symbols[s].required)
+                                       ++required;
                                break;
                        }
        }
-       return found >= NUM_SERIAL_SYMBOLS;
+       return required >= NUM_REQUIRED_SYMBOLS;
 }
 
 static int
-rewrite(struct hex_image *image, unsigned addr, char *data, int len)
+rewrite(struct ao_hex_image *image, unsigned addr, char *data, int len)
 {
        int i;
        if (addr < image->address || image->address + image->length < addr + len)
@@ -91,6 +93,7 @@ rewrite(struct hex_image *image, unsigned addr, char *data, int len)
                printf (" %02x", data[i]);
        printf("\n");
        memcpy(image->data + addr - image->address, data, len);
+       return 1;
 }
 
 static const struct option options[] = {
@@ -110,10 +113,8 @@ int
 main (int argc, char **argv)
 {
        struct ccdbg    *dbg;
-       uint8_t         status;
-       uint16_t        pc;
-       struct hex_file *hex;
-       struct hex_image *image;
+       struct ao_hex_file      *hex;
+       struct ao_hex_image *image;
        char            *filename;
        FILE            *file;
        FILE            *map;
@@ -125,7 +126,6 @@ main (int argc, char **argv)
        char            serial_int[2];
        unsigned int    s;
        int             i;
-       unsigned        usb_descriptors;
        int             string_num;
        char            *tty = NULL;
        char            *device = NULL;
@@ -181,22 +181,22 @@ main (int argc, char **argv)
        }
        fclose(map);
 
-       hex = ccdbg_hex_file_read(file, filename);
+       hex = ao_hex_file_read(file, filename);
        fclose(file);
        if (!hex) {
                perror(filename);
                exit (1);
        }
-       image = ccdbg_hex_image_create(hex);
+       image = ao_hex_image_create(hex);
        if (!image) {
                fprintf(stderr, "image create failed\n");
                exit (1);
        }
-       ccdbg_hex_file_free(hex);
+       ao_hex_file_free(hex);
 
        serial = strtoul(serial_string, NULL, 0);
        if (!serial)
-(argv[0]);
+               usage(argv[0]);
 
        serial_int[0] = serial & 0xff;
        serial_int[1] = (serial >> 8) & 0xff;
@@ -207,35 +207,38 @@ main (int argc, char **argv)
                exit(1);
        }
 
-       usb_descriptors = AO_USB_DESCRIPTORS - image->address;
-       string_num = 0;
-       while (image->data[usb_descriptors] != 0 && usb_descriptors < image->length) {
-               if (image->data[usb_descriptors+1] == AO_USB_DESC_STRING) {
-                       ++string_num;
-                       if (string_num == 4)
-                               break;
+       if (AO_USB_DESCRIPTORS) {
+               unsigned        usb_descriptors;
+               usb_descriptors = AO_USB_DESCRIPTORS - image->address;
+               string_num = 0;
+               while (image->data[usb_descriptors] != 0 && usb_descriptors < image->length) {
+                       if (image->data[usb_descriptors+1] == AO_USB_DESC_STRING) {
+                               ++string_num;
+                               if (string_num == 4)
+                                       break;
+                       }
+                       usb_descriptors += image->data[usb_descriptors];
+               }
+               if (usb_descriptors >= image->length || image->data[usb_descriptors] == 0 ) {
+                       fprintf(stderr, "Cannot rewrite serial string at %04x\n", AO_USB_DESCRIPTORS);
+                       exit(1);
                }
-               usb_descriptors += image->data[usb_descriptors];
-       }
-       if (usb_descriptors >= image->length || image->data[usb_descriptors] == 0 ) {
-               fprintf(stderr, "Cannot rewrite serial string at %04x\n", AO_USB_DESCRIPTORS);
-               exit(1);
-       }
 
-       serial_ucs2_len = image->data[usb_descriptors] - 2;
-       serial_ucs2 = malloc(serial_ucs2_len);
-       if (!serial_ucs2) {
-               fprintf(stderr, "Malloc(%d) failed\n", serial_ucs2_len);
-               exit(1);
-       }
-       s = serial;
-       for (i = serial_ucs2_len / 2; i; i--) {
-               serial_ucs2[i * 2 - 1] = 0;
-               serial_ucs2[i * 2 - 2] = (s % 10) + '0';
-               s /= 10;
+               serial_ucs2_len = image->data[usb_descriptors] - 2;
+               serial_ucs2 = malloc(serial_ucs2_len);
+               if (!serial_ucs2) {
+                       fprintf(stderr, "Malloc(%d) failed\n", serial_ucs2_len);
+                       exit(1);
+               }
+               s = serial;
+               for (i = serial_ucs2_len / 2; i; i--) {
+                       serial_ucs2[i * 2 - 1] = 0;
+                       serial_ucs2[i * 2 - 2] = (s % 10) + '0';
+                       s /= 10;
+               }
+               if (!rewrite(image, usb_descriptors + 2 + image->address, serial_ucs2, serial_ucs2_len))
+                       usage(argv[0]);
        }
-       if (!rewrite(image, usb_descriptors + 2 + image->address, serial_ucs2, serial_ucs2_len))
-               usage(argv[0]);
 
        if (cal) {
                cal_int[0] = cal & 0xff;
@@ -272,7 +275,7 @@ main (int argc, char **argv)
        } else {
                printf("Cannot load code to 0x%04x\n",
                       image->address);
-               ccdbg_hex_image_free(image);
+               ao_hex_image_free(image);
                ccdbg_close(dbg);
                exit(1);
        }