Просмотр исходного кода

fix: esp32c3集成fdb时报的编译错误,修正之

Wendal Chen 4 лет назад
Родитель
Сommit
9f5a779a22

+ 8 - 2
components/fal/src/luat_fal_onchip_flash.c

@@ -1,6 +1,9 @@
 #include "luat_base.h"
 #include "luat_sfd.h"
 
+#define LUAT_LOG_TAG "fal"
+#include "luat_log.h"
+
 #include "fal.h"
 
 static sfd_onchip_t onchip;
@@ -16,12 +19,15 @@ static int (onchip_flash_init)(void) {
     return sfd_onchip_init(&onchip);
 }
 static int (onchip_flash_read)(long offset, uint8_t *buf, size_t size) {
-    return sfd_onchip_read(&onchip, buf, offset, size);
+    //LLOGD("onchip_flash_read %08X %04X", offset, size);
+    return sfd_onchip_read(&onchip, (char*)buf, offset, size);
 }
 static int (onchip_flash_write)(long offset, const uint8_t *buf, size_t size) {
-    return sfd_onchip_write(&onchip, buf, offset, size);
+    //LLOGD("onchip_flash_write %08X %04X", offset, size);
+    return sfd_onchip_write(&onchip, (char*)buf, offset, size);
 }
 static int (onchip_flash_erase)(long offset, size_t size) {
+    //LLOGD("onchip_flash_write %08X %04X", offset, size);
     return sfd_onchip_erase(&onchip, offset, size);
 }
 

+ 9 - 6
components/flashdb/inc/fdb_def.h

@@ -62,14 +62,17 @@ extern "C" {
 /* routine print function. Must be implement by user. */
 #define FDB_INFO(...)                  FDB_PRINT(__VA_ARGS__)
 /* assert for developer. */
-// #define FDB_ASSERT(EXPR)                                                      \
-// if (!(EXPR))                                                                  \
-// {                                                                             \
-//     FDB_DEBUG("(%s) has assert failed at %s.\n", #EXPR, __FUNCTION__);        \
-//     while (1);                                                                \
-// }
+#if 0
+#define FDB_ASSERT(EXPR)                                                      \
+if (!(EXPR))                                                                  \
+{                                                                             \
+    FDB_DEBUG("(%s) has assert failed at %s.\n", #EXPR, __FUNCTION__);        \
+    while (1);                                                                \
+}
+#else
 
 #define FDB_ASSERT(EXPR) 
+#endif
 
 #define FDB_KVDB_CTRL_SET_SEC_SIZE     0x00             /**< set sector size control command, this change MUST before database initialization */
 #define FDB_KVDB_CTRL_GET_SEC_SIZE     0x01             /**< get sector size control command */

+ 1 - 1
components/sfd/luat_sfd_w25q.c

@@ -104,7 +104,7 @@ static int sfd_w25q_read (void* userdata, char* buff, size_t offset, size_t len)
 void sfd_w25q_write_enable(sfd_drv_t *drv) {
     luat_gpio_set(drv->cfg.spi.cs, 0);
     uint8_t cmd = 0x06;
-    luat_spi_send(drv->cfg.spi.id, &cmd, sizeof(cmd));
+    luat_spi_send(drv->cfg.spi.id, (const char*)&cmd, sizeof(cmd));
     luat_gpio_set(drv->cfg.spi.cs, 1);
 }