From b2a54cd95ba6261a8eaf44bf67691db1f547e2fa Mon Sep 17 00:00:00 2001 From: kormax <3392860+kormax@users.noreply.github.com> Date: Sat, 25 Jul 2026 12:58:52 +0300 Subject: [PATCH] Move some used FeliCa constants into shared protocols --- armsrc/felica.c | 6 +++--- armsrc/felicasim.c | 2 +- client/src/cmdhffelica.c | 5 ----- include/protocols.h | 13 +++++++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/armsrc/felica.c b/armsrc/felica.c index 1492e31df..d6425b32c 100644 --- a/armsrc/felica.c +++ b/armsrc/felica.c @@ -327,7 +327,7 @@ static uint8_t felica_select_card(felica_card_select_t *card) { // page-req: 0x06, IDm(8), ServiceNum(1),Slist(2*num) BLocknum (1) BLockids(2-3*num) // page-resp: 0xb2,0x4d,0x1d,0x07, 0xXX,0xXX,0xXX,0xXX,0xXX,0xXX,0xXX,0xXX, 0x00, 0x00, 0x01, 0x10,0x04,0x01,0x00,0x0d,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x23, 0xcb,0x6e, -// builds a readblock frame for felica lite(s). Using SERVICE: SERVICE_FELICA_LITE_READONLY +// builds a readblock frame for felica lite(s). Using SERVICE: FELICA_SERVICE_LITE_READONLY // Felica standard has a different file system, AFAIK, // 8-byte IDm, number of blocks, blocks numbers // number of blocks limited to 4 for FelicaLite(S) @@ -361,8 +361,8 @@ static void BuildFliteRdblk(const uint8_t *idm, uint8_t blocknum, const uint16_t frameSpace[c++] = 0x01; // service code - frameSpace[c++] = (SERVICE_FELICA_LITE_READONLY >> 8); - frameSpace[c++] = SERVICE_FELICA_LITE_READONLY & 0xFF; + frameSpace[c++] = (FELICA_SERVICE_LITE_READONLY >> 8); + frameSpace[c++] = FELICA_SERVICE_LITE_READONLY & 0xFF; // number of blocks frameSpace[c++] = blocknum; diff --git a/armsrc/felicasim.c b/armsrc/felicasim.c index bd6a68082..cb0f3ade2 100644 --- a/armsrc/felicasim.c +++ b/armsrc/felicasim.c @@ -426,7 +426,7 @@ static uint16_t felica_sim_process_get_container_id(const felica_sim_model_heade return 0; } - const felica_sim_system_record_t *system = felica_sim_find_system_by_code(hdr, model, SYSTEMCODE_OSAIFU_KEITAI, NULL); + const felica_sim_system_record_t *system = felica_sim_find_system_by_code(hdr, model, FELICA_SYSTEM_CODE_OSAIFU_KEITAI, NULL); if (system == NULL) { return 0; } diff --git a/client/src/cmdhffelica.c b/client/src/cmdhffelica.c index 77dd0cc13..b0fdc2ed7 100644 --- a/client/src/cmdhffelica.c +++ b/client/src/cmdhffelica.c @@ -69,11 +69,6 @@ #define FELICA_REQUEST_SYSTEM_CODE_ATTEMPTS 5U #define FELICA_SYSTEM_CODE_MAX_COUNT 16U #define FELICA_DISCOVERED_SYSTEM_MAX_COUNT FELICA_SYSTEM_CODE_MAX_COUNT -#define FELICA_SYSTEM_CODE_WILDCARD 0xFFFFU -#define FELICA_SYSTEM_CODE_NFC_TYPE3 0x12FCU -#define FELICA_SYSTEM_CODE_FELICA_LITE 0x88B4U -#define FELICA_SYSTEM_CODE_FELICA_SECURE_ID 0x957AU -#define FELICA_SYSTEM_CODE_FELICA_NETWORKS_COMMON_AREA 0xFE00U #define FELICA_DUMP_DEFAULT_NODE_CAPACITY 128U #define FELICA_DUMP_COMMON_AREA_NODE_CAPACITY 256U #define FELICA_POLLING_REQUEST_NO_DATA 0x00U diff --git a/include/protocols.h b/include/protocols.h index 37c832e68..4358a3cc3 100644 --- a/include/protocols.h +++ b/include/protocols.h @@ -898,6 +898,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's. // FeliCa protocol + #define FELICA_POLLING_REQ 0x00 #define FELICA_POLLING_RES 0x01 @@ -1126,11 +1127,15 @@ ISO 7816-4 Basic interindustry commands. For command APDU's. #define FELICA_GET_RF_CHIP_REGISTER_RES 0xF904 // Other FeliCa constants -#define SYSTEMCODE_WILDCARD 0xffff // ANY -#define SYSTEMCODE_OSAIFU_KEITAI 0xfe0f // Osaifu-Keitai +#define FELICA_SYSTEM_CODE_WILDCARD 0xFFFFU +#define FELICA_SYSTEM_CODE_NFC_TYPE3 0x12FCU +#define FELICA_SYSTEM_CODE_FELICA_LITE 0x88B4U +#define FELICA_SYSTEM_CODE_FELICA_SECURE_ID 0x957AU +#define FELICA_SYSTEM_CODE_OSAIFU_KEITAI 0xFE0FU +#define FELICA_SYSTEM_CODE_FELICA_NETWORKS_COMMON_AREA 0xFE00U -#define SERVICE_FELICA_LITE_READONLY 0x0b00 // FeliCa Lite RO -#define SERVICE_FELICA_LITE_READWRITE 0x0900 // FeliCa Lite RW +#define FELICA_SERVICE_LITE_READONLY 0x0b00 // FeliCa Lite RO +#define FELICA_SERVICE_LITE_READWRITE 0x0900 // FeliCa Lite RW // Calypso protocol #define CALYPSO_GET_RESPONSE 0xC0