PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add tos_slist.h, rename tos.h to tos_k.h

Browse Source
This commit is contained in:
daishengdong
2020-01-03 17:25:38 +08:00
parent af07f199d9
commit c9556307df
268 changed files with 900 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/fs/fatfs/3rdparty/ffsystem.c vendored
View File

@@ -3,7 +3,7 @@
/* (C)ChaN, 2018 */
/*------------------------------------------------------------------------*/
#include "tos.h"
#include "tos_k.h"
#include "ff.h"

2
components/fs/fatfs/wrapper/tos_ffsystem.c
View File

@@ -3,7 +3,7 @@
/* (C)ChaN, 2018 */
/*------------------------------------------------------------------------*/
#include "tos.h"
#include "tos_k.h"
#include "tos_ff.h"

6
components/fs/kv/include/tos_kv.h
View File

@@ -18,7 +18,7 @@
#ifndef _TOS_KV_H_
#define _TOS_KV_H_
#include "tos.h"
#include "tos_k.h"
#include "tos_kv_err.h"
#include "tos_kv_flash.h"
@@ -112,12 +112,12 @@ typedef uint64_t kv_dword_t; // double word
#define KV_BLK_FIRST_ITEM(blk_start) (blk_start + KV_BLK_HDR_SIZE)
#define KV_BLK_NEXT(blk_start) (blk_start + KV_BLK_SIZE >= KV_FLASH_END ? KV_FLASH_START : blk_start + KV_BLK_SIZE)
#define KV_BLK_FOREACH_FROM(cur_blk, start_blk) \
#define KV_BLK_FOR_EACH_FROM(cur_blk, start_blk) \
for (cur_blk = KV_BLK_NEXT(start_blk); \
cur_blk != start_blk; \
cur_blk = KV_BLK_NEXT(cur_blk))
#define KV_BLK_FOREACH(cur_blk) \
#define KV_BLK_FOR_EACH(cur_blk) \
for (cur_blk = KV_FLASH_START; \
cur_blk < KV_FLASH_END; \
cur_blk += KV_BLK_SIZE)

18
components/fs/kv/tos_kv.c
View File

