Fix build bugs exposed by posix port

jepler · jepler · commit f7c4a220d083 · 2024-02-13T17:00:52.000-06:00
diff --git a/main.c b/main.c
@@ -92,6 +92,7 @@
 
 #if CIRCUITPY_DISPLAYIO
 #include "shared-module/displayio/__init__.h"
+#include "shared-bindings/displayio/__init__.h"
 #endif
 
 #if CIRCUITPY_EPAPERDISPLAY
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include "shared-module/displayio/__init__.h"
+#include "shared-bindings/displayio/__init__.h"
 
 #include "shared/runtime/interrupt_char.h"
 #include "py/runtime.h"
@@ -38,7 +39,6 @@
 #include "supervisor/shared/display.h"
 #include "supervisor/shared/reload.h"
 
-#include "supervisor/spi_flash_api.h"
 #include "py/mpconfig.h"
 
 #if CIRCUITPY_BUSDISPLAY
diff --git a/shared-module/epaperdisplay/EPaperDisplay.h b/shared-module/epaperdisplay/EPaperDisplay.h
@@ -26,7 +26,6 @@
 
 #pragma once
 
-#include "shared-bindings/digitalio/DigitalInOut.h"
 #include "shared-bindings/displayio/Group.h"
 
 #include "shared-module/displayio/area.h"
diff --git a/shared-module/framebufferio/FramebufferDisplay.h b/shared-module/framebufferio/FramebufferDisplay.h
@@ -31,7 +31,6 @@
 #include "py/obj.h"
 #include "py/proto.h"
 
-#include "shared-bindings/digitalio/DigitalInOut.h"
 #include "shared-bindings/displayio/Group.h"
 
 #include "shared-module/displayio/area.h"
diff --git a/shared-module/supervisor/StatusBar.c b/shared-module/supervisor/StatusBar.c
@@ -60,7 +60,7 @@ bool shared_module_supervisor_status_bar_get_display(supervisor_status_bar_obj_t
     return self->display;
 }
 
-#if CIRCUITPY_TERMINALIO
+#if CIRCUITPY_STATUS_BAR && CIRCUITPY_TERMINALIO
 void shared_module_supervisor_status_bar_set_display(supervisor_status_bar_obj_t *self, bool enabled) {
     if (self->display == enabled) {
         // Do nothing if not changing the state.

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ bool shared_module_supervisor_status_bar_get_display(supervisor_status_bar_obj_t`
`60`	`60`	`return self->display;`
`61`	`61`	`}`
`62`	`62`
`63`		`-#if CIRCUITPY_TERMINALIO`
	`63`	`+#if CIRCUITPY_STATUS_BAR && CIRCUITPY_TERMINALIO`
`64`	`64`	`void shared_module_supervisor_status_bar_set_display(supervisor_status_bar_obj_t *self, bool enabled) {`
`65`	`65`	`if (self->display == enabled) {`
`66`	`66`	`// Do nothing if not changing the state.`