diff options
| -rw-r--r-- | contrib/freebsd/include/linux/input-event-codes.h | 10 | ||||
| -rw-r--r-- | contrib/freebsd/include/linux/videodev2.h | 1 | ||||
| -rw-r--r-- | include/linux/videodev2.h | 1 | ||||
| -rw-r--r-- | utils/common/codec-v4l2-fwht.c | 3 | ||||
| -rw-r--r-- | utils/common/v4l2-pix-formats.h | 1 | ||||
| -rw-r--r-- | utils/keytable/parse.h | 2 |
6 files changed, 4 insertions, 14 deletions
diff --git a/contrib/freebsd/include/linux/input-event-codes.h b/contrib/freebsd/include/linux/input-event-codes.h index a4990dff..f9f5c0fa 100644 --- a/contrib/freebsd/include/linux/input-event-codes.h +++ b/contrib/freebsd/include/linux/input-event-codes.h @@ -716,7 +716,6 @@ * the situation described above. */ #define REL_RESERVED 0x0a -#define REL_WHEEL_HI_RES 0x0b #define REL_MAX 0x0f #define REL_CNT (REL_MAX+1) @@ -753,15 +752,6 @@ #define ABS_MISC 0x28 -/* - * 0x2e is reserved and should not be used in input drivers. - * It was used by HID as ABS_MISC+6 and userspace needs to detect if - * the next ABS_* event is correct or is just ABS_MISC + n. - * We define here ABS_RESERVED so userspace can rely on it and detect - * the situation described above. - */ -#define ABS_RESERVED 0x2e - #define ABS_MT_SLOT 0x2f /* MT slot being modified */ #define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ #define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */ diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index 33153b53..f47e02d2 100644 --- a/contrib/freebsd/include/linux/videodev2.h +++ b/contrib/freebsd/include/linux/videodev2.h @@ -717,6 +717,7 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_MT21C v4l2_fourcc('M', 'T', '2', '1') /* Mediatek compressed block mode */ #define V4L2_PIX_FMT_INZI v4l2_fourcc('I', 'N', 'Z', 'I') /* Intel Planar Greyscale 10-bit and Depth 16-bit */ #define V4L2_PIX_FMT_SUNXI_TILED_NV12 v4l2_fourcc('S', 'T', '1', '2') /* Sunxi Tiled NV12 Format */ +#define V4L2_PIX_FMT_CNF4 v4l2_fourcc('C', 'N', 'F', '4') /* Intel 4-bit packed depth confidence information */ /* 10bit raw bayer packed, 32 bytes for every 25 pixels, last LSB 6 bits unused */ #define V4L2_PIX_FMT_IPU3_SBGGR10 v4l2_fourcc('i', 'p', '3', 'b') /* IPU3 packed 10-bit BGGR bayer */ diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index a39300ca..9350bdc1 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -683,6 +683,7 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_MT21C v4l2_fourcc('M', 'T', '2', '1') /* Mediatek compressed block mode */ #define V4L2_PIX_FMT_INZI v4l2_fourcc('I', 'N', 'Z', 'I') /* Intel Planar Greyscale 10-bit and Depth 16-bit */ #define V4L2_PIX_FMT_SUNXI_TILED_NV12 v4l2_fourcc('S', 'T', '1', '2') /* Sunxi Tiled NV12 Format */ +#define V4L2_PIX_FMT_CNF4 v4l2_fourcc('C', 'N', 'F', '4') /* Intel 4-bit packed depth confidence information */ /* 10bit raw bayer packed, 32 bytes for every 25 pixels, last LSB 6 bits unused */ #define V4L2_PIX_FMT_IPU3_SBGGR10 v4l2_fourcc('i', 'p', '3', 'b') /* IPU3 packed 10-bit BGGR bayer */ diff --git a/utils/common/codec-v4l2-fwht.c b/utils/common/codec-v4l2-fwht.c index ac5bb683..8cb0212d 100644 --- a/utils/common/codec-v4l2-fwht.c +++ b/utils/common/codec-v4l2-fwht.c @@ -11,7 +11,6 @@ #include "codec-v4l2-fwht.h" static const struct v4l2_fwht_pixfmt_info v4l2_fwht_pixfmts[] = { - { V4L2_PIX_FMT_GREY, 1, 1, 1, 1, 0, 1, 1, 1}, { V4L2_PIX_FMT_YUV420, 1, 3, 2, 1, 1, 2, 2, 3}, { V4L2_PIX_FMT_YVU420, 1, 3, 2, 1, 1, 2, 2, 3}, { V4L2_PIX_FMT_YUV422P, 1, 2, 1, 1, 1, 2, 1, 3}, @@ -35,7 +34,7 @@ static const struct v4l2_fwht_pixfmt_info v4l2_fwht_pixfmts[] = { { V4L2_PIX_FMT_HSV32, 4, 4, 1, 4, 4, 1, 1, 3}, { V4L2_PIX_FMT_ARGB32, 4, 4, 1, 4, 4, 1, 1, 4}, { V4L2_PIX_FMT_ABGR32, 4, 4, 1, 4, 4, 1, 1, 4}, - + { V4L2_PIX_FMT_GREY, 1, 1, 1, 1, 0, 1, 1, 1}, }; const struct v4l2_fwht_pixfmt_info *v4l2_fwht_find_pixfmt(u32 pixelformat) diff --git a/utils/common/v4l2-pix-formats.h b/utils/common/v4l2-pix-formats.h index a696b5b5..83d593cc 100644 --- a/utils/common/v4l2-pix-formats.h +++ b/utils/common/v4l2-pix-formats.h @@ -32,6 +32,7 @@ case V4L2_PIX_FMT_Y12I: return "Interleaved 12-bit Greyscale"; case V4L2_PIX_FMT_Z16: return "16-bit Depth"; case V4L2_PIX_FMT_INZI: return "Planar 10:16 Greyscale Depth"; + case V4L2_PIX_FMT_CNF4: return "4-bit Depth Confidence (Packed)"; case V4L2_PIX_FMT_PAL8: return "8-bit Palette"; case V4L2_PIX_FMT_UV8: return "8-bit Chrominance UV 4-4"; case V4L2_PIX_FMT_YVU410: return "Planar YVU 4:1:0"; diff --git a/utils/keytable/parse.h b/utils/keytable/parse.h index fc848d28..7d1cda93 100644 --- a/utils/keytable/parse.h +++ b/utils/keytable/parse.h @@ -596,7 +596,6 @@ struct parse_event rel_events[] = { {"REL_WHEEL", 0x08}, {"REL_MISC", 0x09}, {"REL_RESERVED", 0x0a}, - {"REL_WHEEL_HI_RES", 0x0b}, {"REL_MAX", 0x0f}, { NULL, 0} }; @@ -627,7 +626,6 @@ struct parse_event abs_events[] = { {"ABS_TOOL_WIDTH", 0x1c}, {"ABS_VOLUME", 0x20}, {"ABS_MISC", 0x28}, - {"ABS_RESERVED", 0x2e}, {"ABS_MT_SLOT", 0x2f}, {"ABS_MT_TOUCH_MAJOR", 0x30}, {"ABS_MT_TOUCH_MINOR", 0x31}, |