mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-03-19 11:33:51 +08:00
mix in proxmark code..
This commit is contained in:
commit
248135682c
2 changed files with 2 additions and 10 deletions
|
@ -1373,8 +1373,6 @@ void T55xxResetRead(void) {
|
||||||
//clear buffer now so it does not interfere with timing later
|
//clear buffer now so it does not interfere with timing later
|
||||||
BigBuf_Clear_keep_EM();
|
BigBuf_Clear_keep_EM();
|
||||||
|
|
||||||
StartTicks();
|
|
||||||
|
|
||||||
// Set up FPGA, 125kHz
|
// Set up FPGA, 125kHz
|
||||||
LFSetupFPGAForADC(95, true);
|
LFSetupFPGAForADC(95, true);
|
||||||
// make sure tag is fully powered up...
|
// make sure tag is fully powered up...
|
||||||
|
@ -1407,8 +1405,6 @@ void T55xxWriteBlockExt(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg)
|
||||||
bool testMode = arg & 0x4;
|
bool testMode = arg & 0x4;
|
||||||
uint32_t i = 0;
|
uint32_t i = 0;
|
||||||
|
|
||||||
StartTicks();
|
|
||||||
|
|
||||||
// Set up FPGA, 125kHz
|
// Set up FPGA, 125kHz
|
||||||
LFSetupFPGAForADC(95, true);
|
LFSetupFPGAForADC(95, true);
|
||||||
|
|
||||||
|
@ -1482,7 +1478,7 @@ void T55xxWriteBlock(uint32_t Data, uint8_t Block, uint32_t Pwd, uint8_t arg) {
|
||||||
// Read one card block in page [page]
|
// Read one card block in page [page]
|
||||||
void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
|
void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
|
||||||
LED_A_ON();
|
LED_A_ON();
|
||||||
bool PwdMode = arg0 & 0x1;
|
bool PwdMode = arg0 & 0x1;
|
||||||
uint8_t Page = (arg0 & 0x2) >> 1;
|
uint8_t Page = (arg0 & 0x2) >> 1;
|
||||||
bool brute_mem = arg0 & 0x4;
|
bool brute_mem = arg0 & 0x4;
|
||||||
|
|
||||||
|
@ -1504,8 +1500,6 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
|
||||||
//make sure block is at max 7
|
//make sure block is at max 7
|
||||||
Block &= 0x7;
|
Block &= 0x7;
|
||||||
|
|
||||||
StartTicks();
|
|
||||||
|
|
||||||
// Set up FPGA, 125kHz to power up the tag
|
// Set up FPGA, 125kHz to power up the tag
|
||||||
LFSetupFPGAForADC(95, true);
|
LFSetupFPGAForADC(95, true);
|
||||||
// make sure tag is fully powered up...
|
// make sure tag is fully powered up...
|
||||||
|
@ -1649,8 +1643,6 @@ void T55xxWakeUp(uint32_t Pwd) {
|
||||||
LED_B_ON();
|
LED_B_ON();
|
||||||
uint32_t i = 0;
|
uint32_t i = 0;
|
||||||
|
|
||||||
StartTicks();
|
|
||||||
|
|
||||||
// Set up FPGA, 125kHz
|
// Set up FPGA, 125kHz
|
||||||
LFSetupFPGAForADC(95, true);
|
LFSetupFPGAForADC(95, true);
|
||||||
// make sure tag is fully powered up...
|
// make sure tag is fully powered up...
|
||||||
|
|
|
@ -344,7 +344,7 @@ int CmdLFHitagSim(const char *Cmd) {
|
||||||
}
|
}
|
||||||
|
|
||||||
static void printHitagConfiguration(uint8_t config) {
|
static void printHitagConfiguration(uint8_t config) {
|
||||||
char msg[90];
|
char msg[100];
|
||||||
memset(msg, 0, sizeof(msg));
|
memset(msg, 0, sizeof(msg));
|
||||||
// encoding
|
// encoding
|
||||||
if (config & 0x1) {
|
if (config & 0x1) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue