diff options
Diffstat (limited to 'drivers/eeprom/eeprom_i2c.c')
| -rw-r--r-- | drivers/eeprom/eeprom_i2c.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/eeprom/eeprom_i2c.c b/drivers/eeprom/eeprom_i2c.c index ca8af3da5..4210f06f9 100644 --- a/drivers/eeprom/eeprom_i2c.c +++ b/drivers/eeprom/eeprom_i2c.c | |||
| @@ -42,14 +42,6 @@ | |||
| 42 | # include "debug.h" | 42 | # include "debug.h" |
| 43 | #endif // DEBUG_EEPROM_OUTPUT | 43 | #endif // DEBUG_EEPROM_OUTPUT |
| 44 | 44 | ||
| 45 | static inline void init_i2c_if_required(void) { | ||
| 46 | static int done = 0; | ||
| 47 | if (!done) { | ||
| 48 | i2c_init(); | ||
| 49 | done = 1; | ||
| 50 | } | ||
| 51 | } | ||
| 52 | |||
| 53 | static inline void fill_target_address(uint8_t *buffer, const void *addr) { | 45 | static inline void fill_target_address(uint8_t *buffer, const void *addr) { |
| 54 | uintptr_t p = (uintptr_t)addr; | 46 | uintptr_t p = (uintptr_t)addr; |
| 55 | for (int i = 0; i < EXTERNAL_EEPROM_ADDRESS_SIZE; ++i) { | 47 | for (int i = 0; i < EXTERNAL_EEPROM_ADDRESS_SIZE; ++i) { |
| @@ -58,7 +50,7 @@ static inline void fill_target_address(uint8_t *buffer, const void *addr) { | |||
| 58 | } | 50 | } |
| 59 | } | 51 | } |
| 60 | 52 | ||
| 61 | void eeprom_driver_init(void) {} | 53 | void eeprom_driver_init(void) { i2c_init(); } |
| 62 | 54 | ||
| 63 | void eeprom_driver_erase(void) { | 55 | void eeprom_driver_erase(void) { |
| 64 | #if defined(CONSOLE_ENABLE) && defined(DEBUG_EEPROM_OUTPUT) | 56 | #if defined(CONSOLE_ENABLE) && defined(DEBUG_EEPROM_OUTPUT) |
| @@ -80,7 +72,6 @@ void eeprom_read_block(void *buf, const void *addr, size_t len) { | |||
| 80 | uint8_t complete_packet[EXTERNAL_EEPROM_ADDRESS_SIZE]; | 72 | uint8_t complete_packet[EXTERNAL_EEPROM_ADDRESS_SIZE]; |
| 81 | fill_target_address(complete_packet, addr); | 73 | fill_target_address(complete_packet, addr); |
| 82 | 74 | ||
| 83 | init_i2c_if_required(); | ||
| 84 | i2c_transmit(EXTERNAL_EEPROM_I2C_ADDRESS((uintptr_t)addr), complete_packet, EXTERNAL_EEPROM_ADDRESS_SIZE, 100); | 75 | i2c_transmit(EXTERNAL_EEPROM_I2C_ADDRESS((uintptr_t)addr), complete_packet, EXTERNAL_EEPROM_ADDRESS_SIZE, 100); |
| 85 | i2c_receive(EXTERNAL_EEPROM_I2C_ADDRESS((uintptr_t)addr), buf, len, 100); | 76 | i2c_receive(EXTERNAL_EEPROM_I2C_ADDRESS((uintptr_t)addr), buf, len, 100); |
| 86 | 77 | ||
| @@ -98,7 +89,6 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) { | |||
| 98 | uint8_t * read_buf = (uint8_t *)buf; | 89 | uint8_t * read_buf = (uint8_t *)buf; |
| 99 | uintptr_t target_addr = (uintptr_t)addr; | 90 | uintptr_t target_addr = (uintptr_t)addr; |
| 100 | 91 | ||
| 101 | init_i2c_if_required(); | ||
| 102 | while (len > 0) { | 92 | while (len > 0) { |
| 103 | uintptr_t page_offset = target_addr % EXTERNAL_EEPROM_PAGE_SIZE; | 93 | uintptr_t page_offset = target_addr % EXTERNAL_EEPROM_PAGE_SIZE; |
| 104 | int write_length = EXTERNAL_EEPROM_PAGE_SIZE - page_offset; | 94 | int write_length = EXTERNAL_EEPROM_PAGE_SIZE - page_offset; |
