RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-26 00:55:19 +08:00
Code Issues Projects Releases Packages Wiki Activity

make style updates

Browse source
This commit is contained in:
Henry Gabryjelski 2023-02-18 12:20:43 -08:00
parent 229454963b
commit c531bd0f65
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
common_arm/flashmem.c
View file

@ -49,7 +49,7 @@ void FlashmemSetSpiBaudrate(uint32_t baudrate) {
} }
// read ID out // read ID out
bool Flash_ReadID_90(flash_device_type_90_t* result) { bool Flash_ReadID_90(flash_device_type_90_t *result) {
if (Flash_CheckBusy(BUSY_TIMEOUT)) return false; if (Flash_CheckBusy(BUSY_TIMEOUT)) return false;
@ -354,20 +354,20 @@ void Flashmem_print_status(void) {
DbpString(" Memory size............. " _GREEN_("2 mbits / 256 kb")); DbpString(" Memory size............. " _GREEN_("2 mbits / 256 kb"));
} else { } else {
Dbprintf(" Device ID............... " _YELLOW_("%02X / %02X (unknown)"), Dbprintf(" Device ID............... " _YELLOW_("%02X / %02X (unknown)"),
device_type.manufacturer_id, device_type.device_id ); device_type.manufacturer_id, device_type.device_id);
} }
} }
uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0}; uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
Flash_UniqueID(uid); Flash_UniqueID(uid);
Dbprintf(" Unique ID (be).......... " _YELLOW_("0x%02X%02X%02X%02X%02X%02X%02X%02X" ), Dbprintf(" Unique ID (be).......... " _YELLOW_("0x%02X%02X%02X%02X%02X%02X%02X%02X"),
uid[0], uid[1], uid[2], uid[3], uid[0], uid[1], uid[2], uid[3],
uid[4], uid[5], uid[6], uid[7] uid[4], uid[5], uid[6], uid[7]
); );
if (g_dbglevel > 3) { if (g_dbglevel > 3) {
Dbprintf(" Unique ID (le).......... " _YELLOW_("0x%02X%02X%02X%02X%02X%02X%02X%02X" ), Dbprintf(" Unique ID (le).......... " _YELLOW_("0x%02X%02X%02X%02X%02X%02X%02X%02X"),
uid[7], uid[6], uid[5], uid[4], uid[7], uid[6], uid[5], uid[4],
uid[3], uid[2], uid[1], uid[0] uid[3], uid[2], uid[1], uid[0]
); );
} }
FlashStop(); FlashStop();

2
common_arm/flashmem.h
View file

@ -127,7 +127,7 @@ typedef struct {
uint8_t manufacturer_id; uint8_t manufacturer_id;
uint8_t device_id; uint8_t device_id;
} flash_device_type_90_t; // to differentiate from JDEC ID via cmd 9F } flash_device_type_90_t; // to differentiate from JDEC ID via cmd 9F
bool Flash_ReadID_90(flash_device_type_90_t* result); bool Flash_ReadID_90(flash_device_type_90_t *result);
uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len); uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len);
uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len); uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len);

4
common_arm/usb_cdc.c
View file

@ -413,8 +413,8 @@ void usb_update_serial(uint64_t newSerialNumber) {
uint8_t nibble2 = (newSerialNumber >> ((8 * i) + 0)) & 0xFu; // bitmasks [0x0F, 0x0F00, 0x0F0000, ... 0x0F00000000000000] uint8_t nibble2 = (newSerialNumber >> ((8 * i) + 0)) & 0xFu; // bitmasks [0x0F, 0x0F00, 0x0F0000, ... 0x0F00000000000000]
char c1 = nibble1 < 10 ? '0' + nibble1 : 'A' + (nibble1 - 10); char c1 = nibble1 < 10 ? '0' + nibble1 : 'A' + (nibble1 - 10);
char c2 = nibble2 < 10 ? '0' + nibble2 : 'A' + (nibble2 - 10); char c2 = nibble2 < 10 ? '0' + nibble2 : 'A' + (nibble2 - 10);
StrSerialNumber[18 + (4*i) + 0] = c1; // [ 18, 22, .., 42, 46 ] StrSerialNumber[18 + (4 * i) + 0] = c1; // [ 18, 22, .., 42, 46 ]
StrSerialNumber[18 + (4*i) + 2] = c2; // [ 20, 24, .., 44, 48 ] StrSerialNumber[18 + (4 * i) + 2] = c2; // [ 20, 24, .., 44, 48 ]
} }
StrSerialNumber[0] = USB_STRING_DESCRIPTOR_SERIAL_NUMBER_LENGTH; StrSerialNumber[0] = USB_STRING_DESCRIPTOR_SERIAL_NUMBER_LENGTH;
} }

7
doc/commands.json
View file

@ -3099,9 +3099,10 @@
"--fc <dec> facility code", "--fc <dec> facility code",
"--cn <dec> card number", "--cn <dec> card number",
"-w, --wiegand <format> see `wiegand list` for available formats", "-w, --wiegand <format> see `wiegand list` for available formats",
"--shallow use shallow (ASK) reader modulation instead of OOK" "--shallow use shallow (ASK) reader modulation instead of OOK",
"-v verbose (print encoded blocks)"
], ],
"usage": "hf iclass encode [-h] [--bin <bin>] --ki <dec> [--credit] [--elite] [--raw] [--enckey <hex>] [--fc <dec>] [--cn <dec>] [-w <format>] [--shallow]" "usage": "hf iclass encode [-hv] [--bin <bin>] --ki <dec> [--credit] [--elite] [--raw] [--enckey <hex>] [--fc <dec>] [--cn <dec>] [-w <format>] [--shallow]"
}, },
"hf iclass encrypt": { "hf iclass encrypt": {
"command": "hf iclass encrypt", "command": "hf iclass encrypt",
@ -11903,6 +11904,6 @@
"metadata": { "metadata": {
"commands_extracted": 749, "commands_extracted": 749,
"extracted_by": "PM3Help2JSON v1.00", "extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2023-02-18T01:26:44" "extracted_on": "2023-02-18T20:20:19"
} }
} }