Fix stm32l readmem32.

[fw/stlink] / gdbserver / gdb-server.c

diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c
index 2520c306e9a142e0b42116dba121319e0862b716..77d7562a4ab147543fe86c31f0af325665b31508 100644 (file)
--- a/gdbserver/gdb-server.c
+++ b/gdbserver/gdb-server.c
@@ -36,18 +36,22 @@ struct chip_params {
        uint32_t bootrom_base, bootrom_size;
 } const devices[] = {
        { 0x412, "Low-density device",
-         0x8000,   0x400, 0x2800,  0x1ffff000, 0x800  },
+         0x8000,   0x400, 0x2800,  0x1ffff000, 0x800  }, // table 1, pm0063
        { 0x410, "Medium-density device",
-         0x20000,  0x400, 0x5000,  0x1ffff000, 0x800  },
+         0x20000,  0x400, 0x5000,  0x1ffff000, 0x800  }, // table 2, pm0063
        { 0x414, "High-density device",
-         0x80000,  0x800, 0x10000, 0x1ffff000, 0x800  },
+         0x80000,  0x800, 0x10000, 0x1ffff000, 0x800  },  // table 3 pm0063 
+          // This ignores the EEPROM! (and uses the page erase size,
+          // not the sector write protection...)
+        { 0x416, "EnergyLite device",
+          0x2000, 0x100, 0x4000, 0x1ff00000, 0x1000 },
        { 0x418, "Connectivity line device",
          0x40000,  0x800, 0x10000, 0x1fffb000, 0x4800 },
        { 0x420, "Medium-density value line device",
          0x20000,  0x400, 0x2000,  0x1ffff000, 0x800  },
        { 0x428, "High-density value line device",
          0x80000,  0x800, 0x8000,  0x1ffff000, 0x800  },
-       { 0x430, "XL-density device",
+       { 0x430, "XL-density device",   // pm0068
          0x100000, 0x800, 0x18000, 0x1fffe000, 0x1800 },
        { 0 }
 };
@@ -69,12 +73,7 @@ int main(int argc, char** argv) {
        if(stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
                stlink_enter_swd_mode(sl);
 
-       uint32_t chip_id;
-
-       stlink_read_mem32(sl, 0xE0042000, 4);
-       chip_id = sl->q_buf[0] | (sl->q_buf[1] << 8) | (sl->q_buf[2] << 16) |
-               (sl->q_buf[3] << 24);
-
+       uint32_t chip_id = stlink_chip_id(sl);
        printf("Chip ID is %08x.\n", chip_id);
 
        const struct chip_params* params = NULL;
@@ -99,7 +98,7 @@ int main(int argc, char** argv) {
 
        uint32_t flash_size;
 
-       stlink_read_mem32(sl, 0x1FFFF7E0, 4);
+       stlink_read_mem32(sl, 0x1FFFF7E0, 4);  // FIXME - that's never going to work!
        flash_size = sl->q_buf[0] | (sl->q_buf[1] << 8);
 
        printf("Flash size is %d KiB.\n", flash_size);