OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

video: Move _VIDIOCBASE and _VIDIOC to include/nuttx/fs/ioctl.h 

to align with other drivers

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-11-03 09:45:30 +08:00 committed by Petro Karashchenko
parent b7d2b38700
commit e292200f61
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/nuttx/fs/ioctl.h
View File

@ -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 */

8
include/nuttx/video/video.h
View File

@ -26,8 +26,8 @@
****************************************************************************/
#include <stdint.h>
#include <sys/ioctl.h>
#include "video_controls.h"
#include <nuttx/fs/ioctl.h>
#include <nuttx/video/video_controls.h>
#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)