Git-Mirrors/tillitis-key
1
0
Fork 0
mirror of https://github.com/tillitis/tillitis-key1.git synced 2025-08-07 22:22:29 -04:00
Code Issues Projects Releases Packages Wiki Activity

fw: Simplify state machine

Browse source 
- Remove state FW_STATE_CDI.
- Add CDI calculation to FW_STATE_START.
- Go directly to FW_STATE_START from both _LOAD_FLASH and _LOADING.
This commit is contained in:
Michael Cardell Widerkrantz 2025-04-07 15:49:08 +02:00 • committed by Mikael Ågren
parent 557031aadc
commit dc9f2c6750
No known key found for this signature in database
GPG key ID: E02DA3D397792C46
1 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
hw/application_fpga/fw/tk1/main.c
View file

@ -315,7 +315,7 @@ static enum state loading_commands(const struct frame_header *hdr,
memcpy_s(&rsp[1], CMDSIZE - 1, &ctx->digest, 32); memcpy_s(&rsp[1], CMDSIZE - 1, &ctx->digest, 32);
fwreply(*hdr, FW_RSP_LOAD_APP_DATA_READY, rsp); fwreply(*hdr, FW_RSP_LOAD_APP_DATA_READY, rsp);
state = FW_STATE_CDI; state = FW_STATE_START;
break; break;
} }
@ -541,11 +541,6 @@ int main(void)
run(&ctx); run(&ctx);
#endif #endif
// TODO Just start something from flash without looking in
// FW_RAM.
//state = FW_STATE_LOAD_FLASH;
for (;;) { for (;;) {
switch (state) { switch (state) {
case FW_STATE_INITIAL: case FW_STATE_INITIAL:
@ -573,13 +568,6 @@ int main(void)
state = loading_commands(&hdr, cmd, state, &ctx); state = loading_commands(&hdr, cmd, state, &ctx);
break; break;
case FW_STATE_CDI:
// CDI = hash(uds, hash(app), uss)
compute_cdi(ctx.digest, ctx.use_uss, ctx.uss);
state = FW_STATE_START;
break;
case FW_STATE_LOAD_FLASH: case FW_STATE_LOAD_FLASH:
if (load_flash_app(&part_table_storage.table, ctx.digest, ctx.flash_slot) < 0) { if (load_flash_app(&part_table_storage.table, ctx.digest, ctx.flash_slot) < 0) {
debug_puts("Couldn't load app from flash\n"); debug_puts("Couldn't load app from flash\n");
@ -594,13 +582,13 @@ int main(void)
} }
} }
// CDI = hash(uds, hash(app), uss)
compute_cdi(ctx.digest, ctx.use_uss, ctx.uss);
state = FW_STATE_START; state = FW_STATE_START;
break; break;
case FW_STATE_START: case FW_STATE_START:
// CDI = hash(uds, hash(app), uss)
compute_cdi(ctx.digest, ctx.use_uss, ctx.uss);
if (ctx.ver_digest != NULL) { if (ctx.ver_digest != NULL) {
print_digest(ctx.digest); print_digest(ctx.digest);
if (!memeq(ctx.digest, (void*)ctx.ver_digest, sizeof(ctx.digest))) { if (!memeq(ctx.digest, (void*)ctx.ver_digest, sizeof(ctx.digest))) {