github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 10:37:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into experimental_varlen

Browse source 
* master:
  missing bracket
  text
  CHG: remove WITH_EMV since its not used at all.
This commit is contained in:
Philippe Teuwen 2019-04-26 10:54:12 +02:00
commit a14b3d8b87
4 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/Makefile.hal
View file

@ -94,10 +94,6 @@ $(info $(findstring WITH_STANDALONE_*,$(PLATFORM_DEFS)))
ifneq (,$(findstring WITH_FPC_,$(PLATFORM_DEFS)))
PLATFORM_DEFS += -DWITH_FPC
endif
# WITH_EMV possible if WITH_ISO14443a :
ifneq (,$(findstring WITH_ISO14443a,$(PLATFORM_DEFS)))
PLATFORM_DEFS += -DWITH_EMV
endif
PLATFORM_DEFS_INFO = $(strip $(filter-out STANDALONE%, $(subst -DWITH_,,$(PLATFORM_DEFS))))
PLATFORM_DEFS_INFO_STANDALONE = $(strip $(subst STANDALONE_,, $(filter STANDALONE%, $(subst -DWITH_,,$(PLATFORM_DEFS)))))

2
common/i2c.c
View file

@ -593,7 +593,7 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
}
void I2C_print_status(void) {
DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Smart card module (ISO 7816"));
DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Smart card module (ISO 7816)"));
uint8_t resp[] = {0, 0, 0, 0};
I2C_Reset_EnterMainProgram();
uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);