sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hosted/cmsis_dap: Done a first pass at rewriting the HID serial number logic to be unicode-safe

This commit is contained in:
dragonmux 2022-07-11 14:16:37 -04:00 committed by Piotr Esden-Tempski
parent 50ff4a2dbe
commit ec5ac64bdc
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/platforms/hosted/cmsis_dap.c
View File

@ -63,6 +63,23 @@ static uint8_t buffer[1024 + 1];
static int report_size = 64 + 1; // TODO: read actual report size static int report_size = 64 + 1; // TODO: read actual report size
static bool has_swd_sequence = false; static bool has_swd_sequence = false;
static size_t mbslen(const char *str)
{
const char *const end = str + strlen(str);
size_t result = 0;
// Reset conversion state
mblen(NULL, 0);
while (str < end) {
const int next = mblen(str, end - str);
// If an error occurs, bail out with whatever we got so far.
if (next == -1)
break;
str += next;
++result;
}
return result;
}
/* LPC845 Breakout Board Rev. 0 report invalid response with > 65 bytes */ /* LPC845 Breakout Board Rev. 0 report invalid response with > 65 bytes */
int dap_init(bmp_info_t *info) int dap_init(bmp_info_t *info)
{ {
@ -73,11 +90,17 @@ int dap_init(bmp_info_t *info)
if (hid_init()) if (hid_init())
return -1; return -1;
const size_t size = strlen(info->serial); const size_t size = mbslen(info->serial);
wchar_t serial[64] = {0}, *wc = serial; if (size > 64) {
for (size_t i = 0; i < size; i++) PRINT_INFO("Serial number invalid, aborting\n");
*wc++ = info->serial[i]; return -1;
*wc = 0; }
wchar_t serial[65] = {0};
if (mbstowcs(serial, info->serial, size) != size) {
PRINT_INFO("Serial number conversion failed, aborting\n");
return -1;
}
serial[size] = 0;
/* Blacklist devices that do not work with 513 byte report length /* Blacklist devices that do not work with 513 byte report length
* FIXME: Find a solution to decipher from the device. * FIXME: Find a solution to decipher from the device.
*/ */
@ -87,7 +110,7 @@ int dap_init(bmp_info_t *info)
} }
handle = hid_open(info->vid, info->pid, (serial[0]) ? serial : NULL); handle = hid_open(info->vid, info->pid, (serial[0]) ? serial : NULL);
if (!handle) { if (!handle) {
DEBUG_WARN("hid_open failed: %ls\n", hid_error(NULL)); PRINT_INFO("hid_open failed: %ls\n", hid_error(NULL));
return -1; return -1;
} }
} else if (type == CMSIS_TYPE_BULK) { } else if (type == CMSIS_TYPE_BULK) {