PRINT("dpal driver base init error"NEWLINE);
panic(PANIC_ASSERT, __LINE__);
}
-
+#ifdef CFG_DRIVERS_MMC
+ emmc_init();
+ g_store_init_select = STORE_CLASS_EMMC;
+ sdiom_internal_freq_handler_register(mmc_set_internal_clk);
+#endif
+#ifdef CFG_DRIVERS_NANDFLASH
+ nandflash_init();
+ g_store_init_select = STORE_CLASS_NAND;
+#endif
uapi_pm_control(PM_DISPLAY_POWER_UP_AND_RUN);
(void)osDelay(TICK_TEN_MS);
thread_init();
button_app_init();
uapi_calendar_init();
-
+
#ifdef SUPPORT_AT_OHOSFWK
show_logo();
#endif
-
-#ifdef CFG_DRIVERS_MMC
- emmc_init();
- g_store_init_select = STORE_CLASS_EMMC;
- sdiom_internal_freq_handler_register(mmc_set_internal_clk);
-#endif
#ifdef CFG_DRIVERS_NANDFLASH
- nandflash_init();
- g_store_init_select = STORE_CLASS_NAND;
+ nandflash_filesystem_mount_user();
#endif
-
#ifdef SUPPORT_AT_OHOSFWK
ohos_startup();
#endif
partition_list = [
- [os.path.join(cur_dir, 'fs', 'system'), "0x140000"],
- [os.path.join(cur_dir, 'fs', 'update'), "0x140000"],
- [os.path.join(cur_dir, 'fs', 'music'), "0x140000"],
+ [os.path.join(cur_dir, 'fs', 'system'), "0xcc0000"],
+ [os.path.join(cur_dir, 'fs', 'update'), "0xcc0000"],
+ [os.path.join(cur_dir, 'fs', 'music'), "0xcc0000"],
[os.path.join(cur_dir, 'fs', 'user'), "null"]
]
uint8_t buffer_verify[DEFALUT_BUFLENGTH] __attribute__((aligned(4)));
uint8_t buffer_oob_verify[128] __attribute__((aligned(4))); // 128 is one max oob size
int has_nandflash_init = 0;
-
+int has_nandflash_user_init = 0;
#ifndef MEMORY_MINI
#define YF_NAME_STRS "/system/", "/update/", "/music/", "/user/"
-uint32_t yf_volume_percent[YF_VOLUMES_NUM] = { 1, 1, 1, 97 };
+uint32_t yf_volume_percent[YF_VOLUMES_NUM] = { 10, 10, 10, 70 };
+// uint32_t yf_volume_percent[YF_VOLUMES_NUM] = { 1, 1, 1, 97 };
#else
#define YF_NAME_STRS "/user/"
uint32_t yf_volume_percent[YF_VOLUMES_NUM] = {100};
return &g_ds35x1g_driver;
}
-static int formate_filesystem(uint32_t total_block_num)
+static int formate_filesystem_without_user(uint32_t total_block_num)
{
int ret;
uint32_t index;
PRINT("formate dev %d name fail \r\n", index);
return -EIO;
}
-
- ret = mount(dev_name, g_volume_names[index], "yaffs", 0, NULL);
- PRINT("formate filesystem devinfo: index = %d , dev_name = %s, folder_name = %s, \
- part_start_sector = %d, part_count_sector = %d\r\n", index, dev_name,
- g_volume_names[index], part_start_sector, part_count_sector);
- if (ret != 0) {
- return ret;
+ if( memcmp("/user/",g_volume_names[index],sizeof("/user/"))== 0 )
+ {
+ PRINT("skip mount /user/ \r\n");
+ }else{
+ ret = mount(dev_name, g_volume_names[index], "yaffs", 0, NULL);
+ PRINT("formate filesystem devinfo: index = %d , dev_name = %s, folder_name = %s, \
+ part_start_sector = %d, part_count_sector = %d\r\n", index, dev_name,
+ g_volume_names[index], part_start_sector, part_count_sector);
+ if (ret != 0) {
+ return ret;
+ }
}
- part_start_sector += part_count_sector;
+ part_start_sector += part_count_sector;
}
return ret;
}
+static int formate_filesystem_user(void)
+{
+ int ret;
+ uint32_t index;
+ char dev_name[64] = { 0 };
+ for (index = 0; index < YF_VOLUMES_NUM; ++index) {
+ ret = sprintf_s(dev_name, sizeof(dev_name), "/dev/nandblk%d", index);
+ if (ret <= 0) {
+ PRINT("formate dev %d name fail \r\n", index);
+ return -EIO;
+ }
+ if( memcmp("/user/",g_volume_names[index],sizeof("/user/"))== 0 )
+ {
+ ret = mount(dev_name, g_volume_names[index], "yaffs", 0, NULL);
+ PRINT("formate filesystem devinfo: index = %d , dev_name = %s, folder_name = %s \r\n", index, dev_name, g_volume_names[index]);
+ if (ret != 0) {
+ return ret;
+ }
+ }
+ }
+ return ret;
+}
+
void erase_all(struct nand_driver_struct *driver)
{
PRINT("get_mtd_info faild!\n");
}
PRINT("yaffs filesystem init start!\n");
- int ret = formate_filesystem(freertos_nandflash_driver->total_block);
+ int ret = formate_filesystem_without_user(freertos_nandflash_driver->total_block);
PRINT("yaffs filesystem init end!\n");
has_nandflash_init = 1;
return ret;
}
+int nandflash_filesystem_mount_user(void)
+{
+
+ if(has_nandflash_init!=1)
+ {
+ PRINT("\r\nskip mount user , nandflash not ready , should init first.\r\n");
+ return -1;
+ }
+ if (has_nandflash_user_init == 1) {
+ PRINT("\r\nnandflash_user init ok.\r\n");
+ return 0;
+ }
+ PRINT("yaffs filesystem mount user start!\n");
+ int ret = formate_filesystem_user();
+ PRINT("yaffs filesystem mount user end!\n");
+ has_nandflash_user_init = 1;
+ return ret;
+}
void nandflash_qspi_resume(void)
{
#ifdef QSPI_DISPLAY
#define IMAGE_OPEN_LOGO_PATH "/user/res/OPEN_LOGO_QSPI.bin"
#else
-#define IMAGE_OPEN_LOGO_PATH "/user/res/KUMI_LOGO.bin"
+#define IMAGE_OPEN_LOGO_PATH "/system/KUMI_LOGO.bin"
#endif
static void UikitRTCCallBack(uintptr_t data)
g_logo->SetPosition(0, 0, OHOS::Screen::GetInstance().GetWidth(), OHOS::Screen::GetInstance().GetHeight());
g_logo->SetAutoEnable(false);
g_logo->SetResizeMode(OHOS::UIImageView::CENTER);
- // g_imgInfo = OHOS::ImageCacheManager::GetInstance().LoadSingleRes(IMAGE_OPEN_LOGO_PATH);
- // g_logo->SetSrc(g_imgInfo);
- g_logo->SetStyle(OHOS::STYLE_BACKGROUND_COLOR, 0xff007dff);
- g_logo->SetStyle(OHOS::STYLE_BACKGROUND_OPA, 0xff);
+ g_imgInfo = OHOS::ImageCacheManager::GetInstance().LoadSingleRes(IMAGE_OPEN_LOGO_PATH);
+ g_logo->SetSrc(g_imgInfo);
+ // g_logo->SetStyle(OHOS::STYLE_BACKGROUND_COLOR, 0xff007dff);
+// g_logo->SetStyle(OHOS::STYLE_BACKGROUND_OPA, 0xff);
OHOS::GraphicEventHandler::GetInstance()->PostGraphicEvent(
[] {
OHOS::RootView::GetInstance()->Add(g_logo);
OHOS::RootView::GetInstance()->Remove(g_logo);
delete g_logo;
g_logo = nullptr;
- // OHOS::ImageCacheManager::GetInstance().UnloadSingleRes(IMAGE_OPEN_LOGO_PATH);
+ OHOS::ImageCacheManager::GetInstance().UnloadSingleRes(IMAGE_OPEN_LOGO_PATH);
g_imgInfo = nullptr;
}
},