]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
CHG: for the 2k3des changes
authoriceman1001 <iceman@iuse.se>
Mon, 4 May 2015 22:34:20 +0000 (00:34 +0200)
committericeman1001 <iceman@iuse.se>
Mon, 4 May 2015 22:34:20 +0000 (00:34 +0200)
armsrc/appmain.c
armsrc/apps.h

index 9ef70b9765ee6fed6f388659e0741b24e07e9a83..9490a8115894d53ffe17872798e69d3488106f6e 100644 (file)
@@ -691,8 +691,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
                        break;
                case CMD_SIMULATE_TAG_125K:
-                       SimulateTagLowFrequency(c->arg[0], c->arg[1], 0);
-                       //SimulateTagLowFrequencyA(c->arg[0], c->arg[1]);
+                       LED_A_ON();
+                       SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
+                       LED_A_OFF();
                        break;
                case CMD_LF_SIMULATE_BIDIR:
                        SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
@@ -834,10 +835,8 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        MifareUC_Auth2(c->arg[0],c->d.asBytes);
                        break;
                case CMD_MIFAREU_READCARD:
-                       MifareUReadCard(c->arg[0], c->arg[1], c->d.asBytes);
-            break;
                case CMD_MIFAREUC_READCARD:
-                       MifareUReadCard(c->arg[0], c->arg[1], c->d.asBytes);
+                       MifareUReadCard(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;          
                case CMD_MIFAREUC_SETPWD: 
                        MifareUSetPwd(c->arg[0], c->d.asBytes);
index 81203001c1af698ecb384cb2d722ec4e5f71f2a6..fba6fefacb2ce2af7554ab61802206a32fd5628c 100644 (file)
@@ -124,9 +124,7 @@ void ReadTItag(void);
 void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc);
 void AcquireTiType(void);
 void AcquireRawBitsTI(void);
-void SimulateTagLowFrequency( uint16_t period, uint32_t gap, uint8_t ledcontrol);
-//void SimulateTagLowFrequencyA(int period, int gap);
-
+void SimulateTagLowFrequency(int period, int gap, int ledcontrol);
 void CmdHIDsimTAG(int hi, int lo, int ledcontrol);
 void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);
 void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream);
@@ -179,7 +177,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *data);
 void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain);
 void MifareUC_Auth1(uint8_t arg0, uint8_t *datain);
 void MifareUC_Auth2(uint32_t arg0, uint8_t *datain);
-void MifareUReadCard(uint8_t arg0, int Pages, uint8_t *datain);
+void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain);
 void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
 void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
 void MifareUWriteBlock(uint8_t arg0,uint8_t *datain);
Impressum, Datenschutz