Skip to content

Commit 3d5528b

Browse files
hierophecthierophect
committed
style edits
1 parent d645ea2 commit 3d5528b

File tree

1 file changed

+42
-23
lines changed
  • ports/stm32f4/common-hal/busio

1 file changed

+42
-23
lines changed

‎ports/stm32f4/common-hal/busio/SPI.c

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ STATIC void spi_clock_disable(uint8_t mask);
5252
STATIC uint32_t get_busclock(SPI_TypeDef * instance) {
5353
//SPI2 and 3 are on PCLK1, if they exist.
5454
#ifdef SPI2
55-
if(instance == SPI2) return HAL_RCC_GetPCLK1Freq();
55+
if (instance == SPI2) return HAL_RCC_GetPCLK1Freq();
5656
#endif
5757
#ifdef SPI3
58-
if(instance == SPI3) return HAL_RCC_GetPCLK1Freq();
58+
if (instance == SPI3) return HAL_RCC_GetPCLK1Freq();
5959
#endif
6060
return HAL_RCC_GetPCLK2Freq();
6161
}
@@ -85,20 +85,20 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
8585
bool spi_taken = false;
8686

8787
//SCK is not optional. MOSI and MISO are
88-
for(uint i=0; i<sck_len;i++) {
88+
for (uint i=0; i<sck_len;i++) {
8989
if (mcu_spi_sck_list[i].pin == sck) {
9090
//if both MOSI and MISO exist, loop search normally
9191
if ((mosi != mp_const_none) && (miso != mp_const_none)) {
9292
//MOSI
93-
for(uint j=0; j<mosi_len;j++) {
93+
for (uint j=0; j<mosi_len;j++) {
9494
if (mcu_spi_mosi_list[j].pin == mosi) {
9595
//MISO
96-
for(uint k=0; k<miso_len;k++) {
96+
for (uint k=0; k<miso_len;k++) {
9797
if ((mcu_spi_miso_list[k].pin == miso) //everything needs the same index
9898
&& (mcu_spi_sck_list[i].spi_index == mcu_spi_mosi_list[j].spi_index)
9999
&& (mcu_spi_sck_list[i].spi_index == mcu_spi_miso_list[k].spi_index)) {
100100
//keep looking if the SPI is taken, edge case
101-
if(reserved_spi[mcu_spi_sck_list[i].spi_index-1]) {
101+
if (reserved_spi[mcu_spi_sck_list[i].spi_index-1]) {
102102
spi_taken = true;
103103
continue;
104104
}
@@ -113,11 +113,11 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
113113
}
114114
// if just MISO, reduce search
115115
} else if (miso != mp_const_none) {
116-
for(uint j=0; j<miso_len;j++) {
116+
for (uint j=0; j<miso_len;j++) {
117117
if ((mcu_spi_miso_list[j].pin == miso) //only SCK and MISO need the same index
118118
&& (mcu_spi_sck_list[i].spi_index == mcu_spi_miso_list[j].spi_index)) {
119119
//keep looking if the SPI is taken, edge case
120-
if(reserved_spi[mcu_spi_sck_list[i].spi_index-1]) {
120+
if (reserved_spi[mcu_spi_sck_list[i].spi_index-1]) {
121121
spi_taken = true;
122122
continue;
123123
}
@@ -130,11 +130,11 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
130130
}
131131
// if just MOSI, reduce search
132132
} else if (mosi != mp_const_none) {
133-
for(uint j=0; j<mosi_len;j++) {
133+
for (uint j=0; j<mosi_len;j++) {
134134
if ((mcu_spi_mosi_list[j].pin == mosi) //only SCK and MOSI need the same index
135135
&& (mcu_spi_sck_list[i].spi_index == mcu_spi_mosi_list[j].spi_index)) {
136136
//keep looking if the SPI is taken, edge case
137-
if(reserved_spi[mcu_spi_sck_list[i].spi_index-1]) {
137+
if (reserved_spi[mcu_spi_sck_list[i].spi_index-1]) {
138138
spi_taken = true;
139139
continue;
140140
}
@@ -153,7 +153,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
153153
}
154154

155155
//handle typedef selection, errors
156-
if( (self->sck!=NULL && self->mosi!=NULL && self->miso != NULL) ||
156+
if ( (self->sck!=NULL && self->mosi!=NULL && self->miso != NULL) ||
157157
(self->sck!=NULL && self->mosi!=NULL && miso == mp_const_none) ||
158158
(self->sck!=NULL && self->miso!=NULL && mosi == mp_const_none)) {
159159
SPIx = mcu_spi_banks[self->sck->spi_index-1];
@@ -219,17 +219,25 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
219219
self->bits = 8;
220220

221221
claim_pin(sck);
222-
if (self->mosi != NULL) claim_pin(mosi);
223-
if (self->miso != NULL) claim_pin(miso);
222+
if (self->mosi != NULL) {
223+
claim_pin(mosi);
224+
}
225+
if (self->miso != NULL) {
226+
claim_pin(miso);
227+
}
224228
}
225229

226230
void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
227-
for(size_t i = 0 ; i < MP_ARRAY_SIZE(mcu_spi_banks); i++) {
231+
for (size_t i = 0 ; i < MP_ARRAY_SIZE(mcu_spi_banks); i++) {
228232
if (mcu_spi_banks[i] == self->handle.Instance) {
229233
never_reset_spi[i] = true;
230234
never_reset_pin_number(self->sck->pin->port, self->sck->pin->number);
231-
if (self->mosi != NULL) never_reset_pin_number(self->mosi->pin->port, self->mosi->pin->number);
232-
if (self->miso != NULL) never_reset_pin_number(self->miso->pin->port, self->miso->pin->number);
235+
if (self->mosi != NULL) {
236+
never_reset_pin_number(self->mosi->pin->port, self->mosi->pin->number);
237+
}
238+
if (self->miso != NULL) {
239+
never_reset_pin_number(self->miso->pin->port, self->miso->pin->number);
240+
}
233241
break;
234242
}
235243
}
@@ -245,8 +253,12 @@ void common_hal_busio_spi_deinit(busio_spi_obj_t *self) {
245253
never_reset_spi[self->sck->spi_index - 1] = false;
246254

247255
reset_pin_number(self->sck->pin->port,self->sck->pin->number);
248-
if (self->mosi != NULL) reset_pin_number(self->mosi->pin->port,self->mosi->pin->number);
249-
if (self->miso != NULL) reset_pin_number(self->miso->pin->port,self->miso->pin->number);
256+
if (self->mosi != NULL) {
257+
reset_pin_number(self->mosi->pin->port,self->mosi->pin->number);
258+
}
259+
if (self->miso != NULL) {
260+
reset_pin_number(self->miso->pin->port,self->miso->pin->number);
261+
}
250262
self->sck = mp_const_none;
251263
self->mosi = mp_const_none;
252264
self->miso = mp_const_none;
@@ -282,7 +294,9 @@ bool common_hal_busio_spi_configure(busio_spi_obj_t *self,
282294
uint32_t baudrate, uint8_t polarity, uint8_t phase, uint8_t bits) {
283295
//This resets the SPI, so check before updating it redundantly
284296
if (baudrate == self->baudrate && polarity== self->polarity
285-
&& phase == self->phase && bits == self->bits) return true;
297+
&& phase == self->phase && bits == self->bits) {
298+
return true;
299+
}
286300

287301
//Deinit SPI
288302
HAL_SPI_DeInit(&self->handle);
@@ -335,22 +349,27 @@ void common_hal_busio_spi_unlock(busio_spi_obj_t *self) {
335349

336350
bool common_hal_busio_spi_write(busio_spi_obj_t *self,
337351
const uint8_t *data, size_t len) {
338-
if (self->mosi == NULL) mp_raise_ValueError(translate("No MOSI Pin"));
352+
if (self->mosi == NULL) {
353+
mp_raise_ValueError(translate("No MOSI Pin"));
354+
}
339355
HAL_StatusTypeDef result = HAL_SPI_Transmit (&self->handle, (uint8_t *)data, (uint16_t)len, HAL_MAX_DELAY);
340356
return result == HAL_OK;
341357
}
342358

343359
bool common_hal_busio_spi_read(busio_spi_obj_t *self,
344360
uint8_t *data, size_t len, uint8_t write_value) {
345-
if (self->miso == NULL) mp_raise_ValueError(translate("No MISO Pin"));
361+
if (self->miso == NULL) {
362+
mp_raise_ValueError(translate("No MISO Pin"));
363+
}
346364
HAL_StatusTypeDef result = HAL_SPI_Receive (&self->handle, data, (uint16_t)len, HAL_MAX_DELAY);
347365
return result == HAL_OK;
348366
}
349367

350368
bool common_hal_busio_spi_transfer(busio_spi_obj_t *self,
351369
uint8_t *data_out, uint8_t *data_in, size_t len) {
352-
if (self->miso == NULL) mp_raise_ValueError(translate("No MISO Pin"));
353-
if (self->mosi == NULL) mp_raise_ValueError(translate("No MOSI Pin"));
370+
if (self->miso == NULL || self->mosi == NULL) {
371+
mp_raise_ValueError(translate("Missing MISO or MOSI Pin"));
372+
}
354373
HAL_StatusTypeDef result = HAL_SPI_TransmitReceive (&self->handle,
355374
data_out, data_in, (uint16_t)len,HAL_MAX_DELAY);
356375
return result == HAL_OK;

0 commit comments

Comments
 (0)