Merge pull request #36 from sonydevworld/develop

Merge release-v2.1.0 into new-master for v2.1.0 release
sonydevworld · Feb 26, 2021 · 7686b71 · 7686b71
2 parents 581da3d + 36a06d9
commit 7686b71
Show file tree

Hide file tree

Showing 51 changed files with 7,953 additions and 1,336 deletions.
diff --git a/arch/arm/include/cxd56xx/cisif.h b/arch/arm/include/cxd56xx/cisif.h
@@ -37,48 +37,10 @@
 #define __ARCH_ARM_INCLUDE_CXD56XX_CISIF_H
 
 /****************************************************************************
- * Public Types
+ * Included Files
  ****************************************************************************/
 
-typedef void (*notify_callback_t)(uint8_t code, uint32_t size, uint32_t addr);
-typedef void (*comp_callback_t)(uint8_t code, uint32_t size, uint32_t addr);
-
-struct cisif_init_yuv_param_s
-{
-  uint16_t          hsize;
-  uint16_t          vsize;
-  uint32_t          notify_size;
-  notify_callback_t notify_func;
-};
-
-typedef struct cisif_init_yuv_param_s cisif_init_yuv_param_t;
-
-struct cisif_init_jpeg_param_s
-{
-  uint32_t notify_size;
-  notify_callback_t notify_func;
-};
-
-typedef struct cisif_init_jpeg_param_s cisif_init_jpeg_param_t;
-
-struct cisif_sarea_s
-{
-  uint8_t *strg_addr;
-  uint32_t strg_size;
-};
-
-typedef struct cisif_sarea_s cisif_sarea_t;
-
-struct cisif_param_s
-{
-  uint32_t                format;
-  cisif_init_yuv_param_t  yuv_param;
-  cisif_init_jpeg_param_t jpg_param;
-  cisif_sarea_t           sarea;
-  comp_callback_t         comp_func;
-};
-
-typedef struct cisif_param_s cisif_param_t;
+#include <nuttx/video/video.h>
 
 #ifndef __ASSEMBLY__
 
@@ -95,11 +57,7 @@ extern "C"
  * Public Function Prototypes
  ****************************************************************************/
 
-int cxd56_cisifinit(void);
-int cxd56_cisiffinalize(void);
-int cxd56_cisifstartcapture(cisif_param_t *param, cisif_sarea_t *sarea);
-int cxd56_cisifstopcapture(void);
-int cxd56_cisifsetdmabuf(cisif_sarea_t *sarea);
+const FAR struct video_imgdata_ops_s *cxd56_cisif_initialize(void);
 
 #undef EXTERN
 #if defined(__cplusplus)

diff --git a/arch/arm/include/cxd56xx/pm.h b/arch/arm/include/cxd56xx/pm.h
@@ -79,6 +79,7 @@
 
 #define PM_CPUFREQLOCK_FLAG_HV (0x0001) /* request HV */
 #define PM_CPUFREQLOCK_FLAG_LV (0x4000) /* request LV */
+#define PM_CPUFREQLOCK_FLAG_HOLD (0x8000) /* hold the current frequency */
 
 /* FrequencyLock identifier tag helper macro function */