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

gdb_if: Run clang-format and done some cleanup

This commit is contained in:
dragonmux 2022-08-10 10:20:58 +01:00 committed by Piotr Esden-Tempski
parent aa6d0fa7e4
commit 8f41217d29
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/platforms/stm32/gdb_if.c
View File

@ -45,12 +45,12 @@ void gdb_if_putchar(unsigned char c, int flush)
if (flush || (count_in == CDCACM_PACKET_SIZE)) { if (flush || (count_in == CDCACM_PACKET_SIZE)) {
/* Refuse to send if USB isn't configured, and /* Refuse to send if USB isn't configured, and
* don't bother if nobody's listening */ * don't bother if nobody's listening */
if((usb_get_config() != 1) || !gdb_uart_get_dtr()) { if (usb_get_config() != 1 || !gdb_uart_get_dtr()) {
count_in = 0; count_in = 0;
return; return;
} }
while(usbd_ep_write_packet(usbdev, CDCACM_GDB_ENDPOINT, while (usbd_ep_write_packet(usbdev, CDCACM_GDB_ENDPOINT, buffer_in, count_in) <= 0)
buffer_in, count_in) <= 0); continue;
if (flush && (count_in == CDCACM_PACKET_SIZE)) { if (flush && (count_in == CDCACM_PACKET_SIZE)) {
/* We need to send an empty packet for some hosts /* We need to send an empty packet for some hosts
@ -59,8 +59,8 @@ void gdb_if_putchar(unsigned char c, int flush)
* that transfer is complete, so we just send a packet * that transfer is complete, so we just send a packet
* containing a null byte for now. * containing a null byte for now.
*/ */
while (usbd_ep_write_packet(usbdev, CDCACM_GDB_ENDPOINT, while (usbd_ep_write_packet(usbdev, CDCACM_GDB_ENDPOINT, "\0", 1) <= 0)
"\0", 1) <= 0); continue;
} }
count_in = 0; count_in = 0;

26
src/platforms/tm4c/gdb_if.c
View File

@ -37,15 +37,15 @@ static volatile uint8_t buffer_in[CDCACM_PACKET_SIZE];
void gdb_if_putchar(unsigned char c, int flush) void gdb_if_putchar(unsigned char c, int flush)
{ {
buffer_in[count_in++] = c; buffer_in[count_in++] = c;
if(flush || (count_in == CDCACM_PACKET_SIZE)) { if (flush || count_in == CDCACM_PACKET_SIZE) {
/* Refuse to send if USB isn't configured, and /* Refuse to send if USB isn't configured, and
* don't bother if nobody's listening */ * don't bother if nobody's listening */
if((usb_get_config() != 1) || !gdb_uart_get_dtr()) { if (usb_get_config() != 1 || !gdb_uart_get_dtr()) {
count_in = 0; count_in = 0;
return; return;
} }
while(usbd_ep_write_packet(usbdev, CDCACM_GDB_ENDPOINT, while (usbd_ep_write_packet(usbdev, CDCACM_GDB_ENDPOINT, (uint8_t *)buffer_in, count_in) <= 0)
(uint8_t *)buffer_in, count_in) <= 0); continue;
count_in = 0; count_in = 0;
} }
} }
@ -56,27 +56,23 @@ void gdb_usb_out_cb(usbd_device *dev, uint8_t ep)
static uint8_t buf[CDCACM_PACKET_SIZE]; static uint8_t buf[CDCACM_PACKET_SIZE];
usbd_ep_nak_set(dev, CDCACM_GDB_ENDPOINT, 1); usbd_ep_nak_set(dev, CDCACM_GDB_ENDPOINT, 1);
uint32_t count = usbd_ep_read_packet(dev, CDCACM_GDB_ENDPOINT, uint32_t count = usbd_ep_read_packet(dev, CDCACM_GDB_ENDPOINT, (uint8_t *)buf, CDCACM_PACKET_SIZE);
(uint8_t *)buf, CDCACM_PACKET_SIZE);
for (uint32_t idx = 0; idx < count; idx++)
uint32_t idx;
for (idx=0; idx<count; idx++) {
buffer_out[head_out++ % sizeof(buffer_out)] = buf[idx]; buffer_out[head_out++ % sizeof(buffer_out)] = buf[idx];
}
usbd_ep_nak_set(dev, CDCACM_GDB_ENDPOINT, 0); usbd_ep_nak_set(dev, CDCACM_GDB_ENDPOINT, 0);
} }
unsigned char gdb_if_getchar(void) unsigned char gdb_if_getchar(void)
{ {
while (tail_out == head_out) { while (tail_out == head_out) {
/* Detach if port closed */ /* Detach if port closed */
if (!gdb_uart_get_dtr()) if (!gdb_uart_get_dtr())
return 0x04; return 0x04;
while(usb_get_config() != 1); while (usb_get_config() != 1)
continue;
} }
return buffer_out[tail_out++ % sizeof(buffer_out)]; return buffer_out[tail_out++ % sizeof(buffer_out)];
@ -87,12 +83,14 @@ unsigned char gdb_if_getchar_to(int timeout)
platform_timeout t; platform_timeout t;
platform_timeout_set(&t, timeout); platform_timeout_set(&t, timeout);
if(head_out == tail_out) do { if (head_out == tail_out)
do {
/* Detach if port closed */ /* Detach if port closed */
if (!gdb_uart_get_dtr()) if (!gdb_uart_get_dtr())
return 0x04; return 0x04;
while(usb_get_config() != 1); while (usb_get_config() != 1)
continue;
} while (!platform_timeout_is_expired(&t) && head_out == tail_out); } while (!platform_timeout_is_expired(&t) && head_out == tail_out);
if (head_out != tail_out) if (head_out != tail_out)