This ensures that they won't be used in kernel code.
Showing the changes to include/uapi/linux (1 of 1 file). Show all
Unified · Split
| @@ -79,24 +79,11 @@ · 78 unmodified lines | ||
| 79 | 79 | /* Current composing area plus all padding pixels */ |
| 80 | 80 | #define V4L2_SEL_TGT_COMPOSE_PADDED 0x0103 |
| 81 | 81 | |
| 82 | −/* Backward compatibility target definitions --- to be removed. */ | |
| 83 | −#define V4L2_SEL_TGT_CROP_ACTIVE V4L2_SEL_TGT_CROP | |
| 84 | −#define V4L2_SEL_TGT_COMPOSE_ACTIVE V4L2_SEL_TGT_COMPOSE | |
| 85 | −#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL V4L2_SEL_TGT_CROP | |
| 86 | −#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE | |
| 87 | −#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS V4L2_SEL_TGT_CROP_BOUNDS | |
| 88 | −#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS | |
| 89 | − | |
| 90 | 82 | /* Selection flags */ |
| 91 | 83 | #define V4L2_SEL_FLAG_GE (1 << 0) |
| 92 | 84 | #define V4L2_SEL_FLAG_LE (1 << 1) |
| 93 | 85 | #define V4L2_SEL_FLAG_KEEP_CONFIG (1 << 2) |
| 94 | 86 | |
| 95 | −/* Backward compatibility flag definitions --- to be removed. */ | |
| 96 | −#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE V4L2_SEL_FLAG_GE | |
| 97 | −#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE V4L2_SEL_FLAG_LE | |
| 98 | −#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG | |
| 99 | − | |
| 100 | 87 | struct v4l2_edid { |
| 101 | 88 | __u32 pad; |
| 102 | 89 | __u32 start_block; |
| @@ -105,4 +92,19 @@ struct v4l2_edid { · 2 unmodified lines | ||
| 105 | 92 | __u8 *edid; |
| 106 | 93 | }; |
| 107 | 94 | |
| 95 | +#ifndef __KERNEL__ | |
| 96 | +/* Backward compatibility target definitions --- to be removed. */ | |
| 97 | +#define V4L2_SEL_TGT_CROP_ACTIVE V4L2_SEL_TGT_CROP | |
| 98 | +#define V4L2_SEL_TGT_COMPOSE_ACTIVE V4L2_SEL_TGT_COMPOSE | |
| 99 | +#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL V4L2_SEL_TGT_CROP | |
| 100 | +#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE | |
| 101 | +#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS V4L2_SEL_TGT_CROP_BOUNDS | |
| 102 | +#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS | |
| 103 | + | |
| 104 | +/* Backward compatibility flag definitions --- to be removed. */ | |
| 105 | +#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE V4L2_SEL_FLAG_GE | |
| 106 | +#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE V4L2_SEL_FLAG_LE | |
| 107 | +#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG | |
| 108 | +#endif | |
| 109 | + | |
| 108 | 110 | #endif /* __V4L2_COMMON__ */ |