lby/mkrtos-real
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

严格代码检查，修复大量错误，以及diskio.c ioctl参数大小导致的卡死问题

Browse Source
This commit is contained in:
zhangzheng
2025-03-23 17:35:56 +08:00
parent 749e24ddb7
commit 54b6bc9c24
139 changed files with 1317 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mkrtos_user/server/fs/appfs/hw_block.c
View File

@@ -24,8 +24,6 @@
static obj_handler_t shm_hd;
static int block_mem_addr = -1;
static int block_nr = -1;
static uint8_t *block_buf; //!< 块缓冲区
static obj_handler_t blk_drv_hd;
static blk_drv_info_t blk_info;
@@ -105,7 +103,7 @@ int hw_init_block(fs_info_t *fs, const char *dev_path)
fs->cb.hw_write_and_erase_block = hw_write_and_erase_block;
again:
ret = ns_query_svr(dev_path, &blk_drv_hd, 0x1);
ret = ns_query_svr(dev_path, &blk_drv_hd);
if (ret < 0)
{
u_sleep_ms(50);
@@ -114,7 +112,7 @@ again:
ret = blk_drv_cli_info(blk_drv_hd, &blk_info);
if (ret < 0)
{
printf("blk info get fail.\n");
printf("blk info get fail. err:%d.\n", ret);
return ret;
}
ret = hw_create_shm_obj(blk_info.blk_size, &shm_hd);
@@ -131,7 +129,7 @@ again:
return -ENOMEM;
}
block_buf = (void *)shm_addr;
printf("block_buf addr:0x%x\n", block_buf);
printf("block_buf addr:0x%x fs_base_addr: 0x%x\n", block_buf, blk_info.blk_start_addr);
// printf("img size is %d, block nr is %d.\n", block_mem_size, block_nr);
return 0;
}