diff --git a/include/nuttx/video/video_controls.h b/include/sys/video_controls.h similarity index 98% rename from include/nuttx/video/video_controls.h rename to include/sys/video_controls.h index 492d02bed0..8f4e864a11 100644 --- a/include/nuttx/video/video_controls.h +++ b/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 index 71b8e0266d..965b747e2f 100644 --- a/include/sys/videoio.h +++ b/include/sys/videoio.h @@ -28,9 +28,9 @@ #include #include #include +#include #include -#include #ifdef __cplusplus extern "C" diff --git a/tools/nxstyle.c b/tools/nxstyle.c index aab68634bc..a5884c72c4 100644 --- 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 };