Skip to content

Commit 4cd715d

Browse files
committed
Fixed uninitiazed read address
1 parent 6a24ee0 commit 4cd715d

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

firmware/main.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ static int cmd_nand_write(usb_t *usb)
370370
static int cmd_nand_read(usb_t *usb)
371371
{
372372
chip_info_t *chip_info;
373-
prog_addr_t prog_addr;
373+
uint32_t addr;
374374
static page_t page;
375375
uint32_t status, write_len;
376376
uint32_t resp_header_size = offsetof(resp_t, data);
@@ -385,8 +385,9 @@ static int cmd_nand_read(usb_t *usb)
385385
if (read_cmd->addr >= chip_info->size)
386386
goto Error;
387387

388-
page.page = read_cmd->addr / chip_info->page_size;
389-
page.offset = read_cmd->addr % chip_info->page_size;
388+
addr = read_cmd->addr;
389+
page.page = addr / chip_info->page_size;
390+
page.offset = addr % chip_info->page_size;
390391

391392
resp->code = RESP_DATA;
392393

@@ -397,7 +398,7 @@ static int cmd_nand_read(usb_t *usb)
397398
{
398399
if (nand_read_status() == NAND_ERROR)
399400
{
400-
if (send_bad_block_info(prog_addr.addr))
401+
if (send_bad_block_info(addr))
401402
goto Error;
402403
}
403404
else
@@ -427,8 +428,8 @@ static int cmd_nand_read(usb_t *usb)
427428

428429
if (read_cmd->len)
429430
{
430-
prog_addr.addr += chip_info->page_size;
431-
if (prog_addr.addr >= chip_info->size)
431+
addr += chip_info->page_size;
432+
if (addr >= chip_info->size)
432433
goto Error;
433434
page.page++;
434435
page.offset = 0;

0 commit comments

Comments
 (0)