Temp fix to work with F4 up to 64k of flash, changed chip detection

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

diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c
index 5b5c4a01afd8e56f0f6437d122e1126fffac1400..4d549a67dcb5fd285f32ef5eae78868849a3826d 100644 (file)
--- a/gdbserver/gdb-server.c
+++ b/gdbserver/gdb-server.c
@@ -1,5 +1,5 @@
 /* -*- tab-width:8 -*- */
-
+#define DEBUG 1
 /*
  Copyright (C)  2011 Peter Zotov <whitequark@whitequark.org>
  Use of this source code is governed by a BSD-style
@@ -35,15 +35,6 @@ static const char hex[] = "0123456789abcdef";
 
 static const char* current_memory_map = NULL;
 
-/*
- * Chip IDs are explained in the appropriate programming manual for the
- * DBGMCU_IDCODE register (0xE0042000)
- */
-
-#define CORE_M3_R1 0x1BA00477
-#define CORE_M3_R2 0x4BA00477
-#define CORE_M4_R0 0x2BA01477
-
 struct chip_params {
        uint32_t chip_id;
        char* description;
@@ -58,8 +49,9 @@ struct chip_params {
          0x100000,   0x20000, 0x20000, 0x1fff0000, 0x7800  }, // table 1, pm0059
        { 0x412, "F1 Low-density device", 0x1ffff7e0,
          0x8000,   0x400, 0x2800,  0x1ffff000, 0x800  }, // table 1, pm0063
+         /*No flash size register? page size is variable */
        { 0x413, "F4 device", 0x1FFF7A10,
-         0x100000,   0x20000, 0x30000,  0x1fff0000, 0x7800  }, // table 1, pm0081
+         0x100000,   0x4000, 0x30000,  0x1fff0000, 0x7800  }, // table 1, pm0081
        { 0x414, "F1 High-density device", 0x1ffff7e0,
          0x80000,  0x800, 0x10000, 0x1ffff000, 0x800  },  // table 3 pm0063 
           // This ignores the EEPROM! (and uses the page erase size,
@@ -91,15 +83,10 @@ int main(int argc, char** argv) {
 
        switch(argc) {
 
-               default: {
-                       fprintf(stderr, HelpStr, NULL);
-                       return 1;
-               }
-
                case 3 : {
                        //sl = stlink_quirk_open(argv[2], 0);
-                        // FIXME - hardcoded to usb....
-                        sl = stlink_open_usb(10);
+                       // FIXME - hardcoded to usb....
+                       sl = stlink_open_usb(10);
                        if(sl == NULL) return 1;
                        break;
                }
@@ -111,6 +98,7 @@ int main(int argc, char** argv) {
                        }
                }
 
+#if CONFIG_USE_LIBSG
                case 1 : { // Search ST-LINK (from /dev/sg0 to /dev/sg99)
                        const int DevNumMax = 99;
                        int ExistDevCount = 0;
@@ -148,31 +136,31 @@ int main(int argc, char** argv) {
                        }
                        break;
                }
+#endif
+
+               default: {
+                       fprintf(stderr, HelpStr, NULL);
+                       return 1;
+               }
        }
 
-        if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE) {
-            stlink_exit_dfu_mode(sl);
-        }
+       if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE) {
+               stlink_exit_dfu_mode(sl);
+       }
 
        if(stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE) {
          stlink_enter_swd_mode(sl);
        }
 
-       uint32_t chip_id = stlink_chip_id(sl);
-       uint32_t core_id = stlink_core_id(sl);
-
-       /* Fix chip_id for F4 */
-       if (((chip_id & 0xFFF) == 0x411) && (core_id == CORE_M4_R0)) {
-         printf("Fixing wrong chip_id for STM32F4 Rev A errata\n");
-         chip_id = 0x413;
-       }
+       stlink_identify_device(sl);
+       printf("Chip ID is %08x, Core ID is  %08x.\n", sl->chip_id, sl->core_id);
 
-       printf("Chip ID is %08x, Core ID is  %08x.\n", chip_id, core_id);
+       sl->verbose=0;
 
        const struct chip_params* params = NULL;
 
        for(int i = 0; i < sizeof(devices) / sizeof(devices[0]); i++) {
-               if(devices[i].chip_id == (chip_id & 0xFFF)) {
+               if(devices[i].chip_id == (sl->chip_id & 0xFFF)) {
                        params = &devices[i];
                        break;
                }
@@ -189,11 +177,16 @@ int main(int argc, char** argv) {
 
        FLASH_PAGE = params->flash_pagesize;
 
+       //sl->flash_pgsz=0x4000;
+       //sl->flash_size=0x100000;
+
        uint32_t flash_size;
 
        stlink_read_mem32(sl, params->flash_size_reg, 4);
        flash_size = sl->q_buf[0] | (sl->q_buf[1] << 8);
 
+       //flash_size=0x100000;
+
        printf("Flash size is %d KiB.\n", flash_size);
        // memory map is in 1k blocks.
        current_memory_map = make_memory_map(params, flash_size * 0x400);
@@ -544,6 +537,7 @@ static int flash_go(stlink_t *sl) {
                        printf("flash_do: page %08x\n", page);
                        #endif
 
+                       //todo:write flash already does erase so why is this here?
                        stlink_erase_flash_page(sl, page);
 
                        if(stlink_write_flash(sl, page, fb->data + (page - fb->addr),
@@ -577,11 +571,7 @@ int serve(stlink_t *sl, int port) {
        }
 
        unsigned int val = 1;
-       struct timeval tv;
-       tv.tv_sec = 30; 
-       tv.tv_usec = 20000; 
        setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
-       setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO , &tv, sizeof(tv));
 
        struct sockaddr_in serv_addr = {0};
        serv_addr.sin_family = AF_INET;