RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 15:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix deprecated-hid-flasher

Browse source
This commit is contained in:
Philippe Teuwen 2019-05-08 13:32:17 +02:00
parent 4fd520c6d4
commit 2f2796be7e
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
client/deprecated-hid-flasher/flasher/flash.c
View file

@ -260,7 +260,7 @@ fail:
// Get the state of the proxmark, backwards compatible
static int get_proxmark_state(uint32_t *state) {
SendCommandOLD(CMD_DEVICE_INFO, 0, 0, 0, NULL, 0);
SendCommandBL(CMD_DEVICE_INFO, 0, 0, 0, NULL, 0);
PacketResponseOLD resp;
ReceiveCommand(&resp);
@ -307,11 +307,11 @@ static int enter_bootloader(void) {
&& (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT)) {
// New style handover: Send CMD_START_FLASH, which will reset the board
// and enter the bootrom on the next boot.
SendCommandOLD(CMD_START_FLASH, 0, 0, 0, NULL, 0);
SendCommandBL(CMD_START_FLASH, 0, 0, 0, NULL, 0);
fprintf(stderr, "(Press and release the button only to abort)\n");
} else {
// Old style handover: Ask the user to press the button, then reset the board
SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
SendCommandBL(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
fprintf(stderr, "Press and hold down button NOW if your bootloader requires it.\n");
}
fprintf(stderr, "Waiting for Proxmark3 to reappear on USB...");
@ -356,9 +356,9 @@ int flash_start_flashing(int enable_bl_writes) {
// This command is stupid. Why the heck does it care which area we're
// flashing, as long as it's not the bootloader area? The mind boggles.
if (enable_bl_writes) {
SendCommandOLD(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
SendCommandBL(CMD_START_FLASH, FLASH_START, FLASH_END, START_FLASH_MAGIC, NULL, 0);
} else {
SendCommandOLD(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
SendCommandBL(CMD_START_FLASH, BOOTLOADER_END, FLASH_END, 0, NULL, 0);
}
return wait_for_ack();
} else {
@ -376,12 +376,12 @@ static int write_block(uint32_t address, uint8_t *data, uint32_t length) {
memcpy(block_buf, data, length);
for (int i = 0; i < 240; i += 48) {
SendCommandOLD(CMD_SETUP_WRITE, i / 4, 0, 0, block_buf + i, 48);
SendCommandBL(CMD_SETUP_WRITE, i / 4, 0, 0, block_buf + i, 48);
if (wait_for_ack() < 0)
return -1;
}
SendCommandOLD(CMD_FINISH_WRITE, address, 0, 0, block_buf + 240, 16);
SendCommandBL(CMD_FINISH_WRITE, address, 0, 0, block_buf + 240, 16);
return wait_for_ack();
}
@ -440,7 +440,7 @@ void flash_free(flash_file_t *ctx) {
// just reset the unit
int flash_stop_flashing(void) {
SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
SendCommandBL(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
msleep(100);
return 0;
}

11
client/deprecated-hid-flasher/flasher/proxusb.c
View file

@ -21,14 +21,21 @@ static unsigned int claimed_iface = 0;
unsigned char return_on_error = 0;
unsigned char error_occured = 0;
void SendCommand(PacketCommandOLD *c) {
void SendCommandBL(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len) {
int ret;
PacketCommandOLD c = {CMD_UNKNOWN, {0, 0, 0}, {{0}}};
c.cmd = cmd;
c.arg[0] = arg0;
c.arg[1] = arg1;
c.arg[2] = arg2;
if (len && data)
memcpy(&c.d, data, len);
#if 0
printf("Sending %d bytes\n", sizeof(PacketCommandOLD));
#endif
ret = usb_bulk_write(devh, 0x01, (char *)c, sizeof(PacketCommandOLD), 1000);
ret = usb_bulk_write(devh, 0x01, (char *)&c, sizeof(PacketCommandOLD), 1000);
if (ret < 0) {
error_occured = 1;
if (return_on_error)

6
client/deprecated-hid-flasher/flasher/proxusb.h
View file

@ -26,9 +26,9 @@
extern unsigned char return_on_error;
extern unsigned char error_occured;
void SendCommand(PacketCommand *c);
bool ReceiveCommandPoll(PacketCommand *c);
void ReceiveCommand(PacketCommand *c);
void SendCommandBL(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *data, size_t len);
bool ReceiveCommandPoll(PacketResponseOLD *c);
void ReceiveCommand(PacketResponseOLD *c);
struct usb_dev_handle *FindProxmark(int verbose, unsigned int *iface);
struct usb_dev_handle *OpenProxmark(int verbose);
void CloseProxmark(void);