crewID/libfreefare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Align macros indentation with the rest of the code

Browse source
This commit is contained in:
Romain Tartière 2017-06-29 09:24:27 +02:00
parent 5bd27a9d68
commit 32c6ed8f32
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
libfreefare/freefare.h
View file

@ -296,11 +296,11 @@ bit 0: PICC master key frozen (reversible with configuration change or when form
*/ */
#define MDMK_SETTINGS(picc_master_key_settings_changeable,free_create_delete_application,free_listing_apps_and_key_settings,picc_master_key_changeable) ( \ #define MDMK_SETTINGS(picc_master_key_settings_changeable,free_create_delete_application,free_listing_apps_and_key_settings,picc_master_key_changeable) ( \
(picc_master_key_settings_changeable << 3) | \ (picc_master_key_settings_changeable << 3) | \
(free_create_delete_application << 2) | \ (free_create_delete_application << 2) | \
(free_listing_apps_and_key_settings << 1) | \ (free_listing_apps_and_key_settings << 1) | \
(picc_master_key_changeable) \ (picc_master_key_changeable) \
) )
/* Mifare DESFire EV1 Application crypto operations */ /* Mifare DESFire EV1 Application crypto operations */
@ -317,21 +317,22 @@ bit 0: PICC master key frozen (reversible with configuration change or when form
*/ */
#define MDAPP_SETTINGS(key_no_for_key_changing,config_changeable,free_create_delete_files,free_listing_contents,app_master_key_changeable) ( \ #define MDAPP_SETTINGS(key_no_for_key_changing,config_changeable,free_create_delete_files,free_listing_contents,app_master_key_changeable) ( \
(key_no_for_key_changing << 4) | \ (key_no_for_key_changing << 4) | \
(config_changeable << 3) | \ (config_changeable << 3) | \
(free_create_delete_files << 2) | \ (free_create_delete_files << 2) | \
(free_listing_contents << 1) | \ (free_listing_contents << 1) | \
(app_master_key_changeable) \ (app_master_key_changeable) \
) )
/* Access right */ /* Access right */
#define MDAR(read,write,read_write,change_access_rights) ( \ #define MDAR(read,write,read_write,change_access_rights) ( \
(read << 12) | \ (read << 12) | \
(write << 8) | \ (write << 8) | \
(read_write << 4) | \ (read_write << 4) | \
(change_access_rights) \ (change_access_rights) \
) )
#define MDAR_READ(ar) (((ar) >> 12) & 0x0f) #define MDAR_READ(ar) (((ar) >> 12) & 0x0f)
#define MDAR_WRITE(ar) (((ar) >> 8) & 0x0f) #define MDAR_WRITE(ar) (((ar) >> 8) & 0x0f)
#define MDAR_READ_WRITE(ar) (((ar) >> 4) & 0x0f) #define MDAR_READ_WRITE(ar) (((ar) >> 4) & 0x0f)