Skip to content

Commit 114d49e

Browse files
fix import errors and transfer_close return typing
1 parent 616ec37 commit 114d49e

4 files changed

Lines changed: 16 additions & 344 deletions

File tree

ports/atmel-samd/common-hal/spitarget/SPITarget.c

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
#include "common-hal/spitarget/SPITarget.h"
22

3+
#include "shared-bindings/spitarget/SPITarget.h"
4+
#include "shared-bindings/microcontroller/Pin.h"
5+
#include "py/mperrno.h"
6+
#include "py/runtime.h"
7+
8+
#include "hpl_sercom_config.h"
9+
#include "peripheral_clk_config.h"
10+
11+
#include "hal/include/hal_gpio.h"
12+
#include "hal/include/hal_spi_m_sync.h"
13+
314
#include "hpl_sercom_config.h"
415
#include "samd/sercom.h"
516

@@ -47,7 +58,7 @@ void common_hal_spitarget_spi_target_construct(spitarget_spi_target_obj_t *self,
4758
if (potential_sercom->SPI.CTRLA.bit.ENABLE != 0) {
4859
continue;
4960
}
50-
clock_pinmux = PINMUX(clock->number, (i == 0) ? MUX_C : MUX_D);
61+
clock_pinmux = PINMUX(sck->number, (i == 0) ? MUX_C : MUX_D);
5162
clock_pad = clock->sercom[i].pad;
5263
if (!samd_peripherals_valid_spi_clock_pad(clock_pad)) {
5364
continue;
@@ -120,7 +131,7 @@ void common_hal_spitarget_spi_target_construct(spitarget_spi_target_obj_t *self,
120131
gpio_set_pin_direction(clock->number, GPIO_DIRECTION_IN);
121132
gpio_set_pin_pull_mode(clock->number, GPIO_PULL_OFF);
122133
gpio_set_pin_function(clock->number, clock_pinmux);
123-
claim_pin(clock);
134+
claim_pin(sck);
124135
self->clock_pin = clock->number;
125136

126137
gpio_set_pin_direction(mosi->number, GPIO_DIRECTION_IN);
@@ -213,7 +224,7 @@ bool common_hal_spitarget_spi_target_transfer_is_finished(spitarget_spi_target_o
213224
return self->running_dma.failure == 1 || shared_dma_transfer_finished(self->running_dma);
214225
}
215226

216-
void common_hal_spitarget_spi_target_transfer_close(spitarget_spi_target_obj_t *self) {
227+
int common_hal_spitarget_spi_target_transfer_close(spitarget_spi_target_obj_t *self) {
217228
if (self->running_dma.failure == 1) {
218229
return 0;
219230
}

shared-bindings/spitarget/SPITarget.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ STATIC mp_obj_t spitarget_spi_target_try_transfer(size_t n_args, const mp_obj_t
177177

178178
do {
179179
if (common_hal_spitarget_spi_target_transfer_is_finished(self)) {
180-
common_hal_spitarget_spi_target_transfer_close(self);
180+
common_hal_spitarget_spi_target_transfer_close(self); // implicitly discards error indicator code
181181
return mp_const_true;
182182
}
183183
mp_hal_delay_us(10);

shared-bindings/spitarget/SPITarget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ extern bool common_hal_spitarget_spi_target_deinited(spitarget_spi_target_obj_t
4242
extern void common_hal_spitarget_spi_target_transfer_start(spitarget_spi_target_obj_t *self,
4343
const uint8_t *mosi_packet, uint8_t *miso_packet, size_t len);
4444
extern bool common_hal_spitarget_spi_target_transfer_is_finished(spitarget_spi_target_obj_t *self);
45-
extern void common_hal_spitarget_spi_target_transfer_close(spitarget_spi_target_obj_t *self);
45+
extern int common_hal_spitarget_spi_target_transfer_close(spitarget_spi_target_obj_t *self);
4646

4747
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_SPI_TARGET_H

0 commit comments

Comments
 (0)