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

replace usb_poll_validate_length() by data_available() that supports USART too

Browse source
This commit is contained in:
Philippe Teuwen 2019-06-03 00:01:08 +02:00
commit 3b12ba2e93
21 changed files with 50 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

14
armsrc/lfops.c
View file

@ -607,7 +607,7 @@ void SimulateTagLowFrequencyEx(int period, int gap, bool ledcontrol, int numcycl
while (!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)) {
WDT_HIT();
if ( check == 1000) {
if (usb_poll_validate_length() || BUTTON_PRESS())
if (data_available() || BUTTON_PRESS())
goto OUT;
check = 0;
}
@ -627,7 +627,7 @@ void SimulateTagLowFrequencyEx(int period, int gap, bool ledcontrol, int numcycl
while (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK) {
WDT_HIT();
if (check == 1000) {
if (usb_poll_validate_length() || BUTTON_PRESS())
if (data_available() || BUTTON_PRESS())
goto OUT;
check = 0;
}
@ -1011,7 +1011,7 @@ void CmdHIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
//clear read buffer
BigBuf_Clear_keep_EM();
while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
while (!BUTTON_PRESS() && !data_available()) {
WDT_HIT();
if (ledcontrol) LED_A_ON();
@ -1105,7 +1105,7 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
LFSetupFPGAForADC(95, true);
while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
while (!BUTTON_PRESS() && !data_available()) {
WDT_HIT();
if (ledcontrol) LED_A_ON();
@ -1197,7 +1197,7 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
LFSetupFPGAForADC(95, true);
while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
while (!BUTTON_PRESS() && !data_available()) {
WDT_HIT();
if (ledcontrol) LED_A_ON();
@ -1263,7 +1263,7 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
// Configure to go in 125Khz listen mode
LFSetupFPGAForADC(95, true);
while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
while (!BUTTON_PRESS() && !data_available()) {
WDT_HIT();
if (ledcontrol) LED_A_ON();
@ -1603,7 +1603,7 @@ void T55xx_ChkPwds() {
uint32_t pwd = 0, curr = 0, prev = 0;
for (uint16_t i = 0; i < pwdCount; ++i) {
if (BUTTON_PRESS() && !usb_poll_validate_length()) {
if (BUTTON_PRESS() && !data_available()) {
goto OUT;
}