1. 18 11月, 2016 2 次提交
  2. 09 7月, 2016 1 次提交
  3. 17 11月, 2015 2 次提交
    • M
      [media] include/media: move driver interface headers to a separate dir · d647f0b7
      Mauro Carvalho Chehab 提交于
      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
      Signed-off-by: NMauro Carvalho Chehab <mchehab@osg.samsung.com>
      Acked-by: NArnd Bergmann <arnd@arndb.de>
      d647f0b7
    • M
      [media] include/media: split I2C headers from V4L2 core · b5dcee22
      Mauro Carvalho Chehab 提交于
      Currently, include/media is messy, as it contains both the V4L2 core
      headers and some driver-specific headers on the same place. That makes
      harder to identify what core headers should be documented and what
      headers belong to I2C drivers that are included only by bridge/main
      drivers that would require the functions provided by them.
      
      Let's move those i2c specific files to its own subdirectory.
      
      The files to move were produced via the following script:
      	mkdir include/media/i2c
      	(cd include/media; for i in *.h; do n=`echo $i|sed s/.h$/.c/`; if [ -e ../../drivers/media/i2c/$n ]; then echo $i; git mv $i i2c/; fi; done)
      	(cd include/media; for i in *.h; do n=`echo $i|sed s/.h$/.c/`; if [ -e ../../drivers/media/*/i2c/$n ]; then echo $i; git mv $i i2c/; fi; done)
      	for i in include/media/*.h; do n=`basename $i`;  (for j in $(git grep -l $n); do dirname $j; done)|sort|uniq|grep -ve '^.$' > list; num=$(wc -l list|cut -d' ' -f1); if [ $num == 1 ]; then if [ "`grep i2c list`" != "" ]; then git mv $i include/media/i2c; fi; fi; done
      
      And the references corrected via this script:
          MAIN_DIR="media/"
          PREV_DIR="media/"
          DIRS="i2c/"
      
          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
      
      Merged Sakari Ailus patch that moves smiapp.h to include/media/i2c.
      Signed-off-by: NMauro Carvalho Chehab <mchehab@osg.samsung.com>
      Acked-by: NArnd Bergmann <arnd@arndb.de>
      b5dcee22
  4. 01 10月, 2015 1 次提交
  5. 10 6月, 2015 1 次提交
    • M
      [media] dvb: Get rid of typedev usage for enums · 0df289a2
      Mauro Carvalho Chehab 提交于
      The DVB API was originally defined using typedefs. This is against
      Kernel CodingStyle, and there's no good usage here. While we can't
      remove its usage on userspace, we can avoid its usage in Kernelspace.
      
      So, let's do it.
      
      This patch was generated by this shell script:
      
      	for j in $(grep typedef include/uapi/linux/dvb/frontend.h |cut -d' ' -f 3); do for i in $(find drivers/media -name '*.[ch]' -type f) $(find drivers/staging/media -name '*.[ch]' -type f); do sed "s,${j}_t,enum $j," <$i >a && mv a $i; done; done
      
      While here, make CodingStyle fixes on the affected lines.
      Signed-off-by: NMauro Carvalho Chehab <mchehab@osg.samsung.com>
      Acked-by: Stefan Richter <stefanr@s5r6.in-berlin.de> # for drivers/media/firewire/*
      0df289a2
  6. 01 5月, 2015 1 次提交
  7. 08 4月, 2015 1 次提交
  8. 17 12月, 2014 1 次提交
  9. 03 11月, 2014 9 次提交
  10. 03 9月, 2013 1 次提交
  11. 21 6月, 2013 1 次提交
  12. 28 4月, 2013 1 次提交
    • M
      [media] cx88: make core less verbose · 02615ed5
      Mauro Carvalho Chehab 提交于
      Along the time, several debug messages were added at cx88-cards.
      While those are still useful to track some troubles with
      tuners, they're too verbose:
      [ 5768.281801] cx88[0]: Calling XC2028/3028 callback
      [ 5768.287388] cx88[0]: Calling XC2028/3028 callback
      [ 5768.292575] cx88[0]: Calling XC2028/3028 callback
      [ 5768.299408] cx88[0]: Calling XC2028/3028 callback
      [ 5768.306244] cx88[0]: Calling XC2028/3028 callback
      ...
      
      and, most of the time, useless.
      
      So, disable them, except if core_debug modprobe parameter
      is used.
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      02615ed5
  13. 08 4月, 2013 1 次提交
  14. 24 3月, 2013 1 次提交
  15. 06 2月, 2013 1 次提交
  16. 28 10月, 2012 1 次提交
    • M
      [media] cx88: reorder inline to prevent a gcc warning · 34206439
      Mauro Carvalho Chehab 提交于
      drivers/media/pci/cx88/cx88.h:97:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
      drivers/media/pci/cx88/cx88.h:103:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
      drivers/media/pci/cx88/cx88-core.c:649:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
      drivers/media/pci/cx88/cx88-core.c:654:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
      drivers/media/pci/cx88/cx88-core.c:659:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
      drivers/media/pci/cx88/cx88-core.c:664:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
      drivers/media/pci/cx88/cx88-core.c:684:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
      drivers/media/pci/cx88/cx88-core.c:695:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      34206439
  17. 16 8月, 2012 1 次提交
  18. 14 8月, 2012 1 次提交
    • E
      [media] cx88: Remove duplicate const · d9bc8510
      Emil Goode 提交于
      This patch fixes the following sparse warnings
      by removing use of duplicate const.
      
      drivers/media/video/cx88/cx88.h:152:40:
      	warning: duplicate const
      drivers/media/video/cx88/cx88-core.c:256:33:
      	warning: duplicate const
      drivers/media/video/cx88/cx88-alsa.c:769:41:
      	warning: duplicate const
      
      As commented by Jonathan Nieder:
      
      	These double "const" were introduced in v2.6.37-rc1~64^2~464 (V4L/DVB:
      	drivers/media: Make static data tables and strings const, 2010-08-25).
      
      	The address of an array is already immutable by definition, so for
      	what it's worth, with or without a clarified commit message,
      
      [mchehab@redhat.com: Tested with "gcc -s" (version 4.7.0):
       the produced asm is indeed equal before and after this patch]
      Signed-off-by: NEmil Goode <emilgoode@gmail.com>
      Acked-by: NJonathan Nieder <jrnieder@gmail.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      d9bc8510
  19. 07 7月, 2012 7 次提交
  20. 07 1月, 2012 1 次提交
  21. 28 7月, 2011 4 次提交
    • D
      [media] cx88: properly maintain decoder config when using MPEG encoder · 243bf1a2
      Devin Heitmueller 提交于
      The cx88 driver would force core->input to always be zero when doing the
      the request_acquire().  While it wasn't actually changing the input register
      in the hardware, the driver makes decision based on the current input.  In
      particular, it decides whether to do things like enabling the comb filter
      when on a composite input but disabling it on s-video.  So for example, on
      the HVR-1300, using the s-video input with the MPEG encoder would end up with
      the video decoder core configured as though the input type were composite.
      
      In short, the driver state did not match the hardware state.
      
      This patch does two things:
      
      1.  It forces the input to zero only if actually switching to DVB mode.  This
      prevents the input from changing when the blackbird driver opens the device.
      
      2.  Keep track of what the input was set to when switching to DVB, and reset
      it back when done.  This eliminates a condition where for example the user
      had the analog side of the board set to capture on the s-video input, then
      he used DVB for a bit, then the analog input would unexpectedly be set to
      the tuner input.
      
      This work was sponsored by Anevia S.A.
      Signed-off-by: NDevin Heitmueller <dheitmueller@kernellabs.com>
      Cc: Florent Audebert <florent.audebert@anevia.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      243bf1a2
    • M
      [media] Stop using linux/version.h on most video drivers · 1990d50b
      Mauro Carvalho Chehab 提交于
      All the modified drivers didn't have any version increment since
      Jan, 1 2011. Several of them didn't have any version increment
      for a long time, even having new features and important bug fixes
      happening.
      
      As we're now filling the QUERYCAP version with the current Kernel
      Release, we don't need to maintain a per-driver version control
      anymore. So, let's just use the default.
      
      In order to preserve the Kernel module version history, a
      KERNEL_VERSION() macro were added to all modified drivers, and
      the extraver number were incremented.
      
      I opted to preserve the per-driver version control to a few
      pwc, pvrusb2, s2255, s5p-fimc and sh_vou.
      
      A few drivers are still using the legacy way to handle ioctl's.
      So, we can't do such change on them, otherwise, they'll break.
      Those are: uvc, et61x251 and sn9c102.
      
      The rationale is that the per-driver version control seems to be
      actively maintained on those.
      
      Yet, I think that the better for them would be to just use the
      default version numbering, instead of doing that by themselves.
      
      While here, removed a few uneeded include linux/version.h
      Acked-by: NHans Verkuil <hans.verkuil@cisco.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      1990d50b
    • I
      [media] cx88: added support for Leadtek WinFast DTV1800 H with XC4000 tuner · 8eb79c0b
      istvan_v@mailbox.hu 提交于
      This patch implements support for the Leadtek WinFast DTV1800 H card with
      XC4000 tuner (107d:6f38).
      Signed-off-by: NIstvan Varga <istvan_v@mailbox.hu>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      8eb79c0b
    • I
      [media] cx88: added support for Leadtek WinFast DTV2000 H Plus · f271a3af
      istvan_v@mailbox.hu 提交于
      This patch implements support for the Leadtek WinFast DTV2000 H Plus card
      with XC4000 tuner (107d:6f42).
      Signed-off-by: NIstvan Varga <istvan_v@mailbox.hu>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      f271a3af