BOOTROM CHANGE: Add jump to interrupt handler from Advanced Interrupt Controller.

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index c2ea9f7d9bbc62001aeb9d2a5750fb683eddfb87..dcbef11375b8e60c790903f98a6286349076d830 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1,13 +1,22 @@
 //-----------------------------------------------------------------------------
-// The main application code. This is the first thing called after start.c
-// executes.
 // Jonathan Westhues, Mar 2006
 // Edits by Gerhard de Koning Gans, Sep 2007 (##)
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// The main application code. This is the first thing called after start.c
+// executes.
 //-----------------------------------------------------------------------------
 
 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
+#include "printf.h"
+#include "string.h"
+
+#include <stdarg.h>
 
 #include "legicrf.h"
 
@@ -16,13 +25,6 @@
 # include "LCD.h"
 #endif
 
-#define va_list __builtin_va_list
-#define va_start __builtin_va_start
-#define va_arg __builtin_va_arg
-#define va_end __builtin_va_end
-int kvsprintf(char const *fmt, void *arg, int radix, va_list ap);
-
-
 #define abs(x) ( ((x)<0) ? -(x) : (x) )
 
 //=============================================================================
@@ -606,6 +608,14 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        break;
 #endif
 
+        case CMD_SIMULATE_TAG_LEGIC_RF:
+            LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]);
+            break;
+
+        case CMD_WRITER_LEGIC_RF:
+            LegicRfWriter(c->arg[1], c->arg[0]);
+            break;
+
                case CMD_READER_LEGIC_RF:
                        LegicRfReader(c->arg[0], c->arg[1]);
                        break;
@@ -633,7 +643,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 
 #ifdef WITH_ISO14443a
                case CMD_READER_ISO_14443a:
-                       ReaderIso14443a(c->arg[0]);
+                       ReaderIso14443a(c, &ack);
                        break;
 #endif
 
@@ -722,7 +732,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        }
                        n.arg[0] = c->arg[0];
                        memcpy(n.d.asDwords, BigBuf+c->arg[0], 12*sizeof(uint32_t));
+                       LED_B_ON();
                        UsbSendPacket((uint8_t *)&n, sizeof(n));
+                       LED_B_OFF();
                        break;
                }