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

CHG: appmain now calls cmd_recieve as it should

Browse source 
CHG: flasher -  removed unneeded parameter to function
CHG: flasher - increased limit to fpga-files that can be loaded
FIX: main client,  wrong windows define fixed.
CHG: device side - recieve usb command does not always get 544 bytes.  usb packages can be incomplete.
CHG: usb_cdc.c also got piwi's changes.
CHG: uart_posix.c removed a debug value
CHG: uart_win32.c clean up.
This commit is contained in:
iceman1001 2017-10-17 20:58:17 +02:00
commit 16028f7d33
9 changed files with 279 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uart/uart_posix.c
View file

@ -224,7 +224,7 @@ bool uart_send(const serial_port sp, const byte_t* pbtTx, const size_t szTxLen)
// Write time-out
if (res == 0) {
printf("UART:: write time-out (%d)\n", res);
printf("UART:: write time-out\n");
return false;
}

11
uart/uart_win32.c
View file

@ -75,7 +75,8 @@ serial_port uart_open(const char* pcPortName) {
return INVALID_SERIAL_PORT;
}
// Prepare the device control
// Prepare the device control
// doesn't matter since PM3 device ignors this CDC command: set_line_coding in usb_cdc.c
memset(&sp->dcb, 0, sizeof(DCB));
sp->dcb.DCBlength = sizeof(DCB);
if (!BuildCommDCBA("baud=115200 parity=N data=8 stop=1",&sp->dcb)) {
@ -124,14 +125,6 @@ bool uart_receive(const serial_port sp, byte_t* p_rx, size_t pszMaxRxLen, size_t
bool uart_send(const serial_port sp, const byte_t* p_tx, const size_t len) {
DWORD txlen = 0;
return WriteFile(((serial_port_windows*)sp)->hPort, p_tx, len, &txlen, NULL);
/*
bool res = WriteFile(((serial_port_windows*)sp)->hPort, p_tx, len, &txlen, NULL);
if ( !res )
return false;
printf("TX %u\n", txlen);
return (txlen != 0);
*/
}
bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed) {