Removed comment about STM32F4 limitations
[fw/stlink] / gdbserver / gdb-server.c
index df2e2b87d38b79214454a6d300fdb7296bb2d871..371d779d7aac66afe8f41e7114e427c1bba7ce72 100644 (file)
@@ -1,5 +1,5 @@
 /* -*- tab-width:8 -*- */
-
+#define DEBUG 0
 /*
  Copyright (C)  2011 Peter Zotov <whitequark@whitequark.org>
  Use of this source code is governed by a BSD-style
@@ -14,6 +14,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <signal.h>
 
 #include <stlink-common.h>
 
 #define FLASH_PAGE_MASK (~((1 << 10) - 1))
 #define FLASH_SIZE (FLASH_PAGE * 128)
 
+volatile int do_exit = 0;
+void ctrl_c(int sig)
+{
+  do_exit = 1;
+}
+
 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)
- */
 struct chip_params {
        uint32_t chip_id;
        char* description;
@@ -43,11 +46,12 @@ struct chip_params {
        { 0x410, "F1 Medium-density device", 0x1ffff7e0,
          0x20000,  0x400, 0x5000,  0x1ffff000, 0x800  }, // table 2, pm0063
        { 0x411, "F2 device", 0, /* No flash size register found in the docs*/
-         0x100000,   0x20000, 0x20000, 0x1ff00000, 0x7800  }, // table 1, pm0059
+         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, 0x20000,  0x1ff00000, 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,
@@ -71,83 +75,129 @@ char* make_memory_map(const struct chip_params *params, uint32_t flash_size);
 int main(int argc, char** argv) {
 
        stlink_t *sl = NULL;
+        int port = 0;
+
+       const char * HelpStr =  "\nUsage:\n"
+                                 "\tst-util [Arguments]\n"
+                                 "\tArguments (no more than 2):\n"
+                                  "\t\t<Port>: Port. Default: 4242.\n"
+                                  "\t\t{usb|sgauto|/dev/sgX}: Transport, "
+                                   "where X = {0, 1, 2, ...}. Default: USB.\n"
+                                 "\tExamples:\n"
+                                  "\t\tst-util 1234\n"
+                                  "\t\tst-util sgauto\n"
+                                  "\t\tst-util 1234 usb\n"
+                                  "\t\tst-util /dev/sgX 1234\n"
+                                  "\t\tst-util 1234 /dev/sgX\n";
+        
+        
+        // Parsing the arguments of command line ...
+        
+        if (argc == 1 || argc > 3) {
+            fprintf(stderr, HelpStr, NULL);
+            return 1;
+        }
+                
+        for(int a = 1; a < argc; a++) {
+            
+            // Port
+            int p = atoi(argv[a]);
+            if (p < 0 || p > 0xFFFF) {
+                fprintf(stderr, "Invalid port\n");
+                fprintf(stderr, HelpStr, NULL);
+                return 1;
+            }
+            if (p > 0 && port == 0) {port = p; continue;}
+            
+            // if (p == 0) ...
+            
+            if (sl != NULL) {
+                fprintf(stderr, "Invalid argumets\n");
+                fprintf(stderr, HelpStr, NULL);
+                return 1;
+            }
+            
+            // usb
+            if (!strcmp(argv[a], "usb")) {
+                sl = stlink_open_usb(10);
+                if(sl == NULL) return 1;
+                continue;
+            }
+
+            // /dev/sgX
+            if (!strncmp(argv[a], "/dev/sgX", 7)) {
+                if(!CONFIG_USE_LIBSG) {
+                    fprintf(stderr, "libsg not use\n");
+                    return 1;
+                }
+                sl = stlink_quirk_open(argv[a], 0);
+                if(sl == NULL) return 1;
+                continue;
+            }
+
+            // sg_auto
+            if (!strcmp(argv[a], "sgauto")) {
+                if(!CONFIG_USE_LIBSG) {
+                    fprintf(stderr, "libsg not use\n");
+                    return 1;
+                }
+
+                // Search ST-LINK (from /dev/sg0 to /dev/sg99)
+                for(int DevNum = 0; DevNum <= 99; DevNum++)
+                {
+                    if(DevNum < 10) {
+                        char DevName[] = "/dev/sgX";
+                        DevName[7] = DevNum + '0';
+                        if ( !access(DevName, F_OK) )
+                            sl = stlink_quirk_open(DevName, 0);
+                    }
+                    else {
+                        char DevName[] = "/dev/sgXY";
+                        DevName[7] = DevNum/10 + '0';
+                        DevName[8] = DevNum%10 + '0';
+                        if ( !access(DevName, F_OK) )
+                            sl = stlink_quirk_open(DevName, 0);
+                    }
+                   if (sl != NULL) break;
+                }
+
+                if(sl == NULL) return 1;
+                continue;
+            }
+            
+            // Invalid argumets
+            fprintf(stderr, "Invalid argumets\n");
+            fprintf(stderr, HelpStr, NULL);
+            return 1;
+        }
+         
+        // Default transport: USB
+        if (sl == NULL) sl = stlink_open_usb(10);
+        // Default port: 4242
+        if (port == 0) port = 4242;
+        
+        // End parsing
+        
+        
+        if (sl == NULL) return 1;
+
+       if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE) {
+               stlink_exit_dfu_mode(sl);
+       }
 
-       const char * HelpStr =  "Usage:\n"
-                                                               "\t st-util port [/dev/sgX]\n"
-                                                               "\t st-util [port]\n"
-                                                               "\t st-util --help\n";
-
-       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(argv[2], 10);
-                       if(sl == NULL) return 1;
-                       break;
-               }
-
-               case 2 : {
-                       if (strcmp(argv[1], "--help") == 0) {
-                               fprintf(stdout, HelpStr, NULL);
-                               return 1;
-                       }
-               }
-
-               case 1 : { // Search ST-LINK (from /dev/sg0 to /dev/sg99)
-                       const int DevNumMax = 99;
-                       int ExistDevCount = 0;
-
-                       for(int DevNum = 0; DevNum <= DevNumMax; DevNum++)
-                       {
-                               if(DevNum < 10) {
-                                       char DevName[] = "/dev/sgX";
-                                       const int X_index = 7;
-                                       DevName[X_index] = DevNum + '0';
-                                       if ( !access(DevName, F_OK) ) {
-                                               sl = stlink_quirk_open(DevName, 0);
-                                               ExistDevCount++;
-                                       }
-                               }
-                               else if(DevNum < 100) {
-                                       char DevName[] = "/dev/sgXY";
-                                       const int X_index = 7;
-                                       const int Y_index = 8;
-                                       DevName[X_index] = DevNum/10 + '0';
-                                       DevName[Y_index] = DevNum%10 + '0';
-                                       if ( !access(DevName, F_OK) ) {
-                                               sl = stlink_quirk_open(DevName, 0);
-                                               ExistDevCount++;
-                                       }
-                               }
-                               if(sl != NULL) break;
-                       }
-
-                       if(sl == NULL) {
-                               fprintf(stdout, "\nNumber of /dev/sgX devices found: %i \n",
-                                               ExistDevCount);
-                               fprintf(stderr, "ST-LINK not found\n");
-                               return 1;
-                       }
-                       break;
-               }
+       if(stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE) {
+         stlink_enter_swd_mode(sl);
        }
 
-       if(stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
-               stlink_enter_swd_mode(sl);
+       stlink_identify_device(sl);
+       printf("Chip ID is %08x, Core ID is  %08x.\n", sl->chip_id, sl->core_id);
 
-       uint32_t chip_id = stlink_chip_id(sl);
-       printf("Chip ID is %08x.\n", chip_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;
                }
@@ -164,28 +214,25 @@ 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);
 
-       int port;
-
-       if(argc == 1) {
-                // not on 64bit?
-               //srand((unsigned int)&port);
-               port = rand()/65535;
-       }
-       else {
-               port = atoi(argv[1]);
-       }
-
        while(serve(sl, port) == 0);
 
+       /* Switch back to mass storage mode before closing. */
+       stlink_run(sl);
+       stlink_exit_debug_mode(sl);
        stlink_close(sl);
 
        return 0;
@@ -525,6 +572,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),
@@ -582,7 +630,9 @@ int serve(stlink_t *sl, int port) {
 
        printf("Listening at *:%d...\n", port);
 
+       (void) signal (SIGINT, ctrl_c);
        int client = accept(sock, NULL, NULL);
+       signal (SIGINT, SIG_DFL);
        if(client < 0) {
                perror("accept");
                return 1;
@@ -639,8 +689,9 @@ int serve(stlink_t *sl, int port) {
                        if(!strcmp(queryName, "Supported")) {
                                reply = strdup("PacketSize=3fff;qXfer:memory-map:read+");
                        } else if(!strcmp(queryName, "Xfer")) {
-                               char *type, *op, *annex, *s_addr, *s_length;
+                               char *type, *op, *s_addr, *s_length;
                                char *tok = params;
+                               char *annex __attribute__((unused));
 
                                type     = strsep(&tok, ":");
                                op       = strsep(&tok, ":");