github-mirrors/thirdparty-littlefs
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-littlefs.git synced 2025-11-01 00:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed all prefixes to include the major version

Browse Source 
This is needed to allow compilation of multiple versions in the same
binary. Also note that the FUSE testing was removed because of related
name issues.

./scripts/prefix.py lfs1
This commit is contained in:
Christopher Haster
2019-01-30 13:25:53 -06:00
parent 43f95b2882
commit daa6577060
25 changed files with 3973 additions and 4006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
emubd/lfs_emubd.c → emubd/lfs1_emubd.c
View File

@@ -4,7 +4,7 @@
* Copyright (c) 2017, Arm Limited. All rights reserved.
* SPDX-License-Identifier: BSD-3-Clause
*/
#include "emubd/lfs_emubd.h"
#include "emubd/lfs1_emubd.h"
#include <errno.h>
#include <string.h>
@@ -20,8 +20,8 @@
// Block device emulated on existing filesystem
int lfs_emubd_create(const struct lfs_config *cfg, const char *path) {
lfs_emubd_t *emu = cfg->context;
int lfs1_emubd_create(const struct lfs1_config *cfg, const char *path) {
lfs1_emubd_t *emu = cfg->context;
emu->cfg.read_size = cfg->read_size;
emu->cfg.prog_size = cfg->prog_size;
emu->cfg.block_size = cfg->block_size;
@@ -29,7 +29,7 @@ int lfs_emubd_create(const struct lfs_config *cfg, const char *path) {
// Allocate buffer for creating children files
size_t pathlen = strlen(path);
emu->path = malloc(pathlen + 1 + LFS_NAME_MAX + 1);
emu->path = malloc(pathlen + 1 + LFS1_NAME_MAX + 1);
if (!emu->path) {
return -ENOMEM;
}
@@ -37,7 +37,7 @@ int lfs_emubd_create(const struct lfs_config *cfg, const char *path) {
strcpy(emu->path, path);
emu->path[pathlen] = '/';
emu->child = &emu->path[pathlen+1];
memset(emu->child, '\0', LFS_NAME_MAX+1);
memset(emu->child, '\0', LFS1_NAME_MAX+1);
// Create directory if it doesn't exist
int err = mkdir(path, 0777);
@@ -46,7 +46,7 @@ int lfs_emubd_create(const struct lfs_config *cfg, const char *path) {
}
// Load stats to continue incrementing
snprintf(emu->child, LFS_NAME_MAX, "stats");
snprintf(emu->child, LFS1_NAME_MAX, "stats");
FILE *f = fopen(emu->path, "r");
if (!f && errno != ENOENT) {
@@ -70,16 +70,16 @@ int lfs_emubd_create(const struct lfs_config *cfg, const char *path) {
return 0;
}
void lfs_emubd_destroy(const struct lfs_config *cfg) {
lfs_emubd_sync(cfg);
void lfs1_emubd_destroy(const struct lfs1_config *cfg) {
lfs1_emubd_sync(cfg);
lfs_emubd_t *emu = cfg->context;
lfs1_emubd_t *emu = cfg->context;
free(emu->path);
}
int lfs_emubd_read(const struct lfs_config *cfg, lfs_block_t block,
lfs_off_t off, void *buffer, lfs_size_t size) {
lfs_emubd_t *emu = cfg->context;
int lfs1_emubd_read(const struct lfs1_config *cfg, lfs1_block_t block,
lfs1_off_t off, void *buffer, lfs1_size_t size) {
lfs1_emubd_t *emu = cfg->context;
uint8_t *data = buffer;
// Check if read is valid
@@ -91,7 +91,7 @@ int lfs_emubd_read(const struct lfs_config *cfg, lfs_block_t block,
memset(data, 0, size);
// Read data
snprintf(emu->child, LFS_NAME_MAX, "%" PRIx32, block);
snprintf(emu->child, LFS1_NAME_MAX, "%" PRIx32, block);
FILE *f = fopen(emu->path, "rb");
if (!f && errno != ENOENT) {
@@ -119,9 +119,9 @@ int lfs_emubd_read(const struct lfs_config *cfg, lfs_block_t block,
return 0;
}
int lfs_emubd_prog(const struct lfs_config *cfg, lfs_block_t block,
lfs_off_t off, const void *buffer, lfs_size_t size) {
lfs_emubd_t *emu = cfg->context;
int lfs1_emubd_prog(const struct lfs1_config *cfg, lfs1_block_t block,
lfs1_off_t off, const void *buffer, lfs1_size_t size) {
lfs1_emubd_t *emu = cfg->context;
const uint8_t *data = buffer;
// Check if write is valid
@@ -130,7 +130,7 @@ int lfs_emubd_prog(const struct lfs_config *cfg, lfs_block_t block,
assert(block < cfg->block_count);
// Program data
snprintf(emu->child, LFS_NAME_MAX, "%" PRIx32, block);
snprintf(emu->child, LFS1_NAME_MAX, "%" PRIx32, block);
FILE *f = fopen(emu->path, "r+b");
if (!f) {
@@ -170,14 +170,14 @@ int lfs_emubd_prog(const struct lfs_config *cfg, lfs_block_t block,
return 0;
}
int lfs_emubd_erase(const struct lfs_config *cfg, lfs_block_t block) {
lfs_emubd_t *emu = cfg->context;
int lfs1_emubd_erase(const struct lfs1_config *cfg, lfs1_block_t block) {
lfs1_emubd_t *emu = cfg->context;
// Check if erase is valid
assert(block < cfg->block_count);
// Erase the block
snprintf(emu->child, LFS_NAME_MAX, "%" PRIx32, block);
snprintf(emu->child, LFS1_NAME_MAX, "%" PRIx32, block);
struct stat st;
int err = stat(emu->path, &st);
if (err && errno != ENOENT) {
@@ -207,11 +207,11 @@ int lfs_emubd_erase(const struct lfs_config *cfg, lfs_block_t block) {
return 0;
}
int lfs_emubd_sync(const struct lfs_config *cfg) {
lfs_emubd_t *emu = cfg->context;
int lfs1_emubd_sync(const struct lfs1_config *cfg) {
lfs1_emubd_t *emu = cfg->context;
// Just write out info/stats for later lookup
snprintf(emu->child, LFS_NAME_MAX, "config");
snprintf(emu->child, LFS1_NAME_MAX, "config");
FILE *f = fopen(emu->path, "w");
if (!f) {
return -errno;
@@ -227,7 +227,7 @@ int lfs_emubd_sync(const struct lfs_config *cfg) {
return -errno;
}
snprintf(emu->child, LFS_NAME_MAX, "stats");
snprintf(emu->child, LFS1_NAME_MAX, "stats");
f = fopen(emu->path, "w");
if (!f) {
return -errno;

44
emubd/lfs_emubd.h → emubd/lfs1_emubd.h
View File

@@ -4,11 +4,11 @@
* Copyright (c) 2017, Arm Limited. All rights reserved.
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef LFS_EMUBD_H
#define LFS_EMUBD_H
#ifndef LFS1_EMUBD_H
#define LFS1_EMUBD_H
#include "lfs.h"
#include "lfs_util.h"
#include "lfs1.h"
#include "lfs1_util.h"
#ifdef __cplusplus
extern "C"
@@ -17,25 +17,25 @@ extern "C"
// Config options
#ifndef LFS_EMUBD_READ_SIZE
#define LFS_EMUBD_READ_SIZE 1
#ifndef LFS1_EMUBD_READ_SIZE
#define LFS1_EMUBD_READ_SIZE 1
#endif
#ifndef LFS_EMUBD_PROG_SIZE
#define LFS_EMUBD_PROG_SIZE 1
#ifndef LFS1_EMUBD_PROG_SIZE
#define LFS1_EMUBD_PROG_SIZE 1
#endif
#ifndef LFS_EMUBD_ERASE_SIZE
#define LFS_EMUBD_ERASE_SIZE 512
#ifndef LFS1_EMUBD_ERASE_SIZE
#define LFS1_EMUBD_ERASE_SIZE 512
#endif
#ifndef LFS_EMUBD_TOTAL_SIZE
#define LFS_EMUBD_TOTAL_SIZE 524288
#ifndef LFS1_EMUBD_TOTAL_SIZE
#define LFS1_EMUBD_TOTAL_SIZE 524288
#endif
// The emu bd state
typedef struct lfs_emubd {
typedef struct lfs1_emubd {
char *path;
char *child;
@@ -51,33 +51,33 @@ typedef struct lfs_emubd {
uint32_t block_size;
uint32_t block_count;
} cfg;
} lfs_emubd_t;
} lfs1_emubd_t;
// Create a block device using path for the directory to store blocks
int lfs_emubd_create(const struct lfs_config *cfg, const char *path);
int lfs1_emubd_create(const struct lfs1_config *cfg, const char *path);
// Clean up memory associated with emu block device
void lfs_emubd_destroy(const struct lfs_config *cfg);
void lfs1_emubd_destroy(const struct lfs1_config *cfg);
// Read a block
int lfs_emubd_read(const struct lfs_config *cfg, lfs_block_t block,
lfs_off_t off, void *buffer, lfs_size_t size);
int lfs1_emubd_read(const struct lfs1_config *cfg, lfs1_block_t block,
lfs1_off_t off, void *buffer, lfs1_size_t size);
// Program a block
//
// The block must have previously been erased.
int lfs_emubd_prog(const struct lfs_config *cfg, lfs_block_t block,
lfs_off_t off, const void *buffer, lfs_size_t size);
int lfs1_emubd_prog(const struct lfs1_config *cfg, lfs1_block_t block,
lfs1_off_t off, const void *buffer, lfs1_size_t size);
// Erase a block
//
// A block must be erased before being programmed. The
// state of an erased block is undefined.
int lfs_emubd_erase(const struct lfs_config *cfg, lfs_block_t block);
int lfs1_emubd_erase(const struct lfs1_config *cfg, lfs1_block_t block);
// Sync the block device
int lfs_emubd_sync(const struct lfs_config *cfg);
int lfs1_emubd_sync(const struct lfs1_config *cfg);
#ifdef __cplusplus