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_spi.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_spi.c')
-rw-r--r-- | drivers/eeprom/eeprom_spi.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/eeprom/eeprom_spi.c b/drivers/eeprom/eeprom_spi.c index 7b6416eaf..182731d82 100644 --- a/drivers/eeprom/eeprom_spi.c +++ b/drivers/eeprom/eeprom_spi.c | |||
@@ -55,14 +55,6 @@ | |||
55 | # include "debug.h" | 55 | # include "debug.h" |
56 | #endif // CONSOLE_ENABLE | 56 | #endif // CONSOLE_ENABLE |
57 | 57 | ||
58 | static void init_spi_if_required(void) { | ||
59 | static int done = 0; | ||
60 | if (!done) { | ||
61 | spi_init(); | ||
62 | done = 1; | ||
63 | } | ||
64 | } | ||
65 | |||
66 | static bool spi_eeprom_start(void) { return spi_start(EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN, EXTERNAL_EEPROM_SPI_LSBFIRST, EXTERNAL_EEPROM_SPI_MODE, EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR); } | 58 | static bool spi_eeprom_start(void) { return spi_start(EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN, EXTERNAL_EEPROM_SPI_LSBFIRST, EXTERNAL_EEPROM_SPI_MODE, EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR); } |
67 | 59 | ||
68 | static spi_status_t spi_eeprom_wait_while_busy(int timeout) { | 60 | static spi_status_t spi_eeprom_wait_while_busy(int timeout) { |
@@ -91,7 +83,7 @@ static void spi_eeprom_transmit_address(uintptr_t addr) { | |||
91 | 83 | ||
92 | //---------------------------------------------------------------------------------------------------------------------- | 84 | //---------------------------------------------------------------------------------------------------------------------- |
93 | 85 | ||
94 | void eeprom_driver_init(void) {} | 86 | void eeprom_driver_init(void) { spi_init(); } |
95 | 87 | ||
96 | void eeprom_driver_erase(void) { | 88 | void eeprom_driver_erase(void) { |
97 | #if defined(CONSOLE_ENABLE) && defined(DEBUG_EEPROM_OUTPUT) | 89 | #if defined(CONSOLE_ENABLE) && defined(DEBUG_EEPROM_OUTPUT) |
@@ -110,8 +102,6 @@ void eeprom_driver_erase(void) { | |||
110 | } | 102 | } |
111 | 103 | ||
112 | void eeprom_read_block(void *buf, const void *addr, size_t len) { | 104 | void eeprom_read_block(void *buf, const void *addr, size_t len) { |
113 | init_spi_if_required(); | ||
114 | |||
115 | //------------------------------------------------- | 105 | //------------------------------------------------- |
116 | // Wait for the write-in-progress bit to be cleared | 106 | // Wait for the write-in-progress bit to be cleared |
117 | bool res = spi_eeprom_start(); | 107 | bool res = spi_eeprom_start(); |
@@ -154,8 +144,6 @@ void eeprom_read_block(void *buf, const void *addr, size_t len) { | |||
154 | } | 144 | } |
155 | 145 | ||
156 | void eeprom_write_block(const void *buf, void *addr, size_t len) { | 146 | void eeprom_write_block(const void *buf, void *addr, size_t len) { |
157 | init_spi_if_required(); | ||
158 | |||
159 | bool res; | 147 | bool res; |
160 | uint8_t * read_buf = (uint8_t *)buf; | 148 | uint8_t * read_buf = (uint8_t *)buf; |
161 | uintptr_t target_addr = (uintptr_t)addr; | 149 | uintptr_t target_addr = (uintptr_t)addr; |