github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 21:33:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chg: use dynamic arrays.

Browse source
This commit is contained in:
iceman1001 2019-05-07 09:37:43 +02:00
commit 86aa593b1b
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
armsrc/appmain.c
View file

@ -422,11 +422,6 @@ void SendStatus(void) {
DbpString(_BLUE_("Installed StandAlone Mode")); DbpString(_BLUE_("Installed StandAlone Mode"));
ModInfo(); ModInfo();
//DbpString("Running ");
//Dbprintf(" Is Device attached to USB| %s", USB_ATTACHED() ? "Yes" : "No");
//Dbprintf(" Is Device attached to FPC| %s", send_using_0 ? "Yes" : "No");
//Dbprintf(" Is USB_reconnect value | %d", GetUSBreconnect() );
//Dbprintf(" Is USB_configured value | %d", GetUSBconfigured() );
reply_old(CMD_ACK, 1, 0, 0, 0, 0); reply_old(CMD_ACK, 1, 0, 0, 0, 0);
} }
@ -1187,22 +1182,29 @@ static void PacketReceived(PacketCommandNG *packet) {
#ifdef WITH_FPC_USART_DEV #ifdef WITH_FPC_USART_DEV
case CMD_USART_TX: { case CMD_USART_TX: {
LED_B_ON();
usart_writebuffer_sync(packet->data.asBytes, packet->length); usart_writebuffer_sync(packet->data.asBytes, packet->length);
reply_ng(CMD_USART_TX, PM3_SUCCESS, NULL, 0); reply_ng(CMD_USART_TX, PM3_SUCCESS, NULL, 0);
LED_B_OFF();
break; break;
} }
case CMD_USART_RX: { case CMD_USART_RX: {
uint8_t dest[USART_FIFOLEN] = {'\0'}; LED_B_ON();
uint8_t *dest = BigBuf_malloc(USART_FIFOLEN);
uint16_t available = usart_rxdata_available(); uint16_t available = usart_rxdata_available();
if (available > 0) { if (available > 0) {
uint16_t len = usart_read_ng(dest, available); uint16_t len = usart_read_ng(dest, available);
reply_ng(CMD_USART_RX, PM3_SUCCESS, dest, len); reply_ng(CMD_USART_RX, PM3_SUCCESS, dest, len);
} else { } else {
reply_ng(CMD_USART_RX, PM3_ENODATA, NULL, 0); reply_ng(CMD_USART_RX, PM3_ENODATA, NULL, 0);
} }
BigBuf_free();
LED_B_OFF();
break; break;
} }
case CMD_USART_TXRX: { case CMD_USART_TXRX: {
LED_B_ON();
struct p { struct p {
uint32_t waittime; uint32_t waittime;
uint8_t data[PM3_CMD_DATA_SIZE - sizeof(uint32_t)]; uint8_t data[PM3_CMD_DATA_SIZE - sizeof(uint32_t)];
@ -1211,7 +1213,9 @@ static void PacketReceived(PacketCommandNG *packet) {
usart_writebuffer_sync(payload->data, packet->length - sizeof(payload->waittime)); usart_writebuffer_sync(payload->data, packet->length - sizeof(payload->waittime));
uint16_t available; uint16_t available;
WaitMS(payload->waittime); WaitMS(payload->waittime);
uint8_t dest[USART_FIFOLEN] = {'\0'};
uint8_t *dest = BigBuf_malloc(USART_FIFOLEN);
available = usart_rxdata_available(); available = usart_rxdata_available();
// Dbprintf("avail (%u)", available); // Dbprintf("avail (%u)", available);
if (available > 0) { if (available > 0) {
@ -1220,6 +1224,8 @@ static void PacketReceived(PacketCommandNG *packet) {
} else { } else {
reply_ng(CMD_USART_TXRX, PM3_ENODATA, NULL, 0); reply_ng(CMD_USART_TXRX, PM3_ENODATA, NULL, 0);
} }
BigBuf_free();
LED_B_OFF();
break; break;
} }
#endif #endif