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

Revert "Comms refactor (prerequisite of libproxmark work) (#371)" (#450)

Browse source 
This reverts commit afdcb8c159.
This commit is contained in:
pwpiwi 2017-10-27 09:56:46 +02:00 • committed by GitHub
parent afdcb8c159
commit 3851172d81
19 changed files with 334 additions and 540 deletions
Download patch file Download diff file Expand all files Collapse all files

77
client/flash.c
View file

@ -13,7 +13,6 @@
#include <stdlib.h>
#include <inttypes.h>
#include <unistd.h>
#include "proxmark3.h"
#include "util.h"
#include "util_posix.h"
@ -21,7 +20,11 @@
#include "elf.h"
#include "proxendian.h"
#include "usb_cmd.h"
#include "comms.h"
void SendCommand(UsbCommand* txcmd);
void ReceiveCommand(UsbCommand* rxcmd);
void CloseProxmark();
int OpenProxmark(size_t i);
// FIXME: what the fuckity fuck
unsigned int current_command = CMD_UNKNOWN;
@ -41,32 +44,6 @@ static const uint8_t elf_ident[] = {
EV_CURRENT
};
void CloseProxmark(receiver_arg* conn, char* serial_port_name) {
pthread_mutex_lock(&conn->recv_lock);
// Block the port from being used by anything
serial_port* my_port = GetSerialPort();
SetSerialPort(NULL);
// Then close the port.
uart_close(my_port);
pthread_mutex_unlock(&conn->recv_lock);
// Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/*
unlink(serial_port_name);
}
bool OpenProxmark(char* serial_port_name) {
serial_port *new_port = uart_open(serial_port_name);
if (new_port == INVALID_SERIAL_PORT || new_port == CLAIMED_SERIAL_PORT) {
//poll once a second
return false;
}
SetSerialPort(new_port);
return true;
}
// Turn PHDRs into flasher segments, checking for PHDR sanity and merging adjacent
// unaligned segments if needed
static int build_segs_from_phdrs(flash_file_t *ctx, FILE *fd, Elf32_Phdr *phdrs, int num_phdrs)
@ -301,12 +278,9 @@ static int get_proxmark_state(uint32_t *state)
{
UsbCommand c;
c.cmd = CMD_DEVICE_INFO;
SendCommand(&c);
SendCommand(&c);
UsbCommand resp;
while (!WaitForResponse(CMD_ANY, &resp)) {
// Keep waiting for a response
msleep(100);
}
ReceiveCommand(&resp);
// Three outcomes:
// 1. The old bootrom code will ignore CMD_DEVICE_INFO, but respond with an ACK
@ -333,7 +307,7 @@ static int get_proxmark_state(uint32_t *state)
}
// Enter the bootloader to be able to start flashing
static int enter_bootloader(receiver_arg* conn, char *serial_port_name)
static int enter_bootloader(char *serial_port_name)
{
uint32_t state;
@ -364,17 +338,16 @@ static int enter_bootloader(receiver_arg* conn, char *serial_port_name)
SendCommand(&c);
fprintf(stderr,"Press and hold down button NOW if your bootloader requires it.\n");
}
msleep(100);
CloseProxmark(conn, serial_port_name);
msleep(100);
CloseProxmark();
fprintf(stderr,"Waiting for Proxmark to reappear on %s",serial_port_name);
do {
do {
sleep(1);
fprintf(stderr, ".");
} while (!OpenProxmark(serial_port_name));
} while (!OpenProxmark(0));
fprintf(stderr," Found.\n");
return 0;
}
@ -382,25 +355,23 @@ static int enter_bootloader(receiver_arg* conn, char *serial_port_name)
return -1;
}
static int wait_for_ack()
static int wait_for_ack(void)
{
UsbCommand resp;
while (!WaitForResponse(CMD_ANY, &resp)) {
msleep(100);
}
if (resp.cmd != CMD_ACK) {
printf("Error: Unexpected reply 0x%04" PRIx64 " (expected ACK)\n", resp.cmd);
UsbCommand ack;
ReceiveCommand(&ack);
if (ack.cmd != CMD_ACK) {
printf("Error: Unexpected reply 0x%04" PRIx64 " (expected ACK)\n", ack.cmd);
return -1;
}
return 0;
}
// Go into flashing mode
int flash_start_flashing(receiver_arg* conn, int enable_bl_writes,char *serial_port_name)
int flash_start_flashing(int enable_bl_writes,char *serial_port_name)
{
uint32_t state;
if (enter_bootloader(conn, serial_port_name) < 0)
if (enter_bootloader(serial_port_name) < 0)
return -1;
if (get_proxmark_state(&state) < 0)
@ -499,9 +470,9 @@ void flash_free(flash_file_t *ctx)
}
// just reset the unit
int flash_stop_flashing() {
int flash_stop_flashing(void) {
UsbCommand c = {CMD_HARDWARE_RESET};
SendCommand(&c);
msleep(100);
return 0;
SendCommand(&c);
msleep(100);
return 0;
}