2010-02-21 08:47:22 +08:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
|
|
|
|
//
|
|
|
|
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
|
|
|
|
// at your option, any later version. See the LICENSE.txt file for the text of
|
|
|
|
// the license.
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Hardware commands
|
2019-05-07 17:42:36 +08:00
|
|
|
// low-level hardware control
|
2010-02-21 08:47:22 +08:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <limits.h>
|
|
|
|
#include "ui.h"
|
2012-12-05 07:39:18 +08:00
|
|
|
#include "proxmark3.h"
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
#include "cmdparser.h"
|
|
|
|
#include "cmdhw.h"
|
2013-10-05 02:54:10 +08:00
|
|
|
#include "cmdmain.h"
|
2015-01-08 05:51:34 +08:00
|
|
|
#include "cmddata.h"
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
|
|
|
|
static int CmdHelp(const char *Cmd);
|
|
|
|
|
2019-05-06 20:38:56 +08:00
|
|
|
static int usage_hw_detectreader(void) {
|
|
|
|
PrintAndLogEx(NORMAL, "Start to detect presences of reader field");
|
|
|
|
PrintAndLogEx(NORMAL, "");
|
|
|
|
PrintAndLogEx(NORMAL, "Usage: hw detectreader [h] <L|H>");
|
|
|
|
PrintAndLogEx(NORMAL, "Options:");
|
|
|
|
PrintAndLogEx(NORMAL, " h This help");
|
|
|
|
PrintAndLogEx(NORMAL, " <type> L = 125/134 kHz, H = 13.56 mHz");
|
|
|
|
PrintAndLogEx(NORMAL, "");
|
|
|
|
PrintAndLogEx(NORMAL, "Examples:");
|
|
|
|
PrintAndLogEx(NORMAL, " hw detectreader L");
|
|
|
|
return PM3_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int usage_hw_setmux(void) {
|
2019-05-07 17:05:05 +08:00
|
|
|
PrintAndLogEx(NORMAL, "Set the ADC mux to a specific value");
|
2019-05-06 20:38:56 +08:00
|
|
|
PrintAndLogEx(NORMAL, "");
|
|
|
|
PrintAndLogEx(NORMAL, "Usage: hw setmux [h] <lopkd | loraw | hipkd | hiraw>");
|
|
|
|
PrintAndLogEx(NORMAL, "Options:");
|
|
|
|
PrintAndLogEx(NORMAL, " h This help");
|
|
|
|
PrintAndLogEx(NORMAL, " <type> Low peak, Low raw, Hi peak, Hi raw");
|
|
|
|
PrintAndLogEx(NORMAL, "");
|
|
|
|
PrintAndLogEx(NORMAL, "Examples:");
|
|
|
|
PrintAndLogEx(NORMAL, " hw setmux lopkd");
|
|
|
|
return PM3_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2019-05-07 17:05:05 +08:00
|
|
|
static int usage_hw_connect(void) {
|
|
|
|
PrintAndLogEx(NORMAL, "Connects to a Proxmark3 device via specified serial port");
|
|
|
|
PrintAndLogEx(NORMAL, "");
|
|
|
|
PrintAndLogEx(NORMAL, "Usage: hw connect [h] <port>");
|
|
|
|
PrintAndLogEx(NORMAL, "Options:");
|
|
|
|
PrintAndLogEx(NORMAL, " h This help");
|
|
|
|
PrintAndLogEx(NORMAL, " <port> serial port to connect to");
|
|
|
|
PrintAndLogEx(NORMAL, "");
|
|
|
|
PrintAndLogEx(NORMAL, "Examples:");
|
2019-05-07 17:42:36 +08:00
|
|
|
PrintAndLogEx(NORMAL, " hw connect "SERIAL_PORT_H);
|
2019-05-07 17:05:05 +08:00
|
|
|
return PM3_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
|
2019-03-10 06:35:06 +08:00
|
|
|
char asBuff[120];
|
|
|
|
memset(asBuff, 0, sizeof(asBuff));
|
|
|
|
uint32_t mem_avail = 0;
|
|
|
|
PrintAndLogEx(NORMAL, "\n [ Hardware ] ");
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
switch (iChipID) {
|
|
|
|
case 0x270B0A40:
|
|
|
|
sprintf(asBuff, "AT91SAM7S512 Rev A");
|
|
|
|
break;
|
|
|
|
case 0x270B0A4F:
|
|
|
|
sprintf(asBuff, "AT91SAM7S512 Rev B");
|
|
|
|
break;
|
|
|
|
case 0x270D0940:
|
|
|
|
sprintf(asBuff, "AT91SAM7S256 Rev A");
|
|
|
|
break;
|
|
|
|
case 0x270B0941:
|
|
|
|
sprintf(asBuff, "AT91SAM7S256 Rev B");
|
|
|
|
break;
|
|
|
|
case 0x270B0942:
|
|
|
|
sprintf(asBuff, "AT91SAM7S256 Rev C");
|
|
|
|
break;
|
|
|
|
case 0x270B0943:
|
|
|
|
sprintf(asBuff, "AT91SAM7S256 Rev D");
|
|
|
|
break;
|
|
|
|
case 0x270C0740:
|
|
|
|
sprintf(asBuff, "AT91SAM7S128 Rev A");
|
|
|
|
break;
|
|
|
|
case 0x270A0741:
|
|
|
|
sprintf(asBuff, "AT91SAM7S128 Rev B");
|
|
|
|
break;
|
|
|
|
case 0x270A0742:
|
|
|
|
sprintf(asBuff, "AT91SAM7S128 Rev C");
|
|
|
|
break;
|
|
|
|
case 0x270A0743:
|
|
|
|
sprintf(asBuff, "AT91SAM7S128 Rev D");
|
|
|
|
break;
|
|
|
|
case 0x27090540:
|
|
|
|
sprintf(asBuff, "AT91SAM7S64 Rev A");
|
|
|
|
break;
|
|
|
|
case 0x27090543:
|
|
|
|
sprintf(asBuff, "AT91SAM7S64 Rev B");
|
|
|
|
break;
|
|
|
|
case 0x27090544:
|
|
|
|
sprintf(asBuff, "AT91SAM7S64 Rev C");
|
|
|
|
break;
|
|
|
|
case 0x27080342:
|
|
|
|
sprintf(asBuff, "AT91SAM7S321 Rev A");
|
|
|
|
break;
|
|
|
|
case 0x27080340:
|
|
|
|
sprintf(asBuff, "AT91SAM7S32 Rev A");
|
|
|
|
break;
|
|
|
|
case 0x27080341:
|
|
|
|
sprintf(asBuff, "AT91SAM7S32 Rev B");
|
|
|
|
break;
|
|
|
|
case 0x27050241:
|
|
|
|
sprintf(asBuff, "AT9SAM7S161 Rev A");
|
|
|
|
break;
|
|
|
|
case 0x27050240:
|
|
|
|
sprintf(asBuff, "AT91SAM7S16 Rev A");
|
|
|
|
break;
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
2019-03-10 07:00:59 +08:00
|
|
|
PrintAndLogEx(NORMAL, " --= uC: %s", asBuff);
|
|
|
|
switch ((iChipID & 0xE0) >> 5) {
|
|
|
|
case 1:
|
|
|
|
sprintf(asBuff, "ARM946ES");
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
sprintf(asBuff, "ARM7TDMI");
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
sprintf(asBuff, "ARM920T");
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
sprintf(asBuff, "ARM926EJS");
|
|
|
|
break;
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
2019-03-10 07:00:59 +08:00
|
|
|
PrintAndLogEx(NORMAL, " --= Embedded Processor: %s", asBuff);
|
|
|
|
switch ((iChipID & 0xF00) >> 8) {
|
|
|
|
case 0:
|
|
|
|
mem_avail = 0;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
mem_avail = 8;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
mem_avail = 16;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
mem_avail = 32;
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
mem_avail = 64;
|
|
|
|
break;
|
|
|
|
case 7:
|
|
|
|
mem_avail = 128;
|
|
|
|
break;
|
|
|
|
case 9:
|
|
|
|
mem_avail = 256;
|
|
|
|
break;
|
|
|
|
case 10:
|
|
|
|
mem_avail = 512;
|
|
|
|
break;
|
|
|
|
case 12:
|
|
|
|
mem_avail = 1024;
|
|
|
|
break;
|
|
|
|
case 14:
|
|
|
|
mem_avail = 2048;
|
|
|
|
break;
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
uint32_t mem_left = 0;
|
2019-03-10 07:00:59 +08:00
|
|
|
if (mem_avail > 0)
|
2019-03-10 06:35:06 +08:00
|
|
|
mem_left = (mem_avail * 1024) - mem_used;
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, " --= Nonvolatile Program Memory Size: %uK bytes, Used: %u bytes (%2.0f%%) Free: %u bytes (%2.0f%%)",
|
2019-03-10 07:00:59 +08:00
|
|
|
mem_avail,
|
|
|
|
mem_used,
|
|
|
|
mem_avail == 0 ? 0.0f : (float)mem_used / (mem_avail * 1024) * 100,
|
|
|
|
mem_left,
|
|
|
|
mem_avail == 0 ? 0.0f : (float)mem_left / (mem_avail * 1024) * 100
|
|
|
|
);
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
switch ((iChipID & 0xF000) >> 12) {
|
|
|
|
case 0:
|
|
|
|
sprintf(asBuff, "None");
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
sprintf(asBuff, "8K bytes");
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
sprintf(asBuff, "16K bytes");
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
sprintf(asBuff, "32K bytes");
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
sprintf(asBuff, "64K bytes");
|
|
|
|
break;
|
|
|
|
case 7:
|
|
|
|
sprintf(asBuff, "128K bytes");
|
|
|
|
break;
|
|
|
|
case 9:
|
|
|
|
sprintf(asBuff, "256K bytes");
|
|
|
|
break;
|
|
|
|
case 10:
|
|
|
|
sprintf(asBuff, "512K bytes");
|
|
|
|
break;
|
|
|
|
case 12:
|
|
|
|
sprintf(asBuff, "1024K bytes");
|
|
|
|
break;
|
|
|
|
case 14:
|
|
|
|
sprintf(asBuff, "2048K bytes");
|
|
|
|
break;
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
2019-03-10 07:00:59 +08:00
|
|
|
PrintAndLogEx(NORMAL, " --= Second Nonvolatile Program Memory Size: %s", asBuff);
|
|
|
|
switch ((iChipID & 0xF0000) >> 16) {
|
|
|
|
case 1:
|
|
|
|
sprintf(asBuff, "1K bytes");
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
sprintf(asBuff, "2K bytes");
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
sprintf(asBuff, "6K bytes");
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
sprintf(asBuff, "112K bytes");
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
sprintf(asBuff, "4K bytes");
|
|
|
|
break;
|
|
|
|
case 6:
|
|
|
|
sprintf(asBuff, "80K bytes");
|
|
|
|
break;
|
|
|
|
case 7:
|
|
|
|
sprintf(asBuff, "160K bytes");
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
sprintf(asBuff, "8K bytes");
|
|
|
|
break;
|
|
|
|
case 9:
|
|
|
|
sprintf(asBuff, "16K bytes");
|
|
|
|
break;
|
|
|
|
case 10:
|
|
|
|
sprintf(asBuff, "32K bytes");
|
|
|
|
break;
|
|
|
|
case 11:
|
|
|
|
sprintf(asBuff, "64K bytes");
|
|
|
|
break;
|
|
|
|
case 12:
|
|
|
|
sprintf(asBuff, "128K bytes");
|
|
|
|
break;
|
|
|
|
case 13:
|
|
|
|
sprintf(asBuff, "256K bytes");
|
|
|
|
break;
|
|
|
|
case 14:
|
|
|
|
sprintf(asBuff, "96K bytes");
|
|
|
|
break;
|
|
|
|
case 15:
|
|
|
|
sprintf(asBuff, "512K bytes");
|
|
|
|
break;
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
2019-03-10 07:00:59 +08:00
|
|
|
PrintAndLogEx(NORMAL, " --= Internal SRAM Size: %s", asBuff);
|
|
|
|
switch ((iChipID & 0xFF00000) >> 20) {
|
|
|
|
case 0x19:
|
|
|
|
sprintf(asBuff, "AT91SAM9xx Series");
|
|
|
|
break;
|
|
|
|
case 0x29:
|
|
|
|
sprintf(asBuff, "AT91SAM9XExx Series");
|
|
|
|
break;
|
|
|
|
case 0x34:
|
|
|
|
sprintf(asBuff, "AT91x34 Series");
|
|
|
|
break;
|
|
|
|
case 0x37:
|
|
|
|
sprintf(asBuff, "CAP7 Series");
|
|
|
|
break;
|
|
|
|
case 0x39:
|
|
|
|
sprintf(asBuff, "CAP9 Series");
|
|
|
|
break;
|
|
|
|
case 0x3B:
|
|
|
|
sprintf(asBuff, "CAP11 Series");
|
|
|
|
break;
|
|
|
|
case 0x40:
|
|
|
|
sprintf(asBuff, "AT91x40 Series");
|
|
|
|
break;
|
|
|
|
case 0x42:
|
|
|
|
sprintf(asBuff, "AT91x42 Series");
|
|
|
|
break;
|
|
|
|
case 0x55:
|
|
|
|
sprintf(asBuff, "AT91x55 Series");
|
|
|
|
break;
|
|
|
|
case 0x60:
|
|
|
|
sprintf(asBuff, "AT91SAM7Axx Series");
|
|
|
|
break;
|
|
|
|
case 0x61:
|
|
|
|
sprintf(asBuff, "AT91SAM7AQxx Series");
|
|
|
|
break;
|
|
|
|
case 0x63:
|
|
|
|
sprintf(asBuff, "AT91x63 Series");
|
|
|
|
break;
|
|
|
|
case 0x70:
|
|
|
|
sprintf(asBuff, "AT91SAM7Sxx Series");
|
|
|
|
break;
|
|
|
|
case 0x71:
|
|
|
|
sprintf(asBuff, "AT91SAM7XCxx Series");
|
|
|
|
break;
|
|
|
|
case 0x72:
|
|
|
|
sprintf(asBuff, "AT91SAM7SExx Series");
|
|
|
|
break;
|
|
|
|
case 0x73:
|
|
|
|
sprintf(asBuff, "AT91SAM7Lxx Series");
|
|
|
|
break;
|
|
|
|
case 0x75:
|
|
|
|
sprintf(asBuff, "AT91SAM7Xxx Series");
|
|
|
|
break;
|
|
|
|
case 0x92:
|
|
|
|
sprintf(asBuff, "AT91x92 Series");
|
|
|
|
break;
|
|
|
|
case 0xF0:
|
|
|
|
sprintf(asBuff, "AT75Cxx Series");
|
|
|
|
break;
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
2019-03-10 07:00:59 +08:00
|
|
|
PrintAndLogEx(NORMAL, " --= Architecture Identifier: %s", asBuff);
|
|
|
|
switch ((iChipID & 0x70000000) >> 28) {
|
|
|
|
case 0:
|
|
|
|
sprintf(asBuff, "ROM");
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
sprintf(asBuff, "ROMless or on-chip Flash");
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
sprintf(asBuff, "Embedded Flash Memory");
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
sprintf(asBuff, "ROM and Embedded Flash Memory\nNVPSIZ is ROM size\nNVPSIZ2 is Flash size");
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
sprintf(asBuff, "SRAM emulating ROM");
|
|
|
|
break;
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
2019-03-10 07:00:59 +08:00
|
|
|
PrintAndLogEx(NORMAL, " --= Nonvolatile Program Memory Type: %s", asBuff);
|
2013-10-05 02:54:10 +08:00
|
|
|
}
|
|
|
|
|
2019-04-14 03:54:04 +08:00
|
|
|
static int CmdDetectReader(const char *Cmd) {
|
2019-04-19 04:42:15 +08:00
|
|
|
uint16_t arg = 0;
|
2019-05-06 20:38:56 +08:00
|
|
|
char c = toupper(Cmd[0]);
|
2019-04-28 17:09:46 +08:00
|
|
|
switch (c) {
|
2019-05-06 20:38:56 +08:00
|
|
|
case 'L':
|
2019-04-28 17:09:46 +08:00
|
|
|
arg = 1;
|
2019-04-27 17:07:59 +08:00
|
|
|
break;
|
2019-05-06 20:38:56 +08:00
|
|
|
case 'H':
|
2019-04-28 17:09:46 +08:00
|
|
|
arg = 2;
|
2019-04-27 17:07:59 +08:00
|
|
|
break;
|
|
|
|
default: {
|
2019-05-06 20:38:56 +08:00
|
|
|
usage_hw_detectreader();
|
2019-04-28 17:09:46 +08:00
|
|
|
return PM3_EINVARG;
|
|
|
|
}
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
2019-04-28 17:09:46 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
clearCommandBuffer();
|
2019-04-19 04:42:15 +08:00
|
|
|
SendCommandOLD(CMD_LISTEN_READER_FIELD, arg, 0, 0, NULL, 0);
|
|
|
|
return PM3_SUCCESS;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// ## FPGA Control
|
2019-04-14 03:54:04 +08:00
|
|
|
static int CmdFPGAOff(const char *Cmd) {
|
2019-04-10 18:23:40 +08:00
|
|
|
(void)Cmd; // Cmd is not used so far
|
2019-03-10 06:35:06 +08:00
|
|
|
clearCommandBuffer();
|
2019-04-19 04:42:15 +08:00
|
|
|
SendCommandOLD(CMD_FPGA_MAJOR_MODE_OFF, 0, 0, 0, NULL, 0);
|
|
|
|
return PM3_SUCCESS;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
|
|
|
|
2019-04-14 03:54:04 +08:00
|
|
|
static int CmdLCD(const char *Cmd) {
|
2019-03-10 06:35:06 +08:00
|
|
|
int i, j;
|
|
|
|
sscanf(Cmd, "%x %d", &i, &j);
|
|
|
|
while (j--) {
|
|
|
|
clearCommandBuffer();
|
2019-04-19 04:42:15 +08:00
|
|
|
SendCommandOLD(CMD_LCD, i & 0x1ff, 0, 0, NULL, 0);
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
2019-04-19 04:42:15 +08:00
|
|
|
return PM3_SUCCESS;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
|
|
|
|
2019-04-14 03:54:04 +08:00
|
|
|
static int CmdLCDReset(const char *Cmd) {
|
2019-03-10 06:35:06 +08:00
|
|
|
clearCommandBuffer();
|
2019-04-19 04:42:15 +08:00
|
|
|
SendCommandOLD(CMD_LCD_RESET, strtol(Cmd, NULL, 0), 0, 0, NULL, 0);
|
|
|
|
return PM3_SUCCESS;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
|
|
|
|
2019-04-14 03:54:04 +08:00
|
|
|
static int CmdReadmem(const char *Cmd) {
|
2019-03-10 06:35:06 +08:00
|
|
|
clearCommandBuffer();
|
2019-04-19 04:42:15 +08:00
|
|
|
SendCommandOLD(CMD_READ_MEM, strtol(Cmd, NULL, 0), 0, 0, NULL, 0);
|
|
|
|
return PM3_SUCCESS;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
|
|
|
|
2019-04-14 03:54:04 +08:00
|
|
|
static int CmdReset(const char *Cmd) {
|
2019-04-10 18:23:40 +08:00
|
|
|
(void)Cmd; // Cmd is not used so far
|
2019-03-10 06:35:06 +08:00
|
|
|
clearCommandBuffer();
|
2019-04-19 04:42:15 +08:00
|
|
|
SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
|
|
|
|
return PM3_SUCCESS;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Sets the divisor for LF frequency clock: lets the user choose any LF frequency below
|
|
|
|
* 600kHz.
|
|
|
|
*/
|
2019-04-14 03:54:04 +08:00
|
|
|
static int CmdSetDivisor(const char *Cmd) {
|
2019-04-19 04:42:15 +08:00
|
|
|
uint16_t arg = strtol(Cmd, NULL, 0);
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-04-19 04:42:15 +08:00
|
|
|
if (arg < 19 || arg > 255) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, "divisor must be between 19 and 255");
|
2019-04-19 04:42:15 +08:00
|
|
|
return PM3_EINVARG;
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
|
|
|
// 12 000 000 (12Mhz)
|
|
|
|
clearCommandBuffer();
|
2019-04-19 04:42:15 +08:00
|
|
|
SendCommandOLD(CMD_SET_LF_DIVISOR, arg, 0, 0, NULL, 0);
|
|
|
|
PrintAndLogEx(NORMAL, "Divisor set, expected %.1f KHz", ((double)12000 / (arg + 1)));
|
|
|
|
return PM3_SUCCESS;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
|
|
|
|
2019-04-14 03:54:04 +08:00
|
|
|
static int CmdSetMux(const char *Cmd) {
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
if (strlen(Cmd) < 5) {
|
2019-05-06 20:38:56 +08:00
|
|
|
usage_hw_setmux();
|
2019-04-19 04:42:15 +08:00
|
|
|
return PM3_EINVARG;
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-05-06 20:38:56 +08:00
|
|
|
str_lower((char *)Cmd);
|
|
|
|
|
|
|
|
uint8_t arg = 0;
|
2019-04-19 04:42:15 +08:00
|
|
|
if (strcmp(Cmd, "lopkd") == 0) arg = 0;
|
|
|
|
else if (strcmp(Cmd, "loraw") == 0) arg = 1;
|
|
|
|
else if (strcmp(Cmd, "hipkd") == 0) arg = 2;
|
|
|
|
else if (strcmp(Cmd, "hiraw") == 0) arg = 3;
|
|
|
|
else {
|
2019-05-06 20:38:56 +08:00
|
|
|
usage_hw_setmux();
|
2019-04-19 04:42:15 +08:00
|
|
|
return PM3_EINVARG;
|
2019-05-07 17:05:05 +08:00
|
|
|
}
|
2019-03-10 06:35:06 +08:00
|
|
|
clearCommandBuffer();
|
2019-04-19 04:42:15 +08:00
|
|
|
SendCommandOLD(CMD_SET_ADC_MUX, arg, 0, 0, NULL, 0);
|
|
|
|
return PM3_SUCCESS;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
|
|
|
|
2019-04-14 03:54:04 +08:00
|
|
|
static int CmdTune(const char *Cmd) {
|
2014-12-18 05:26:16 +08:00
|
|
|
return CmdTuneSamples(Cmd);
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
|
|
|
|
2019-04-14 03:54:04 +08:00
|
|
|
static int CmdVersion(const char *Cmd) {
|
|
|
|
(void)Cmd; // Cmd is not used so far
|
|
|
|
pm3_version(true);
|
2019-04-19 04:42:15 +08:00
|
|
|
return PM3_SUCCESS;
|
2015-07-23 05:00:52 +08:00
|
|
|
}
|
|
|
|
|
2019-04-14 03:54:04 +08:00
|
|
|
static int CmdStatus(const char *Cmd) {
|
2019-04-10 18:23:40 +08:00
|
|
|
(void)Cmd; // Cmd is not used so far
|
2019-03-10 06:35:06 +08:00
|
|
|
clearCommandBuffer();
|
2019-04-18 18:43:35 +08:00
|
|
|
PacketResponseNG resp;
|
2019-04-19 04:19:28 +08:00
|
|
|
SendCommandOLD(CMD_STATUS, 0, 0, 0, NULL, 0);
|
2019-05-06 20:38:56 +08:00
|
|
|
if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000))
|
|
|
|
PrintAndLogEx(NORMAL, "Status command failed. Communication speed test timed out");
|
2019-04-19 04:42:15 +08:00
|
|
|
return PM3_SUCCESS;
|
2015-07-23 05:00:52 +08:00
|
|
|
}
|
|
|
|
|
2019-04-14 03:54:04 +08:00
|
|
|
static int CmdPing(const char *Cmd) {
|
2019-04-10 18:23:40 +08:00
|
|
|
(void)Cmd; // Cmd is not used so far
|
2019-03-10 06:35:06 +08:00
|
|
|
clearCommandBuffer();
|
2019-04-18 18:43:35 +08:00
|
|
|
PacketResponseNG resp;
|
2019-04-20 08:41:40 +08:00
|
|
|
SendCommandMIX(CMD_PING, 0, 0, 0, NULL, 0);
|
2019-03-10 06:35:06 +08:00
|
|
|
if (WaitForResponseTimeout(CMD_ACK, &resp, 1000))
|
2019-05-07 17:05:05 +08:00
|
|
|
PrintAndLogEx(SUCCESS, "Ping " _GREEN_("successful"));
|
2019-03-10 06:35:06 +08:00
|
|
|
else
|
2019-05-07 17:05:05 +08:00
|
|
|
PrintAndLogEx(WARNING, "Ping " _RED_("failed"));
|
2019-04-19 04:42:15 +08:00
|
|
|
return PM3_SUCCESS;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
|
|
|
|
2019-04-16 16:01:08 +08:00
|
|
|
static int CmdPingNG(const char *Cmd) {
|
|
|
|
uint32_t len = strtol(Cmd, NULL, 0);
|
2019-05-01 03:10:11 +08:00
|
|
|
if (len > PM3_CMD_DATA_SIZE)
|
|
|
|
len = PM3_CMD_DATA_SIZE;
|
2019-05-07 04:40:06 +08:00
|
|
|
PrintAndLogEx(INFO, "PingNG sent with payload len=%d", len);
|
2019-04-16 16:01:08 +08:00
|
|
|
clearCommandBuffer();
|
2019-04-18 18:43:35 +08:00
|
|
|
PacketResponseNG resp;
|
2019-05-01 03:10:11 +08:00
|
|
|
uint8_t data[PM3_CMD_DATA_SIZE] = {0};
|
2019-04-18 04:08:10 +08:00
|
|
|
for (uint16_t i = 0; i < len; i++)
|
2019-04-17 05:15:23 +08:00
|
|
|
data[i] = i & 0xFF;
|
2019-04-19 04:19:28 +08:00
|
|
|
SendCommandNG(CMD_PING, data, len);
|
2019-04-18 03:30:01 +08:00
|
|
|
if (WaitForResponseTimeout(CMD_PING, &resp, 1000)) {
|
|
|
|
bool error = false;
|
|
|
|
if (len)
|
2019-04-18 05:44:48 +08:00
|
|
|
error = memcmp(data, resp.data.asBytes, len) != 0;
|
2019-05-07 04:40:06 +08:00
|
|
|
PrintAndLogEx((error)? ERR:SUCCESS, "PingNG response received, content is %s", error ? _RED_("NOT ok") : _GREEN_("ok"));
|
2019-04-17 02:49:32 +08:00
|
|
|
} else
|
2019-05-07 04:40:06 +08:00
|
|
|
PrintAndLogEx(WARNING, "PingNG response " _RED_("timeout"));
|
2019-04-19 04:42:15 +08:00
|
|
|
return PM3_SUCCESS;
|
2019-04-16 16:01:08 +08:00
|
|
|
}
|
|
|
|
|
2019-05-07 17:05:05 +08:00
|
|
|
static int CmdConnect(const char *Cmd) {
|
|
|
|
|
|
|
|
if (tolower(Cmd[0] == 'h'))
|
|
|
|
return usage_hw_connect();
|
|
|
|
|
|
|
|
char *port = NULL;
|
|
|
|
port = (char *)Cmd;
|
|
|
|
|
2019-05-07 17:42:36 +08:00
|
|
|
// default back to previous used serial port
|
|
|
|
if (strlen(port) == 0 )
|
|
|
|
GetSavedSerialPortName( &port );
|
2019-05-07 17:05:05 +08:00
|
|
|
|
2019-05-07 17:42:36 +08:00
|
|
|
// if we were already connected, disconnect first.
|
|
|
|
if (session.pm3_present) {
|
|
|
|
PrintAndLogEx(INFO, "Disconnecting from current serial port");
|
|
|
|
CloseProxmark();
|
|
|
|
session.pm3_present = false;
|
|
|
|
}
|
2019-05-07 17:05:05 +08:00
|
|
|
|
2019-05-07 17:42:36 +08:00
|
|
|
// try to open serial port
|
|
|
|
session.pm3_present = OpenProxmark(port, false, 20, false, USART_BAUD_RATE);
|
2019-05-07 17:05:05 +08:00
|
|
|
|
2019-05-07 17:42:36 +08:00
|
|
|
if (session.pm3_present && (TestProxmark() != PM3_SUCCESS)) {
|
|
|
|
PrintAndLogEx(ERR, _RED_("ERROR:") "cannot communicate with the Proxmark\n");
|
|
|
|
CloseProxmark();
|
|
|
|
session.pm3_present = false;
|
2019-05-07 17:05:05 +08:00
|
|
|
}
|
|
|
|
return PM3_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2018-01-09 23:30:30 +08:00
|
|
|
static command_t CommandTable[] = {
|
2019-05-02 02:48:15 +08:00
|
|
|
{"help", CmdHelp, AlwaysAvailable, "This help"},
|
2019-05-07 17:05:05 +08:00
|
|
|
{"connect", CmdConnect, AlwaysAvailable, "connect Proxmark3 to serial port"},
|
2019-05-02 02:48:15 +08:00
|
|
|
{"detectreader", CmdDetectReader, IfPm3Present, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},
|
|
|
|
{"fpgaoff", CmdFPGAOff, IfPm3Present, "Set FPGA off"},
|
2019-05-02 04:47:21 +08:00
|
|
|
{"lcd", CmdLCD, IfPm3Lcd, "<HEX command> <count> -- Send command/data to LCD"},
|
|
|
|
{"lcdreset", CmdLCDReset, IfPm3Lcd, "Hardware reset LCD"},
|
2019-05-07 17:05:05 +08:00
|
|
|
{"ping", CmdPing, IfPm3Present, "Test if the Proxmark3 is responding"},
|
|
|
|
{"pingng", CmdPingNG, IfPm3Present, "Test if the Proxmark3 is responsive, using new frame format (experimental)"},
|
2019-05-02 02:48:15 +08:00
|
|
|
{"readmem", CmdReadmem, IfPm3Present, "[address] -- Read memory at decimal address from flash"},
|
|
|
|
{"reset", CmdReset, IfPm3Present, "Reset the Proxmark3"},
|
|
|
|
{"setlfdivisor", CmdSetDivisor, IfPm3Present, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
|
2019-05-07 17:05:05 +08:00
|
|
|
{"setmux", CmdSetMux, IfPm3Present, "Set the ADC mux to a specific value"},
|
|
|
|
{"status", CmdStatus, IfPm3Present, "Show runtime status information about the connected Proxmark3"},
|
2019-05-02 02:48:15 +08:00
|
|
|
{"tune", CmdTune, IfPm3Present, "Measure antenna tuning"},
|
|
|
|
{"version", CmdVersion, IfPm3Present, "Show version information about the connected Proxmark3"},
|
|
|
|
{NULL, NULL, NULL, NULL}
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
};
|
|
|
|
|
2019-04-14 03:54:04 +08:00
|
|
|
static int CmdHelp(const char *Cmd) {
|
|
|
|
(void)Cmd; // Cmd is not used so far
|
|
|
|
CmdsHelp(CommandTable);
|
2019-04-19 04:42:15 +08:00
|
|
|
return PM3_SUCCESS;
|
2019-04-14 03:54:04 +08:00
|
|
|
}
|
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
int CmdHW(const char *Cmd) {
|
2019-03-10 06:35:06 +08:00
|
|
|
clearCommandBuffer();
|
2019-04-19 04:42:15 +08:00
|
|
|
return CmdsParse(CommandTable, Cmd);
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
|
|
|
|
2019-04-14 03:54:04 +08:00
|
|
|
void pm3_version(bool verbose) {
|
|
|
|
if (!verbose)
|
|
|
|
return;
|
2019-04-18 18:43:35 +08:00
|
|
|
PacketResponseNG resp;
|
2019-04-14 03:54:04 +08:00
|
|
|
clearCommandBuffer();
|
2019-04-19 04:42:15 +08:00
|
|
|
SendCommandOLD(CMD_VERSION, 0, 0, 0, NULL, 0);
|
2019-04-14 03:54:04 +08:00
|
|
|
if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
|
2019-04-26 14:29:48 +08:00
|
|
|
PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n");
|
2019-04-14 03:54:04 +08:00
|
|
|
PrintAndLogEx(NORMAL, "\n [ CLIENT ]");
|
2019-05-02 03:46:29 +08:00
|
|
|
PrintAndLogEx(NORMAL, " client: RRG/Iceman"); // TODO version info?
|
2019-05-04 04:30:17 +08:00
|
|
|
PrintAndLogEx(NORMAL, "\n [ PROXMARK RDV4 ]");
|
|
|
|
PrintAndLogEx(NORMAL, " external flash: %s", IfPm3Flash() ? _GREEN_("present") : _YELLOW_("absent"));
|
|
|
|
PrintAndLogEx(NORMAL, " smartcard reader: %s", IfPm3Smartcard() ? _GREEN_("present") : _YELLOW_("absent"));
|
|
|
|
PrintAndLogEx(NORMAL, "\n [ PROXMARK RDV4 Extras ]");
|
|
|
|
PrintAndLogEx(NORMAL, " FPC USART for BT add-on support: %s", IfPm3FpcUsartHost() ? _GREEN_("present") : _YELLOW_("absent"));
|
|
|
|
if (IfPm3FpcUsartDevFromUsb())
|
|
|
|
PrintAndLogEx(NORMAL, " FPC USART for developer support: %s", _GREEN_("present"));
|
|
|
|
PrintAndLogEx(NORMAL, "");
|
2019-04-18 05:44:48 +08:00
|
|
|
PrintAndLogEx(NORMAL, (char *)resp.data.asBytes);
|
|
|
|
lookupChipID(resp.oldarg[0], resp.oldarg[1]);
|
2019-04-14 03:54:04 +08:00
|
|
|
}
|
|
|
|
PrintAndLogEx(NORMAL, "\n");
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|