summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/drivers/media/radio/Kconfig2
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-dvb.c45
-rw-r--r--linux/drivers/media/video/zr364xx.c13
-rw-r--r--v4l/Makefile4
-rwxr-xr-xv4l/scripts/prep_commit_msg.pl27
5 files changed, 56 insertions, 35 deletions
diff --git a/linux/drivers/media/radio/Kconfig b/linux/drivers/media/radio/Kconfig
index 6d96b17a7..4ab38a851 100644
--- a/linux/drivers/media/radio/Kconfig
+++ b/linux/drivers/media/radio/Kconfig
@@ -3,7 +3,7 @@
#
menu "Radio Adapters"
- depends on VIDEO_DEV!=n
+ depends on VIDEO_DEV
config RADIO_CADET
tristate "ADS Cadet AM/FM Tuner"
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c
index ddee1ae81..4de46b2d7 100644
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c
@@ -61,8 +61,12 @@ static int debug = 0;
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "Turn on/off module debugging (default:off).");
-#define dprintk(fmt, arg...) if (debug) \
- printk(KERN_DEBUG "%s/dvb: " fmt, dev->name , ## arg)
+#define dprintk(fmt, arg...) do { if (debug) \
+ printk(KERN_DEBUG "%s/dvb: " fmt, dev->name , ## arg); } while(0)
+
+/* Print a warning */
+#define wprintk(fmt, arg...) \
+ printk(KERN_WARNING "%s/dvb: " fmt, dev->name, ## arg)
/* ------------------------------------------------------------------
* mt352 based DVB-T cards
@@ -88,8 +92,7 @@ static int pinnacle_antenna_pwr(struct saa7134_dev *dev, int on)
saa_setl(SAA7134_GPIO_GPSTATUS0 >> 2, (1 << 28));
udelay(10);
ok = saa_readl(SAA7134_GPIO_GPSTATUS0) & (1 << 27);
- printk("%s: %s %s\n", dev->name, __FUNCTION__,
- ok ? "on" : "off");
+ dprintk("%s %s\n", __FUNCTION__, ok ? "on" : "off");
if (!ok)
saa_clearl(SAA7134_GPIO_GPSTATUS0 >> 2, (1 << 26));
@@ -109,7 +112,7 @@ static int mt352_pinnacle_init(struct dvb_frontend* fe)
static u8 irq_cfg [] = { INTERRUPT_EN_0, 0x00, 0x00, 0x00, 0x00 };
struct saa7134_dev *dev= fe->dvb->priv;
- printk("%s: %s called\n",dev->name,__FUNCTION__);
+ dprintk("%s called\n", __FUNCTION__);
mt352_write(fe, clock_config, sizeof(clock_config));
udelay(200);
@@ -293,7 +296,8 @@ static int philips_tda6651_pll_set(struct dvb_frontend *fe, struct dvb_frontend_
if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1);
if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1) {
- printk("%s/dvb: could not write to tuner at addr: 0x%02x\n",dev->name, addr << 1);
+ wprintk("could not write to tuner at addr: 0x%02x\n",
+ addr << 1);
return -EIO;
}
msleep(1);
@@ -563,7 +567,8 @@ static int philips_fmd1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_
if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1);
if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1) {
- printk("%s/dvb: could not write to tuner at addr: 0x%02x\n",dev->name, addr << 1);
+ wprintk("could not write to tuner at addr: 0x%02x\n",
+ addr << 1);
return -EIO;
}
return 0;
@@ -610,7 +615,8 @@ static void philips_tda827x_lna_gain(struct dvb_frontend *fe, int high)
saa7134_set_gpio(dev, 22, 0);
GP00_LEV[1] = high ? 0 : 1;
if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1) {
- printk("%s/dvb: could not access tda8290 at addr: 0x%02x\n",dev->name, addr << 1);
+ wprintk("could not access tda8290 at addr: 0x%02x\n",
+ addr << 1);
return;
}
msg.buf = GP00_LEV;
@@ -638,7 +644,8 @@ static int tda8290_i2c_gate_ctrl( struct dvb_frontend* fe, int enable)
tda8290_msg.buf = tda8290_open;
}
if (i2c_transfer(state->i2c, &tda8290_msg, 1) != 1) {
- printk("saa7134/dvb: could not access tda8290 I2C gate\n");
+ struct saa7134_dev *dev = fe->dvb->priv;
+ wprintk("could not access tda8290 I2C gate\n");
return -EIO;
}
msleep(20);
@@ -695,7 +702,7 @@ static void configure_tda827x_fe(struct saa7134_dev *dev, struct tda1004x_config
dev->dvb.frontend->ops.i2c_gate_ctrl = tda8290_i2c_gate_ctrl;
if (dvb_attach(tda827x_attach, dev->dvb.frontend, tda_conf->tuner_address,
&dev->i2c_adap,&tda827x_cfg) == NULL) {
- printk ("saa7134/dvb: no tda827x tuner found at addr: %02x\n",
+ wprintk("no tda827x tuner found at addr: %02x\n",
tda_conf->tuner_address);
}
}
@@ -943,7 +950,7 @@ static int dvb_init(struct saa7134_dev *dev)
switch (dev->board) {
case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL:
- printk("%s: pinnacle 300i dvb setup\n",dev->name);
+ dprintk("pinnacle 300i dvb setup\n");
dev->dvb.frontend = dvb_attach(mt352_attach, &pinnacle_300i,
&dev->i2c_adap);
if (dev->dvb.frontend) {
@@ -952,7 +959,7 @@ static int dvb_init(struct saa7134_dev *dev)
break;
case SAA7134_BOARD_AVERMEDIA_777:
case SAA7134_BOARD_AVERMEDIA_A16AR:
- printk("%s: avertv 777 dvb setup\n",dev->name);
+ dprintk("avertv 777 dvb setup\n");
dev->dvb.frontend = dvb_attach(mt352_attach, &avermedia_777,
&dev->i2c_adap);
if (dev->dvb.frontend) {
@@ -1027,11 +1034,11 @@ static int dvb_init(struct saa7134_dev *dev)
if (dev->dvb.frontend) {
if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x63,
&dev->i2c_adap, 0) == NULL) {
- printk("%s: Lifeview Trio, No tda826x found!\n", __FUNCTION__);
+ wprintk("%s: Lifeview Trio, No tda826x found!\n", __FUNCTION__);
}
if (dvb_attach(isl6421_attach, dev->dvb.frontend, &dev->i2c_adap,
0x08, 0, 0) == NULL) {
- printk("%s: Lifeview Trio, No ISL6421 found!\n", __FUNCTION__);
+ wprintk("%s: Lifeview Trio, No ISL6421 found!\n", __FUNCTION__);
}
}
}
@@ -1045,7 +1052,7 @@ static int dvb_init(struct saa7134_dev *dev)
if (dvb_attach(tda827x_attach,dev->dvb.frontend,
ads_tech_duo_config.tuner_address,
&dev->i2c_adap,&ads_duo_cfg) == NULL) {
- printk ("saa7134/dvb: no tda827x tuner found at addr: %02x\n",
+ wprintk("no tda827x tuner found at addr: %02x\n",
ads_tech_duo_config.tuner_address);
}
}
@@ -1078,11 +1085,11 @@ static int dvb_init(struct saa7134_dev *dev)
if (dev->dvb.frontend) {
if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x60,
&dev->i2c_adap, 0) == NULL) {
- printk("%s: No tda826x found!\n", __FUNCTION__);
+ wprintk("%s: No tda826x found!\n", __FUNCTION__);
}
if (dvb_attach(isl6421_attach, dev->dvb.frontend,
&dev->i2c_adap, 0x08, 0, 0) == NULL) {
- printk("%s: No ISL6421 found!\n", __FUNCTION__);
+ wprintk("%s: No ISL6421 found!\n", __FUNCTION__);
}
}
break;
@@ -1116,12 +1123,12 @@ static int dvb_init(struct saa7134_dev *dev)
configure_tda827x_fe(dev, &philips_tiger_s_config);
break;
default:
- printk("%s: Huh? unknown DVB card?\n",dev->name);
+ wprintk("Huh? unknown DVB card?\n");
break;
}
if (NULL == dev->dvb.frontend) {
- printk("%s: frontend initialization failed\n",dev->name);
+ printk(KERN_ERR "%s/dvb: frontend initialization failed\n", dev->name);
return -1;
}
diff --git a/linux/drivers/media/video/zr364xx.c b/linux/drivers/media/video/zr364xx.c
index 43643ce84..88b1fec85 100644
--- a/linux/drivers/media/video/zr364xx.c
+++ b/linux/drivers/media/video/zr364xx.c
@@ -282,7 +282,7 @@ static unsigned char header3;
static int read_frame(struct zr364xx_camera *cam, int framenum)
{
int i, n, temp, head, size, actual_length;
- unsigned char *ptr = NULL, *jpeg, swap;
+ unsigned char *ptr = NULL, *jpeg;
redo:
/* hardware brightness */
@@ -313,12 +313,11 @@ static int read_frame(struct zr364xx_camera *cam, int framenum)
}
/* swap bytes if camera needs it */
- if (cam->method == METHOD0)
- for (i = 0; i < BUFFER_SIZE; i += 2) {
- swap = cam->buffer[i];
- cam->buffer[i] = cam->buffer[i + 1];
- cam->buffer[i + 1] = swap;
- }
+ if (cam->method == METHOD0) {
+ u16 *buf = (u16*)cam->buffer;
+ for (i = 0; i < BUFFER_SIZE/2; i++)
+ swab16s(buf + i);
+ }
/* write the JPEG header */
if (!head) {
diff --git a/v4l/Makefile b/v4l/Makefile
index abc53110c..ad499751d 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -231,8 +231,8 @@ endif
links::
@echo creating symbolic links...
- @find ../linux/drivers/media -name '*.[ch]' -type f -exec ln -sf '{}' . \;
- @find ../linux/sound -name '*.[ch]' -type f -exec ln -sf '{}' . \;
+ @find ../linux/drivers/media -name '*.[ch]' -type f -print0 | xargs -0n 255 ln -sf --target-directory=.
+ @find ../linux/sound -name '*.[ch]' -type f -print0 | xargs -0n 255 ln -sf --target-directory=.
# This link is so code with #include "oss/*.h" will find its header files
oss:
diff --git a/v4l/scripts/prep_commit_msg.pl b/v4l/scripts/prep_commit_msg.pl
index a4594c7f9..f4047c6ba 100755
--- a/v4l/scripts/prep_commit_msg.pl
+++ b/v4l/scripts/prep_commit_msg.pl
@@ -5,16 +5,31 @@ my $autopatch = shift;
# Get Hg username from environment
my $user = $ENV{HGUSER};
-# Didn't work? Try the .hgrc file
-if ($user eq "") {
- open IN, "<$ENV{HOME}/.hgrc";
+sub hgrcuser($)
+{
+ my $file = shift;
+ my $ui = 0;
+ open IN, '<', $file;
while (<IN>) {
- if(/^\s*username\s*=\s*(\S.*)$/) {
- $user = $1;
- last;
+ $ui = 1 if (/^\s*\[ui\]/);
+ if ($ui && /^\s*username\s*=\s*(\S.*?)\s*$/) {
+ close IN;
+ return($1);
}
}
close IN;
+ return("");
+}
+
+# Didn't work? Try the repo's .hgrc file
+if ($user eq "") {
+ my $hgroot = `hg root`;
+ chomp($hgroot);
+ $user = hgrcuser("$hgroot/.hg/hgrc");
+}
+# Ok, try ~/.hgrc next
+if ($user eq "") {
+ $user = hgrcuser("$ENV{HOME}/.hgrc");
}
# Still no luck? Try some other environment variables
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-25 05:51:52 +0000