diff options
author | jkh <jkh@FreeBSD.org> | 1996-06-07 22:55:14 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1996-06-07 22:55:14 +0000 |
commit | 996a2d831474ffd06649ca53d5c694a5e78ace35 (patch) | |
tree | 700b53bcc9eb532d5f683f47669ed39e15ca68a5 /sys | |
parent | 047f8d9223a6ae0b4ce774c98315a1680a87a6f0 (diff) | |
download | FreeBSD-src-996a2d831474ffd06649ca53d5c694a5e78ace35.zip FreeBSD-src-996a2d831474ffd06649ca53d5c694a5e78ace35.tar.gz |
A trailing patch Jim left out of the last commit.
Submitted-by: james
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/bktr/ioctl_meteor.h | 8 | ||||
-rw-r--r-- | sys/i386/include/ioctl_meteor.h | 8 | ||||
-rw-r--r-- | sys/sys/ioctl_meteor.h | 8 |
3 files changed, 21 insertions, 3 deletions
diff --git a/sys/dev/bktr/ioctl_meteor.h b/sys/dev/bktr/ioctl_meteor.h index f3a6c63..f432550 100644 --- a/sys/dev/bktr/ioctl_meteor.h +++ b/sys/dev/bktr/ioctl_meteor.h @@ -131,7 +131,7 @@ struct meteor_video { #define METEOR_FMT_SECAM 0x00400 /* SECAM */ #define METEOR_FMT_AUTOMODE 0x00800 /* auto-mode */ #define METEOR_INPUT_DEV0 0x01000 /* camera input 0 -- default */ -#define METEOR_INPUT_DEV_RCA METEOR_GEO_DEV0 +#define METEOR_INPUT_DEV_RCA METEOR_INPUT_DEV0 #define METEOR_INPUT_DEV1 0x02000 /* camera input 1 */ #define METEOR_INPUT_DEV2 0x04000 /* camera input 2 */ #define METEOR_INPUT_DEV3 0x08000 /* camera input 3 */ @@ -154,6 +154,12 @@ struct meteor_video { #define METEOR_GEO_YUV_12 0x10000000 /* YUV 12 format */ #define METEOR_GEO_YUV_9 0x40000000 /* YUV 9 format */ +#define METEOR_FIELD_MODE 0x80000000 /* Field cap or Frame cap */ + +#define METEOR_SIG_MODE_MASK 0xffff0000 +#define METEOR_SIG_FRAME 0x00000000 /* signal every frame */ +#define METEOR_SIG_FIELD 0x00010000 /* signal every field */ + /* following structure is used to coordinate the synchronous */ struct meteor_mem { diff --git a/sys/i386/include/ioctl_meteor.h b/sys/i386/include/ioctl_meteor.h index f3a6c63..f432550 100644 --- a/sys/i386/include/ioctl_meteor.h +++ b/sys/i386/include/ioctl_meteor.h @@ -131,7 +131,7 @@ struct meteor_video { #define METEOR_FMT_SECAM 0x00400 /* SECAM */ #define METEOR_FMT_AUTOMODE 0x00800 /* auto-mode */ #define METEOR_INPUT_DEV0 0x01000 /* camera input 0 -- default */ -#define METEOR_INPUT_DEV_RCA METEOR_GEO_DEV0 +#define METEOR_INPUT_DEV_RCA METEOR_INPUT_DEV0 #define METEOR_INPUT_DEV1 0x02000 /* camera input 1 */ #define METEOR_INPUT_DEV2 0x04000 /* camera input 2 */ #define METEOR_INPUT_DEV3 0x08000 /* camera input 3 */ @@ -154,6 +154,12 @@ struct meteor_video { #define METEOR_GEO_YUV_12 0x10000000 /* YUV 12 format */ #define METEOR_GEO_YUV_9 0x40000000 /* YUV 9 format */ +#define METEOR_FIELD_MODE 0x80000000 /* Field cap or Frame cap */ + +#define METEOR_SIG_MODE_MASK 0xffff0000 +#define METEOR_SIG_FRAME 0x00000000 /* signal every frame */ +#define METEOR_SIG_FIELD 0x00010000 /* signal every field */ + /* following structure is used to coordinate the synchronous */ struct meteor_mem { diff --git a/sys/sys/ioctl_meteor.h b/sys/sys/ioctl_meteor.h index f3a6c63..f432550 100644 --- a/sys/sys/ioctl_meteor.h +++ b/sys/sys/ioctl_meteor.h @@ -131,7 +131,7 @@ struct meteor_video { #define METEOR_FMT_SECAM 0x00400 /* SECAM */ #define METEOR_FMT_AUTOMODE 0x00800 /* auto-mode */ #define METEOR_INPUT_DEV0 0x01000 /* camera input 0 -- default */ -#define METEOR_INPUT_DEV_RCA METEOR_GEO_DEV0 +#define METEOR_INPUT_DEV_RCA METEOR_INPUT_DEV0 #define METEOR_INPUT_DEV1 0x02000 /* camera input 1 */ #define METEOR_INPUT_DEV2 0x04000 /* camera input 2 */ #define METEOR_INPUT_DEV3 0x08000 /* camera input 3 */ @@ -154,6 +154,12 @@ struct meteor_video { #define METEOR_GEO_YUV_12 0x10000000 /* YUV 12 format */ #define METEOR_GEO_YUV_9 0x40000000 /* YUV 9 format */ +#define METEOR_FIELD_MODE 0x80000000 /* Field cap or Frame cap */ + +#define METEOR_SIG_MODE_MASK 0xffff0000 +#define METEOR_SIG_FRAME 0x00000000 /* signal every frame */ +#define METEOR_SIG_FIELD 0x00010000 /* signal every field */ + /* following structure is used to coordinate the synchronous */ struct meteor_mem { |