From e292200f615ab5de17b0cb8593c460a5c06d2f0a Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Thu, 3 Nov 2022 09:45:30 +0800 Subject: [PATCH] video: Move _VIDIOCBASE and _VIDIOC to include/nuttx/fs/ioctl.h to align with other drivers Signed-off-by: Xiang Xiao --- include/nuttx/fs/ioctl.h | 6 ++++++ include/nuttx/video/video.h | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/nuttx/fs/ioctl.h b/include/nuttx/fs/ioctl.h index ef654c47c9..ffe67bddfa 100644 --- a/include/nuttx/fs/ioctl.h +++ b/include/nuttx/fs/ioctl.h @@ -92,6 +92,7 @@ #define _BLUETOOTHBASE (0x3400) /* Bluetooth ioctl commands */ #define _PKTRADIOBASE (0x3500) /* Packet radio ioctl commands */ #define _LTEBASE (0x3600) /* LTE device ioctl commands */ +#define _VIDIOCBASE (0x3700) /* Video device ioctl commands */ #define _WLIOCBASE (0x8b00) /* Wireless modules ioctl network commands */ /* boardctl() commands share the same number space */ @@ -599,6 +600,11 @@ #define _LTEIOCVALID(c) (_IOC_TYPE(c)==_LTEBASE) #define _LTEIOC(nr) _IOC(_LTEBASE,nr) +/* Video device ioctl definitions *******************************************/ + +#define _VIDIOCVALID(c) (_IOC_TYPE(c)==_VIDIOCBASE) +#define _VIDIOC(nr) _IOC(_VIDIOCBASE,nr) + /* Wireless driver network ioctl definitions ********************************/ /* (see nuttx/include/wireless/wireless.h */ diff --git a/include/nuttx/video/video.h b/include/nuttx/video/video.h index b7703e7749..dfe843d7a0 100644 --- a/include/nuttx/video/video.h +++ b/include/nuttx/video/video.h @@ -26,8 +26,8 @@ ****************************************************************************/ #include -#include -#include "video_controls.h" +#include +#include #ifdef __cplusplus extern "C" @@ -38,10 +38,6 @@ extern "C" * Pre-processor Definitions ****************************************************************************/ -#define _VIDIOCBASE (0x1000) - -#define _VIDIOC(nr) _IOC(_VIDIOCBASE,nr) - /* Enumerate the formats supported by device */ #define VIDIOC_ENUM_FMT _VIDIOC(0x0001)