Browse Source

update:对csdk的支持适配

alienwalker 2 years ago
parent
commit
b3949afe03
2 changed files with 9 additions and 3 deletions
  1. 8 2
      components/camera/luat_camera.h
  2. 1 1
      luat/include/luat_mcu.h

+ 8 - 2
components/camera/luat_camera.h

@@ -7,8 +7,9 @@
 #define Luat_CAMERA_H
 
 #include "luat_base.h"
+#ifdef __LUATOS__
 #include "luat_lcd.h"
-
+#endif
 typedef struct luat_camera_conf
 {
     uint8_t id;
@@ -26,7 +27,11 @@ typedef struct luat_camera_conf
 	uint8_t id_value;
     size_t init_cmd_size;
     uint8_t *init_cmd;
+#ifdef __LUATOS__
     luat_lcd_conf_t* lcd_conf;
+#else
+    void *lcd_conf;
+#endif
 } luat_camera_conf_t;
 
 typedef struct
@@ -44,8 +49,9 @@ typedef struct
 	uint8_t is_two_line_rx; //0 or 1;
 	uint8_t seq_type;	//0 or 1
 } luat_spi_camera_t;
-
+#ifdef __LUATOS__
 int l_camera_handler(lua_State *L, void* ptr);
+#endif
 /**
  * @brief 配置spi camera并且初始化camera
  * @param id camera接收数据总线ID,ec618上有2条,0和1

+ 1 - 1
luat/include/luat_mcu.h

@@ -26,7 +26,7 @@ uint64_t luat_mcu_tick64(void);
 int luat_mcu_us_period(void);
 uint64_t luat_mcu_tick64_ms(void);
 void luat_mcu_set_clk_source(uint8_t source_main, uint8_t source_32k, uint32_t delay);
-
+uint8_t luat_mcu_iomux_is_default(uint8_t type, uint8_t sn);
 void luat_mcu_iomux_ctrl(uint8_t type, uint8_t sn, int pad_index, uint8_t alt, uint8_t is_input);
 
 void luat_mcu_set_hardfault_mode(int mode);