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

cleaned up some if-def routines

Browse source
This commit is contained in:
roel@libnfc.org 2011-12-16 11:00:51 +00:00
parent 23487cd23c
commit 7e67e42f7e
4 changed files with 55 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
armsrc/Makefile
View file

@ -10,7 +10,7 @@ APP_INCLUDES = apps.h
#remove one of the following defines and comment out the relevant line #remove one of the following defines and comment out the relevant line
#in the next section to remove that particular feature from compilation #in the next section to remove that particular feature from compilation
APP_CFLAGS = -O2 -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b APP_CFLAGS = -O2 -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS -DWITH_LEGICRF
#-DWITH_LCD #-DWITH_LCD
#SRC_LCD = fonts.c LCD.c #SRC_LCD = fonts.c LCD.c

151
armsrc/appmain.c
View file

@ -607,21 +607,38 @@ void UsbPacketReceived(uint8_t *packet, int len)
AcquireRawAdcSamples125k(c->arg[0]); AcquireRawAdcSamples125k(c->arg[0]);
UsbSendPacket((uint8_t*)&ack, sizeof(ack)); UsbSendPacket((uint8_t*)&ack, sizeof(ack));
break; break;
#endif
#ifdef WITH_LF
case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K: case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
ModThenAcquireRawAdcSamples125k(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes); ModThenAcquireRawAdcSamples125k(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
break; break;
case CMD_HID_DEMOD_FSK:
CmdHIDdemodFSK(0, 0, 0, 1); // Demodulate HID tag
break;
case CMD_HID_SIM_TAG:
CmdHIDsimTAG(c->arg[0], c->arg[1], 1); // Simulate HID tag by ID
break;
case CMD_HID_CLONE_TAG:
CopyHIDtoT5567(c->arg[0], c->arg[1]); // Clone HID tag by ID to T55x7
break;
case CMD_READ_TI_TYPE:
ReadTItag();
break;
case CMD_WRITE_TI_TYPE:
WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
break;
case CMD_SIMULATE_TAG_125K:
LED_A_ON();
SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
LED_A_OFF();
break;
case CMD_LF_SIMULATE_BIDIR:
SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
break;
#endif #endif
#ifdef WITH_ISO15693 #ifdef WITH_ISO15693
case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693: case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:
AcquireRawAdcSamplesIso15693(); AcquireRawAdcSamplesIso15693();
break; break;
#endif
#ifdef WITH_ISO15693
case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693: case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693:
RecordRawAdcSamplesIso15693(); RecordRawAdcSamplesIso15693();
break; break;
@ -638,63 +655,60 @@ void UsbPacketReceived(uint8_t *packet, int len)
SetDebugIso15693(c->arg[0]); SetDebugIso15693(c->arg[0]);
break; break;
#endif
case CMD_BUFF_CLEAR:
BufferClear();
break;
#ifdef WITH_ISO15693
case CMD_READER_ISO_15693: case CMD_READER_ISO_15693:
ReaderIso15693(c->arg[0]); ReaderIso15693(c->arg[0]);
break; break;
case CMD_SIMTAG_ISO_15693:
SimTagIso15693(c->arg[0]);
break;
#endif #endif
case CMD_SIMULATE_TAG_LEGIC_RF: #ifdef WITH_LEGICRF
LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]); case CMD_SIMULATE_TAG_LEGIC_RF:
break; LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]);
break;
case CMD_WRITER_LEGIC_RF: case CMD_WRITER_LEGIC_RF:
LegicRfWriter(c->arg[1], c->arg[0]); LegicRfWriter(c->arg[1], c->arg[0]);
break; break;
case CMD_READER_LEGIC_RF: case CMD_READER_LEGIC_RF:
LegicRfReader(c->arg[0], c->arg[1]); LegicRfReader(c->arg[0], c->arg[1]);
break; break;
#ifdef WITH_ISO15693
case CMD_SIMTAG_ISO_15693:
SimTagIso15693(c->arg[0]);
break;
#endif #endif
#ifdef WITH_ISO14443b #ifdef WITH_ISO14443b
case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443: case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443:
AcquireRawAdcSamplesIso14443(c->arg[0]); AcquireRawAdcSamplesIso14443(c->arg[0]);
break; break;
#endif
#ifdef WITH_ISO14443b
case CMD_READ_SRI512_TAG: case CMD_READ_SRI512_TAG:
ReadSRI512Iso14443(c->arg[0]); ReadSRI512Iso14443(c->arg[0]);
break; break;
case CMD_READ_SRIX4K_TAG: case CMD_READ_SRIX4K_TAG:
ReadSRIX4KIso14443(c->arg[0]); ReadSRIX4KIso14443(c->arg[0]);
break; break;
case CMD_SNOOP_ISO_14443:
SnoopIso14443();
break;
case CMD_SIMULATE_TAG_ISO_14443:
SimulateIso14443Tag();
break;
#endif #endif
#ifdef WITH_ISO14443a #ifdef WITH_ISO14443a
case CMD_SNOOP_ISO_14443a:
SnoopIso14443a();
break;
case CMD_READER_ISO_14443a: case CMD_READER_ISO_14443a:
ReaderIso14443a(c, &ack); ReaderIso14443a(c, &ack);
break; break;
#endif case CMD_SIMULATE_TAG_ISO_14443a:
SimulateIso14443aTag(c->arg[0], c->arg[1]); // ## Simulate iso14443a tag - pass tag type & UID
break;
#ifdef WITH_ISO14443a
case CMD_READER_MIFARE: case CMD_READER_MIFARE:
ReaderMifare(c->arg[0]); ReaderMifare(c->arg[0]);
break; break;
#endif
#ifdef WITH_ISO14443a
case CMD_MIFARE_READBL: case CMD_MIFARE_READBL:
MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
break; break;
@ -730,22 +744,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
case CMD_MIFARE_EML_CARDLOAD: case CMD_MIFARE_EML_CARDLOAD:
MifareECardLoad(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes); MifareECardLoad(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
break; break;
#endif #endif
#ifdef WITH_ISO14443b #ifdef WITH_ICLASS
case CMD_SNOOP_ISO_14443:
SnoopIso14443();
break;
#endif
#ifdef WITH_ISO14443a
case CMD_SNOOP_ISO_14443a:
SnoopIso14443a();
break;
#endif
#ifdef WITH_ISO14443a
// Makes use of ISO14443a FPGA Firmware // Makes use of ISO14443a FPGA Firmware
case CMD_SNOOP_ICLASS: case CMD_SNOOP_ICLASS:
SnoopIClass(); SnoopIClass();
@ -756,17 +757,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
SimulateTagHfListen(); SimulateTagHfListen();
break; break;
#ifdef WITH_ISO14443b case CMD_BUFF_CLEAR:
case CMD_SIMULATE_TAG_ISO_14443: BufferClear();
SimulateIso14443Tag();
break; break;
#endif
#ifdef WITH_ISO14443a
case CMD_SIMULATE_TAG_ISO_14443a:
SimulateIso14443aTag(c->arg[0], c->arg[1]); // ## Simulate iso14443a tag - pass tag type & UID
break;
#endif
case CMD_MEASURE_ANTENNA_TUNING: case CMD_MEASURE_ANTENNA_TUNING:
MeasureAntennaTuning(); MeasureAntennaTuning();
@ -780,42 +773,12 @@ void UsbPacketReceived(uint8_t *packet, int len)
ListenReaderField(c->arg[0]); ListenReaderField(c->arg[0]);
break; break;
#ifdef WITH_LF
case CMD_HID_DEMOD_FSK:
CmdHIDdemodFSK(0, 0, 0, 1); // Demodulate HID tag
break;
#endif
#ifdef WITH_LF
case CMD_HID_SIM_TAG:
CmdHIDsimTAG(c->arg[0], c->arg[1], 1); // Simulate HID tag by ID
break;
#endif
#ifdef WITH_LF
case CMD_HID_CLONE_TAG:
CopyHIDtoT5567(c->arg[0], c->arg[1]); // Clone HID tag by ID to T55x7
break;
#endif
case CMD_FPGA_MAJOR_MODE_OFF: // ## FPGA Control case CMD_FPGA_MAJOR_MODE_OFF: // ## FPGA Control
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
SpinDelay(200); SpinDelay(200);
LED_D_OFF(); // LED D indicates field ON or OFF LED_D_OFF(); // LED D indicates field ON or OFF
break; break;
#ifdef WITH_LF
case CMD_READ_TI_TYPE:
ReadTItag();
break;
#endif
#ifdef WITH_LF
case CMD_WRITE_TI_TYPE:
WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
break;
#endif
case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: { case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: {
UsbCommand n; UsbCommand n;
if(c->cmd == CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K) { if(c->cmd == CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K) {
@ -839,14 +802,6 @@ void UsbPacketReceived(uint8_t *packet, int len)
break; break;
} }
#ifdef WITH_LF
case CMD_SIMULATE_TAG_125K:
LED_A_ON();
SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
LED_A_OFF();
break;
#endif
case CMD_READ_MEM: case CMD_READ_MEM:
ReadMem(c->arg[0]); ReadMem(c->arg[0]);
break; break;
@ -869,9 +824,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
break; break;
#ifdef WITH_LF #ifdef WITH_LF
case CMD_LF_SIMULATE_BIDIR:
SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
break;
#endif #endif
#ifdef WITH_LCD #ifdef WITH_LCD

3
armsrc/iclass.c
View file

@ -44,8 +44,7 @@
#include "apps.h" #include "apps.h"
#include "util.h" #include "util.h"
#include "string.h" #include "string.h"
#include "common.h"
#include "iclass.h"
static uint8_t *trace = (uint8_t *) BigBuf; static uint8_t *trace = (uint8_t *) BigBuf;
static int traceLen = 0; static int traceLen = 0;

6
armsrc/iclass.h
View file

@ -1,6 +0,0 @@
#ifndef __ISOICLASS_H
#define __ISOICLASS_H
#include "common.h"
#endif /* __ISOICLASS_H */