Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-29 20:56:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

z20x: Correct issues loading code from FLASH

Browse Source 
boards/z80/ez80/z20x/src/w25_main.c:  (1)  Correct size comparison typo:  Should have been >= not != (2) Fix sizeof():  Was ugetting the sizeof the pointer instead of the sizeof the pointed at structure. (3) Improve some comments.
This commit is contained in:
Gregory Nutt
2020-03-09 17:24:44 -06:00
committed by Xiang Xiao
parent 722de0f4f1
commit f886d814b7
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/z80/ez80/z20x/src/w25_main.c
+10 -4
View File
@@ -209,7 +209,7 @@ static int w25_write_binary(FAR const struct prog_header_s *hdr)
return ret; return ret;
} }
/* Write the hdr to the W25 */ /* Write the header to the W25 */
ret = w25_write(fd, hdr, sizeof(struct prog_header_s)); ret = w25_write(fd, hdr, sizeof(struct prog_header_s));
if (ret < 0) if (ret < 0)
@@ -292,7 +292,7 @@ static int w25_read_binary(FAR struct prog_header_s *hdr)
/* Read the header at the beginning of the partition */ /* Read the header at the beginning of the partition */
ret = w25_read(fd, hdr, sizeof(hdr)); ret = w25_read(fd, hdr, sizeof(struct prog_header_s));
if (ret < 0) if (ret < 0)
{ {
fprintf(stderr, "ERROR: Failed read program header: %d\n", ret); fprintf(stderr, "ERROR: Failed read program header: %d\n", ret);
@@ -301,20 +301,26 @@ static int w25_read_binary(FAR struct prog_header_s *hdr)
/* Check for a valid program header */ /* Check for a valid program header */
/* A valid program should have a MAGIC number */
if (hdr->magic != PROG_MAGIC) if (hdr->magic != PROG_MAGIC)
{ {
ret = -ENOENT; ret = -ENOENT;
goto errout; goto errout;
} }
if (hdr->len != PROGSIZE) /* A valid program should fit in RAM */
if (hdr->len >= PROGSIZE)
{ {
fprintf(stderr, "ERROR: Program too big\n"); fprintf(stderr, "ERROR: Program too big\n");
ret = -E2BIG; ret = -E2BIG;
goto errout; goto errout;
} }
/* Read the program binary */ /* Read the program binary. A valid program should also have a matching
* CRC after loaded to memory.
*/
ret = w25_read(fd, (FAR void *)PROGSTART, hdr->len); ret = w25_read(fd, (FAR void *)PROGSTART, hdr->len);
if (ret < 0) if (ret < 0)