SEGAy/Arduino-Aime-Reader
1
0
Fork 0
mirror of synced 2025-02-17 11:08:36 +01:00
Code Releases Activity

修改数据结构，解决结构体字节对齐问题。

Browse Source
This commit is contained in:
Sucareto 2022-04-22 19:48:03 +08:00
parent 2b792a73e0
commit 56fa455f53
1 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
cmd.h
View File

@ -60,16 +60,16 @@ typedef union packet_req {
uint8_t encap_code; uint8_t encap_code;
union { union {
struct { //FELICA_CMD_POLL，猜测 struct { //FELICA_CMD_POLL，猜测
uint16_t poll_systemCode; uint8_t poll_systemCode[2];
uint8_t poll_requestCode; uint8_t poll_requestCode;
uint8_t poll_timeout; uint8_t poll_timeout;
}; };
struct { //NDA_06,NDA_08,NDA_A4 struct { //NDA_06,NDA_08,NDA_A4
uint8_t RW_IDm[8]; uint8_t RW_IDm[8];
uint8_t numService;//and NDA_A4 unknown byte uint8_t numService;//and NDA_A4 unknown byte
uint16_t serviceCodeList; uint8_t serviceCodeList[2];
uint8_t numBlock; uint8_t numBlock;
uint16_t blockList[4]; uint8_t blockList[4][2];
uint8_t blockData[16];//WriteWithoutEncryption,ignore uint8_t blockData[16];//WriteWithoutEncryption,ignore
}; };
uint8_t felica_payload[113]; uint8_t felica_payload[113];
@ -111,10 +111,10 @@ typedef union packet_res {
union { union {
struct {//FELICA_CMD_POLL struct {//FELICA_CMD_POLL
uint8_t poll_PMm[8]; uint8_t poll_PMm[8];
uint16_t poll_systemCode; uint8_t poll_systemCode[2];
}; };
struct { struct {
uint16_t RW_status;//猜测,NDA_06,NDA_08 uint8_t RW_status[2];//猜测,NDA_06,NDA_08
uint8_t numBlock;//NDA_06 uint8_t numBlock;//NDA_06
uint8_t blockData[4][16];//NDA_06 uint8_t blockData[4][16];//NDA_06
}; };
@ -269,33 +269,51 @@ static void sg_nfc_cmd_felica_encap() {
res.encap_code = code + 1; res.encap_code = code + 1;
switch (code) { switch (code) {
case FELICA_CMD_POLL: case FELICA_CMD_POLL:
sg_res_init(0x14); {
res.poll_systemCode = SystemCode; sg_res_init(0x14);
res.poll_systemCode[0] = SystemCode;
res.poll_systemCode[1] = SystemCode >> 8;
}
break; break;
case FELICA_CMD_GET_SYSTEM_CODE: case FELICA_CMD_GET_SYSTEM_CODE:
sg_res_init(0x0D); {
res.felica_payload[0] = 0x01;//未知 sg_res_init(0x0D);
res.felica_payload[1] = SystemCode & 0xFF;//SystemCode res.felica_payload[0] = 0x01;//未知
res.felica_payload[2] = SystemCode >> 8; res.felica_payload[1] = SystemCode;//SystemCode
res.felica_payload[2] = SystemCode >> 8;
}
break; break;
case FELICA_CMD_NDA_A4: case FELICA_CMD_NDA_A4:
sg_res_init(0x0B); {
res.felica_payload[0] = 0x00; sg_res_init(0x0B);
res.felica_payload[0] = 0x00;
}
break; break;
case FELICA_CMD_NDA_06: case FELICA_CMD_NDA_06:
//大小端反转注意 {
if (nfc.felica_ReadWithoutEncryption(req.numService, &req.serviceCodeList, req.numBlock, req.blockList, res.blockData) == 1) { uint16_t serviceCodeList[1] = {req.serviceCodeList[1] << 8 | req.serviceCodeList[0]};
sg_res_init(0x1D); uint16_t blockList[4] = {
res.numBlock = req.numBlock; req.blockList[0][0] << 8 | req.blockList[0][1],
} else { req.blockList[1][0] << 8 | req.blockList[1][1],
sg_res_init(); req.blockList[2][0] << 8 | req.blockList[2][1],
res.status = 1; req.blockList[3][0] << 8 | req.blockList[3][1],
return; };
if (nfc.felica_ReadWithoutEncryption(req.numService, serviceCodeList, req.numBlock, blockList, res.blockData) == 1) {
sg_res_init(0x0E + req.numBlock * 16);
res.numBlock = req.numBlock;
} else {
sg_res_init();
res.status = 1;
return;
}
} }
break; break;
case FELICA_CMD_NDA_08: case FELICA_CMD_NDA_08:
sg_res_init(0x0C);//此处应有写入卡，但是不打算实现 {
res.RW_status = 0x0000; sg_res_init(0x0C);//此处应有写入卡，但是不打算实现
res.RW_status[0] = 0;
res.RW_status[1] = 0;
}
break; break;
default: default:
sg_res_init(); sg_res_init();