Skip to content

steami: Fix READ_SECTOR command argument length and address. #1

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
nedseb merged 4 commits into from
Mar 16, 2026
Merged

steami: Fix READ_SECTOR command argument length and address. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6955e0c
steami: Fix READ_SECTOR command argument length and address.
nedseb Mar 16, 2026
22a283d
fix: address PR review comments
nedseb Mar 16, 2026
633cc4d
steami: Fix WRITE_DATA page boundary corruption.
nedseb Mar 16, 2026
e876fc8
fix: restrict READ_SECTOR to file area only
nedseb Mar 16, 2026
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
24 changes: 17 additions & 7 deletions source/board/steami/steami32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ static char buffer_filename[STEAMI_FLASH_NAME_SIZE] = {'\0'};
static uint8_t buffer_sector[STEAMI_FLASH_SECTOR] = {0};
static uint8_t task_rx[STEAMI_I2C_RX_BUFFER_SIZE] = {'\0'};
static uint16_t task_rx_len = 0;
static uint16_t task_rx_offset = 0;
static uint8_t status_error = 0;
static bool is_user_delete_file_flash = false;

Expand Down Expand Up @@ -188,6 +189,7 @@ static void on_I2C_receive_command(steami_i2c_command cmd, uint8_t* rx, uint16_t

current_task = TASK_WRITE_DATA_COUNT;
task_rx_len = rx[0];
task_rx_offset = 0;
memcpy(task_rx, rx + 1, task_rx_len);
break;

Expand Down Expand Up @@ -349,34 +351,42 @@ void process_task()

if( task_rx_len == 0){
steami_uart_write_string("No more data in rx_len to write to flash.\n");
task_rx_offset = 0;
current_task = TASK_NONE;
break;
}

uint32_t bytes_wrote = 0;
int16_t bytes_sent = steami_flash_append_file(task_rx + bytes_wrote, task_rx_len);
int16_t bytes_sent = steami_flash_append_file(task_rx + task_rx_offset, task_rx_len);

if( bytes_sent == -1 ){
error_status_set_last_command_fail(&status_error);
steami_uart_write_string("ERROR Unable to write data to flash\n");
task_rx_offset = 0;
current_task = TASK_NONE;
}
else{
task_rx_len -= bytes_sent;
bytes_wrote += bytes_sent;
task_rx_offset += bytes_sent;
current_task = TASK_WRITE_DATA_WRITE;
}
break;
}

case TASK_READ_SECTOR:{

if( task_rx_len == 1 && steami_flash_read_sector(task_rx[0], buffer_sector) ){
steami_i2c_set_tx_data(buffer_sector, 256);
if( task_rx_len == 2 ){
uint16_t sector = ((uint16_t)task_rx[0] << 8) | task_rx[1];
if( steami_flash_read_sector(sector, buffer_sector) ){
steami_i2c_set_tx_data(buffer_sector, STEAMI_FLASH_SECTOR);
}
else{
error_status_set_last_command_fail(&status_error);
steami_uart_write_string("ERROR Unable to read sector (bad sector parameter ?)\n");
}
}
else{
error_status_set_last_command_fail(&status_error);
steami_uart_write_string("ERROR Unable to read sector (bad sector parameter ?)\n");
error_status_bad_parameter(&status_error);
steami_uart_write_string("ERROR READ_SECTOR expects 2 bytes (sector number)\n");
}

current_task = TASK_WAIT_FLASH_BUSY;
Expand Down
4 changes: 2 additions & 2 deletions source/board/steami/steami_flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,11 @@ int16_t steami_flash_append_file(uint8_t* data, uint16_t data_len){

bool steami_flash_read_sector(uint32_t sector_number, uint8_t* data){

if( sector_number >= STEAMI_FLASH_NB_SECTOR ){
if( sector_number >= STEAMI_FLASH_FILE_SIZE / STEAMI_FLASH_SECTOR ){
return false;
}

return w25q64_read_data(data, 0, 256);
return w25q64_read_data(data, STEAMI_FLASH_FILE_ADDR + (sector_number * STEAMI_FLASH_SECTOR), STEAMI_FLASH_SECTOR);
Comment thread
nedseb marked this conversation as resolved.
}

uint16_t steami_flash_read_file(uint8_t* data, uint16_t data_len, uint32_t offset){
Expand Down