Skip to content

Commit b1379db

Browse files
committed
Fix warnings in hal-spi caused by pariman transition
1 parent 2d2ddb5 commit b1379db

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

cores/esp32/esp32-hal-spi.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ bool spiAttachSCK(spi_t * spi, int8_t sck)
229229
return false;
230230
#endif
231231
}
232-
uint8_t bus = (uint8_t)perimanGetPinBus(sck, ESP32_BUS_TYPE_SPI_MASTER);
232+
void * bus = perimanGetPinBus(sck, ESP32_BUS_TYPE_SPI_MASTER);
233233
if(bus != NULL && !perimanSetPinBus(sck, ESP32_BUS_TYPE_INIT, NULL)){
234234
return false;
235235
}
@@ -239,7 +239,7 @@ bool spiAttachSCK(spi_t * spi, int8_t sck)
239239
spi->sck = sck;
240240

241241
if(!perimanSetPinBus(sck, ESP32_BUS_TYPE_SPI_MASTER, (void *)(spi->num+1))){
242-
spiDetachBus((void *)bus);
242+
spiDetachBus(bus);
243243
log_e("Failed to set pin bus to SPI for pin %d", sck);
244244
return false;
245245
}
@@ -279,7 +279,7 @@ bool spiAttachMISO(spi_t * spi, int8_t miso)
279279
return false;
280280
#endif
281281
}
282-
uint8_t bus = (uint8_t)perimanGetPinBus(miso, ESP32_BUS_TYPE_SPI_MASTER);
282+
void * bus = perimanGetPinBus(miso, ESP32_BUS_TYPE_SPI_MASTER);
283283
if(bus != NULL && !perimanSetPinBus(miso, ESP32_BUS_TYPE_INIT, NULL)){
284284
return false;
285285
}
@@ -291,7 +291,7 @@ bool spiAttachMISO(spi_t * spi, int8_t miso)
291291
SPI_MUTEX_UNLOCK();
292292

293293
if(!perimanSetPinBus(miso, ESP32_BUS_TYPE_SPI_MASTER, (void *)(spi->num+1))){
294-
spiDetachBus((void *)bus);
294+
spiDetachBus(bus);
295295
log_e("Failed to set pin bus to SPI for pin %d", miso);
296296
return false;
297297
}
@@ -331,7 +331,7 @@ bool spiAttachMOSI(spi_t * spi, int8_t mosi)
331331
return false;
332332
#endif
333333
}
334-
uint8_t bus = (uint8_t)perimanGetPinBus(mosi, ESP32_BUS_TYPE_SPI_MASTER);
334+
void * bus = perimanGetPinBus(mosi, ESP32_BUS_TYPE_SPI_MASTER);
335335
if(bus != NULL && !perimanSetPinBus(mosi, ESP32_BUS_TYPE_INIT, NULL)){
336336
return false;
337337
}
@@ -341,7 +341,7 @@ bool spiAttachMOSI(spi_t * spi, int8_t mosi)
341341
spi->mosi = mosi;
342342

343343
if(!perimanSetPinBus(mosi, ESP32_BUS_TYPE_SPI_MASTER, (void *)(spi->num+1))){
344-
spiDetachBus((void *)bus);
344+
spiDetachBus(bus);
345345
log_e("Failed to set pin bus to SPI for pin %d", mosi);
346346
return false;
347347
}
@@ -502,7 +502,7 @@ bool spiAttachSS(spi_t * spi, uint8_t cs_num, int8_t ss)
502502
return false;
503503
#endif
504504
}
505-
uint8_t bus = (uint8_t)perimanGetPinBus(ss, ESP32_BUS_TYPE_SPI_MASTER);
505+
void * bus = perimanGetPinBus(ss, ESP32_BUS_TYPE_SPI_MASTER);
506506
if(bus != NULL && !perimanSetPinBus(ss, ESP32_BUS_TYPE_INIT, NULL)){
507507
return false;
508508
}
@@ -513,7 +513,7 @@ bool spiAttachSS(spi_t * spi, uint8_t cs_num, int8_t ss)
513513
spi->ss = ss;
514514

515515
if(!perimanSetPinBus(ss, ESP32_BUS_TYPE_SPI_MASTER, (void *)(spi->num+1))){
516-
spiDetachBus((void *)bus);
516+
spiDetachBus(bus);
517517
log_e("Failed to set pin bus to SPI for pin %d", ss);
518518
return false;
519519
}

0 commit comments

Comments
 (0)