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

add putpacket2 to send two sub messages merged as one

This commit is contained in:
mean 2022-03-19 10:27:15 +01:00 committed by Rachel Mant
parent 48c6db1963
commit 82c41cb739
2 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/gdb_packet.c
View File

@ -138,6 +138,49 @@ int gdb_getpacket(char *packet, int size)
return i; return i;
} }
static void gdb_next_char(char c, unsigned char *csum)
{
#if PC_HOSTED == 1
if ((c >= 32) && (c < 127))
DEBUG_GDB_WIRE("%c", c);
else
DEBUG_GDB_WIRE("\\x%02X", c);
#endif
if((c == '$') || (c == '#') || (c == '}') || (c == '*')) {
gdb_if_putchar('}', 0);
gdb_if_putchar(c ^ 0x20, 0);
*csum += '}' + (c ^ 0x20);
} else {
gdb_if_putchar(c, 0);
*csum += c;
}
}
void gdb_putpacket2(const char *packet1, int size1,const char *packet2, int size2)
{
int i;
unsigned char csum;
unsigned char c;
char xmit_csum[3];
int tries = 0;
do {
DEBUG_GDB_WIRE("%s : ", __func__);
csum = 0;
gdb_if_putchar('$', 0);
for(i = 0; i < size1; i++)
gdb_next_char( packet1[i],&csum);
for(i = 0; i < size2; i++)
gdb_next_char( packet2[i],&csum);
gdb_if_putchar('#', 0);
snprintf(xmit_csum, sizeof(xmit_csum), "%02X", csum);
gdb_if_putchar(xmit_csum[0], 0);
gdb_if_putchar(xmit_csum[1], 1);
DEBUG_GDB_WIRE("\n");
} while((gdb_if_getchar_to(2000) != '+') && (tries++ < 3));
}
void gdb_putpacket(const char *packet, int size) void gdb_putpacket(const char *packet, int size)
{ {
int i; int i;
@ -150,23 +193,8 @@ void gdb_putpacket(const char *packet, int size)
DEBUG_GDB_WIRE("%s : ", __func__); DEBUG_GDB_WIRE("%s : ", __func__);
csum = 0; csum = 0;
gdb_if_putchar('$', 0); gdb_if_putchar('$', 0);
for(i = 0; i < size; i++) { for(i = 0; i < size; i++)
c = packet[i]; gdb_next_char(packet[i],&csum);
#if PC_HOSTED == 1
if ((c >= 32) && (c < 127))
DEBUG_GDB_WIRE("%c", c);
else
DEBUG_GDB_WIRE("\\x%02X", c);
#endif
if((c == '$') || (c == '#') || (c == '}') || (c == '*')) {
gdb_if_putchar('}', 0);
gdb_if_putchar(c ^ 0x20, 0);
csum += '}' + (c ^ 0x20);
} else {
gdb_if_putchar(c, 0);
csum += c;
}
}
gdb_if_putchar('#', 0); gdb_if_putchar('#', 0);
snprintf(xmit_csum, sizeof(xmit_csum), "%02X", csum); snprintf(xmit_csum, sizeof(xmit_csum), "%02X", csum);
gdb_if_putchar(xmit_csum[0], 0); gdb_if_putchar(xmit_csum[0], 0);
@ -193,10 +221,10 @@ void gdb_out(const char *buf)
char *hexdata; char *hexdata;
int i; int i;
hexdata = alloca((i = strlen(buf)*2 + 1) + 1); int l=strlen(buf);
hexdata[0] = 'O'; hexdata = alloca(2*l+1);
hexify(hexdata+1, buf, strlen(buf)); hexify(hexdata, buf, l);
gdb_putpacket(hexdata, i); gdb_putpacket2("O",1,hexdata, 2*l);
} }
void gdb_voutf(const char *fmt, va_list ap) void gdb_voutf(const char *fmt, va_list ap)

2
src/platforms/swlink/platform.h
View File

@ -115,7 +115,7 @@ int usbuart_debug_write(const char *buf, size_t len);
#define USBUSART_DMA_CLK RCC_DMA1 #define USBUSART_DMA_CLK RCC_DMA1
#define USBUSART_DMA_TX_CHAN DMA_CHANNEL4 #define USBUSART_DMA_TX_CHAN DMA_CHANNEL4
#define USBUSART_DMA_TX_IRQ NVIC_DMA1_CHANNEL4_IRQ #define USBUSART_DMA_TX_IRQ NVIC_DMA1_CHANNEL4_IRQ
#define USBUSART_DMA_TX_ISR(x) dma1_channel4_isr(x) //#define USBUSART_DMA_TX_ISR(x) dma1_channel4_isr(x)
#define USBUSART_DMA_RX_CHAN DMA_CHANNEL5 #define USBUSART_DMA_RX_CHAN DMA_CHANNEL5
#define USBUSART_DMA_RX_IRQ NVIC_DMA1_CHANNEL5_IRQ #define USBUSART_DMA_RX_IRQ NVIC_DMA1_CHANNEL5_IRQ
#define USBUSART_DMA_RX_ISR(x) dma1_channel5_isr(x) #define USBUSART_DMA_RX_ISR(x) dma1_channel5_isr(x)