]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/appmain.c
Add obj/.dummy for clients that don't track empty dirs
[proxmark3-svn] / armsrc / appmain.c
index f69bdccc16dee5aa9277f1580a48847bb32cef19..b517fa6cd36c5fe401d02371bf4018cf2ff03fe1 100644 (file)
@@ -6,7 +6,6 @@
 //-----------------------------------------------------------------------------\r
 \r
 #include <proxmark3.h>\r
-#include <stdlib.h>\r
 #include "apps.h"\r
 #include "legicrf.h"\r
 #ifdef WITH_LCD\r
@@ -20,6 +19,9 @@
 #define va_end __builtin_va_end\r
 int kvsprintf(char const *fmt, void *arg, int radix, va_list ap);\r
        \r
+\r
+#define abs(x) ( ((x)<0) ? -(x) : (x) )\r
+\r
 //=============================================================================\r
 // A buffer where we can queue things up to be sent through the FPGA, for\r
 // any purpose (fake tag, as reader, whatever). We go MSB first, since that\r
@@ -569,12 +571,12 @@ void UsbPacketReceived(BYTE *packet, int len)
 {\r
        UsbCommand *c = (UsbCommand *)packet;\r
        UsbCommand ack;\r
+       ack.cmd = CMD_ACK;\r
 \r
        switch(c->cmd) {\r
 #ifdef WITH_LF\r
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:\r
                        AcquireRawAdcSamples125k(c->arg[0]);\r
-                       ack.cmd = CMD_ACK;\r
                        UsbSendPacket((BYTE*)&ack, sizeof(ack));\r
                        break;\r
 #endif\r
@@ -602,8 +604,8 @@ void UsbPacketReceived(BYTE *packet, int len)
 #endif\r
 \r
                case CMD_READER_LEGIC_RF:\r
-                       LegicRfReader();\r
-                       break;\r
+                       LegicRfReader(c->arg[0], c->arg[1]);\r
+                       break;
 \r
 #ifdef WITH_ISO15693\r
                case CMD_SIMTAG_ISO_15693:\r
@@ -725,7 +727,6 @@ void UsbPacketReceived(BYTE *packet, int len)
                        BYTE *b = (BYTE *)BigBuf;\r
                        memcpy(b+c->arg[0], c->d.asBytes, 48);\r
                        //Dbprintf("copied 48 bytes to %i",b+c->arg[0]);\r
-                       ack.cmd = CMD_ACK;\r
                        UsbSendPacket((BYTE*)&ack, sizeof(ack));\r
                        break;\r
                }\r
Impressum, Datenschutz