From 0ef6a7496384021f59acc969ac34d3d7320ae474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Tue, 19 Jan 2016 15:12:29 +0100 Subject: [PATCH] Drop deprecated struct supported_tag. --- libfreefare/freefare.c | 15 --------------- libfreefare/freefare_internal.h | 11 ----------- 2 files changed, 26 deletions(-) diff --git a/libfreefare/freefare.c b/libfreefare/freefare.c index 930c2cb..b7c2fb5 100644 --- a/libfreefare/freefare.c +++ b/libfreefare/freefare.c @@ -28,21 +28,6 @@ #define NXP_MANUFACTURER_CODE 0x04 -struct supported_tag supported_tags[] = { - { FELICA, "FeliCA", NMT_FELICA, 0x00, 0, 0, { 0x00 }, NULL }, - { MIFARE_CLASSIC_1K, "Mifare Classic 1k", NMT_ISO14443A, 0x08, 0, 0, { 0x00 }, NULL }, - { MIFARE_CLASSIC_1K, "Mifare Classic 1k (Emulated)", NMT_ISO14443A, 0x28, 0, 0, { 0x00 }, NULL }, - { MIFARE_CLASSIC_1K, "Mifare Classic 1k (Emulated)", NMT_ISO14443A, 0x68, 0, 0, { 0x00 }, NULL }, - { MIFARE_CLASSIC_1K, "Infineon Mifare Classic 1k", NMT_ISO14443A, 0x88, 0, 0, { 0x00 }, NULL }, - { MIFARE_CLASSIC_4K, "Mifare Classic 4k", NMT_ISO14443A, 0x18, 0, 0, { 0x00 }, NULL }, - { MIFARE_CLASSIC_4K, "Mifare Classic 4k (Emulated)", NMT_ISO14443A, 0x38, 0, 0, { 0x00 }, NULL }, - { MIFARE_DESFIRE, "Mifare DESFire", NMT_ISO14443A, 0x20, 5, 4, { 0x75, 0x77, 0x81, 0x02 /*, 0xXX */ }, NULL}, - { MIFARE_DESFIRE, "Cyanogenmod card emulation", NMT_ISO14443A, 0x60, 4, 3, { 0x78, 0x33, 0x88 /*, 0xXX */ }, NULL}, - { MIFARE_DESFIRE, "Android HCE", NMT_ISO14443A, 0x60, 4, 3, { 0x78, 0x80, 0x70 /*, 0xXX */ }, NULL}, - { MIFARE_ULTRALIGHT_C, "Mifare UltraLightC", NMT_ISO14443A, 0x00, 0, 0, { 0x00 }, is_mifare_ultralightc_on_reader }, - { MIFARE_ULTRALIGHT, "Mifare UltraLight", NMT_ISO14443A, 0x00, 0, 0, { 0x00 }, NULL }, -}; - /* * Automagically allocate a FreefareTag given a device and target info. */ diff --git a/libfreefare/freefare_internal.h b/libfreefare/freefare_internal.h index 18f2b62..b792ced 100644 --- a/libfreefare/freefare_internal.h +++ b/libfreefare/freefare_internal.h @@ -157,17 +157,6 @@ void *assert_crypto_buffer_size (FreefareTag tag, size_t nbytes); // Max PAGE_COUNT of the Ultralight Family: #define MIFARE_ULTRALIGHT_MAX_PAGE_COUNT 0x30 -struct supported_tag { - enum freefare_tag_type type; - const char *friendly_name; - uint8_t modulation_type; - uint8_t SAK; - uint8_t ATS_min_length; - uint8_t ATS_compare_length; - uint8_t ATS[5]; - bool (*check_tag_on_reader) (nfc_device *, nfc_iso14443a_info); -}; - /* * This structure is common to all supported MIFARE targets but shall not be * used directly (it's some kind of abstract class). All members in this