mirror
/
stlink
kopia lustrzana https://github.com/stlink-org/stlink
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

[fix] parsing command line and sg autodetection

pull/21/head
Dmitry Bravikov 2011-11-08 09:41:43 +06:00
rodzic 55bd816703
commit 72104c9816
1 zmienionych plików z 9 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
gdbserver/gdb-server.c
Wyświetl plik

@ -119,9 +119,14 @@ int main(int argc, char** argv) {
// if (p == 0) ... // if (p == 0) ...
if (sl != NULL) {
fprintf(stderr, "Invalid argumets\n");
fprintf(stderr, HelpStr, NULL);
return 1;
}
// usb // usb
if (!strcmp(argv[a], "usb")) { if (!strcmp(argv[a], "usb")) {
if (sl != NULL) return 1;
sl = stlink_open_usb(10); sl = stlink_open_usb(10);
if(sl == NULL) return 1; if(sl == NULL) return 1;
continue; continue;
@ -133,7 +138,6 @@ int main(int argc, char** argv) {
fprintf(stderr, "libsg not use\n"); fprintf(stderr, "libsg not use\n");
return 1; return 1;
} }
if (sl != NULL) return 1;
sl = stlink_quirk_open(argv[a], 0); sl = stlink_quirk_open(argv[a], 0);
if(sl == NULL) return 1; if(sl == NULL) return 1;
continue; continue;
@ -149,7 +153,6 @@ int main(int argc, char** argv) {
// Search ST-LINK (from /dev/sg0 to /dev/sg99) // Search ST-LINK (from /dev/sg0 to /dev/sg99)
for(int DevNum = 0; DevNum <= 99; DevNum++) for(int DevNum = 0; DevNum <= 99; DevNum++)
{ {
if(sl != NULL) return 1;
if(DevNum < 10) { if(DevNum < 10) {
char DevName[] = "/dev/sgX"; char DevName[] = "/dev/sgX";
DevName[7] = DevNum + '0'; DevName[7] = DevNum + '0';
@ -163,7 +166,7 @@ int main(int argc, char** argv) {
if ( !access(DevName, F_OK) ) if ( !access(DevName, F_OK) )
sl = stlink_quirk_open(DevName, 0); sl = stlink_quirk_open(DevName, 0);
} }
if (sl != NULL) break;
} }
if(sl == NULL) return 1; if(sl == NULL) return 1;
@ -181,6 +184,8 @@ int main(int argc, char** argv) {
// Default port: 4242 // Default port: 4242
if (port == 0) port = 4242; if (port == 0) port = 4242;
// End parsing
if (sl == NULL) return 1; if (sl == NULL) return 1;