espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-08-06 15:15:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/return_spiffs_error_code' into 'master'

Browse Source 
Enhancement of spiffs

See merge request sdk/ESP8266_RTOS_SDK!221
This commit is contained in:
Wu Jian Gang
2018-06-08 19:10:56 +08:00
parent 5358373550 2f026acc0d
commit 04cc431f6c
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/spiffs/include/spiffs/esp_spiffs.h
View File

@ -59,8 +59,8 @@ struct esp_spiffs_config {
*
* @param struct esp_spiffs_config *config : ESP8266 spiffs configuration
*
* @return 0 : succeed
* @return otherwise : fail
* @return 0 : succeed (Equals SPIFFS_OK)
* @return otherwise : fail (-1 or SPIFFS_ERR_*)
*/
s32_t esp_spiffs_init(struct esp_spiffs_config *config);

32
components/spiffs/library/esp_spiffs.c
View File

@ -85,7 +85,7 @@ static s32_t esp_spiffs_erase(u32_t addr, u32_t size)
s32_t esp_spiffs_init(struct esp_spiffs_config *config)
{
if (SPIFFS_mounted(&fs)) {
return -1;
return SPIFFS_ERR_MOUNTED;
}
spiffs_config cfg;
@ -145,6 +145,8 @@ s32_t esp_spiffs_init(struct esp_spiffs_config *config)
free(spiffs_cache_buf);
}
ret = SPIFFS_errno(&fs);
return ret;
}
@ -155,10 +157,9 @@ void esp_spiffs_deinit(u8_t format)
free(spiffs_work_buf);
free(spiffs_fd_buf);
free(spiffs_cache_buf);
if (format) {
SPIFFS_format(&fs);
}
}
if (format) {
SPIFFS_format(&fs);
}
}
@ -197,7 +198,9 @@ int _spiffs_open_r(struct _reent *r, const char *filename, int flags, int mode)
if (res >= 0) {
res += NUM_SYS_FD;
}
else {
res = SPIFFS_errno(&fs);
}
return res;
}
@ -210,6 +213,9 @@ _ssize_t _spiffs_read_r(struct _reent *r, int fd, void *buf, size_t len)
res = -1;
} else {
res = SPIFFS_read(&fs, fd - NUM_SYS_FD, buf, len);
if(res < 0) {
res = SPIFFS_errno(&fs);
}
}
return res;
@ -223,6 +229,9 @@ _ssize_t _spiffs_write_r(struct _reent *r, int fd, void *buf, size_t len)
}
int res = SPIFFS_write(&fs, fd - NUM_SYS_FD, (char *) buf, len);
if(res < 0){
return SPIFFS_errno(&fs);
}
return res;
}
@ -235,6 +244,9 @@ _off_t _spiffs_lseek_r(struct _reent *r, int fd, _off_t where, int whence)
res = -1;
} else {
res = SPIFFS_lseek(&fs, fd - NUM_SYS_FD, where, whence);
if(res < 0) {
res = SPIFFS_errno(&fs);
}
}
return res;
@ -255,6 +267,9 @@ int _spiffs_rename_r(struct _reent *r, const char *from, const char *to)
{
int res = SPIFFS_rename(&fs, (char *) from, (char *) to);
if(res < 0) {
res = SPIFFS_errno(&fs);
}
return res;
}
@ -262,6 +277,9 @@ int _spiffs_unlink_r(struct _reent *r, const char *filename)
{
int res = SPIFFS_remove(&fs, (char *) filename);
if(res < 0) {
res = SPIFFS_errno(&fs);
}
return res;
}
@ -282,7 +300,7 @@ int _spiffs_fstat_r(struct _reent *r, int fd, struct stat *s)
res = SPIFFS_fstat(&fs, fd - NUM_SYS_FD, &ss);
if (res < 0) {
return res;
return SPIFFS_errno(&fs);
}
s->st_ino = ss.obj_id;