|
@@ -25,7 +25,7 @@ file_t *miniffs_open(miniffs_t *fs, char *filename)
|
|
goto exit;
|
|
goto exit;
|
|
}
|
|
}
|
|
|
|
|
|
- ret->private = fs;
|
|
|
|
|
|
+ ret->private_data = fs;
|
|
ret->fent = miniffs_findfile(fs, filename);
|
|
ret->fent = miniffs_findfile(fs, filename);
|
|
if (!ret->fent)
|
|
if (!ret->fent)
|
|
{
|
|
{
|
|
@@ -47,7 +47,7 @@ exit:
|
|
int miniffs_close(file_t *file)
|
|
int miniffs_close(file_t *file)
|
|
{
|
|
{
|
|
/* Let's poison the struct */
|
|
/* Let's poison the struct */
|
|
- file->private = NULL;
|
|
|
|
|
|
+ file->private_data = NULL;
|
|
file->offset = 0;
|
|
file->offset = 0;
|
|
file->fent = NULL;
|
|
file->fent = NULL;
|
|
|
|
|
|
@@ -56,13 +56,13 @@ int miniffs_close(file_t *file)
|
|
|
|
|
|
void *miniffs_map(file_t *file)
|
|
void *miniffs_map(file_t *file)
|
|
{
|
|
{
|
|
- miniffs_t *fs = (miniffs_t *)file->private;
|
|
|
|
|
|
+ miniffs_t *fs = (miniffs_t *)file->private_data;
|
|
return miniffs_getfileaddr(fs, file->fent);
|
|
return miniffs_getfileaddr(fs, file->fent);
|
|
}
|
|
}
|
|
|
|
|
|
uint8_t miniffs_read(file_t *file)
|
|
uint8_t miniffs_read(file_t *file)
|
|
{
|
|
{
|
|
- miniffs_t *fs = (miniffs_t *) file->private;
|
|
|
|
|
|
+ miniffs_t *fs = (miniffs_t *) file->private_data;
|
|
uint8_t *filePtr = miniffs_getfileaddr(fs, file->fent);
|
|
uint8_t *filePtr = miniffs_getfileaddr(fs, file->fent);
|
|
uint8_t ret = filePtr[file->offset];
|
|
uint8_t ret = filePtr[file->offset];
|
|
|
|
|
|
@@ -80,7 +80,7 @@ uint8_t miniffs_read(file_t *file)
|
|
int miniffs_read_blocks(void *ptr, size_t size, size_t nmemb, file_t *file)
|
|
int miniffs_read_blocks(void *ptr, size_t size, size_t nmemb, file_t *file)
|
|
{
|
|
{
|
|
int i;
|
|
int i;
|
|
- miniffs_t *fs = (miniffs_t *) file->private;
|
|
|
|
|
|
+ miniffs_t *fs = (miniffs_t *) file->private_data;
|
|
uint8_t *filePtr = miniffs_getfileaddr(fs, file->fent);
|
|
uint8_t *filePtr = miniffs_getfileaddr(fs, file->fent);
|
|
size_t fileOffset = file->offset;
|
|
size_t fileOffset = file->offset;
|
|
size_t bufferOffset = 0;
|
|
size_t bufferOffset = 0;
|