Merge branch 'master' into fix_hfmfsim

[proxmark3-svn] / client / proxmark3.h

diff --git a/client/proxmark3.h b/client/proxmark3.h
index 11b8aabdfe627a678e09ae7ae7b5500beb906433..c6185c436457807c1adf4e9c08a8a9f2748d623b 100644 (file)
--- a/client/proxmark3.h
+++ b/client/proxmark3.h
@@ -13,7 +13,6 @@
 #define PROXMARK3_H__
 
 #include "usb_cmd.h"
 #define PROXMARK3_H__
 
 #include "usb_cmd.h"

-#include "uart.h"

 
 #define PROXPROMPT "proxmark3> "
 
 
 #define PROXPROMPT "proxmark3> "
 


@@ -24,7 +23,7 @@ extern "C" {
 void SendCommand(UsbCommand *c);
 const char *get_my_executable_path(void);
 const char *get_my_executable_directory(void);
 void SendCommand(UsbCommand *c);
 const char *get_my_executable_path(void);
 const char *get_my_executable_directory(void);

-void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present, serial_port* sp);
+void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present);

 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus
 }