diff options
| author | James Buren <braewoods+rb@braewoods.net> | 2020-11-11 10:54:05 +0000 |
|---|---|---|
| committer | James Buren <braewoods+rb@braewoods.net> | 2020-11-11 13:30:09 +0000 |
| commit | 4aa749b59db9fb46a47a0bcff4f19a6f0552b2aa (patch) | |
| tree | 39784c771741613847e83dce95b122f27cf485e6 /firmware/export | |
| parent | c4254d10fc61779656dd5692c2f6333692ba73f8 (diff) | |
| download | rockbox-4aa749b59d.tar.gz rockbox-4aa749b59d.zip | |
iriver_flash: refactor code to be easier to understand
This overhauls most of the code to be easier to understand in terms
of the interactions with the flash. I found the original to be rather
confusing with how it kept switching between byte and word offsets.
My solution was to make all external access to the flash in terms of
sectors and bytes. Whatever the flash uses internally is now handled
by the subroutines for performing the erase, program, and verify
operations.
This helps make it far more consistent for the code that actually uses
these operations as they do not need to concern themselves with word
sizes and offsets anymore.
As a side effect of this change the flash operations are now done
entirely by subroutines; even the batch operations that used to use
custom loops.
Additionally some functions were merged with other functions in order
to reduce the amount of functions as well as consolidating common
code fragments.
Change-Id: I4698e920a226a3bbe8070004a14e5848abdd70ec
Diffstat (limited to 'firmware/export')
| -rw-r--r-- | firmware/export/config/iriverh100.h | 1 | ||||
| -rw-r--r-- | firmware/export/config/iriverh120.h | 1 | ||||
| -rw-r--r-- | firmware/export/config/iriverh300.h | 1 | ||||
| -rw-r--r-- | firmware/export/system.h | 4 |
4 files changed, 5 insertions, 2 deletions
diff --git a/firmware/export/config/iriverh100.h b/firmware/export/config/iriverh100.h index bbfab01ba5..b7f1ca4b30 100644 --- a/firmware/export/config/iriverh100.h +++ b/firmware/export/config/iriverh100.h @@ -172,6 +172,7 @@ #define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTDIR "/.rockbox" +#define FLASH_BASE 0x00000000 #define BOOTLOADER_ENTRYPOINT 0x001F0000 #define FLASH_RAMIMAGE_ENTRY 0x00001000 #define FLASH_ROMIMAGE_ENTRY 0x00100000 diff --git a/firmware/export/config/iriverh120.h b/firmware/export/config/iriverh120.h index 77ee1382be..4b658bcf49 100644 --- a/firmware/export/config/iriverh120.h +++ b/firmware/export/config/iriverh120.h @@ -178,6 +178,7 @@ #define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTDIR "/.rockbox" +#define FLASH_BASE 0x00000000 #define BOOTLOADER_ENTRYPOINT 0x001F0000 #define FLASH_RAMIMAGE_ENTRY 0x00001000 #define FLASH_ROMIMAGE_ENTRY 0x00100000 diff --git a/firmware/export/config/iriverh300.h b/firmware/export/config/iriverh300.h index f901f160c6..e5805dd8f4 100644 --- a/firmware/export/config/iriverh300.h +++ b/firmware/export/config/iriverh300.h @@ -187,6 +187,7 @@ #define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTDIR "/.rockbox" +#define FLASH_BASE 0x00000000 #define BOOTLOADER_ENTRYPOINT 0x003F0000 #define FLASH_RAMIMAGE_ENTRY 0x00001000 #define FLASH_ROMIMAGE_ENTRY 0x00200000 diff --git a/firmware/export/system.h b/firmware/export/system.h index 1885acfffd..68d7958870 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h @@ -36,8 +36,8 @@ extern void system_init(void); extern long cpu_frequency; struct flash_header { - unsigned long magic; - unsigned long length; + uint32_t magic; + uint32_t length; char version[32]; }; |