diff options
author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-11-28 12:02:18 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-28 12:02:18 -0800 |
commit | c66df1664497546f32662409778731143e45a552 (patch) | |
tree | da73a2d532a27685a31d932b3a44a707d4a3af81 /drivers/eeprom/eeprom_i2c.c | |
parent | 15385d4113414d42bd062c60c9de5df797d3157f (diff) | |
download | qmk_firmware-c66df1664497546f32662409778731143e45a552.tar.gz qmk_firmware-c66df1664497546f32662409778731143e45a552.zip |
2020 November 28 Breaking Changes Update (#11053)
* Branch point for 2020 November 28 Breaking Change
* Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183)
* Add support for soft serial to ATmega32U2 (#10204)
* Change MIDI velocity implementation to allow direct control of velocity value (#9940)
* Add ability to build a subset of all keyboards based on platform.
* Actually use eeprom_driver_init().
* Make bootloader_jump weak for ChibiOS. (#10417)
* Joystick 16-bit support (#10439)
* Per-encoder resolutions (#10259)
* Share button state from mousekey to pointing_device (#10179)
* Add hotfix for chibios keyboards not wake (#10088)
* Add advanced/efficient RGB Matrix Indicators (#8564)
* Naming change.
* Support for STM32 GPIOF,G,H,I,J,K (#10206)
* Add milc as a dependency and remove the installed milc (#10563)
* ChibiOS upgrade: early init conversions (#10214)
* ChibiOS upgrade: configuration file migrator (#9952)
* Haptic and solenoid cleanup (#9700)
* XD75 cleanup (#10524)
* OLED display update interval support (#10388)
* Add definition based on currently-selected serial driver. (#10716)
* New feature: Retro Tapping per key (#10622)
* Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638)
* Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530)
* Rescale both ChibiOS and AVR backlighting.
* Reduce Helix keyboard build variation (#8669)
* Minor change to behavior allowing display updates to continue between task ticks (#10750)
* Some GPIO manipulations in matrix.c change to atomic. (#10491)
* qmk cformat (#10767)
* [Keyboard] Update the Speedo firmware for v3.0 (#10657)
* Maartenwut/Maarten namechange to evyd13/Evy (#10274)
* [quantum] combine repeated lines of code (#10837)
* Add step sequencer feature (#9703)
* aeboards/ext65 refactor (#10820)
* Refactor xelus/dawn60 for Rev2 later (#10584)
* add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824)
* [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549)
* update chibios os usb for the otg driver (#8893)
* Remove HD44780 References, Part 4 (#10735)
* [Keyboard] Add Valor FRL TKL (+refactor) (#10512)
* Fix cursor position bug in oled_write_raw functions (#10800)
* Fixup version.h writing when using SKIP_VERSION=yes (#10972)
* Allow for certain code in the codebase assuming length of string. (#10974)
* Add AT90USB support for serial.c (#10706)
* Auto shift: support repeats and early registration (#9826)
* Rename ledmatrix.h to match .c file (#7949)
* Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231)
* Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840)
* Merge point for 2020 Nov 28 Breaking Change
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; |