Add support for Echo command to 'hf felica sim'

This commit is contained in:
kormax committed 2026-06-13 22:16:10 +03:00
1 parent 7cad850d54
commit 0e9e796670
1 file changed
+23 -2
+23 -2
View File
@@ -246,6 +246,20 @@ static uint16_t felica_sim_response_finish(uint8_t *resp, uint16_t pos) {
return resp[2] + 4U;
}
static uint16_t felica_sim_process_echo(const uint8_t *req, uint16_t req_len, uint8_t *resp) {
if (req_len < 3 ||
req[3] != ((FELICA_ECHO_REQ >> 8) & 0xFFU) ||
req[4] != (FELICA_ECHO_REQ & 0xFFU)) {
return 0;
}
resp[0] = 0xb2;
resp[1] = 0x4d;
memcpy(resp + 2, req + 2, req_len);
AddCrc(resp + 2, resp[2]);
return resp[2] + 4U;
}
static void felica_sim_append_idm(uint8_t *resp, uint16_t *pos, const felica_sim_system_record_t *system) {
memcpy(resp + *pos, system->idm, sizeof(system->idm));
*pos += sizeof(system->idm);
@@ -698,7 +712,7 @@ static uint16_t felica_sim_process_read_without_encryption(const felica_sim_mode
static uint16_t felica_sim_process_request(const felica_sim_model_header_t *hdr, const uint8_t *model,
const felica_frame_t *request, uint16_t *active_system_index,
uint8_t *resp) {
if (request == NULL || request->crc_ok == false || request->len < 8 || request->framebytes[2] < 2) {
if (request == NULL || request->crc_ok == false || request->len < 6 || request->framebytes[2] < 2) {
return 0;
}
@@ -711,9 +725,16 @@ static uint16_t felica_sim_process_request(const felica_sim_model_header_t *hdr,
const felica_sim_system_record_t *systems = felica_sim_systems(hdr, model);
const felica_sim_system_record_t *active_system = &systems[*active_system_index];
switch (req[3]) {
uint16_t req_command = req[3];
if (req[3] >= 0xC0U && req_len >= 3U) {
req_command = ((uint16_t)req[3] << 8) | req[4];
}
switch (req_command) {
case FELICA_POLL_REQ:
return felica_sim_process_polling(hdr, model, req, req_len, active_system_index, resp);
case FELICA_ECHO_REQ:
return felica_sim_process_echo(req, req_len, resp);
case FELICA_REQSYSCODE_REQ:
return felica_sim_process_request_system_code(hdr, model, req, req_len, active_system, resp);
case FELICA_REQRESP_REQ: