Fixed page read loop

bbogush · bbogush · commit 5f07ed7c359b · 2017-04-02T20:49:30.000+03:00
diff --git a/firmware/main.c b/firmware/main.c
@@ -422,8 +422,6 @@ static int cmd_nand_read(usb_t *usb)
             CDC_Send_DATA(usb->tx_buf, resp_header_size + write_len);
 
             page.offset += write_len;
-            if (page.offset == chip_info->page_size)
-                page.offset = 0;
             read_cmd->len -= write_len;
         }
 
@@ -433,6 +431,7 @@ static int cmd_nand_read(usb_t *usb)
             if (prog_addr.addr >= chip_info->size)
                 goto Error;
             page.page++;
+            page.offset = 0;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -422,8 +422,6 @@ static int cmd_nand_read(usb_t *usb)`
`422`	`422`	`CDC_Send_DATA(usb->tx_buf, resp_header_size + write_len);`
`423`	`423`
`424`	`424`	`page.offset += write_len;`
`425`		`- if (page.offset == chip_info->page_size)`
`426`		`- page.offset = 0;`
`427`	`425`	`read_cmd->len -= write_len;`
`428`	`426`	`}`
`429`	`427`
`@@ -433,6 +431,7 @@ static int cmd_nand_read(usb_t *usb)`
`433`	`431`	`if (prog_addr.addr >= chip_info->size)`
`434`	`432`	`goto Error;`
`435`	`433`	`page.page++;`
	`434`	`+ page.offset = 0;`
`436`	`435`	`}`
`437`	`436`	`}`
`438`	`437`