@@ -136,7 +136,7 @@ __STATIC__ uint32_t kv_blk_next_fresh(void)
uint32_t cur_blk;
// we try to find a fresh block behind current block(take all the blocks as a ring)
KV_BLK_FOREACH_FROM(cur_blk, KV_MGR_WORKSPACE) {
KV_BLK_FOR_EACH_FROM(cur_blk, KV_MGR_WORKSPACE) {
if (kv_blk_is_fresh(cur_blk)) {
return cur_blk;
}
@@ -149,7 +149,7 @@ __STATIC__ uint32_t kv_blk_search_inuse(uint32_t item_size)
{
uint32_t cur_blk;
KV_BLK_FOREACH_FROM(cur_blk, KV_MGR_WORKSPACE) {
KV_BLK_FOR_EACH_FROM(cur_blk, KV_MGR_WORKSPACE) {
if (kv_blk_is_inuse(cur_blk) &&
kv_blk_freesz_get(cur_blk) >= item_size) {
return cur_blk;
@@ -668,7 +668,7 @@ __STATIC__ kv_item_t *kv_item_find(const char *key)
uint32_t cur_blk;
kv_item_t *item;
KV_BLK_FOREACH(cur_blk) {
KV_BLK_FOR_EACH(cur_blk) {
if (kv_blk_is_bad(cur_blk) ||
kv_blk_is_fresh(cur_blk)) {
continue;
@@ -699,7 +699,7 @@ __STATIC__ kv_item_t *kv_item_find_new_copy(kv_item_t *the_item)
uint32_t cur_blk;
kv_item_t *item;
KV_BLK_FOREACH(cur_blk) {
KV_BLK_FOR_EACH(cur_blk) {
if (kv_blk_is_bad(cur_blk) ||
kv_blk_is_fresh(cur_blk)) {
continue;
@@ -893,7 +893,7 @@ __STATIC__ int kv_mgr_blk_index_rebuild(void)
uint32_t cur_blk;
int is_rebuild_done = K_FALSE;
KV_BLK_FOREACH(cur_blk) {
KV_BLK_FOR_EACH(cur_blk) {
if (kv_blk_is_hanging(cur_blk)) {
if (kv_mgr_index_build(cur_blk) == KV_ERR_NONE) {
kv_blk_reset_hanging(cur_blk);
@@ -921,7 +921,7 @@ __STATIC__ kv_err_t kv_mgr_workspace_locate(void)
/* if no block inuse, we locate workspace in first fresh block
else locate in first block inuse
*/
KV_BLK_FOREACH(cur_blk) {
KV_BLK_FOR_EACH(cur_blk) {
if (KV_MGR_BLK_NUM_INUSE == 0) {
if (kv_blk_is_fresh(cur_blk)) {
KV_MGR_WORKSPACE = cur_blk;
@@ -942,7 +942,7 @@ __STATIC__ void kv_mgr_ctl_build(void)
uint32_t cur_blk;
kv_blk_hdr_t blk_hdr;
KV_BLK_FOREACH(cur_blk) {
KV_BLK_FOR_EACH(cur_blk) {
if (kv_blk_hdr_read(cur_blk, &blk_hdr) != KV_ERR_NONE) {
// sth must be wrong seriously with this block
kv_blk_set_bad(cur_blk);
@@ -1022,7 +1022,7 @@ __STATIC__ kv_err_t kv_gc(void)
// there must be at least one fresh block left, make workspace pointer to the fresh one
KV_MGR_WORKSPACE = kv_blk_next_fresh();
KV_BLK_FOREACH(cur_blk) {
KV_BLK_FOR_EACH(cur_blk) {
if (kv_blk_is_dirty(cur_blk)) {
if (kv_do_gc(cur_blk) != KV_ERR_NONE) {
// cannot do gc for this block, give others a try
@@ -1171,7 +1171,7 @@ __DEBUG__ kv_err_t tos_kv_walkthru(void)
printf("workspace: 0x%x [%d block]\n", KV_MGR_WORKSPACE, KV_BLK_ADDR2IDX(KV_MGR_WORKSPACE));
KV_BLK_FOREACH(cur_blk) {
KV_BLK_FOR_EACH(cur_blk) {
printf("[%d] block\n", i++);
printf("addr: 0x%x\n", cur_blk);

2
components/fs/vfs/include/tos_vfs.h
View File

@@ -1,7 +1,7 @@
#ifndef _TOS_VFS_H_
#define _TOS_VFS_H_
#include "tos.h"
#include "tos_k.h"
#if TOS_CFG_VFS_EN > 0u

6
components/fs/vfs/tos_vfs_fs.c
View File

@@ -7,13 +7,11 @@ TOS_LIST_DEFINE(k_vfs_fsmap_list);
__STATIC__ vfs_fsmap_t *vfs_fsmap_get(const char *fs_name)
{
k_list_t *curr;
char *name = K_NULL;
vfs_fsmap_t *fsmap = K_NULL;
TOS_LIST_FOR_EACH(curr, &k_vfs_fsmap_list) {
fsmap = TOS_LIST_ENTRY(curr, vfs_fsmap_t, list);
name = (char *)fsmap->name;
TOS_LIST_FOR_EACH_ENTRY(fsmap, vfs_fsmap_t, list, &k_vfs_fsmap_list) {
name = (char *)fsmap->name;
if (strlen(name) == strlen(fs_name) &&
strncmp(name, fs_name, strlen(name)) == 0) {
return fsmap;

4
components/fs/vfs/tos_vfs_inode.c
View File

@@ -20,15 +20,13 @@ __STATIC__ TOS_LIST_DEFINE(k_vfs_inode_list);
*/
__STATIC__ vfs_inode_t *vfs_inode_search(const char *path, const char **relative_path)
{
k_list_t *curr;
char *name = K_NULL;
int path_len, name_len;
vfs_inode_t *inode = K_NULL;
path_len = strlen(path);
TOS_LIST_FOR_EACH(curr, &k_vfs_inode_list) {
inode = TOS_LIST_ENTRY(curr, vfs_inode_t, list);
TOS_LIST_FOR_EACH_ENTRY(inode, vfs_inode_t, list, &k_vfs_inode_list) {
name = (char *)inode->name;
name_len = strlen(name);