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

Improve naming consistency.

Browse source 
Ensure all MIFARE related names and structures start with "mifare_" or
"MIFARE_".
This commit is contained in:
Romain Tartière 2015-05-12 13:29:21 +02:00
parent faac4ae5d8
commit 1ce3db3ca6
26 changed files with 178 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

12
examples/mifare-classic-format.c
View file

@ -215,8 +215,8 @@ main(int argc, char *argv[])
for (int i = 0; (!error) && tags[i]; i++) {
switch (freefare_get_tag_type (tags[i])) {
case CLASSIC_1K:
case CLASSIC_4K:
case MIFARE_CLASSIC_1K:
case MIFARE_CLASSIC_4K:
break;
default:
continue;
@ -240,11 +240,11 @@ main(int argc, char *argv[])
at_block = 0;
if (format_options.fast) {
printf (START_FORMAT_N, (tt == CLASSIC_1K) ? 1 : 2);
printf (START_FORMAT_N, (tt == MIFARE_CLASSIC_1K) ? 1 : 2);
if (!try_format_sector (tags[i], 0x00))
break;
if (tt == CLASSIC_4K)
if (tt == MIFARE_CLASSIC_4K)
if (!try_format_sector (tags[i], 0x10))
break;
@ -252,12 +252,12 @@ main(int argc, char *argv[])
continue;
}
switch (tt) {
case CLASSIC_1K:
case MIFARE_CLASSIC_1K:
mod_block = 4;
if (!format_mifare_classic_1k (tags[i]))
error = 1;
break;
case CLASSIC_4K:
case MIFARE_CLASSIC_4K:
mod_block = 10;
if (!format_mifare_classic_4k (tags[i]))
error = 1;

4
examples/mifare-classic-read-ndef.c
View file

@ -139,8 +139,8 @@ main(int argc, char *argv[])
for (int i = 0; (!error) && tags[i]; i++) {
switch (freefare_get_tag_type (tags[i])) {
case CLASSIC_1K:
case CLASSIC_4K:
case MIFARE_CLASSIC_1K:
case MIFARE_CLASSIC_4K:
break;
default:
continue;

18
examples/mifare-classic-write-ndef.c
View file

@ -229,8 +229,8 @@ main(int argc, char *argv[])
for (int i = 0; (!error) && tags[i]; i++) {
switch (freefare_get_tag_type (tags[i])) {
case CLASSIC_1K:
case CLASSIC_4K:
case MIFARE_CLASSIC_1K:
case MIFARE_CLASSIC_4K:
break;
default:
continue;
@ -257,13 +257,13 @@ main(int argc, char *argv[])
if (write_ndef) {
switch (freefare_get_tag_type (tags[i])) {
case CLASSIC_4K:
case MIFARE_CLASSIC_4K:
if (!search_sector_key (tags[i], 0x10, &(card_write_keys[0x10].key), &(card_write_keys[0x10].type))) {
error = 1;
goto error;
}
/* fallthrough */
case CLASSIC_1K:
case MIFARE_CLASSIC_1K:
if (!search_sector_key (tags[i], 0x00, &(card_write_keys[0x00].key), &(card_write_keys[0x00].type))) {
error = 1;
goto error;
@ -277,7 +277,7 @@ main(int argc, char *argv[])
if (!error) {
/* Ensure the auth key is always a B one. If not, change it! */
switch (freefare_get_tag_type (tags[i])) {
case CLASSIC_4K:
case MIFARE_CLASSIC_4K:
if (card_write_keys[0x10].type != MFC_KEY_B) {
if( 0 != fix_mad_trailer_block (device, tags[i], 0x10, card_write_keys[0x10].key, card_write_keys[0x10].type)) {
error = 1;
@ -287,7 +287,7 @@ main(int argc, char *argv[])
card_write_keys[0x10].type = MFC_KEY_B;
}
/* fallthrough */
case CLASSIC_1K:
case MIFARE_CLASSIC_1K:
if (card_write_keys[0x00].type != MFC_KEY_B) {
if( 0 != fix_mad_trailer_block (device, tags[i], 0x00, card_write_keys[0x00].key, card_write_keys[0x00].type)) {
error = 1;
@ -336,7 +336,7 @@ main(int argc, char *argv[])
} else {
// Create a MAD and mark unaccessible sectors in the card
if (!(mad = mad_new ((freefare_get_tag_type (tags[i]) == CLASSIC_4K) ? 2 : 1))) {
if (!(mad = mad_new ((freefare_get_tag_type (tags[i]) == MIFARE_CLASSIC_4K) ? 2 : 1))) {
perror ("mad_new");
error = 1;
goto error;
@ -344,10 +344,10 @@ main(int argc, char *argv[])
MifareClassicSectorNumber max_s = 0;
switch (freefare_get_tag_type (tags[i])) {
case CLASSIC_1K:
case MIFARE_CLASSIC_1K:
max_s = 15;
break;
case CLASSIC_4K:
case MIFARE_CLASSIC_4K:
max_s = 39;
break;
default:

2
examples/mifare-desfire-access.c
View file

@ -63,7 +63,7 @@ main(int argc, char *argv[])
}
for (int i = 0; (!error) && tags[i]; i++) {
if (DESFIRE != freefare_get_tag_type (tags[i]))
if (MIFARE_DESFIRE != freefare_get_tag_type (tags[i]))
continue;
int res;

2
examples/mifare-desfire-create-ndef.c
View file

@ -119,7 +119,7 @@ main(int argc, char *argv[])
}
for (int i = 0; (!error) && tags[i]; i++) {
if (DESFIRE != freefare_get_tag_type (tags[i]))
if (MIFARE_DESFIRE != freefare_get_tag_type (tags[i]))
continue;
char *tag_uid = freefare_get_tag_uid (tags[i]);

2
examples/mifare-desfire-ev1-configure-ats.c
View file

@ -111,7 +111,7 @@ main(int argc, char *argv[])
}
for (int i = 0; (!error) && tags[i]; i++) {
if (DESFIRE != freefare_get_tag_type (tags[i]))
if (MIFARE_DESFIRE != freefare_get_tag_type (tags[i]))
continue;
char *tag_uid = freefare_get_tag_uid (tags[i]);

2
examples/mifare-desfire-ev1-configure-default-key.c
View file

@ -97,7 +97,7 @@ main(int argc, char *argv[])
}
for (int i = 0; (!error) && tags[i]; i++) {
if (DESFIRE != freefare_get_tag_type (tags[i]))
if (MIFARE_DESFIRE != freefare_get_tag_type (tags[i]))
continue;
char *tag_uid = freefare_get_tag_uid (tags[i]);

2
examples/mifare-desfire-ev1-configure-random-uid.c
View file

@ -107,7 +107,7 @@ main(int argc, char *argv[])
}
for (int i = 0; (!error) && tags[i]; i++) {
if (DESFIRE != freefare_get_tag_type (tags[i]))
if (MIFARE_DESFIRE != freefare_get_tag_type (tags[i]))
continue;
char *tag_uid = freefare_get_tag_uid (tags[i]);

2
examples/mifare-desfire-format.c
View file

@ -107,7 +107,7 @@ main(int argc, char *argv[])
}
for (int i = 0; (!error) && tags[i]; i++) {
if (DESFIRE != freefare_get_tag_type (tags[i]))
if (MIFARE_DESFIRE != freefare_get_tag_type (tags[i]))
continue;
char *tag_uid = freefare_get_tag_uid (tags[i]);

2
examples/mifare-desfire-info.c
View file

@ -61,7 +61,7 @@ main(int argc, char *argv[])
}
for (int i = 0; (!error) && tags[i]; i++) {
if (DESFIRE != freefare_get_tag_type (tags[i]))
if (MIFARE_DESFIRE != freefare_get_tag_type (tags[i]))
continue;
int res;

2
examples/mifare-desfire-read-ndef.c
View file

@ -147,7 +147,7 @@ main(int argc, char *argv[])
}
for (int i = 0; (!error) && tags[i]; i++) {
if (DESFIRE != freefare_get_tag_type (tags[i]))
if (MIFARE_DESFIRE != freefare_get_tag_type (tags[i]))
continue;
char *tag_uid = freefare_get_tag_uid (tags[i]);

2
examples/mifare-desfire-write-ndef.c
View file

@ -176,7 +176,7 @@ main(int argc, char *argv[])
}
for (int i = 0; (!error) && tags[i]; i++) {
if (DESFIRE != freefare_get_tag_type (tags[i]))
if (MIFARE_DESFIRE != freefare_get_tag_type (tags[i]))
continue;
char *tag_uid = freefare_get_tag_uid (tags[i]);

6
examples/mifare-ultralight-info.c
View file

@ -57,8 +57,8 @@ main (int argc, char *argv[])
for (int i = 0; (!error) && tags[i]; i++) {
switch (freefare_get_tag_type (tags[i])) {
case ULTRALIGHT:
case ULTRALIGHT_C:
case MIFARE_ULTRALIGHT:
case MIFARE_ULTRALIGHT_C:
break;
default:
continue;
@ -66,7 +66,7 @@ main (int argc, char *argv[])
char *tag_uid = freefare_get_tag_uid (tags[i]);
printf ("Tag with UID %s is a %s\n", tag_uid, freefare_get_tag_friendly_name (tags[i]));
if (freefare_get_tag_type (tags[i]) == ULTRALIGHT_C) {
if (freefare_get_tag_type (tags[i]) == MIFARE_ULTRALIGHT_C) {
FreefareTag tag = tags[i];
int res;
MifareDESFireKey key;