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

chg: preparing for iso7816 module statuses

Browse source
This commit is contained in:
iceman1001 2018-04-03 11:45:20 +02:00
commit 3f5aab8f05
4 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
armsrc/appmain.c
View file

@ -364,6 +364,7 @@ void SendStatus(void) {
BigBuf_print_status(); BigBuf_print_status();
Fpga_print_status(); Fpga_print_status();
Flashmem_print_status(); Flashmem_print_status();
//Iso7816_print_status();
printConfig(); //LF Sampling config printConfig(); //LF Sampling config
printUSBSpeed(); printUSBSpeed();
Dbprintf("Various"); Dbprintf("Various");

3
armsrc/iso14443a.c
View file

@ -782,7 +782,7 @@ bool prepare_tag_modulation(tag_response_info_t* response_info, size_t max_buffe
if (ToSendMax > max_buffer_size) { if (ToSendMax > max_buffer_size) {
Dbprintf("Out of memory, when modulating bits for tag answer:"); Dbprintf("Out of memory, when modulating bits for tag answer:");
Dbhexdump(response_info->response_n,response_info->response,false); Dbhexdump(response_info->response_n,response_info->response,false);
return false; return false;
} }
// Copy the byte array, used for this modulation to the buffer position // Copy the byte array, used for this modulation to the buffer position
@ -3045,6 +3045,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
// find reader field // find reader field
if (cardSTATE == MFEMUL_NOFIELD) { if (cardSTATE == MFEMUL_NOFIELD) {
vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10; vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
if (vHf > MF_MINFIELDV) { if (vHf > MF_MINFIELDV) {
cardSTATE_TO_IDLE(); cardSTATE_TO_IDLE();

13
armsrc/iso7816.c
View file

@ -121,7 +121,6 @@ bool ISO7816_init(void) {
StartTicks(); StartTicks();
// StopTicks(); // StopTicks();
// return false; // return false;
@ -134,4 +133,16 @@ void ISO7816_test(void) {
if (!ISO7816_init()) return; if (!ISO7816_init()) return;
ISO7816_stop(); ISO7816_stop();
}
void Iso7816_print_status(void) {
DbpString("Contact module (iso7816)");
if (!ISO7816_init()) {
DbpString(" init....................FAIL");
return;
}
DbpString(" init....................OK");
ISO7816_stop();
} }

7
armsrc/iso7816.h
View file

@ -5,10 +5,7 @@
#include "apps.h" #include "apps.h"
#include "ticks.h" #include "ticks.h"
// Used Command #define ISO_CLK 75000000 //Hex equivalent of 75MHz
#define ID 0x90
#define SPI_CLK 75000000 //Hex equivalent of 75MHz
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
extern void Dbprintf(const char *fmt, ...); extern void Dbprintf(const char *fmt, ...);
@ -19,5 +16,5 @@ bool ISO7816_waitidle(void);
uint16_t ISO7816_sendbyte(uint32_t data); uint16_t ISO7816_sendbyte(uint32_t data);
bool ISO7816_init(); bool ISO7816_init();
void ISO7816_test(void); void ISO7816_test(void);
void Iso7816_print_status(void);
#endif #endif