Minor bug fixes with help from Holiman.

[proxmark3-svn] / armsrc / iso15693.c

diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index ed7beb6fb95ab029321bb7fcb0c514f8f5e9c851..d8bec898dece7872be78157a3ea009cf6310be7b 100644 (file)
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -58,12 +58,14 @@
 // *) document all the functions
 
 
 // *) document all the functions
 
 

-#include "proxmark3.h"
+#include "../include/proxmark3.h"

 #include "util.h"
 #include "apps.h"
 #include "string.h"
 #include "util.h"
 #include "apps.h"
 #include "string.h"

-#include "iso15693tools.h"
-#include "cmd.h"
+#include "../common/iso15693tools.h"
+#include "../common/cmd.h"
+#include "crapto1.h"
+#include "mifareutil.h"

 
 #define arraylen(x) (sizeof(x)/sizeof((x)[0]))
 
 
 #define arraylen(x) (sizeof(x)/sizeof((x)[0]))
 


@@ -600,10 +602,10 @@ static void BuildIdentifyRequest(void);
 //-----------------------------------------------------------------------------
 void AcquireRawAdcSamplesIso15693(void)
 {
 //-----------------------------------------------------------------------------
 void AcquireRawAdcSamplesIso15693(void)
 {

+       uint8_t *dest =  mifare_get_bigbufptr();
+

        int c = 0;
        int c = 0;

-       uint8_t *dest = (uint8_t *)BigBuf;

        int getNext = 0;
        int getNext = 0;

-

        int8_t prev = 0;
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        int8_t prev = 0;
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);


@@ -682,10 +684,10 @@ void AcquireRawAdcSamplesIso15693(void)
 
 void RecordRawAdcSamplesIso15693(void)
 {
 
 void RecordRawAdcSamplesIso15693(void)
 {

+       uint8_t *dest =  mifare_get_bigbufptr();
+

        int c = 0;
        int c = 0;

-       uint8_t *dest = (uint8_t *)BigBuf;

        int getNext = 0;
        int getNext = 0;

-

        int8_t prev = 0;
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        int8_t prev = 0;
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);


@@ -693,8 +695,8 @@ void RecordRawAdcSamplesIso15693(void)
        FpgaSetupSsc();
 
        // Start from off (no field generated)
        FpgaSetupSsc();
 
        // Start from off (no field generated)

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-       SpinDelay(200);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       SpinDelay(200);

 
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
 
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 


@@ -1275,12 +1277,8 @@ void DirectTag15693Command(uint32_t datalen,uint32_t speed, uint32_t recv, uint8
        recvlen=SendDataTag(data,datalen,1,speed,(recv?&recvbuf:NULL));
 
        if (recv) { 
        recvlen=SendDataTag(data,datalen,1,speed,(recv?&recvbuf:NULL));
 
        if (recv) { 

-//             n.cmd=/* CMD_ISO_15693_COMMAND_DONE */ CMD_ACK;
-//             n.arg[0]=recvlen>48?48:recvlen;
-//             memcpy(n.d.asBytes, recvbuf, 48);

                LED_B_ON();
     cmd_send(CMD_ACK,recvlen>48?48:recvlen,0,0,recvbuf,48);
                LED_B_ON();
     cmd_send(CMD_ACK,recvlen>48?48:recvlen,0,0,recvbuf,48);

-//             UsbSendPacket((uint8_t *)&n, sizeof(n));

                LED_B_OFF();    
                
                if (DEBUG) {
                LED_B_OFF();    
                
                if (DEBUG) {