]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
USB comms: part 3 towards @micolous PR#463
authorpwpiwi <pwpiwi@users.noreply.github.com>
Sat, 28 Apr 2018 08:09:16 +0000 (10:09 +0200)
committerGitHub <noreply@github.com>
Sat, 28 Apr 2018 08:09:16 +0000 (10:09 +0200)
* change variable 'sp' from global to static
* move code to open and close USB port to comms.c (OpenProxmark() and CloseProxmark())
* change scope of USBCommandReceived() to static
* (flasher still unchanged)

client/comms.c
client/comms.h
client/proxmark3.c

index 2dd5534ce7ed53e4c608292d94cef90d4f0aa261..97d58ef97a0abce055ac1af6a5a0fa7cfb71a305 100644 (file)
@@ -21,7 +21,7 @@
 // Declare globals.
 
 // Serial port that we are communicating with the PM3 on.
-serial_port sp;
+static serial_port sp;
 
 // If TRUE, then there is no active connection to the PM3, and we will drop commands sent.
 static bool offline;
@@ -58,6 +58,38 @@ bool IsOffline() {
        return offline;
 }
 
+bool OpenProxmark(char *portname, bool waitCOMPort, int timeout) {
+       if (!waitCOMPort) {
+               sp = uart_open(portname);
+       } else {
+               printf("Waiting for Proxmark to appear on %s ", portname);
+               fflush(stdout);
+               int openCount = 0;
+               do {
+                       sp = uart_open(portname);
+                       msleep(1000);
+                       printf(".");
+                       fflush(stdout);
+               } while(++openCount < timeout && (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT));
+               printf("\n");
+       }
+
+       // check result of uart opening
+       if (sp == INVALID_SERIAL_PORT) {
+               printf("ERROR: invalid serial port\n");
+               return false;
+       } else if (sp == CLAIMED_SERIAL_PORT) {
+               printf("ERROR: serial port is claimed by another process\n");
+               return false;
+       } else {
+               return true;
+       }
+}
+
+void CloseProxmark(void) {
+       uart_close(sp);
+}
+
 void SendCommand(UsbCommand *c) {
        #ifdef COMMS_DEBUG
        printf("Sending %04x cmd\n", c->cmd);
@@ -73,6 +105,7 @@ void SendCommand(UsbCommand *c) {
        Not good.../holiman
        **/
        while(txcmd_pending);
+
        txcmd = *c;
        txcmd_pending = true;
 }
@@ -140,11 +173,7 @@ int getCommand(UsbCommand* response)
 }
 
 
-//-----------------------------------------------------------------------------
-// Entry point into our code: called whenever we received a packet over USB
-// that we weren't necessarily expecting, for example a debug print.
-//-----------------------------------------------------------------------------
-void UsbCommandReceived(UsbCommand *UC)
+static void UsbCommandReceived(UsbCommand *UC)
 {
        switch(UC->cmd) {
                // First check if we are handling a debug message
@@ -170,7 +199,7 @@ void UsbCommandReceived(UsbCommand *UC)
                } break;
 
                default:
-                       storeCommand(UC);
+                       storeCommand(UC);
                        break;
        }
 
@@ -184,12 +213,12 @@ __attribute__((force_align_arg_pointer))
 #endif
 #endif
 *uart_receiver(void *targ) {
-       receiver_arg *arg = (receiver_arg*)targ;
+       receiver_arg *conn = (receiver_arg*)targ;
        size_t rxlen;
        uint8_t rx[sizeof(UsbCommand)];
        uint8_t *prx = rx;
 
-       while (arg->run) {
+       while (conn->run) {
                rxlen = 0;
                if (uart_receive(sp, prx, sizeof(UsbCommand) - (prx-rx), &rxlen) && rxlen) {
                        prx += rxlen;
index 51a1467dc883db8e0e5ca2708071813fd131d848..616f7ddbdddf15e1eb2d5f2740cf9f33a6cbd22a 100644 (file)
@@ -31,19 +31,18 @@ typedef struct {
 } receiver_arg;
 
 
-// Wrappers required as static variables can only be used in one file.
 void SetOffline(bool new_offline);
 bool IsOffline();
 
+bool OpenProxmark(char *portname, bool waitCOMPort, int timeout);
+void CloseProxmark(void);
+
 void SendCommand(UsbCommand *c);
 
 void *uart_receiver(void *targ);
-void UsbCommandReceived(UsbCommand *UC);
 void clearCommandBuffer();
 bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning);
 bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout);
 bool WaitForResponse(uint32_t cmd, UsbCommand* response);
 
-extern serial_port sp;
-
 #endif // COMMS_H_
index 6587bcff6508a1fe6ff05d568a3cead7d22f6557..88cb5fa76db22a705172e9318fa566f9205b9a15 100644 (file)
@@ -21,7 +21,6 @@
 #include "util_posix.h"
 #include "proxgui.h"
 #include "cmdmain.h"
-#include "uart.h"
 #include "ui.h"
 #include "util.h"
 #include "cmdparser.h"
@@ -137,7 +136,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
        }
 
        write_history(".history");
-  
+
        if (usb_present) {
                conn.run = false;
                pthread_join(reader_thread, NULL);
@@ -293,33 +292,9 @@ int main(int argc, char* argv[]) {
        
        // set global variables
        set_my_executable_path();
-       
-       // open uart
-       if (!waitCOMPort) {
-               sp = uart_open(argv[1]);
-       } else {
-               printf("Waiting for Proxmark to appear on %s ", argv[1]);
-               fflush(stdout);
-               int openCount = 0;
-               do {
-                       sp = uart_open(argv[1]);
-                       msleep(1000);
-                       printf(".");
-                       fflush(stdout);
-               } while(++openCount < 20 && (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT));
-               printf("\n");
-       }
 
-       // check result of uart opening
-       if (sp == INVALID_SERIAL_PORT) {
-               printf("ERROR: invalid serial port\n");
-               usb_present = false;
-       } else if (sp == CLAIMED_SERIAL_PORT) {
-               printf("ERROR: serial port is claimed by another process\n");
-               usb_present = false;
-       } else {
-               usb_present = true;
-       }
+       // try to open USB connection to Proxmark
+       usb_present = OpenProxmark(argv[1], waitCOMPort, 20);
 
 #ifdef HAVE_GUI
 #ifdef _WIN32
@@ -344,7 +319,7 @@ int main(int argc, char* argv[]) {
 
        // Clean up the port
        if (usb_present) {
-               uart_close(sp);
+               CloseProxmark();
        }
 
        exit(0);
Impressum, Datenschutz