From ea15d962abcad3a2acc852bc450916b75fddb253 Mon Sep 17 00:00:00 2001 From: Matthew Peddie Date: Sun, 14 Apr 2013 10:30:16 -0700 Subject: [PATCH] Remove redundant access size argument in F4 flash code. --- include/libopencm3/stm32/f4/flash.h | 8 ++++---- lib/stm32/f4/flash.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/libopencm3/stm32/f4/flash.h b/include/libopencm3/stm32/f4/flash.h index aa78d191..72fedd3c 100644 --- a/include/libopencm3/stm32/f4/flash.h +++ b/include/libopencm3/stm32/f4/flash.h @@ -139,10 +139,10 @@ void flash_unlock_option_bytes(void); void flash_lock_option_bytes(void); void flash_erase_all_sectors(u32 program_size); void flash_erase_sector(u32 sector, u32 program_size); -void flash_program_double_word(u32 address, u64 data, u32 program_size); -void flash_program_word(u32 address, u32 data, u32 program_size); -void flash_program_half_word(u32 address, u16 data, u32 program_size); -void flash_program_byte(u32 address, u8 data, u32 program_size); +void flash_program_double_word(u32 address, u64 data); +void flash_program_word(u32 address, u32 data); +void flash_program_half_word(u32 address, u16 data); +void flash_program_byte(u32 address, u8 data); void flash_wait_for_last_operation(void); void flash_program_option_bytes(u32 data); diff --git a/lib/stm32/f4/flash.c b/lib/stm32/f4/flash.c index f3abb21c..4da63a14 100644 --- a/lib/stm32/f4/flash.c +++ b/lib/stm32/f4/flash.c @@ -152,11 +152,11 @@ void flash_wait_for_last_operation(void) ; } -void flash_program_double_word(u32 address, u64 data, u32 program_size) +void flash_program_double_word(u32 address, u64 data) { /* Ensure that all flash operations are complete. */ flash_wait_for_last_operation(); - flash_set_program_size(program_size); + flash_set_program_size(FLASH_CR_PROGRAM_X64); /* Enable writes to flash. */ FLASH_CR |= FLASH_CR_PG; @@ -171,11 +171,11 @@ void flash_program_double_word(u32 address, u64 data, u32 program_size) FLASH_CR &= ~FLASH_CR_PG; } -void flash_program_word(u32 address, u32 data, u32 program_size) +void flash_program_word(u32 address, u32 data) { /* Ensure that all flash operations are complete. */ flash_wait_for_last_operation(); - flash_set_program_size(program_size); + flash_set_program_size(FLASH_CR_PROGRAM_X32); /* Enable writes to flash. */ FLASH_CR |= FLASH_CR_PG; @@ -190,10 +190,10 @@ void flash_program_word(u32 address, u32 data, u32 program_size) FLASH_CR &= ~FLASH_CR_PG; } -void flash_program_half_word(u32 address, u16 data, u32 program_size) +void flash_program_half_word(u32 address, u16 data) { flash_wait_for_last_operation(); - flash_set_program_size(program_size); + flash_set_program_size(FLASH_CR_PROGRAM_X16); FLASH_CR |= FLASH_CR_PG; @@ -204,10 +204,10 @@ void flash_program_half_word(u32 address, u16 data, u32 program_size) FLASH_CR &= ~FLASH_CR_PG; /* Disable the PG bit. */ } -void flash_program_byte(u32 address, u8 data, u32 program_size) +void flash_program_byte(u32 address, u8 data) { flash_wait_for_last_operation(); - flash_set_program_size(program_size); + flash_set_program_size(FLASH_CR_PROGRAM_X8); FLASH_CR |= FLASH_CR_PG;