Let's not mix headers used by the core with those headers that are needed by some driver-specific interface header. The headers used on drivers were manually moved using: mkdir include/media/drv-intf/ git mv include/media/cx2341x.h include/media/cx25840.h \ include/media/exynos-fimc.h include/media/msp3400.h \ include/media/s3c_camif.h include/media/saa7146.h \ include/media/saa7146_vv.h include/media/sh_mobile_ceu.h \ include/media/sh_mobile_csi2.h include/media/sh_vou.h \ include/media/si476x.h include/media/soc_mediabus.h \ include/media/tea575x.h include/media/drv-intf/ And the references for those headers were corrected using: MAIN_DIR="media/" PREV_DIR="media/" DIRS="drv-intf/" echo "Checking affected files" >&2 for i in $DIRS; do for j in $(find include/$MAIN_DIR/$i -type f -name '*.h'); do n=`basename $j` git grep -l $n done done|sort|uniq >files && ( echo "Handling files..." >&2; echo "for i in \$(cat files|grep -v Documentation); do cat \$i | \\"; ( cd include/$MAIN_DIR; for j in $DIRS; do for i in $(ls $j); do echo "perl -ne 's,(include [\\\"\\<])$PREV_DIR($i)([\\\"\\>]),\1$MAIN_DIR$j\2\3,; print \$_' |\\"; done; done; echo "cat > a && mv a \$i; done"; ); echo "Handling documentation..." >&2; echo "for i in MAINTAINERS \$(cat files); do cat \$i | \\"; ( cd include/$MAIN_DIR; for j in $DIRS; do for i in $(ls $j); do echo " perl -ne 's,include/$PREV_DIR($i)\b,include/$MAIN_DIR$j\1,; print \$_' |\\"; done; done; echo "cat > a && mv a \$i; done" ); ) >script && . ./script
Showing the changes to include/uapi (1 of 98 files). Show all
Unified · Split
| @@ -158,8 +158,10 @@ enum v4l2_colorfx { · 157 unmodified lines | |||
| 158 | * We reserve 16 controls for this driver. */ | 158 | * We reserve 16 controls for this driver. */ |
| 159 | #define V4L2_CID_USER_S2255_BASE (V4L2_CID_USER_BASE + 0x1030) | 159 | #define V4L2_CID_USER_S2255_BASE (V4L2_CID_USER_BASE + 0x1030) |
| 160 | 160 | ||
| 161 | /* The base for the si476x driver controls. See include/media/si476x.h for the list | 161 | /* |
| 162 | * of controls. Total of 16 controls is reserved for this driver */ | 162 | * The base for the si476x driver controls. See include/media/drv-intf/si476x.h |
| 163 | * for the list of controls. Total of 16 controls is reserved for this driver | ||
| 164 | */ | ||
| 163 | #define V4L2_CID_USER_SI476X_BASE (V4L2_CID_USER_BASE + 0x1040) | 165 | #define V4L2_CID_USER_SI476X_BASE (V4L2_CID_USER_BASE + 0x1040) |
| 164 | 166 | ||
| 165 | /* The base for the TI VPE driver controls. Total of 16 controls is reserved for | 167 | /* The base for the TI VPE driver controls. Total of 16 controls is reserved for |