diff options
Diffstat (limited to 'firmware/src/os/flash.c')
| -rw-r--r-- | firmware/src/os/flash.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/firmware/src/os/flash.c b/firmware/src/os/flash.c index c729ff8..dabc033 100644 --- a/firmware/src/os/flash.c +++ b/firmware/src/os/flash.c @@ -13,34 +13,34 @@ #define EFCS_CMD_CLEAR_NVM_BIT 0xd #define EFCS_CMD_SET_SECURITY_BIT 0xf -static u_int16_t page_from_ramaddr(const void *addr) +static uint16_t page_from_ramaddr(const void *addr) { - u_int32_t ramaddr = (u_int32_t) addr; - ramaddr -= (u_int32_t) AT91C_IFLASH; + uint32_t ramaddr = (uint32_t) addr; + ramaddr -= (uint32_t) AT91C_IFLASH; return ((ramaddr >> AT91C_IFLASH_PAGE_SHIFT)); } #define PAGES_PER_LOCKREGION (AT91C_IFLASH_LOCK_REGION_SIZE>>AT91C_IFLASH_PAGE_SHIFT) #define IS_FIRST_PAGE_OF_LOCKREGION(x) ((x % PAGES_PER_LOCKREGION) == 0) #define LOCKREGION_FROM_PAGE(x) (x / PAGES_PER_LOCKREGION) -static int is_page_locked(u_int16_t page) +static int is_page_locked(uint16_t page) { - u_int16_t lockregion = LOCKREGION_FROM_PAGE(page); + uint16_t lockregion = LOCKREGION_FROM_PAGE(page); return (AT91C_BASE_MC->MC_FSR & (lockregion << 16)); } -static void unlock_page(u_int16_t page) +static void unlock_page(uint16_t page) { page &= 0x3ff; AT91F_MC_EFC_PerformCmd(AT91C_BASE_MC, AT91C_MC_FCMD_UNLOCK | AT91C_MC_CORRECT_KEY | (page << 8)); } -void flash_page(u_int8_t *addr) +void flash_page(uint8_t *addr) { - u_int16_t page = page_from_ramaddr(addr) & 0x3ff; - u_int32_t fsr = AT91F_MC_EFC_GetStatus(AT91C_BASE_MC); + uint16_t page = page_from_ramaddr(addr) & 0x3ff; + uint32_t fsr = AT91F_MC_EFC_GetStatus(AT91C_BASE_MC); DEBUGP("flash_page(0x%x=%u) ", addr, page); if (is_page_locked(page)) { |