From cb5a30b9297380a55ffff6ddf3fa4b6b784f0c16 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 31 Jan 2006 19:49:20 -0200 Subject: Fixed a bug at strip-trailing-whitespaces From: Mauro Carvalho Chehab Sometimes, it was needed to run it several times. fixed. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/strip-trailing-whitespaces.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/v4l/scripts/strip-trailing-whitespaces.sh b/v4l/scripts/strip-trailing-whitespaces.sh index ea3e4defa..1a23e436d 100755 --- a/v4l/scripts/strip-trailing-whitespaces.sh +++ b/v4l/scripts/strip-trailing-whitespaces.sh @@ -10,21 +10,25 @@ for file in `find linux -type d | grep -v CVS | grep -v .cvsignore` ; do done for file in `find linux -type f | grep -v CVS | grep -v .cvsignore` ; do tmpfile="$WORK/${file}.$$" - perl -ne 's/[ \t]+$//; + perl -ne 's/[ \t]+$//; s/^\ \ \ \ \ \ \ \ /\t/; s/^\ \ \ \ \ \ \ \t/\t/; s/^\ \ \ \ \ \ \t/\t/; s/^\ \ \ \ \ \t/\t/; s/^\ \ \ \t/\t/; s/^\ \ \t/\t/; - s/^\ \t/\t/; - s/\t\ \ \ \ \ \ \ \ /\t\t/g; - s/\t\ \ \ \ \ \ \ \t/\t\t/g; - s/\t\ \ \ \ \ \ \t/\t\t/g; - s/\t\ \ \ \ \ \t/\t\t/g; - s/\t\ \ \ \t/\t\t/g; - s/\t\ \ \t/\t\t/g; - s/\t\ \t/\t\t/g; + s/^\ \t/\t/; + $m=1; + while ($m>0) { + $m=0; + $m= s/\t\ \ \ \ \ \ \ \ /\t\t/g; + $m=$m+s/\t\ \ \ \ \ \ \ \t/\t\t/g; + $m=$m+s/\t\ \ \ \ \ \ \t/\t\t/g; + $m=$m+s/\t\ \ \ \ \ \t/\t\t/g; + $m=$m+s/\t\ \ \ \t/\t\t/g; + $m=$m+s/\t\ \ \t/\t\t/g; + $m=$m+s/\t\ \t/\t\t/g; + } print' < "${file}" > "${tmpfile}" diff -u "${file}" "${tmpfile}" | sed \ -e "s|^--- ${file}|--- ${file}.orig|" \ -- cgit v1.2.3 From 28af95926667ed6ee25e7a050286bb72f546438e Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 31 Jan 2006 23:51:25 -0200 Subject: Fixed a bug at strip-trailing-whitespaces From: Mauro Carvalho Chehab Sometimes, it was needed to run it several times. fixed. Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/strip-trailing-whitespaces.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/v4l/scripts/strip-trailing-whitespaces.sh b/v4l/scripts/strip-trailing-whitespaces.sh index ea3e4defa..1a23e436d 100755 --- a/v4l/scripts/strip-trailing-whitespaces.sh +++ b/v4l/scripts/strip-trailing-whitespaces.sh @@ -10,21 +10,25 @@ for file in `find linux -type d | grep -v CVS | grep -v .cvsignore` ; do done for file in `find linux -type f | grep -v CVS | grep -v .cvsignore` ; do tmpfile="$WORK/${file}.$$" - perl -ne 's/[ \t]+$//; + perl -ne 's/[ \t]+$//; s/^\ \ \ \ \ \ \ \ /\t/; s/^\ \ \ \ \ \ \ \t/\t/; s/^\ \ \ \ \ \ \t/\t/; s/^\ \ \ \ \ \t/\t/; s/^\ \ \ \t/\t/; s/^\ \ \t/\t/; - s/^\ \t/\t/; - s/\t\ \ \ \ \ \ \ \ /\t\t/g; - s/\t\ \ \ \ \ \ \ \t/\t\t/g; - s/\t\ \ \ \ \ \ \t/\t\t/g; - s/\t\ \ \ \ \ \t/\t\t/g; - s/\t\ \ \ \t/\t\t/g; - s/\t\ \ \t/\t\t/g; - s/\t\ \t/\t\t/g; + s/^\ \t/\t/; + $m=1; + while ($m>0) { + $m=0; + $m= s/\t\ \ \ \ \ \ \ \ /\t\t/g; + $m=$m+s/\t\ \ \ \ \ \ \ \t/\t\t/g; + $m=$m+s/\t\ \ \ \ \ \ \t/\t\t/g; + $m=$m+s/\t\ \ \ \ \ \t/\t\t/g; + $m=$m+s/\t\ \ \ \t/\t\t/g; + $m=$m+s/\t\ \ \t/\t\t/g; + $m=$m+s/\t\ \t/\t\t/g; + } print' < "${file}" > "${tmpfile}" diff -u "${file}" "${tmpfile}" | sed \ -e "s|^--- ${file}|--- ${file}.orig|" \ -- cgit v1.2.3 From 243c1d1fa0d09431bf84f02e4a20c002da7c08c7 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 5 Feb 2006 11:25:13 -0500 Subject: Use MT352 parallel transport function for all Bluebird FusionHDTV DVB-T boxes. From: Michael Krufky Use the parallel transport function of the MT352 demodulator in TH7579 and LGZ201 -based FusionHDTV Bluebird usb boxes. Signed-off-by: Michael Krufky --- linux/drivers/media/dvb/dvb-usb/cxusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/drivers/media/dvb/dvb-usb/cxusb.c b/linux/drivers/media/dvb/dvb-usb/cxusb.c index cfd3caf34..1c249d950 100644 --- a/linux/drivers/media/dvb/dvb-usb/cxusb.c +++ b/linux/drivers/media/dvb/dvb-usb/cxusb.c @@ -255,7 +255,7 @@ static int cxusb_dee1601_demod_init(struct dvb_frontend* fe) static int cxusb_mt352_demod_init(struct dvb_frontend* fe) { /* used in both lgz201 and th7579 */ - static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x39 }; + static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x29 }; static u8 reset [] = { RESET, 0x80 }; static u8 adc_ctl_1_cfg [] = { ADC_CTL_1, 0x40 }; static u8 agc_cfg [] = { AGC_TARGET, 0x24, 0x20 }; -- cgit v1.2.3 From afcfb73bdbe21ae90b41a3adc127b65854b294df Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 7 Feb 2006 10:15:34 -0200 Subject: Kernel Sync stuff From: Mauro Carvalho Chehab Added a new format at videodev2.h Added support for a new board at snd-bt87x module kernel-sync Signed-off-by: Mauro Carvalho Chehab --- linux/include/linux/videodev2.h | 1 + linux/sound/pci/bt87x.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 0fe3901c6..1b76d3e9a 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -356,6 +356,7 @@ struct v4l2_pix_format #define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S','9','1','0') /* SN9C10x compression */ #define V4L2_PIX_FMT_PWC1 v4l2_fourcc('P','W','C','1') /* pwc older webcam */ #define V4L2_PIX_FMT_PWC2 v4l2_fourcc('P','W','C','2') /* pwc newer webcam */ +#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E','6','2','5') /* ET61X251 compression */ /* * F O R M A T E N U M E R A T I O N diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c index e4e99e429..65f7b6a4f 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -781,6 +781,8 @@ static struct pci_device_id snd_bt87x_ids[] = { BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, 0x0070, 0x13eb, 32000), /* Viewcast Osprey 200 */ BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0xff01, 44100), + /* AVerMedia Studio No. 103, 203, ...? */ + BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1461, 0x0003, 48000), { } }; MODULE_DEVICE_TABLE(pci, snd_bt87x_ids); @@ -808,7 +810,7 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci) const struct pci_device_id *supported; supported = pci_match_device(&driver, pci); - if (supported) + if (supported && supported->driver_data > 0) return supported->driver_data; for (i = 0; i < ARRAY_SIZE(blacklist); ++i) -- cgit v1.2.3