summaryrefslogtreecommitdiff
path: root/shared-module
diff options
context:
space:
mode:
authorScott Shawcroft <scott@tannewt.org>2019-04-05 19:06:37 -0700
committerScott Shawcroft <scott@tannewt.org>2019-04-05 19:06:37 -0700
commit7686f93ef456aa46f538da3159d0e12cae9fa737 (patch)
treebdd9d98d82e09d9ea725284e9bb2eee2d71c2f41 /shared-module
parent8b9e93329d5b9c732954f0d8f1ba2c97819ad774 (diff)
Fix crash when getting board.SPI outside the VM
If one of the default pins was already in use it would crash. The internal API has been refined to allow us to get the value without causing an init of the singleton. Fixes #1753
Diffstat (limited to 'shared-module')
-rw-r--r--shared-module/displayio/__init__.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index ced5b0fef..49c85f277 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -190,7 +190,7 @@ void reset_displays(void) {
if (((uint32_t) fourwire->bus) < ((uint32_t) &displays) ||
((uint32_t) fourwire->bus) > ((uint32_t) &displays + CIRCUITPY_DISPLAY_LIMIT)) {
busio_spi_obj_t* original_spi = fourwire->bus;
- if (original_spi == board_spi()) {
+ if (original_spi == common_hal_board_get_spi()) {
continue;
}
memcpy(&fourwire->inline_bus, original_spi, sizeof(busio_spi_obj_t));