jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove redundant access size argument in F4 flash code.

Browse Source
This commit is contained in:
Matthew Peddie 2013-04-14 10:30:16 -07:00 committed by Piotr Esden-Tempski
parent 6313af8869
commit ea15d962ab
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/libopencm3/stm32/f4/flash.h
View File

@ -139,10 +139,10 @@ void flash_unlock_option_bytes(void);
void flash_lock_option_bytes(void); void flash_lock_option_bytes(void);
void flash_erase_all_sectors(u32 program_size); void flash_erase_all_sectors(u32 program_size);
void flash_erase_sector(u32 sector, 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_double_word(u32 address, u64 data);
void flash_program_word(u32 address, u32 data, u32 program_size); void flash_program_word(u32 address, u32 data);
void flash_program_half_word(u32 address, u16 data, u32 program_size); void flash_program_half_word(u32 address, u16 data);
void flash_program_byte(u32 address, u8 data, u32 program_size); void flash_program_byte(u32 address, u8 data);
void flash_wait_for_last_operation(void); void flash_wait_for_last_operation(void);
void flash_program_option_bytes(u32 data); void flash_program_option_bytes(u32 data);

16
lib/stm32/f4/flash.c
View File

@ -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. */ /* Ensure that all flash operations are complete. */
flash_wait_for_last_operation(); flash_wait_for_last_operation();
flash_set_program_size(program_size); flash_set_program_size(FLASH_CR_PROGRAM_X64);
/* Enable writes to flash. */ /* Enable writes to flash. */
FLASH_CR |= FLASH_CR_PG; 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; 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. */ /* Ensure that all flash operations are complete. */
flash_wait_for_last_operation(); flash_wait_for_last_operation();
flash_set_program_size(program_size); flash_set_program_size(FLASH_CR_PROGRAM_X32);
/* Enable writes to flash. */ /* Enable writes to flash. */
FLASH_CR |= FLASH_CR_PG; 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; 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_wait_for_last_operation();
flash_set_program_size(program_size); flash_set_program_size(FLASH_CR_PROGRAM_X16);
FLASH_CR |= FLASH_CR_PG; 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. */ 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_wait_for_last_operation();
flash_set_program_size(program_size); flash_set_program_size(FLASH_CR_PROGRAM_X8);
FLASH_CR |= FLASH_CR_PG; FLASH_CR |= FLASH_CR_PG;