Git-Mirrors/tillitis-key
1
0
Fork 0
mirror of https://github.com/tillitis/tillitis-key1.git synced 2025-02-07 10:35:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add fw cmd to get UDI

Browse Source
This commit is contained in:
Daniel Lublin 2022-11-21 14:19:09 +01:00 committed by Michael Cardell Widerkrantz
parent 98a3a1240b
commit acb9c37ee7
No known key found for this signature in database
GPG Key ID: D3DB3DDF57E704E5
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/application_fpga/fw/tk1/main.c
View File

@ -15,10 +15,11 @@ static volatile uint32_t *switch_app = (volatile uint32_t *)TK1_MMIO_TK1_SWITCH_
static volatile uint32_t *name0 = (volatile uint32_t *)TK1_MMIO_TK1_NAME0; static volatile uint32_t *name0 = (volatile uint32_t *)TK1_MMIO_TK1_NAME0;
static volatile uint32_t *name1 = (volatile uint32_t *)TK1_MMIO_TK1_NAME1; static volatile uint32_t *name1 = (volatile uint32_t *)TK1_MMIO_TK1_NAME1;
static volatile uint32_t *ver = (volatile uint32_t *)TK1_MMIO_TK1_VERSION; static volatile uint32_t *ver = (volatile uint32_t *)TK1_MMIO_TK1_VERSION;
static volatile uint32_t *udi = (volatile uint32_t *)TK1_MMIO_TK1_UDI_FIRST;
static volatile uint32_t *cdi = (volatile uint32_t *)TK1_MMIO_TK1_CDI_FIRST; static volatile uint32_t *cdi = (volatile uint32_t *)TK1_MMIO_TK1_CDI_FIRST;
static volatile uint32_t *app_addr = (volatile uint32_t *)TK1_MMIO_TK1_APP_ADDR; static volatile uint32_t *app_addr = (volatile uint32_t *)TK1_MMIO_TK1_APP_ADDR;
static volatile uint32_t *app_size = (volatile uint32_t *)TK1_MMIO_TK1_APP_SIZE; static volatile uint32_t *app_size = (volatile uint32_t *)TK1_MMIO_TK1_APP_SIZE;
static volatile uint8_t *fw_ram = (volatile uint8_t *)TK1_MMIO_FW_RAM_BASE; static volatile uint8_t *fw_ram = (volatile uint8_t *)TK1_MMIO_FW_RAM_BASE;
#define LED_RED (1 << TK1_MMIO_TK1_LED_R_BIT) #define LED_RED (1 << TK1_MMIO_TK1_LED_R_BIT)
#define LED_GREEN (1 << TK1_MMIO_TK1_LED_G_BIT) #define LED_GREEN (1 << TK1_MMIO_TK1_LED_G_BIT)
@ -138,6 +139,21 @@ int main()
fwreply(hdr, FW_RSP_NAME_VERSION, rsp); fwreply(hdr, FW_RSP_NAME_VERSION, rsp);
break; break;
case FW_CMD_GET_UDI:
puts("FW_CMD_GET_UDI\n");
if (hdr.len != 1) {
// Bad cmd length
rsp[0] = STATUS_BAD;
fwreply(hdr, FW_RSP_GET_UDI, rsp);
break;
}
rsp[0] = STATUS_OK;
uint32_t udi_words[2];
wordcpy(udi_words, (void *)udi, 2);
memcpy(rsp + 1, udi_words, 2 * 4);
fwreply(hdr, FW_RSP_GET_UDI, rsp);
break;
case FW_CMD_LOAD_USS: case FW_CMD_LOAD_USS:
puts("cmd: load-uss\n"); puts("cmd: load-uss\n");

5
hw/application_fpga/fw/tk1/proto.c
View File

@ -96,6 +96,11 @@ void fwreply(struct frame_header hdr, enum fwcmd rspcode, uint8_t *buf)
nbytes = 128; nbytes = 128;
break; break;
case FW_RSP_GET_UDI:
len = LEN_32;
nbytes = 32;
break;
default: default:
puts("fwreply(): Unknown response code: 0x"); puts("fwreply(): Unknown response code: 0x");
puthex(rspcode); puthex(rspcode);

2
hw/application_fpga/fw/tk1/proto.h
View File

@ -37,6 +37,8 @@ enum fwcmd {
FW_CMD_GET_APP_DIGEST = 0x09, FW_CMD_GET_APP_DIGEST = 0x09,
FW_CMD_LOAD_USS = 0x0a, FW_CMD_LOAD_USS = 0x0a,
FW_RSP_LOAD_USS = 0x0b, FW_RSP_LOAD_USS = 0x0b,
FW_CMD_GET_UDI = 0x0c,
FW_RSP_GET_UDI = 0x0d,
/* ... */ /* ... */
FW_RSP_GET_APP_DIGEST = 0x10, // encoded as 0x10 for backwards compatibility FW_RSP_GET_APP_DIGEST = 0x10, // encoded as 0x10 for backwards compatibility
}; };