Fix more boards and docs

Author: tannewt

docs/supported_ports.rst

@@ -20,6 +20,7 @@ Additional testing is limited.
     ../ports/mimxrt10xx/README
     ../ports/nordic/README
     ../ports/raspberrypi/README
+    ../ports/renode/README
     ../ports/silabs/README
     ../ports/stm/README
     ../ports/unix/README

ports/espressif/supervisor/internal_flash.c

@@ -43,7 +43,10 @@
 
 #include "supervisor/filesystem.h"
 #include "supervisor/flash.h"
+
+#if CIRCUITPY_USB
 #include "supervisor/usb.h"
+#endif
 
 #define OP_READ     0
 #define OP_WRITE    1

ports/nordic/background.c

@@ -27,10 +27,7 @@
 #include "background.h"
 
 #include "py/runtime.h"
-#include "supervisor/filesystem.h"
 #include "supervisor/port.h"
-#include "supervisor/shared/stack.h"
-#include "supervisor/usb.h"
 
 #if CIRCUITPY_DISPLAYIO
 #include "shared-module/displayio/__init__.h"

ports/nordic/common-hal/_bleio/Adapter.c

@@ -26,7 +26,6 @@
  * THE SOFTWARE.
  */
 
-#include <math.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -43,14 +42,15 @@
 #include "supervisor/shared/bluetooth/bluetooth.h"
 #include "supervisor/shared/safe_mode.h"
 #include "supervisor/shared/tick.h"
-#include "supervisor/usb.h"
 #include "shared-bindings/_bleio/__init__.h"
 #include "shared-bindings/_bleio/Adapter.h"
 #include "shared-bindings/_bleio/Address.h"
 #include "shared-bindings/nvm/ByteArray.h"
 #include "shared-bindings/_bleio/Connection.h"
-#include "shared-bindings/_bleio/ScanEntry.h"
-#include "shared-bindings/time/__init__.h"
+
+#if CIRCUITPY_USB
+#include "supervisor/usb.h"
+#endif
 
 #if CIRCUITPY_OS_GETENV
 #include "shared-bindings/os/__init__.h"

shared-bindings/storage/__init__.c

@@ -203,7 +203,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(storage_erase_filesystem_obj, 0, storage_erase_filesy
 //|     ...
 //|
 STATIC mp_obj_t storage_disable_usb_drive(void) {
-    #if CIRCUITPY_USB_MSC
+    #if CIRCUITPY_USB && CIRCUITPY_USB_MSC
     if (!common_hal_storage_disable_usb_drive()) {
     #else
     if (true) {
@@ -228,7 +228,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(storage_disable_usb_drive_obj, storage_disable_usb_dri
 //|     ...
 //|
 STATIC mp_obj_t storage_enable_usb_drive(void) {
-    #if CIRCUITPY_USB_MSC
+    #if CIRCUITPY_USB && CIRCUITPY_USB_MSC
     if (!common_hal_storage_enable_usb_drive()) {
     #else
     if (true) {
@@ -275,38 +275,30 @@ STATIC const mp_rom_map_elem_t storage_module_globals_table[] = {
 //|         larger filesystems, but you will need to format the filesystem on another device.
 //|         """
 //|         ...
-//|
 //|     def open(self, path: str, mode: str) -> None:
 //|         """Like builtin ``open()``"""
 //|         ...
-//|
 //|     def ilistdir(
 //|         self, path: str
 //|     ) -> Iterator[Union[Tuple[AnyStr, int, int, int], Tuple[AnyStr, int, int]]]:
 //|         """Return an iterator whose values describe files and folders within
 //|         ``path``"""
 //|         ...
-//|
 //|     def mkdir(self, path: str) -> None:
 //|         """Like `os.mkdir`"""
 //|         ...
-//|
 //|     def rmdir(self, path: str) -> None:
 //|         """Like `os.rmdir`"""
 //|         ...
-//|
 //|     def stat(self, path: str) -> Tuple[int, int, int, int, int, int, int, int, int, int]:
 //|         """Like `os.stat`"""
 //|         ...
-//|
 //|     def statvfs(self, path: int) -> Tuple[int, int, int, int, int, int, int, int, int, int]:
 //|         """Like `os.statvfs`"""
 //|         ...
-//|
 //|     def mount(self, readonly: bool, mkfs: VfsFat) -> None:
 //|         """Don't call this directly, call `storage.mount`."""
 //|         ...
-//|
 //|     def umount(self) -> None:
 //|         """Don't call this directly, call `storage.umount`."""
 //|         ...

shared-module/busdisplay/BusDisplay.c

@@ -42,7 +42,10 @@
 #include "shared-module/displayio/display_core.h"
 #include "supervisor/shared/display.h"
 #include "supervisor/shared/tick.h"
+
+#if CIRCUITPY_USB
 #include "supervisor/usb.h"
+#endif
 
 #include <stdint.h>
 #include <string.h>

shared-module/epaperdisplay/EPaperDisplay.c

@@ -35,7 +35,10 @@
 #include "shared-module/displayio/__init__.h"
 #include "supervisor/shared/display.h"
 #include "supervisor/shared/tick.h"
+
+#if CIRCUITPY_USB
 #include "supervisor/usb.h"
+#endif
 
 #include <stdint.h>
 #include <string.h>

shared-module/framebufferio/FramebufferDisplay.c

@@ -35,7 +35,10 @@
 #include "shared-module/displayio/display_core.h"
 #include "supervisor/shared/display.h"
 #include "supervisor/shared/tick.h"
+
+#if CIRCUITPY_USB
 #include "supervisor/usb.h"
+#endif
 
 #include <stdint.h>
 #include <string.h>

shared-module/storage/__init__.c

@@ -38,9 +38,12 @@
 #include "shared-bindings/storage/__init__.h"
 #include "supervisor/filesystem.h"
 #include "supervisor/flash.h"
+
+#if CIRCUITPY_USB
 #include "supervisor/usb.h"
+#endif
 
-#if CIRCUITPY_USB_MSC
+#if CIRCUITPY_USB && CIRCUITPY_USB_MSC
 #include "tusb.h"
 
 static const uint8_t usb_msc_descriptor_template[] = {
@@ -262,7 +265,7 @@ void common_hal_storage_remount(const char *mount_path, bool readonly, bool disa
         mp_raise_OSError(MP_EINVAL);
     }
 
-    #if CIRCUITPY_USB_MSC
+    #if CIRCUITPY_USB && CIRCUITPY_USB_MSC
     if (!usb_msc_ejected() && storage_usb_is_enabled) {
         mp_raise_RuntimeError(MP_ERROR_TEXT("Cannot remount '/' when visible via USB."));
     }

shared-module/storage/__init__.h

@@ -27,10 +27,9 @@
 #ifndef SHARED_MODULE_STORAGE___INIT___H
 #define SHARED_MODULE_STORAGE___INIT___H
 
-#include "py/mpconfig.h"
+#if CIRCUITPY_USB
 #include "supervisor/usb.h"
 
-#if CIRCUITPY_USB
 bool storage_usb_enabled(void);
 void storage_usb_set_defaults(void);
 size_t storage_usb_descriptor_length(void);