diff options
| author | Lucian Copeland <hierophect@gmail.com> | 2020-01-24 14:33:28 -0500 |
|---|---|---|
| committer | Lucian Copeland <hierophect@gmail.com> | 2020-01-24 14:33:28 -0500 |
| commit | 70932cab4223463816974e57945f6f803bbe7371 (patch) | |
| tree | 2363d412e683d9cee5e94a423fbecb0b19637e25 /shared-module | |
| parent | 2afca4e942df2f4aa656f6c8a6aa84de581682c9 (diff) | |
Simplify the flash-display conflict fix
Diffstat (limited to 'shared-module')
| -rw-r--r-- | shared-module/board/__init__.c | 11 | ||||
| -rw-r--r-- | shared-module/displayio/__init__.c | 7 |
2 files changed, 5 insertions, 13 deletions
diff --git a/shared-module/board/__init__.c b/shared-module/board/__init__.c index 8d87a98eb..914bc4313 100644 --- a/shared-module/board/__init__.c +++ b/shared-module/board/__init__.c @@ -29,8 +29,6 @@ #include "mpconfigboard.h" #include "py/runtime.h" -#include "supervisor/spi_flash_api.h" - #if CIRCUITPY_BUSIO #include "shared-bindings/busio/I2C.h" #include "shared-bindings/busio/SPI.h" @@ -91,15 +89,6 @@ mp_obj_t common_hal_board_create_spi(void) { } #endif -#if BOARD_INTERNAL_SPI -//Provide a reference to the internal SPI, if required. -mp_obj_t common_hal_board_get_internal_spi(void) { - //TODO: can we change the name of this without having to change every instance of spi in every - //flash file? - return (mp_obj_t)(&spi); -} -#endif - #if BOARD_UART mp_obj_t common_hal_board_get_uart(void) { return MP_STATE_VM(shared_uart_bus); diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c index 795de7b87..8d9f14883 100644 --- a/shared-module/displayio/__init__.c +++ b/shared-module/displayio/__init__.c @@ -16,6 +16,9 @@ #include "supervisor/shared/display.h" #include "supervisor/memory.h" +#include "supervisor/spi_flash_api.h" +#include "py/mpconfig.h" + primary_display_t displays[CIRCUITPY_DISPLAY_LIMIT]; // Check for recursive calls to displayio_background. @@ -100,8 +103,8 @@ void reset_displays(void) { continue; } #endif - #if BOARD_INTERNAL_SPI - if (original_spi == common_hal_board_get_internal_spi()) { + #ifdef BOARD_USE_INTERNAL_SPI + if (original_spi == (mp_obj_t)(&spi)) { continue; } #endif |