Skip to content

[rescue] Avoid large rodata initializer for dfu_ctx_t #30169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cfrantz merged 1 commit into from
May 21, 2026
+13 −14
Merged

[rescue] Avoid large rodata initializer for dfu_ctx_t #30169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sw/device/silicon_creator/lib/rescue/rescue_spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ void dfu_transport_result(dfu_ctx_t *ctx, rom_error_t result) {

rom_error_t rescue_protocol(boot_data_t *bootdata, boot_log_t *boot_log,
const owner_rescue_config_t *config) {
dfu_ctx_t ctx = {
.dfu_state = kDfuStateIdle,
.dfu_error = kDfuErrOk,
};
dfu_ctx_t ctx;
memset(&ctx, 0, sizeof(ctx));
ctx.dfu_state = kDfuStateIdle;
ctx.dfu_error = kDfuErrOk;
dbg_printf("SPI-DFU rescue ready\r\n");
rescue_state_init(&ctx.state, bootdata, boot_log, config);
spi_device_init(
Expand Down
19 changes: 9 additions & 10 deletions sw/device/silicon_creator/lib/rescue/rescue_usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include "sw/device/lib/arch/device.h"
#include "sw/device/lib/base/macros.h"
#include "sw/device/lib/base/memory.h"
#include "sw/device/silicon_creator/lib/boot_data.h"
#include "sw/device/silicon_creator/lib/dbg_print.h"
#include "sw/device/silicon_creator/lib/drivers/lifecycle.h"
Expand Down Expand Up @@ -164,16 +165,14 @@ void dfu_transport_result(dfu_ctx_t *ctx, rom_error_t result) {
rom_error_t rescue_protocol(boot_data_t *bootdata, boot_log_t *boot_log,
const owner_rescue_config_t *config) {
set_serialnumber();
dfu_ctx_t ctx = {
.ep0 =
{
.device_desc = &device_desc,
.config_desc = config_desc,
.string_desc = string_desc,
},
.dfu_state = kDfuStateIdle,
.dfu_error = kDfuErrOk,
};
dfu_ctx_t ctx;
memset(&ctx, 0, sizeof(ctx));
ctx.ep0.device_desc = &device_desc;
ctx.ep0.config_desc = config_desc;
ctx.ep0.string_desc = string_desc;
ctx.dfu_state = kDfuStateIdle;
ctx.dfu_error = kDfuErrOk;

dbg_printf("USB-DFU rescue ready\r\n");
rescue_state_init(&ctx.state, bootdata, boot_log, config);
pinmux_init_usb();
Expand Down
Loading