When reading BB marker, store it at the correct buffer offset

pilatomic · pilatomic · commit 733d785e943f · 2020-06-28T16:15:50.000+02:00
diff --git a/firmware/programmer/nand_programmer.c b/firmware/programmer/nand_programmer.c
@@ -350,8 +350,8 @@ static int np_read_bad_block_info_from_page(np_prog_t *prog, uint32_t block,
 {
     uint32_t status, addr = block * prog->chip_info.block_size;
 
-    status = nand_read_spare_data(prog->page.buf, page,
-        prog->chip_info.bb_mark_off, 1);
+    status = nand_read_spare_data(&prog->page.buf[prog->chip_info.page_size +
+            prog->chip_info.bb_mark_off], page, prog->chip_info.bb_mark_off, 1);
     if (status == NAND_INVALID_CMD)
     {
         status = nand_read_page(prog->page.buf, page,

Original file line number	Diff line number	Diff line change
`@@ -350,8 +350,8 @@ static int np_read_bad_block_info_from_page(np_prog_t *prog, uint32_t block,`
`350`	`350`	`{`
`351`	`351`	`uint32_t status, addr = block * prog->chip_info.block_size;`
`352`	`352`
`353`		`- status = nand_read_spare_data(prog->page.buf, page,`
`354`		`- prog->chip_info.bb_mark_off, 1);`
	`353`	`+ status = nand_read_spare_data(&prog->page.buf[prog->chip_info.page_size +`
	`354`	`+ prog->chip_info.bb_mark_off], page, prog->chip_info.bb_mark_off, 1);`
`355`	`355`	`if (status == NAND_INVALID_CMD)`
`356`	`356`	`{`
`357`	`357`	`status = nand_read_page(prog->page.buf, page,`