SEGAy/Arduino-Aime-Reader
1
0
Fork 0
mirror of synced 2024-11-23 23:50:56 +01:00
Code Releases Activity

对齐数据结构，使用可变长度数组；分次读取数据，解决执行3次以上报错问题。

Browse Source
This commit is contained in:
Sucareto 2022-04-22 23:20:13 +08:00
parent 56fa455f53
commit 3b5d68454f
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmd.h
View File

@ -69,7 +69,7 @@ typedef union packet_req {
uint8_t numService;//and NDA_A4 unknown byte uint8_t numService;//and NDA_A4 unknown byte
uint8_t serviceCodeList[2]; uint8_t serviceCodeList[2];
uint8_t numBlock; uint8_t numBlock;
uint8_t blockList[4][2]; uint8_t blockList[1][2];//长度可变
uint8_t blockData[16];//WriteWithoutEncryption,ignore uint8_t blockData[16];//WriteWithoutEncryption,ignore
}; };
uint8_t felica_payload[113]; uint8_t felica_payload[113];
@ -116,7 +116,7 @@ typedef union packet_res {
struct { struct {
uint8_t RW_status[2];//猜测,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[1][1][16];//NDA_06
}; };
uint8_t felica_payload[112]; uint8_t felica_payload[112];
}; };
@ -291,22 +291,20 @@ static void sg_nfc_cmd_felica_encap() {
break; break;
case FELICA_CMD_NDA_06: case FELICA_CMD_NDA_06:
{ {
uint16_t serviceCodeList[1] = {req.serviceCodeList[1] << 8 | req.serviceCodeList[0]}; uint16_t serviceCodeList[1] = {(uint16_t)(req.serviceCodeList[1] << 8 | req.serviceCodeList[0])};//大小端反转注意
uint16_t blockList[4] = { for (uint8_t i = 0; i < req.numBlock; i++) {
req.blockList[0][0] << 8 | req.blockList[0][1], uint16_t blockList[1] = {(uint16_t)(req.blockList[i][0] << 8 | req.blockList[i][1])};
req.blockList[1][0] << 8 | req.blockList[1][1], if (nfc.felica_ReadWithoutEncryption(1, serviceCodeList, 1, blockList, res.blockData[i]) != 1) {
req.blockList[2][0] << 8 | req.blockList[2][1],
req.blockList[3][0] << 8 | req.blockList[3][1],
};
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(); sg_res_init();
res.status = 1; res.status = 1;
return; return;
} }
} }
res.RW_status[0] = 0;
res.RW_status[1] = 0;
res.numBlock = req.numBlock;
sg_res_init(0x0D + req.numBlock * 16);
}
break; break;
case FELICA_CMD_NDA_08: case FELICA_CMD_NDA_08:
{ {