Skip to content

Commit 81a9c45

Browse files
authoredNov 23, 2017
Update IDF to e5b2c1c (#865)
* Update BLE Library * Fix SD driver * Update toolchain * Update IDF to e5b2c1c
1 parent a3a9dd3 commit 81a9c45

File tree

119 files changed

+1175
-439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+1175
-439
lines changed
 

‎libraries/SD/src/sd_diskio.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ typedef struct {
5757
int status;
5858
} ardu_sdcard_t;
5959

60-
static ardu_sdcard_t* s_cards[_VOLUMES] = { NULL };
60+
static ardu_sdcard_t* s_cards[FF_VOLUMES] = { NULL };
6161

6262
/*
6363
* SD SPI
@@ -645,7 +645,7 @@ DRESULT ff_sd_ioctl(uint8_t pdrv, uint8_t cmd, void* buff)
645645
uint8_t sdcard_uninit(uint8_t pdrv)
646646
{
647647
ardu_sdcard_t * card = s_cards[pdrv];
648-
if (pdrv >= _VOLUMES || card == NULL) {
648+
if (pdrv >= FF_VOLUMES || card == NULL) {
649649
return 1;
650650
}
651651
ff_diskio_register(pdrv, NULL);
@@ -700,7 +700,7 @@ uint8_t sdcard_init(uint8_t cs, SPIClass * spi, int hz)
700700
uint8_t sdcard_unmount(uint8_t pdrv)
701701
{
702702
ardu_sdcard_t * card = s_cards[pdrv];
703-
if (pdrv >= _VOLUMES || card == NULL) {
703+
if (pdrv >= FF_VOLUMES || card == NULL) {
704704
return 1;
705705
}
706706
card->status |= STA_NOINIT;
@@ -714,7 +714,7 @@ uint8_t sdcard_unmount(uint8_t pdrv)
714714
bool sdcard_mount(uint8_t pdrv, const char* path)
715715
{
716716
ardu_sdcard_t * card = s_cards[pdrv];
717-
if(pdrv >= _VOLUMES || card == NULL){
717+
if(pdrv >= FF_VOLUMES || card == NULL){
718718
return false;
719719
}
720720

@@ -748,15 +748,15 @@ bool sdcard_mount(uint8_t pdrv, const char* path)
748748
uint32_t sdcard_num_sectors(uint8_t pdrv)
749749
{
750750
ardu_sdcard_t * card = s_cards[pdrv];
751-
if(pdrv >= _VOLUMES || card == NULL){
751+
if(pdrv >= FF_VOLUMES || card == NULL){
752752
return 0;
753753
}
754754
return card->sectors;
755755
}
756756

757757
uint32_t sdcard_sector_size(uint8_t pdrv)
758758
{
759-
if(pdrv >= _VOLUMES || s_cards[pdrv] == NULL){
759+
if(pdrv >= FF_VOLUMES || s_cards[pdrv] == NULL){
760760
return 0;
761761
}
762762
return 512;
@@ -765,7 +765,7 @@ uint32_t sdcard_sector_size(uint8_t pdrv)
765765
sdcard_type_t sdcard_type(uint8_t pdrv)
766766
{
767767
ardu_sdcard_t * card = s_cards[pdrv];
768-
if(pdrv >= _VOLUMES || card == NULL){
768+
if(pdrv >= FF_VOLUMES || card == NULL){
769769
return CARD_NONE;
770770
}
771771
return card->type;

0 commit comments

Comments
 (0)