Skip to content

Commit 5657f8a

Browse files
fix typing and naming mismatches
1 parent 114d49e commit 5657f8a

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void common_hal_spitarget_spi_target_construct(spitarget_spi_target_obj_t *self,
3434
// Special case for SAMR21 boards. (feather_radiofruit_zigbee)
3535
#if defined(PIN_PC19F_SERCOM4_PAD0)
3636
if (miso == &pin_PC19) {
37-
if (mosi == &pin_PB30 && clock == &pin_PC18) {
37+
if (mosi == &pin_PB30 && sck == &pin_PC18) {
3838
sercom = SERCOM4;
3939
sercom_index = 4;
4040
clock_pinmux = MUX_F;
@@ -59,7 +59,7 @@ void common_hal_spitarget_spi_target_construct(spitarget_spi_target_obj_t *self,
5959
continue;
6060
}
6161
clock_pinmux = PINMUX(sck->number, (i == 0) ? MUX_C : MUX_D);
62-
clock_pad = clock->sercom[i].pad;
62+
clock_pad = sck->sercom[i].pad;
6363
if (!samd_peripherals_valid_spi_clock_pad(clock_pad)) {
6464
continue;
6565
}
@@ -128,11 +128,11 @@ void common_hal_spitarget_spi_target_construct(spitarget_spi_target_obj_t *self,
128128
mp_raise_OSError(MP_EIO);
129129
}
130130

131-
gpio_set_pin_direction(clock->number, GPIO_DIRECTION_IN);
132-
gpio_set_pin_pull_mode(clock->number, GPIO_PULL_OFF);
133-
gpio_set_pin_function(clock->number, clock_pinmux);
131+
gpio_set_pin_direction(sck->number, GPIO_DIRECTION_IN);
132+
gpio_set_pin_pull_mode(sck->number, GPIO_PULL_OFF);
133+
gpio_set_pin_function(sck->number, clock_pinmux);
134134
claim_pin(sck);
135-
self->clock_pin = clock->number;
135+
self->clock_pin = sck->number;
136136

137137
gpio_set_pin_direction(mosi->number, GPIO_DIRECTION_IN);
138138
gpio_set_pin_pull_mode(mosi->number, GPIO_PULL_OFF);
@@ -172,12 +172,12 @@ void common_hal_spitarget_spi_target_deinit(spitarget_spi_target_obj_t *self) {
172172
self->clock_pin = NO_PIN;
173173
}
174174

175-
void common_hal_spitarget_spi_target_deinited(spitarget_spi_target_obj_t *self) {
175+
bool common_hal_spitarget_spi_target_deinited(spitarget_spi_target_obj_t *self) {
176176
return self->clock_pin == NO_PIN;
177177
}
178178

179179
void common_hal_spitarget_spi_target_transfer_start(spitarget_spi_target_obj_t *self,
180-
uint8_t *miso_packet, uint8_t *mosi_packet, size_t len) {
180+
uint8_t *mosi_packet, const uint8_t *miso_packet, size_t len) {
181181
if (len == 0) {
182182
return;
183183
}

shared-bindings/spitarget/SPITarget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ extern void common_hal_spitarget_spi_target_deinit(spitarget_spi_target_obj_t *s
4040
extern bool common_hal_spitarget_spi_target_deinited(spitarget_spi_target_obj_t *self);
4141

4242
extern void common_hal_spitarget_spi_target_transfer_start(spitarget_spi_target_obj_t *self,
43-
const uint8_t *mosi_packet, uint8_t *miso_packet, size_t len);
43+
uint8_t *mosi_packet, const uint8_t *miso_packet, size_t len);
4444
extern bool common_hal_spitarget_spi_target_transfer_is_finished(spitarget_spi_target_obj_t *self);
4545
extern int common_hal_spitarget_spi_target_transfer_close(spitarget_spi_target_obj_t *self);
4646

0 commit comments

Comments
 (0)