Fix formatting and replace tabs with spaces

This commit is contained in:
MCUdude 2022-10-20 12:39:11 +02:00
parent 867d83c215
commit 72da5c73db
1 changed files with 114 additions and 139 deletions

View File

@ -65,81 +65,70 @@ static int usbhid_open(const char *port, union pinfo pinfo, union filedescriptor
* right-to-left, so only the least significant nibbles need to be
* specified.
*/
if ((serno = strchr(port, ':')) != NULL)
{
/* first, drop all colons there if any */
cp2 = ++serno;
if ((serno = strchr(port, ':')) != NULL) {
/* First, drop all colons there if any */
cp2 = ++serno;
while ((cp2 = strchr(cp2, ':')) != NULL)
{
x = strlen(cp2) - 1;
memmove(cp2, cp2 + 1, x);
cp2[x] = '\0';
}
while ((cp2 = strchr(cp2, ':')) != NULL) {
x = strlen(cp2) - 1;
memmove(cp2, cp2 + 1, x);
cp2[x] = '\0';
}
if (strlen(serno) > 12)
{
pmsg_error("invalid serial number %s\n", serno);
return -1;
}
if (strlen(serno) > 12) {
pmsg_error("invalid serial number %s\n", serno);
return -1;
}
wchar_t wserno[15];
mbstowcs(wserno, serno, 15);
size_t serlen = strlen(serno);
wchar_t wserno[15];
mbstowcs(wserno, serno, 15);
size_t serlen = strlen(serno);
/*
* Now, try finding all devices matching VID:PID, and compare
* their serial numbers against the requested one.
*/
struct hid_device_info *list, *walk;
list = hid_enumerate(pinfo.usbinfo.vid, pinfo.usbinfo.pid);
if (list == NULL) {
pmsg_error("No USB HID devices found\n");
return -1;
}
/*
* Now, try finding all devices matching VID:PID, and compare
* their serial numbers against the requested one.
*/
struct hid_device_info *list, *walk;
list = hid_enumerate(pinfo.usbinfo.vid, pinfo.usbinfo.pid);
if (list == NULL) {
pmsg_error("No USB HID devices found\n");
return -1;
}
walk = list;
while (walk)
walk = list;
while (walk) {
pmsg_notice("usbhid_open(): found %ls, serno: %ls\n", walk->product_string, walk->serial_number);
size_t slen = wcslen(walk->serial_number);
if (slen >= serlen && wcscmp(walk->serial_number + slen - serlen, wserno) == 0)
{
pmsg_notice("usbhid_open(): found %ls, serno: %ls\n", walk->product_string, walk->serial_number);
size_t slen = wcslen(walk->serial_number);
if (slen >= serlen &&
wcscmp(walk->serial_number + slen - serlen, wserno) == 0)
{
/* found matching serial number */
break;
}
pmsg_debug("usbhid_open(): serial number does not match\n");
walk = walk->next;
/* Found matching serial number */
break;
}
if (walk == NULL)
{
pmsg_error("no matching device found\n");
hid_free_enumeration(list);
return -1;
}
pmsg_debug("usbhid_open(): opening path %s\n", walk->path);
dev = hid_open_path(walk->path);
pmsg_debug("usbhid_open(): serial number does not match\n");
walk = walk->next;
}
if (walk == NULL) {
pmsg_error("no matching device found\n");
hid_free_enumeration(list);
if (dev == NULL)
{
pmsg_error("found device, but hid_open_path() failed\n");
return -1;
}
return -1;
}
else
pmsg_debug("usbhid_open(): opening path %s\n", walk->path);
dev = hid_open_path(walk->path);
hid_free_enumeration(list);
if (dev == NULL) {
pmsg_error("found device, but hid_open_path() failed\n");
return -1;
}
} else {
/* No serial number requested, pass straight to hid_open() */
dev = hid_open(pinfo.usbinfo.vid, pinfo.usbinfo.pid, NULL);
if (dev == NULL)
{
/*
* No serial number requested, pass straight to hid_open()
*/
dev = hid_open(pinfo.usbinfo.vid, pinfo.usbinfo.pid, NULL);
if (dev == NULL)
{
pmsg_warning("USB device with VID: 0x%04x and PID: 0x%04x not found\n",
pinfo.usbinfo.vid, pinfo.usbinfo.pid);
return -1;
}
pmsg_warning("USB device with VID: 0x%04x and PID: 0x%04x not found\n",
pinfo.usbinfo.vid, pinfo.usbinfo.pid);
return -1;
}
}
fd->usb.handle = dev;
@ -169,39 +158,38 @@ static int usbhid_open(const char *port, union pinfo pinfo, union filedescriptor
* be incremented by one, as the report ID will be omitted by the
* hidapi library.
*/
if (pinfo.usbinfo.vid == USB_VENDOR_ATMEL)
{
pmsg_debug("usbhid_open(): probing for max packet size\n");
memset(usbbuf, 0, sizeof usbbuf);
usbbuf[0] = 0; /* no HID reports used */
usbbuf[1] = 0; /* DAP_Info */
usbbuf[2] = 0xFF; /* get max. packet size */
if (pinfo.usbinfo.vid == USB_VENDOR_ATMEL) {
pmsg_debug("usbhid_open(): probing for max packet size\n");
memset(usbbuf, 0, sizeof usbbuf);
usbbuf[0] = 0; /* no HID reports used */
usbbuf[1] = 0; /* DAP_Info */
usbbuf[2] = 0xFF; /* get max. packet size */
hid_write(dev, usbbuf, 65);
fd->usb.max_xfer = 64; /* first guess */
hid_write(dev, usbbuf, 65);
fd->usb.max_xfer = 64; /* first guess */
memset(usbbuf, 0, sizeof usbbuf);
int res = hid_read_timeout(dev, usbbuf, 10 /* bytes */, 50 /* milliseconds */);
if (res == 0) {
/* no timely response, assume 512 byte size */
hid_write(dev, usbbuf, (512 - 64) + 1);
fd->usb.max_xfer = 512;
res = hid_read_timeout(dev, usbbuf, 10, 50);
}
if (res <= 0) {
pmsg_error("no response from device\n");
hid_close(dev);
return -1;
}
if (usbbuf[0] != 0 || usbbuf[1] != 2) {
pmsg_error("unexpected reply to DAP_Info: 0x%02x 0x%02x\n",
usbbuf[0], usbbuf[1]);
} else {
fd->usb.max_xfer = usbbuf[2] + (usbbuf[3] << 8);
pmsg_debug("usbhid_open(): setting max_xfer from DAP_Info response to %d\n",
fd->usb.max_xfer);
}
memset(usbbuf, 0, sizeof usbbuf);
int res = hid_read_timeout(dev, usbbuf, 10 /* bytes */, 50 /* milliseconds */);
if (res == 0) {
/* No timely response, assume 512 byte size */
hid_write(dev, usbbuf, (512 - 64) + 1);
fd->usb.max_xfer = 512;
res = hid_read_timeout(dev, usbbuf, 10, 50);
}
if (res <= 0) {
pmsg_error("no response from device\n");
hid_close(dev);
return -1;
}
if (usbbuf[0] != 0 || usbbuf[1] != 2) {
pmsg_error("unexpected reply to DAP_Info: 0x%02x 0x%02x\n",
usbbuf[0], usbbuf[1]);
} else {
fd->usb.max_xfer = usbbuf[2] + (usbbuf[3] << 8);
pmsg_debug("usbhid_open(): setting max_xfer from DAP_Info response to %d\n",
fd->usb.max_xfer);
}
}
if (fd->usb.max_xfer > USBDEV_MAX_XFER_3) {
pmsg_error("unexpected max size %d, reducing to %d\n",
fd->usb.max_xfer, USBDEV_MAX_XFER_3);
@ -211,8 +199,7 @@ static int usbhid_open(const char *port, union pinfo pinfo, union filedescriptor
return 0;
}
static void usbhid_close(union filedescriptor *fd)
{
static void usbhid_close(union filedescriptor *fd) {
hid_device *udev = (hid_device *)fd->usb.handle;
if (udev == NULL)
@ -222,22 +209,20 @@ static void usbhid_close(union filedescriptor *fd)
}
static int usbhid_send(const union filedescriptor *fd, const unsigned char *bp, size_t mlen)
{
static int usbhid_send(const union filedescriptor *fd, const unsigned char *bp, size_t mlen) {
hid_device *udev = (hid_device *)fd->usb.handle;
int rv;
int i = mlen;
const unsigned char * p = bp;
unsigned char usbbuf[USBDEV_MAX_XFER_3 + 1];
int tx_size;
if (udev == NULL)
return -1;
tx_size = (mlen < USBDEV_MAX_XFER_3)? mlen: USBDEV_MAX_XFER_3;
usbbuf[0] = 0; /* no report ID used */
usbbuf[0] = 0; /* No report ID used */
memcpy(usbbuf + 1, bp, tx_size);
rv = hid_write(udev, usbbuf, tx_size + 1);
if (rv < 0) {
@ -247,30 +232,26 @@ static int usbhid_send(const union filedescriptor *fd, const unsigned char *bp,
if (rv != tx_size + 1)
pmsg_error("short write to USB: %d bytes out of %d written\n", rv, tx_size + 1);
if (verbose > 4)
{
pmsg_trace2("sent: ");
if (verbose > 4) {
pmsg_trace2("sent: ");
while (i) {
unsigned char c = *p;
if (isprint(c)) {
msg_trace2("%c ", c);
}
else {
msg_trace2(". ");
}
msg_trace2("[%02x] ", c);
while (i) {
unsigned char c = *p;
if (isprint(c))
msg_trace2("%c ", c);
else
msg_trace2(". ");
msg_trace2("[%02x] ", c);
p++;
i--;
}
msg_trace2("\n");
p++;
i--;
}
msg_trace2("\n");
}
return 0;
}
static int usbhid_recv(const union filedescriptor *fd, unsigned char *buf, size_t nbytes)
{
static int usbhid_recv(const union filedescriptor *fd, unsigned char *buf, size_t nbytes) {
hid_device *udev = (hid_device *)fd->usb.handle;
int i, rv;
unsigned char * p = buf;
@ -282,31 +263,26 @@ static int usbhid_recv(const union filedescriptor *fd, unsigned char *buf, size_
if (i != nbytes)
pmsg_error("short read, read only %d out of %lu bytes\n", i, (unsigned long) nbytes);
if (verbose > 4)
{
pmsg_trace2("recv: ");
if (verbose > 4) {
pmsg_trace2("recv: ");
while (i) {
unsigned char c = *p;
if (isprint(c)) {
msg_trace2("%c ", c);
}
else {
msg_trace2(". ");
}
msg_trace2("[%02x] ", c);
while (i) {
unsigned char c = *p;
if (isprint(c))
msg_trace2("%c ", c);
else
msg_trace2(". ");
msg_trace2("[%02x] ", c);
p++;
i--;
}
msg_trace2("\n");
p++;
i--;
}
msg_trace2("\n");
}
return rv;
}
static int usbhid_drain(const union filedescriptor *fd, int display)
{
static int usbhid_drain(const union filedescriptor *fd, int display) {
/*
* There is not much point in trying to flush any data
* on an USB endpoint, as the endpoint is supposed to
@ -324,8 +300,7 @@ static int usbhid_drain(const union filedescriptor *fd, int display)
/*
* Device descriptor.
*/
struct serial_device usbhid_serdev =
{
struct serial_device usbhid_serdev = {
.open = usbhid_open,
.close = usbhid_close,
.send = usbhid_send,