github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 21:03:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Comms refactor (prerequisite of libproxmark work) (#371)

Browse source 
* Refactor the comms code only from PR#346, without comms_globals.h.
* OSX: Add note for example serial port
This commit is contained in:
Michael Farrell 2017-10-27 06:54:27 +11:00 • committed by pwpiwi
commit afdcb8c159
19 changed files with 540 additions and 334 deletions
Download patch file Download diff file Expand all files Collapse all files

85
client/flasher.c
View file

@ -10,12 +10,15 @@
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include <pthread.h>
#include "proxmark3.h"
#include "util.h"
#include "util_posix.h"
#include "flash.h"
#include "uart.h"
#include "usb_cmd.h"
#include "comms.h"
#ifdef _WIN32
# define unlink(x)
@ -23,9 +26,6 @@
# include <unistd.h>
#endif
static serial_port sp;
static char* serial_port_name;
void cmd_debug(UsbCommand* UC) {
// Debug
printf("UsbCommand length[len=%zd]\n",sizeof(UsbCommand));
@ -40,45 +40,6 @@ void cmd_debug(UsbCommand* UC) {
printf("...\n");
}
void SendCommand(UsbCommand* txcmd) {
// printf("send: ");
// cmd_debug(txcmd);
if (!uart_send(sp,(byte_t*)txcmd,sizeof(UsbCommand))) {
printf("Sending bytes to proxmark failed\n");
exit(1);
}
}
void ReceiveCommand(UsbCommand* rxcmd) {
byte_t* prxcmd = (byte_t*)rxcmd;
byte_t* prx = prxcmd;
size_t rxlen;
while (true) {
if (uart_receive(sp, prx, sizeof(UsbCommand) - (prx-prxcmd), &rxlen)) {
prx += rxlen;
if ((prx-prxcmd) >= sizeof(UsbCommand)) {
return;
}
}
}
}
void CloseProxmark() {
// Clean up the port
uart_close(sp);
// Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/*
unlink(serial_port_name);
}
int OpenProxmark(size_t i) {
sp = uart_open(serial_port_name);
if (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT) {
//poll once a second
return 0;
}
return 1;
}
static void usage(char *argv0)
{
fprintf(stderr, "Usage: %s <port> [-b] image.elf [image.elf...]\n\n", argv0);
@ -86,9 +47,10 @@ static void usage(char *argv0)
//Is the example below really true? /Martin
fprintf(stderr, "Example:\n\n\t %s path/to/osimage.elf path/to/fpgaimage.elf\n", argv0);
fprintf(stderr, "\nExample (Linux):\n\n\t %s /dev/ttyACM0 armsrc/obj/fullimage.elf\n", argv0);
fprintf(stderr, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark to reappear on <DEVICE>',\n");
fprintf(stderr, " you need to blacklist proxmark for modem-manager - see wiki for more details:\n");
fprintf(stderr, " http://code.google.com/p/proxmark3/wiki/Linux\n\n");
fprintf(stderr, "\nNote (Linux): if the flasher gets stuck at 'Waiting for Proxmark to reappear',\n");
fprintf(stderr, " you may need to blacklist proxmark for modem-manager. v1.4.14 and later\n");
fprintf(stderr, " include this configuration patch already. The change can be found at:\n");
fprintf(stderr, " https://cgit.freedesktop.org/ModemManager/ModemManager/commit/?id=6e7ff47\n\n");
}
#define MAX_FILES 4
@ -99,7 +61,10 @@ int main(int argc, char **argv)
int num_files = 0;
int res;
flash_file_t files[MAX_FILES];
receiver_arg conn;
pthread_t reader_thread;
memset(&conn, 0, sizeof(receiver_arg));
memset(files, 0, sizeof(files));
if (argc < 3) {
@ -126,16 +91,22 @@ int main(int argc, char **argv)
}
}
serial_port_name = argv[1];
fprintf(stderr,"Waiting for Proxmark to appear on %s",serial_port_name);
do {
msleep(1000);
fprintf(stderr, ".");
} while (!OpenProxmark(0));
fprintf(stderr," Found.\n");
pthread_mutex_init(&conn.recv_lock, NULL);
res = flash_start_flashing(can_write_bl,serial_port_name);
char* serial_port_name = argv[1];
fprintf(stderr,"Waiting for Proxmark to appear on %s", serial_port_name);
do {
sleep(1);
fprintf(stderr, ".");
} while (!OpenProxmark(serial_port_name));
fprintf(stderr," Found.\n");
// Lets start up the communications thread
conn.run = true;
pthread_create(&reader_thread, NULL, &uart_receiver, &conn);
res = flash_start_flashing(&conn, can_write_bl, serial_port_name);
if (res < 0)
return -1;
@ -155,7 +126,11 @@ int main(int argc, char **argv)
if (res < 0)
return -1;
CloseProxmark();
// Stop the command thread.
conn.run = false;
pthread_join(reader_thread, NULL);
CloseProxmark(&conn, serial_port_name);
pthread_mutex_destroy(&conn.recv_lock);
fprintf(stderr, "All done.\n\n");
fprintf(stderr, "Have a nice day!\n");