mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-21 21:41:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

libusb: fix packet log path derivation from usb path if additional arguments are provided

Browse Source
This commit is contained in:
Matthias Ringwald 2018-03-26 16:36:53 +02:00
parent c0519d72a1
commit fb34235af3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
port/libusb/main.c
View File

@ -122,23 +122,24 @@ int main(int argc, const char * argv[]){
uint8_t usb_path[USB_MAX_PATH_LEN]; uint8_t usb_path[USB_MAX_PATH_LEN];
int usb_path_len = 0; int usb_path_len = 0;
const char * usb_path_string = NULL;
if (argc >= 3 && strcmp(argv[1], "-u") == 0){ if (argc >= 3 && strcmp(argv[1], "-u") == 0){
// parse command line options for "-u 11:22:33" // parse command line options for "-u 11:22:33"
const char * port_str = argv[2]; usb_path_string = argv[2];
printf("Specified USB Path: "); printf("Specified USB Path: ");
while (1){ while (1){
char * delimiter; char * delimiter;
int port = strtol(port_str, &delimiter, 16); int port = strtol(usb_path_string, &delimiter, 16);
usb_path[usb_path_len] = port; usb_path[usb_path_len] = port;
usb_path_len++; usb_path_len++;
printf("%02x ", port); printf("%02x ", port);
if (!delimiter) break; if (!delimiter) break;
if (*delimiter != ':' && *delimiter != '-') break; if (*delimiter != ':' && *delimiter != '-') break;
port_str = delimiter+1; usb_path_string = delimiter+1;
} }
printf("\n"); printf("\n");
argc -= 2; argc -= 2;
memmove(&argv[0], &argv[2], argc * sizeof(char *)); memmove(&argv[1], &argv[3], (argc-1) * sizeof(char *));
} }
/// GET STARTED with BTstack /// /// GET STARTED with BTstack ///
@ -155,7 +156,7 @@ int main(int argc, const char * argv[]){
strcpy(pklg_path, "/tmp/hci_dump"); strcpy(pklg_path, "/tmp/hci_dump");
if (usb_path_len){ if (usb_path_len){
strcat(pklg_path, "_"); strcat(pklg_path, "_");
strcat(pklg_path, argv[2]); strcat(pklg_path, usb_path_string);
} }
strcat(pklg_path, ".pklg"); strcat(pklg_path, ".pklg");
printf("Packet Log: %s\n", pklg_path); printf("Packet Log: %s\n", pklg_path);