chg: 'hf felica' adjustments

This commit is contained in:
iceman1001 2017-11-11 01:26:53 +01:00
parent 02af3b9e1d
commit c3403da76c

View file

@ -5,8 +5,6 @@
#include "usb_cdc.h" // for usb_poll_validate_length #include "usb_cdc.h" // for usb_poll_validate_length
#include "../common/protocols.h" #include "../common/protocols.h"
//random service RW: 0x0009 //random service RW: 0x0009
//random service RO: 0x000B //random service RO: 0x000B
@ -48,13 +46,6 @@ static void ResetNFCFrame() {
NFCFrame.rolling_crc = 0; NFCFrame.rolling_crc = 0;
} }
uint8_t reverse(uint8_t b) {
b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
return b;
}
//shift byte into frame, reversing it at the same time //shift byte into frame, reversing it at the same time
static void shiftInByte(uint8_t bt) { static void shiftInByte(uint8_t bt) {
@ -74,12 +65,8 @@ static void shiftInByte(uint8_t bt) {
static uint16_t crc_tabccitt[256]; static uint16_t crc_tabccitt[256];
static uint8_t crc_tabccitt_init = 0; static uint8_t crc_tabccitt_init = 0;
static void init_crcccitt_tab( void ) static void init_crcccitt_tab( void ) {
{ uint16_t i, j, crc, c;
uint16_t i;
uint16_t j;
uint16_t crc;
uint16_t c;
for (i=0; i<256; i++) { for (i=0; i<256; i++) {
@ -88,57 +75,58 @@ static void init_crcccitt_tab( void )
for (j=0; j<8; j++) { for (j=0; j<8; j++) {
if ( (crc ^ c) & 0x8000 ) crc = ( crc << 1 ) ^ 0x1021; if ( (crc ^ c) & 0x8000 )
else crc = crc << 1; crc = ( crc << 1 ) ^ 0x1021;
else
crc = crc << 1;
c = c << 1; c = c << 1;
} }
crc_tabccitt[i] = crc; crc_tabccitt[i] = crc;
} }
crc_tabccitt_init = true; crc_tabccitt_init = true;
} }
static uint16_t update_crc_ccitt( uint16_t crc, unsigned char c ) static uint16_t update_crc_ccitt( uint16_t crc, unsigned char c ) {
{
//rely on prior init
//if ( ! crc_tabccitt_init ) init_crcccitt_tab();
return (crc << 8) ^ crc_tabccitt[ ((crc >> 8) ^ (uint16_t) c) & 0x00FF ]; return (crc << 8) ^ crc_tabccitt[ ((crc >> 8) ^ (uint16_t) c) & 0x00FF ];
} }
void SetcrcToFrame(uint8_t * framebf) {
//expect framebuf to be preset with len...
uint16_t crc = 0;
for (int i=2; i < 2 + framebf[2]; i++) {
crc = update_crc_ccitt(crc, framebf[i]);
}
framebf[2 + framebf[2]] = (crc >> 8);
framebf[3 + framebf[2]] = (crc & 0xff);
}
static void ProcessNFCByte(uint8_t bt) { static void ProcessNFCByte(uint8_t bt) {
switch (NFCFrame.state) { switch (NFCFrame.state) {
case STATE_UNSYNCD: { case STATE_UNSYNCD: {
//almost any nonzero byte can be start of SYNC. SYNC should be preceded by zeros, but that is not alsways the case //almost any nonzero byte can be start of SYNC. SYNC should be preceded by zeros, but that is not alsways the case
if (bt > 0) { if (bt > 0) {
NFCFrame.shiftReg = reverse(bt); NFCFrame.shiftReg = reflect(bt, 8);
NFCFrame.state = STATE_TRYING_SYNC; NFCFrame.state = STATE_TRYING_SYNC;
} }
};
break; break;
case STATE_TRYING_SYNC: }
{ case STATE_TRYING_SYNC: {
if(bt==0) if (bt == 0) {
{
//desync //desync
NFCFrame.shiftReg = bt; NFCFrame.shiftReg = bt;
NFCFrame.state = STATE_UNSYNCD; NFCFrame.state = STATE_UNSYNCD;
} } else {
else for (int i=0; i<8; i++) {
{
for(int i=0;i<8;i++) if (NFCFrame.shiftReg == SYNC_16BIT) {
{ //SYNC done!
if(NFCFrame.shiftReg==SYNC_16BIT)
{ //SYNC done!
NFCFrame.state = STATE_GET_LENGTH; NFCFrame.state = STATE_GET_LENGTH;
NFCFrame.framebytes[0] = 0xb2; NFCFrame.framebytes[0] = 0xb2;
NFCFrame.framebytes[1] = 0x4d; //write SYNC NFCFrame.framebytes[1] = 0x4d; //write SYNC
NFCFrame.byte_offset = i; NFCFrame.byte_offset = i;
//shift in remaining byte, slowly... //shift in remaining byte, slowly...
for(int j=i;j<8;j++) for(int j=i; j<8; j++) {
{
NFCFrame.framebytes[2] = (NFCFrame.framebytes[2] << 1) + (bt & 1); NFCFrame.framebytes[2] = (NFCFrame.framebytes[2] << 1) + (bt & 1);
bt >>= 1; bt >>= 1;
} }
@ -152,8 +140,8 @@ static void ProcessNFCByte(uint8_t bt) {
} }
//that byte was last byte of sync //that byte was last byte of sync
if(NFCFrame.shiftReg==SYNC_16BIT) if (NFCFrame.shiftReg == SYNC_16BIT) {
{ //Force SYNC on next byte //Force SYNC on next byte
NFCFrame.state = STATE_GET_LENGTH; NFCFrame.state = STATE_GET_LENGTH;
NFCFrame.framebytes[0] = 0xb2; NFCFrame.framebytes[0] = 0xb2;
NFCFrame.framebytes[1] = 0x4d; NFCFrame.framebytes[1] = 0x4d;
@ -161,49 +149,41 @@ static void ProcessNFCByte(uint8_t bt) {
NFCFrame.posCnt = 1; NFCFrame.posCnt = 1;
} }
} }
};break; break;
case STATE_GET_LENGTH: }
{ case STATE_GET_LENGTH: {
shiftInByte(bt); shiftInByte(bt);
NFCFrame.rem_len = NFCFrame.framebytes[2] - 1; NFCFrame.rem_len = NFCFrame.framebytes[2] - 1;
NFCFrame.rolling_crc = update_crc_ccitt(0, NFCFrame.framebytes[2]); //start calculating CRC for later NFCFrame.rolling_crc = update_crc_ccitt(0, NFCFrame.framebytes[2]); //start calculating CRC for later
NFCFrame.len = NFCFrame.framebytes[2] + 4; //with crc and sync NFCFrame.len = NFCFrame.framebytes[2] + 4; //with crc and sync
NFCFrame.state = STATE_GET_DATA; NFCFrame.state = STATE_GET_DATA;
};break; break;
case STATE_GET_DATA: }
{ case STATE_GET_DATA: {
shiftInByte(bt); shiftInByte(bt);
if (NFCFrame.byte_offset != 0) if (NFCFrame.byte_offset != 0)
NFCFrame.rolling_crc = update_crc_ccitt(NFCFrame.rolling_crc, NFCFrame.framebytes[NFCFrame.posCnt-1] ); NFCFrame.rolling_crc = update_crc_ccitt(NFCFrame.rolling_crc, NFCFrame.framebytes[NFCFrame.posCnt-1] );
else else
NFCFrame.rolling_crc = update_crc_ccitt(NFCFrame.rolling_crc, NFCFrame.framebytes[NFCFrame.posCnt]); NFCFrame.rolling_crc = update_crc_ccitt(NFCFrame.rolling_crc, NFCFrame.framebytes[NFCFrame.posCnt]);
if(NFCFrame.rem_len<=0) if (NFCFrame.rem_len <= 0) {
{
NFCFrame.state = STATE_GET_CRC; NFCFrame.state = STATE_GET_CRC;
NFCFrame.rem_len = 2; NFCFrame.rem_len = 2;
} }
break;
}
};break; case STATE_GET_CRC: {
case STATE_GET_CRC:
{
shiftInByte(bt); shiftInByte(bt);
if(NFCFrame.rem_len<=0) if ( NFCFrame.rem_len <= 0 ) {
{
NFCFrame.crc_ok = ((NFCFrame.rolling_crc & 0xff) == NFCFrame.framebytes[NFCFrame.len-1] && (NFCFrame.rolling_crc >> 8) == NFCFrame.framebytes[NFCFrame.len-2]); NFCFrame.crc_ok = ((NFCFrame.rolling_crc & 0xff) == NFCFrame.framebytes[NFCFrame.len-1] && (NFCFrame.rolling_crc >> 8) == NFCFrame.framebytes[NFCFrame.len-2]);
NFCFrame.state = STATE_FULL; NFCFrame.state = STATE_FULL;
NFCFrame.rem_len = 0; NFCFrame.rem_len = 0;
} }
break;
};break; }
case STATE_FULL: case STATE_FULL: //ignore byte. Don't forget to clear frame to receive next one...
{ default:
//ignore byte. Don't forget to clear frame to receive next one... break;
};break;
} }
} }
@ -211,8 +191,6 @@ void HfSnoopISO18(uint32_t samplesToSkip, uint32_t triggersToSkip) {
if (!crc_tabccitt_init) if (!crc_tabccitt_init)
init_crcccitt_tab(); init_crcccitt_tab();
BigBuf_free(); BigBuf_Clear();
int remFrames = (samplesToSkip) ? samplesToSkip : 0; int remFrames = (samplesToSkip) ? samplesToSkip : 0;
Dbprintf("Snoop FelicaLiteS: Getting first %d frames, Skipping %d triggers.\n", samplesToSkip, triggersToSkip); Dbprintf("Snoop FelicaLiteS: Getting first %d frames, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
@ -224,33 +202,36 @@ void HfSnoopISO18(uint32_t samplesToSkip, uint32_t triggersToSkip) {
FpgaSetupSsc(); FpgaSetupSsc();
// connect Demodulated Signal to ADC: // connect Demodulated Signal to ADC:
SetAdcMuxFor(GPIO_MUXSEL_HIPKD); SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
BigBuf_free(); BigBuf_Clear();
clear_trace();
FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092|FPGA_HF_ISO18092_FLAG_NOMOD); FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092|FPGA_HF_ISO18092_FLAG_NOMOD);
AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
SpinDelay(100); SpinDelay(100);
//the frame bits are slow enough. //the frame bits are slow enough.
int n = BigBuf_max_traceLen() / sizeof(uint8_t); // take all memory int n = BigBuf_max_traceLen() / sizeof(uint8_t); // take all memory
int numbts = 0;
uint8_t *dest = (uint8_t *)BigBuf_get_addr(); uint8_t *dest = (uint8_t *)BigBuf_get_addr();
uint8_t *destend = dest + n-2; uint8_t *destend = dest + n-2;
StartCountSspClk(); //for apx frame timing
AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
ResetNFCFrame(); ResetNFCFrame();
int numbts=0; StartCountSspClk(); //for apx frame timing
uint32_t endframe = GetCountSspClk(); uint32_t endframe = GetCountSspClk();
while(dest <= destend) while (dest <= destend) {
{
WDT_HIT(); WDT_HIT();
if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) if( BUTTON_PRESS()) break;
{
if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
uint8_t dist = (uint8_t)(AT91C_BASE_SSC->SSC_RHR); uint8_t dist = (uint8_t)(AT91C_BASE_SSC->SSC_RHR);
ProcessNFCByte(dist); ProcessNFCByte(dist);
if(NFCFrame.state==STATE_GET_LENGTH) //to be sure we are in frame //to be sure we are in frame
{ if (NFCFrame.state == STATE_GET_LENGTH) {
//length is after 48 (PRE)+16 (SYNC) - 64 ticks +maybe offset? not 100% //length is after 48 (PRE)+16 (SYNC) - 64 ticks +maybe offset? not 100%
uint16_t distance = GetCountSspClk() - endframe - 64 + (NFCFrame.byte_offset > 0 ? (8-NFCFrame.byte_offset) : 0); uint16_t distance = GetCountSspClk() - endframe - 64 + (NFCFrame.byte_offset > 0 ? (8-NFCFrame.byte_offset) : 0);
*dest = distance >> 8; *dest = distance >> 8;
@ -258,13 +239,12 @@ void HfSnoopISO18(uint32_t samplesToSkip, uint32_t triggersToSkip) {
*dest = (distance & 0xff); *dest = (distance & 0xff);
dest++; dest++;
} }
if(NFCFrame.state==STATE_FULL) //crc NOT checked //crc NOT checked
{ if (NFCFrame.state == STATE_FULL) {
endframe = GetCountSspClk(); endframe = GetCountSspClk();
*dest = NFCFrame.crc_ok; //kind of wasteful *dest = NFCFrame.crc_ok; //kind of wasteful
dest++; dest++;
for(int i=0;i<NFCFrame.len;i++) for(int i=0; i < NFCFrame.len; i++) {
{
*dest = NFCFrame.framebytes[i]; *dest = NFCFrame.framebytes[i];
dest++; dest++;
if (dest >= destend ) break; if (dest >= destend ) break;
@ -274,19 +254,22 @@ void HfSnoopISO18(uint32_t samplesToSkip, uint32_t triggersToSkip) {
remFrames--; remFrames--;
if (remFrames <= 0) break; if (remFrames <= 0) break;
if (dest >= destend ) break; if (dest >= destend ) break;
numbts += NFCFrame.len; numbts += NFCFrame.len;
ResetNFCFrame(); ResetNFCFrame();
} }
} }
if( BUTTON_PRESS()) break;
} }
//reset framing //reset framing
AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0); AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
set_tracelen(numbts); set_tracelen(numbts);
LED_D_OFF();
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
Dbprintf("Felica sniffing done, tracelen: %i, use hf list felica for annotations", BigBuf_get_traceLen()); Dbprintf("Felica sniffing done, tracelen: %i, use hf list felica for annotations", BigBuf_get_traceLen());
LED_D_OFF(); cmd_send(CMD_ACK,1,0,0,0,0);
} }
// poll-0: 0xb2,0x4d,0x06,0x00,0xff,0xff,0x00,0x00,0x09,0x21, // poll-0: 0xb2,0x4d,0x06,0x00,0xff,0xff,0x00,0x00,0x09,0x21,
@ -297,25 +280,14 @@ void HfSnoopISO18(uint32_t samplesToSkip, uint32_t triggersToSkip) {
// page-req: 0x06, IDm(8), ServiceNum(1),Slist(2*num) BLocknum (1) BLockids(2-3*num) // 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, // 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,
void SetcrcToFrame(uint8_t * framebf) {
//expect framebuf to be preset with len...
uint16_t crc = 0;
for(int i=2; i < 2 + framebf[2]; i++) {
crc = update_crc_ccitt(crc, framebf[i]);
}
framebf[2+framebf[2]] = (crc >> 8);
framebf[3+framebf[2]] = (crc & 0xff);
}
//builds a readblock frame for felica lite(s). Felica standart has a different file system, AFAIK //builds a readblock frame for felica lite(s). Felica standart has a different file system, AFAIK
// 8-byte ndef, number of blocks, blocks numbers // 8-byte ndef, number of blocks, blocks numbers
// number of blocks limited to 4 for FelicaLite(S) // number of blocks limited to 4 for FelicaLite(S)
static void BuildFliteRdblk(uint8_t* ndef, int blocknum,uint16_t * blocks ) static void BuildFliteRdblk(uint8_t* ndef, int blocknum,uint16_t * blocks ) {
{
if (blocknum > 4 || blocknum <= 0) if (blocknum > 4 || blocknum <= 0)
{
Dbprintf("Invalid number of blocks, %d. Up to 4 are allowed.", blocknum); Dbprintf("Invalid number of blocks, %d. Up to 4 are allowed.", blocknum);
}
int c = 0, i = 0; int c = 0, i = 0;
frameSpace[c++] = 0xb2; frameSpace[c++] = 0xb2;
frameSpace[c++] = 0x4d; frameSpace[c++] = 0x4d;
@ -328,17 +300,14 @@ static void BuildFliteRdblk(uint8_t* ndef, int blocknum,uint16_t * blocks )
frameSpace[c++]= (uint8_t)(((uint16_t)FLITE_SERVICE_RO)&0xff);//service code -big endian? frameSpace[c++]= (uint8_t)(((uint16_t)FLITE_SERVICE_RO)&0xff);//service code -big endian?
frameSpace[c++]= (uint8_t)(((uint16_t)FLITE_SERVICE_RO)>>8); frameSpace[c++]= (uint8_t)(((uint16_t)FLITE_SERVICE_RO)>>8);
frameSpace[c++]= blocknum; //number of blocks frameSpace[c++]= blocknum; //number of blocks
for(i=0;i<blocknum;i++) for (i=0; i < blocknum; i++) {
{
if(blocks[i]>=256) //3-byte block //3-byte block
{ if (blocks[i] >= 256) {
frameSpace[c++] = 0x00; frameSpace[c++] = 0x00;
frameSpace[c++] = (blocks[i] >> 8); //block number, little endian.... frameSpace[c++] = (blocks[i] >> 8); //block number, little endian....
frameSpace[c++] = (blocks[i] & 0xff); frameSpace[c++] = (blocks[i] & 0xff);
} else {
}
else
{
frameSpace[c++] = 0x80; frameSpace[c++] = 0x80;
frameSpace[c++] = blocks[i]; frameSpace[c++] = blocks[i];
} }
@ -368,12 +337,11 @@ static void fillManch() {
manch_tbl_fill = 1; manch_tbl_fill = 1;
} }
static void sendNFCToFPGA(uint8_t * frame, int len, uint32_t waitTill, uint8_t power, uint8_t highspeed) { static void TransmitFor18092_AsReader(uint8_t * frame, int len, uint32_t waitTill, uint8_t power, uint8_t highspeed) {
if (!manch_tbl_fill) if (!manch_tbl_fill)
fillManch(); fillManch();
volatile uint32_t b; volatile uint32_t b;
int c; int c;
uint32_t ThisTransferTime = 0; uint32_t ThisTransferTime = 0;
@ -423,6 +391,9 @@ static void sendNFCToFPGA(uint8_t * frame, int len, uint32_t waitTill, uint8_t p
FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | 1 ); FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | 1 );
} }
#define R_POLL0_LEN 0x16
#define R_POLL1_LEN 0x18
#define R_READBLK_LEN 0x21
//simulate NFC Tag3 card - for now only poll response works //simulate NFC Tag3 card - for now only poll response works
// second half (4 bytes) of NDEF2 goes into nfcid2_0, first into nfcid2_1 // second half (4 bytes) of NDEF2 goes into nfcid2_0, first into nfcid2_1
void HfSimLite( uint64_t nfcid) { void HfSimLite( uint64_t nfcid) {
@ -433,25 +404,23 @@ void HfSimLite( uint64_t nfcid) {
if (!manch_tbl_fill) if (!manch_tbl_fill)
fillManch(); fillManch();
int i, curlen = 0;
uint8_t *curresp = 0;
uint8_t ndef[8]; uint8_t ndef[8];
num_to_bytes(nfcid, 8, ndef); num_to_bytes(nfcid, 8, ndef);
//NFC tag 3/ ISo technically. Many overlapping standards
DbpString("Felica Lite-S sim start");
Dbprintf("NDEF2 UID: %02x %02x %02x %02x %02x %02x %02x %02x",ndef[0],ndef[1],ndef[2],ndef[3],ndef[4],ndef[5],ndef[6],ndef[7]);
//prepare our 3 responses... //prepare our 3 responses...
#define R_POLL0_LEN 0x16
#define R_POLL1_LEN 0x18
#define R_READBLK_LEN 0x21
uint8_t resp_poll0[R_POLL0_LEN] = { 0xb2,0x4d,0x12,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f}; uint8_t resp_poll0[R_POLL0_LEN] = { 0xb2,0x4d,0x12,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00,0xb3,0x7f};
uint8_t resp_poll1[R_POLL1_LEN] = { 0xb2,0x4d,0x14,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00, 0x88,0xb4,0xb3,0x7f}; uint8_t resp_poll1[R_POLL1_LEN] = { 0xb2,0x4d,0x14,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf1,0x00,0x00,0x00,0x01,0x43,0x00, 0x88,0xb4,0xb3,0x7f};
uint8_t resp_readblk[R_READBLK_LEN] = { 0xb2,0x4d,0x1d,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x10,0x04,0x01,0x00,0x0d,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x23,0xcb,0x6e}; uint8_t resp_readblk[R_READBLK_LEN] = { 0xb2,0x4d,0x1d,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x10,0x04,0x01,0x00,0x0d,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x23,0xcb,0x6e};
int i; //NFC tag 3/ ISo technically. Many overlapping standards
uint8_t *curresp = 0; DbpString("Felica Lite-S sim start");
int curlen = 0; Dbprintf("NDEF2 UID: %02x %02x %02x %02x %02x %02x %02x %02x",
ndef[0], ndef[1], ndef[2], ndef[3],
ndef[4], ndef[5], ndef[6], ndef[7]
);
//fill in blanks //fill in blanks
for( i=0; i<8; i++) { for( i=0; i<8; i++) {
@ -459,6 +428,7 @@ void HfSimLite( uint64_t nfcid) {
resp_poll1[i+4] = ndef[i]; resp_poll1[i+4] = ndef[i];
resp_readblk[i+4] = ndef[i]; resp_readblk[i+4] = ndef[i];
} }
//calculate and set CRC //calculate and set CRC
SetcrcToFrame(resp_poll0); SetcrcToFrame(resp_poll0);
SetcrcToFrame(resp_poll1); SetcrcToFrame(resp_poll1);
@ -470,6 +440,7 @@ void HfSimLite( uint64_t nfcid) {
FpgaSetupSsc(); FpgaSetupSsc();
// connect Demodulated Signal to ADC: // connect Demodulated Signal to ADC:
SetAdcMuxFor(GPIO_MUXSEL_HIPKD); SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_NOMOD); FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_NOMOD);
SpinDelay(100); SpinDelay(100);
@ -477,6 +448,7 @@ void HfSimLite( uint64_t nfcid) {
AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0); AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
ResetNFCFrame(); ResetNFCFrame();
StartCountSspClk(); // should work without now, this is mostly for debugging StartCountSspClk(); // should work without now, this is mostly for debugging
bool listenmode = true; bool listenmode = true;
@ -530,7 +502,7 @@ void HfSimLite( uint64_t nfcid) {
if (!listenmode) { if (!listenmode) {
//trying to answer... here to start answering immediately. //trying to answer... here to start answering immediately.
//this one is a bit finicky. Seems that being a bit late is better than earlier //this one is a bit finicky. Seems that being a bit late is better than earlier
sendNFCToFPGA(curresp, curlen, frtm+512, 0, 0); TransmitFor18092_AsReader(curresp, curlen, frtm+512, 0, 0);
//switch back //switch back
FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_NOMOD); FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_NOMOD);
@ -550,6 +522,7 @@ void HfSimLite( uint64_t nfcid) {
int WaitForFelicaReply(int maxbytes) { int WaitForFelicaReply(int maxbytes) {
int bcnt = 0; int bcnt = 0;
ResetNFCFrame(); ResetNFCFrame();
FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_NOMOD | FPGA_HF_ISO18092_FLAG_READER); FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_NOMOD | FPGA_HF_ISO18092_FLAG_READER);
for (; bcnt < maxbytes; ) { for (; bcnt < maxbytes; ) {
@ -562,10 +535,12 @@ int WaitForFelicaReply(int maxbytes) {
if (NFCFrame.crc_ok) { if (NFCFrame.crc_ok) {
return 1; return 1;
} else { } else {
Dbprintf("Got frame %d with wrong crc, crc %02x %02x", NFCFrame.framebytes[3], (NFCFrame.rolling_crc & 0xff), (NFCFrame.rolling_crc>>8)); Dbprintf("Got frame %d with wrong crc, crc %02x %02x"
int j; , NFCFrame.framebytes[3]
for(j = 0; j < 25; j++) , (NFCFrame.rolling_crc & 0xff)
Dbprintf("%02x ", NFCFrame.framebytes[j]); , (NFCFrame.rolling_crc >> 8)
);
Dbhexdump(25, NFCFrame.framebytes, false);
return 0; return 0;
} }
break ; break ;
@ -577,13 +552,20 @@ int WaitForFelicaReply(int maxbytes) {
void HfDumpFelicaLiteS() { void HfDumpFelicaLiteS() {
DbpString("Felica Lite-S READ start"); // setup device.
FpgaDownloadAndGo(FPGA_BITSTREAM_HF); FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
FpgaSetupSsc();
// connect Demodulated Signal to ADC:
SetAdcMuxFor(GPIO_MUXSEL_HIPKD); SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
// Set up the synchronous serial port
FpgaSetupSsc();
// allocate command receive buffer
BigBuf_free(); BigBuf_Clear(); BigBuf_free(); BigBuf_Clear();
LED_D_ON();
uint8_t ndef[8]; uint8_t ndef[8];
uint8_t poll[10] = { 0xb2,0x4d,0x06,0x00,0xff,0xff,0x00,0x00,0x09,0x21}; uint8_t poll[10] = { 0xb2,0x4d,0x06,0x00,0xff,0xff,0x00,0x00,0x09,0x21};
uint16_t liteblks[28] = {0x00, 0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x90,0x91,0x92,0xa0}; uint16_t liteblks[28] = {0x00, 0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x90,0x91,0x92,0xa0};
@ -591,18 +573,17 @@ void HfDumpFelicaLiteS() {
if (!crc_tabccitt_init) if (!crc_tabccitt_init)
init_crcccitt_tab(); init_crcccitt_tab();
if(!manch_tbl_fill) { if (!manch_tbl_fill)
fillManch(); fillManch();
}
ResetNFCFrame(); ResetNFCFrame();
FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_READER |FPGA_HF_ISO18092_FLAG_NOMOD); FpgaWriteConfWord(FPGA_MAJOR_MODE_ISO18092 | FPGA_HF_ISO18092_FLAG_READER |FPGA_HF_ISO18092_FLAG_NOMOD);
AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0); AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
SpinDelay(100);
SpinDelay(500); // Start the timer
StartCountSspClk(); StartCountSspClk();
int c; int c;
@ -610,15 +591,22 @@ void HfDumpFelicaLiteS() {
int cntfails = 0; int cntfails = 0;
uint8_t *dest = (uint8_t *)BigBuf_get_addr(); uint8_t *dest = (uint8_t *)BigBuf_get_addr();
for (;;) { while (!BUTTON_PRESS() && !usb_poll_validate_length()) {
sendNFCToFPGA(poll,10,GetCountSspClk()+8,1,0);
WDT_HIT();
TransmitFor18092_AsReader(poll, 10, GetCountSspClk()+8,1,0);
if (WaitForFelicaReply(512) && NFCFrame.framebytes[3] == FELICA_POLL_ACK) { if (WaitForFelicaReply(512) && NFCFrame.framebytes[3] == FELICA_POLL_ACK) {
for (c=0; c < 8; c++) for (c=0; c < 8; c++)
ndef[c] = NFCFrame.framebytes[c+4]; ndef[c] = NFCFrame.framebytes[c+4];
for (c=0; c < 28;) { for (c=0; c < 28;) {
BuildFliteRdblk(ndef, 1, &liteblks[c]); BuildFliteRdblk(ndef, 1, &liteblks[c]);
sendNFCToFPGA(frameSpace,frameSpace[2]+4,GetCountSspClk()+8,1,0);
TransmitFor18092_AsReader(frameSpace, frameSpace[2]+4, GetCountSspClk()+8, 1, 0);
if (WaitForFelicaReply(1024) && NFCFrame.framebytes[3] == FELICA_RDBLK_ACK) { if (WaitForFelicaReply(1024) && NFCFrame.framebytes[3] == FELICA_RDBLK_ACK) {
dest[cnt++] = liteblks[c]; dest[cnt++] = liteblks[c];
@ -627,7 +615,7 @@ void HfDumpFelicaLiteS() {
dest[cnt++] = fb[12]; dest[cnt++] = fb[12];
dest[cnt++] = fb[13]; dest[cnt++] = fb[13];
for(int j=0; j<16; j++) for(uint8_t j=0; j < 16; j++)
dest[cnt++] = fb[15+j]; dest[cnt++] = fb[15+j];
c++; c++;
@ -642,20 +630,14 @@ void HfDumpFelicaLiteS() {
} }
break; break;
} }
//Resetting Frame mode (First set in fpgaloader.c) //SpinDelay(500);
if( BUTTON_PRESS())
break;
SpinDelay(500);
if( BUTTON_PRESS())
break;
} }
//Resetting Frame mode (First set in fpgaloader.c)
AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0); AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);
//setting tracelen - important! it was set by buffer overflow before //setting tracelen - important! it was set by buffer overflow before
set_tracelen(cnt); set_tracelen(cnt);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
cmd_send(CMD_ACK,1,0,0,0,0);
} }