Move video_controls.h from include/nuttx/video to include/sys

The video_controls.h is a public header file, and it is used by videoio.h. So it should be moved to the include/sys directory. Signed-off-by: Xiang Xiao <[email protected]> Signed-off-by: shizhenghui <[email protected]>
shizhenghui · Mar 18, 2024 · 70fb823 · 70fb823
1 parent f451522
commit 70fb823
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/include/nuttx/video/video_controls.h → include/sys/video_controls.h b/include/nuttx/video/video_controls.h → include/sys/video_controls.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/video/video_controls.h
+ * include/sys/video_controls.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_VIDEO_VIDEO_CONTROLS_H
-#define __INCLUDE_NUTTX_VIDEO_VIDEO_CONTROLS_H
+#ifndef __INCLUDE_SYS_VIDEO_CONTROLS_H
+#define __INCLUDE_SYS_VIDEO_CONTROLS_H
 
 /****************************************************************************
  * Included Files
@@ -250,4 +250,4 @@ enum v4l2_flash_led_mode
 
 #define V4L2_CID_JPEG_COMPRESSION_QUALITY JPEG_CID(0) /* JPEG quality */
 
-#endif /* __INCLUDE_NUTTX_VIDEO_VIDEO_CONTROLS_H */
+#endif /* __INCLUDE_SYS_VIDEO_CONTROLS_H */
diff --git a/include/sys/videoio.h b/include/sys/videoio.h
@@ -28,9 +28,9 @@
 #include <stdint.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <sys/video_controls.h>
 
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/video/video_controls.h>
 
 #ifdef __cplusplus
 extern "C"

diff --git a/tools/nxstyle.c b/tools/nxstyle.c
@@ -206,8 +206,8 @@ static const char *g_white_prefix[] =
   "ub32",    /* Ref:  include/fixedmath.h */
   "lua_",    /* Ref:  apps/interpreters/lua/lua-5.x.x/src/lua.h */
   "luaL_",   /* Ref:  apps/interpreters/lua/lua-5.x.x/src/lauxlib.h */
+  "V4L2_",   /* Ref:  include/sys/video_controls.h */
   "Ifx",     /* Ref:  arch/tricore/src */
-
   NULL
 };