espressif/arduino-esp32
1
0
Fork 1
mirror of https://github.com/0xFEEDC0DE64/arduino-esp32.git synced 2025-07-01 04:50:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update IDF to e5b2c1c (#865)

Browse Source 
* Update BLE Library

* Fix SD driver

* Update toolchain

* Update IDF to e5b2c1c
This commit is contained in:
Me No Dev
2017-11-23 23:26:53 +01:00
committed by GitHub
parent a3a9dd3af9
commit 81a9c45a1e
119 changed files with 1185 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/SD/src/sd_diskio.cpp
View File

@ -57,7 +57,7 @@ typedef struct {
int status;
} ardu_sdcard_t;
static ardu_sdcard_t* s_cards[_VOLUMES] = { NULL };
static ardu_sdcard_t* s_cards[FF_VOLUMES] = { NULL };
/*
* SD SPI
@ -645,7 +645,7 @@ DRESULT ff_sd_ioctl(uint8_t pdrv, uint8_t cmd, void* buff)
uint8_t sdcard_uninit(uint8_t pdrv)
{
ardu_sdcard_t * card = s_cards[pdrv];
if (pdrv >= _VOLUMES || card == NULL) {
if (pdrv >= FF_VOLUMES || card == NULL) {
return 1;
}
ff_diskio_register(pdrv, NULL);
@ -700,7 +700,7 @@ uint8_t sdcard_init(uint8_t cs, SPIClass * spi, int hz)
uint8_t sdcard_unmount(uint8_t pdrv)
{
ardu_sdcard_t * card = s_cards[pdrv];
if (pdrv >= _VOLUMES || card == NULL) {
if (pdrv >= FF_VOLUMES || card == NULL) {
return 1;
}
card->status |= STA_NOINIT;
@ -714,7 +714,7 @@ uint8_t sdcard_unmount(uint8_t pdrv)
bool sdcard_mount(uint8_t pdrv, const char* path)
{
ardu_sdcard_t * card = s_cards[pdrv];
if(pdrv >= _VOLUMES || card == NULL){
if(pdrv >= FF_VOLUMES || card == NULL){
return false;
}
@ -748,7 +748,7 @@ bool sdcard_mount(uint8_t pdrv, const char* path)
uint32_t sdcard_num_sectors(uint8_t pdrv)
{
ardu_sdcard_t * card = s_cards[pdrv];
if(pdrv >= _VOLUMES || card == NULL){
if(pdrv >= FF_VOLUMES || card == NULL){
return 0;
}
return card->sectors;
@ -756,7 +756,7 @@ uint32_t sdcard_num_sectors(uint8_t pdrv)
uint32_t sdcard_sector_size(uint8_t pdrv)
{
if(pdrv >= _VOLUMES || s_cards[pdrv] == NULL){
if(pdrv >= FF_VOLUMES || s_cards[pdrv] == NULL){
return 0;
}
return 512;
@ -765,7 +765,7 @@ uint32_t sdcard_sector_size(uint8_t pdrv)
sdcard_type_t sdcard_type(uint8_t pdrv)
{
ardu_sdcard_t * card = s_cards[pdrv];
if(pdrv >= _VOLUMES || card == NULL){
if(pdrv >= FF_VOLUMES || card == NULL){
return CARD_NONE;
}
return card->type;