diff options
| author | Dan Halbert <halbert@halwitz.org> | 2018-11-09 15:56:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-09 15:56:29 -0500 |
| commit | 97bc95183d5114ce69c9387ebd2e2aa13feb65a7 (patch) | |
| tree | 83853be3b0197c1c18bcea4f5d3403d48a63e15e /shared-bindings | |
| parent | d08747d374057b24803b429bbf6474a2e4dcea5c (diff) | |
| parent | 43f7ca7985768c974b6881957b21d687c34413ba (diff) | |
Merge pull request #1321 from tannewt/tinyusb_samd
Move atmel-samd to tinyusb and support nRF flash.
Diffstat (limited to 'shared-bindings')
| -rw-r--r-- | shared-bindings/busio/SPI.h | 3 | ||||
| -rw-r--r-- | shared-bindings/usb_hid/Device.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/shared-bindings/busio/SPI.h b/shared-bindings/busio/SPI.h index 555f32c92..2d12b8b76 100644 --- a/shared-bindings/busio/SPI.h +++ b/shared-bindings/busio/SPI.h @@ -61,4 +61,7 @@ extern bool common_hal_busio_spi_transfer(busio_spi_obj_t *self, uint8_t *data_o // Return actual SPI bus frequency. uint32_t common_hal_busio_spi_get_frequency(busio_spi_obj_t* self); +// This is used by the supervisor to claim SPI devices indefinitely. +extern void common_hal_busio_spi_never_reset(busio_spi_obj_t *self); + #endif // MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_SPI_H diff --git a/shared-bindings/usb_hid/Device.h b/shared-bindings/usb_hid/Device.h index 2bc553c4a..cb9a64b5e 100644 --- a/shared-bindings/usb_hid/Device.h +++ b/shared-bindings/usb_hid/Device.h @@ -27,7 +27,7 @@ #ifndef MICROPY_INCLUDED_SHARED_BINDINGS_USB_HID_DEVICE_H #define MICROPY_INCLUDED_SHARED_BINDINGS_USB_HID_DEVICE_H -#include "common-hal/usb_hid/Device.h" +#include "shared-module/usb_hid/Device.h" const mp_obj_type_t usb_hid_device_type; |