Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

e620d1e3 · Linus Torvalds <[email protected]> · 2010-06-04 15:38:12 -07:00

* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (87 commits)
  V4L/DVB: ivtv: Timing tweaks and code re-order to try and improve stability
  V4L/DVB: ivtv: Avoid accidental video standard change
  V4L/DVB: ivtvfb : Module load / unload fixes
  V4L/DVB: cx2341x: Report correct temporal setting for log-status
  V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address
  V4L/DVB: drivers/media: Eliminate a NULL pointer dereference
  V4L/DVB: dvb-core: Fix ULE decapsulation bug
  V4L/DVB: Bug fix: make IR work again for dm1105
  V4L/DVB: media/IR: nec-decoder needs to select BITREV
  V4L/DVB: video/saa7134: change dprintk() to i2cdprintk()
  V4L/DVB: video/saa7134: remove duplicate break
  V4L/DVB: IR/imon: add auto-config for 0xffdc rf device
  V4L/DVB: IR/imon: clean up usage of bools
  V4L/DVB: em28xx: remove unneeded null checks
  V4L/DVB: ngene: remove unused #include <linux/version.h>
  V4L/DVB: ak881x needs slab.h
  V4L/DVB: FusionHDTV: Use quick reads for I2C IR device probing
  V4L/DVB: Technotrend S2-3200 ships with a TT 1500 remote
  V4L/DVB: drivers/media: Use kzalloc
  V4L/DVB: m920x: Select simple tuner
  ...

Commit: e620d1e39aa33b43bed96aa7f2ebbc88914aed58
Parents: d2dd328b · 666092c6

Merge commit. Changes below are compared with the first parent: d2dd328b.

Changes

138 files changed · +2031 −1508

File	Status	Add	Del	Content
Documentation/DocBook/v4l/v4l2.xml	modified	+1	−1	View file
Documentation/DocBook/v4l/vidioc-query-dv-preset.xml	modified	+4	−2	View file
Documentation/video4linux/CARDLIST.saa7134	modified	+3	−2	View file
Documentation/video4linux/gspca.txt	modified	+1	−0	View file
MAINTAINERS	modified	+2	−2	View file
drivers/media/IR/Kconfig	modified	+2	−0	View file
drivers/media/IR/imon.c	modified	+41	−34	View file
drivers/media/IR/ir-keytable.c	modified	+10	−7	View file
drivers/media/IR/ir-sysfs.c	modified	+4	−3	View file
drivers/media/IR/keymaps/Makefile	modified	+2	−1	View file
drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c → drivers/media/IR/keymaps/rc-avermedia-m135a.c	renamed	+74	−17	View file
drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c	added	+95	−0	View file
drivers/media/dvb/dm1105/dm1105.c	modified	+1	−1	View file
drivers/media/dvb/dvb-core/dvb_net.c	modified	+11	−1	View file
drivers/media/dvb/dvb-usb/Kconfig	modified	+3	−1	View file
drivers/media/dvb/dvb-usb/cxusb.c	modified	+3	−1	View file
drivers/media/dvb/dvb-usb/dvb-usb-ids.h	modified	+1	−0	View file
drivers/media/dvb/dvb-usb/ttusb2.c	modified	+89	−6	View file
drivers/media/dvb/firewire/firedtv-1394.c	modified	+1	−1	View file
drivers/media/dvb/frontends/au8522_decoder.c	modified	+0	−26	View file
drivers/media/dvb/frontends/ds3000.c	modified	+1	−4	View file
drivers/media/dvb/frontends/stv6110x.c	modified	+4	−1	View file
drivers/media/dvb/ngene/ngene-cards.c	modified	+15	−0	View file
drivers/media/dvb/ngene/ngene-core.c	modified	+55	−25	View file
drivers/media/dvb/ngene/ngene-dvb.c	modified	+3	−12	View file
drivers/media/dvb/ngene/ngene-i2c.c	modified	+0	−1	View file
drivers/media/dvb/ngene/ngene.h	modified	+3	−0	View file
drivers/media/dvb/ttpci/Kconfig	modified	+3	−2	View file
drivers/media/dvb/ttpci/budget-ci.c	modified	+1	−0	View file
drivers/media/video/Kconfig	modified	+2	−2	View file
drivers/media/video/ak881x.c	modified	+2	−1	View file
drivers/media/video/bw-qcam.c	modified	+414	−345	View file
drivers/media/video/bw-qcam.h	deleted	+0	−69	View before deletion
drivers/media/video/c-qcam.c	modified	+330	−304	View file
drivers/media/video/cx18/cx18-alsa-main.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-alsa-mixer.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-alsa-mixer.h	modified	+1	−1	View file
drivers/media/video/cx18/cx18-alsa-pcm.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-alsa-pcm.h	modified	+1	−1	View file
drivers/media/video/cx18/cx18-alsa.h	modified	+1	−1	View file
drivers/media/video/cx18/cx18-av-audio.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-av-core.c	modified	+57	−70	View file
drivers/media/video/cx18/cx18-av-core.h	modified	+1	−1	View file
drivers/media/video/cx18/cx18-av-firmware.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-cards.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-cards.h	modified	+1	−1	View file
drivers/media/video/cx18/cx18-controls.c	modified	+5	−6	View file
drivers/media/video/cx18/cx18-driver.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-driver.h	modified	+1	−1	View file
drivers/media/video/cx18/cx18-dvb.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-fileops.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-firmware.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-gpio.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-gpio.h	modified	+1	−1	View file
drivers/media/video/cx18/cx18-i2c.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-io.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-io.h	modified	+2	−2	View file
drivers/media/video/cx18/cx18-ioctl.c	modified	+6	−4	View file
drivers/media/video/cx18/cx18-ioctl.h	modified	+1	−1	View file
drivers/media/video/cx18/cx18-irq.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-irq.h	modified	+1	−1	View file
drivers/media/video/cx18/cx18-mailbox.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-mailbox.h	modified	+1	−1	View file
drivers/media/video/cx18/cx18-queue.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-queue.h	modified	+1	−1	View file
drivers/media/video/cx18/cx18-scb.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-scb.h	modified	+1	−1	View file
drivers/media/video/cx18/cx18-streams.c	modified	+1	−1	View file
drivers/media/video/cx18/cx18-streams.h	modified	+1	−1	View file
drivers/media/video/cx231xx/cx231xx-video.c	modified	+4	−1	View file
drivers/media/video/cx2341x.c	modified	+1	−5	View file
drivers/media/video/cx23885/cx23885-dvb.c	modified	+2	−0	View file
drivers/media/video/cx23885/cx23885-i2c.c	modified	+11	−1	View file
drivers/media/video/cx23885/cx23885-input.c	modified	+1	−1	View file
drivers/media/video/cx23885/cx23885-input.h	modified	+1	−1	View file
drivers/media/video/cx23885/cx23885-ioctl.c	modified	+1	−1	View file
drivers/media/video/cx23885/cx23885-ioctl.h	modified	+1	−1	View file
drivers/media/video/cx23885/cx23885-ir.c	modified	+1	−1	View file
drivers/media/video/cx23885/cx23885-ir.h	modified	+1	−1	View file
drivers/media/video/cx23885/cx23885-video.c	modified	+4	−1	View file
drivers/media/video/cx23885/cx23888-ir.c	modified	+1	−1	View file
drivers/media/video/cx23885/cx23888-ir.h	modified	+1	−1	View file
drivers/media/video/cx25840/cx25840-core.c	modified	+41	−58	View file
drivers/media/video/cx88/cx88-i2c.c	modified	+15	−1	View file
drivers/media/video/em28xx/em28xx-core.c	modified	+2	−5	View file
drivers/media/video/gspca/sonixb.c	modified	+0	−2	View file
drivers/media/video/gspca/sonixj.c	modified	+4	−1	View file
drivers/media/video/hdpvr/hdpvr-video.c	modified	+1	−1	View file
drivers/media/video/ivtv/ivtv-controls.c	modified	+5	−5	View file
drivers/media/video/ivtv/ivtv-fileops.c	modified	+7	−4	View file
drivers/media/video/ivtv/ivtv-ioctl.c	modified	+5	−1	View file
drivers/media/video/ivtv/ivtv-streams.c	modified	+21	−2	View file
drivers/media/video/ivtv/ivtvfb.c	modified	+11	−3	View file
drivers/media/video/mt9m001.c	modified	+2	−2	View file
drivers/media/video/mt9m111.c	modified	+2	−2	View file
drivers/media/video/mt9t031.c	modified	+1	−1	View file
drivers/media/video/mt9t112.c	modified	+2	−2	View file
drivers/media/video/mt9v011.c	modified	+17	−20	View file
drivers/media/video/mt9v022.c	modified	+2	−2	View file
drivers/media/video/mx3_camera.c	modified	+2	−2	View file
drivers/media/video/omap/omap_vout.c	modified	+1	−2	View file
drivers/media/video/ov772x.c	modified	+2	−2	View file
drivers/media/video/ov9640.c	modified	+2	−2	View file
drivers/media/video/pvrusb2/pvrusb2-devattr.c	modified	+1	−0	View file
drivers/media/video/pvrusb2/pvrusb2-devattr.h	modified	+5	−0	View file
drivers/media/video/pvrusb2/pvrusb2-hdw.c	modified	+30	−7	View file
drivers/media/video/pvrusb2/pvrusb2-main.c	modified	+2	−2	View file
drivers/media/video/pvrusb2/pvrusb2-sysfs.c	modified	+10	−3	View file
drivers/media/video/pvrusb2/pvrusb2-v4l2.c	modified	+12	−3	View file
drivers/media/video/pxa_camera.c	modified	+2	−2	View file
drivers/media/video/rj54n1cb0c.c	modified	+2	−2	View file
drivers/media/video/saa7115.c	modified	+6	−13	View file
drivers/media/video/saa7127.c	modified	+0	−8	View file
drivers/media/video/saa7134/saa6752hs.c	modified	+26	−20	View file
drivers/media/video/saa7134/saa7134-cards.c	modified	+55	−0	View file
drivers/media/video/saa7134/saa7134-empress.c	modified	+7	−2	View file
drivers/media/video/saa7134/saa7134-input.c	modified	+12	−6	View file
drivers/media/video/saa7134/saa7134.h	modified	+1	−0	View file
drivers/media/video/saa717x.c	modified	+21	−17	View file
drivers/media/video/sh_mobile_ceu_camera.c	modified	+2	−2	View file
drivers/media/video/sn9c102/sn9c102_devtable.h	modified	+1	−1	View file
drivers/media/video/soc_camera.c	modified	+2	−1	View file
drivers/media/video/soc_camera_platform.c	modified	+1	−1	View file
drivers/media/video/tvp514x.c	modified	+40	−183	View file
drivers/media/video/tvp5150.c	modified	+0	−20	View file
drivers/media/video/tw9910.c	modified	+1	−1	View file
drivers/media/video/usbvision/usbvision-video.c	modified	+1	−2	View file
drivers/staging/tm6000/Kconfig	modified	+2	−1	View file
drivers/staging/tm6000/tm6000-alsa.c	modified	+24	−1	View file
drivers/staging/tm6000/tm6000-cards.c	modified	+29	−16	View file
drivers/staging/tm6000/tm6000-core.c	modified	+121	−0	View file
drivers/staging/tm6000/tm6000-dvb.c	modified	+53	−21	View file
drivers/staging/tm6000/tm6000-video.c	modified	+56	−48	View file
drivers/staging/tm6000/tm6000.h	modified	+24	−1	View file
include/media/rc-map.h	modified	+2	−1	View file
include/media/soc_camera.h	modified	+1	−1	View file
include/media/v4l2-mediabus.h	modified	+21	−0	View file
include/media/v4l2-subdev.h	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/DocBook/v4l/v4l2.xml

View file

diff --git a/Documentation/DocBook/v4l/v4l2.xml b/Documentation/DocBook/v4l/v4l2.xml
index 9737243..7c3c098 100644
--- a/Documentation/DocBook/v4l/v4l2.xml
+++ b/Documentation/DocBook/v4l/v4l2.xml
@@ -58,7 +58,7 @@ MPEG stream embedded, sliced VBI data format in this specification.
 </contrib>
 	<affiliation>
 	  <address>
-	    <email>[email protected]</email>
+	    <email>[email protected]</email>
 	  </address>
 	</affiliation>
       </author>

Documentation/DocBook/v4l/vidioc-query-dv-preset.xml

View file

diff --git a/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml b/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
index 87e4f0f..402229e 100644
--- a/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
+++ b/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
@@ -53,8 +53,10 @@ input</refpurpose>
 automatically, similar to sensing the video standard. To do so, applications
 call <constant> VIDIOC_QUERY_DV_PRESET</constant> with a pointer to a
 &v4l2-dv-preset; type. Once the hardware detects a preset, that preset is
-returned in the preset field of &v4l2-dv-preset;. When detection is not
-possible or fails, the value V4L2_DV_INVALID is returned.</para>
+returned in the preset field of &v4l2-dv-preset;. If the preset could not be
+detected because there was no signal, or the signal was unreliable, or the
+signal did not map to a supported preset, then the value V4L2_DV_INVALID is
+returned.</para>
   </refsect1>
 
   <refsect1>

Documentation/video4linux/CARDLIST.saa7134

View file

diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 070f257..1387a69 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -176,5 +176,6 @@
 175 -> Leadtek Winfast DTV1000S                 [107d:6655]
 176 -> Beholder BeholdTV 505 RDS                [0000:5051]
 177 -> Hawell HW-404M7
-179 -> Beholder BeholdTV H7			[5ace:7190]
-180 -> Beholder BeholdTV A7			[5ace:7090]
+178 -> Beholder BeholdTV H7                     [5ace:7190]
+179 -> Beholder BeholdTV A7                     [5ace:7090]
+180 -> Avermedia M733A                          [1461:4155,1461:4255]

Documentation/video4linux/gspca.txt

View file

diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index 8f3f5d3..f13eb03 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -290,6 +290,7 @@ sonixb		0c45:602e	Genius VideoCam Messenger
 sonixj		0c45:6040	Speed NVC 350K
 sonixj		0c45:607c	Sonix sn9c102p Hv7131R
 sonixj		0c45:60c0	Sangha Sn535
+sonixj		0c45:60ce	USB-PC-Camera-168 (TALK-5067)
 sonixj		0c45:60ec	SN9C105+MO4000
 sonixj		0c45:60fb	Surfer NoName
 sonixj		0c45:60fc	LG-LIC300

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index a73dd80..67accd7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1731,7 +1731,7 @@ S:	Maintained
 F:	sound/pci/cs5535audio/
 
 CX18 VIDEO4LINUX DRIVER
-M:	Andy Walls <[email protected]>
+M:	Andy Walls <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
@@ -3165,7 +3165,7 @@ F:	Documentation/hwmon/it87
 F:	drivers/hwmon/it87.c
 
 IVTV VIDEO4LINUX DRIVER
-M:	Andy Walls <[email protected]>
+M:	Andy Walls <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

drivers/media/IR/Kconfig

View file

diff --git a/drivers/media/IR/Kconfig b/drivers/media/IR/Kconfig
index 195c6cf..d22a8ec 100644
--- a/drivers/media/IR/Kconfig
+++ b/drivers/media/IR/Kconfig
@@ -13,6 +13,7 @@ source "drivers/media/IR/keymaps/Kconfig"
 config IR_NEC_DECODER
 	tristate "Enable IR raw decoder for the NEC protocol"
 	depends on IR_CORE
+	select BITREVERSE
 	default y
 
 	---help---
@@ -22,6 +23,7 @@ config IR_NEC_DECODER
 config IR_RC5_DECODER
 	tristate "Enable IR raw decoder for the RC-5 protocol"
 	depends on IR_CORE
+	select BITREVERSE
 	default y
 
 	---help---

drivers/media/IR/imon.c

View file

diff --git a/drivers/media/IR/imon.c b/drivers/media/IR/imon.c
index 5e20456..4bbd45f 100644
--- a/drivers/media/IR/imon.c
+++ b/drivers/media/IR/imon.c
@@ -94,6 +94,7 @@ struct imon_context {
 
 	bool display_supported;		/* not all controllers do */
 	bool display_isopen;		/* display port has been opened */
+	bool rf_device;			/* true if iMON 2.4G LT/DT RF device */
 	bool rf_isassociating;		/* RF remote associating */
 	bool dev_present_intf0;		/* USB device presence, interface 0 */
 	bool dev_present_intf1;		/* USB device presence, interface 1 */
@@ -385,7 +386,7 @@ static int display_open(struct inode *inode, struct file *file)
 		err("%s: display port is already open", __func__);
 		retval = -EBUSY;
 	} else {
-		ictx->display_isopen = 1;
+		ictx->display_isopen = true;
 		file->private_data = ictx;
 		dev_dbg(ictx->dev, "display port opened\n");
 	}
@@ -422,7 +423,7 @@ static int display_close(struct inode *inode, struct file *file)
 		err("%s: display is not open", __func__);
 		retval = -EIO;
 	} else {
-		ictx->display_isopen = 0;
+		ictx->display_isopen = false;
 		dev_dbg(ictx->dev, "display port closed\n");
 		if (!ictx->dev_present_intf0) {
 			/*
@@ -491,12 +492,12 @@ static int send_packet(struct imon_context *ictx)
 	}
 
 	init_completion(&ictx->tx.finished);
-	ictx->tx.busy = 1;
+	ictx->tx.busy = true;
 	smp_rmb(); /* ensure later readers know we're busy */
 
 	retval = usb_submit_urb(ictx->tx_urb, GFP_KERNEL);
 	if (retval) {
-		ictx->tx.busy = 0;
+		ictx->tx.busy = false;
 		smp_rmb(); /* ensure later readers know we're not busy */
 		err("%s: error submitting urb(%d)", __func__, retval);
 	} else {
@@ -682,7 +683,7 @@ static ssize_t store_associate_remote(struct device *d,
 		return -ENODEV;
 
 	mutex_lock(&ictx->lock);
-	ictx->rf_isassociating = 1;
+	ictx->rf_isassociating = true;
 	send_associate_24g(ictx);
 	mutex_unlock(&ictx->lock);
 
@@ -950,7 +951,7 @@ static void usb_tx_callback(struct urb *urb)
 	ictx->tx.status = urb->status;
 
 	/* notify waiters that write has finished */
-	ictx->tx.busy = 0;
+	ictx->tx.busy = false;
 	smp_rmb(); /* ensure later readers know we're not busy */
 	complete(&ictx->tx.finished);
 }
@@ -1215,7 +1216,7 @@ static bool imon_mouse_event(struct imon_context *ictx,
 {
 	char rel_x = 0x00, rel_y = 0x00;
 	u8 right_shift = 1;
-	bool mouse_input = 1;
+	bool mouse_input = true;
 	int dir = 0;
 
 	/* newer iMON device PAD or mouse button */
@@ -1246,7 +1247,7 @@ static bool imon_mouse_event(struct imon_context *ictx,
 	} else if (ictx->kc == KEY_CHANNELDOWN && (buf[2] & 0x40) != 0x40) {
 		dir = -1;
 	} else
-		mouse_input = 0;
+		mouse_input = false;
 
 	if (mouse_input) {
 		dev_dbg(ictx->dev, "sending mouse data via input subsystem\n");
@@ -1450,7 +1451,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
 	unsigned char *buf = urb->transfer_buffer;
 	struct device *dev = ictx->dev;
 	u32 kc;
-	bool norelease = 0;
+	bool norelease = false;
 	int i;
 	u64 temp_key;
 	u64 panel_key = 0;
@@ -1465,7 +1466,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
 	idev = ictx->idev;
 
 	/* filter out junk data on the older 0xffdc imon devices */
-	if ((buf[0] == 0xff) && (buf[7] == 0xff))
+	if ((buf[0] == 0xff) && (buf[1] == 0xff) && (buf[2] == 0xff))
 		return;
 
 	/* Figure out what key was pressed */
@@ -1517,7 +1518,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
 	     !(buf[1] & 0x1 || buf[1] >> 2 & 0x1))) {
 		len = 8;
 		imon_pad_to_keys(ictx, buf);
-		norelease = 1;
+		norelease = true;
 	}
 
 	if (debug) {
@@ -1580,7 +1581,7 @@ not_input_data:
 	    (buf[6] == 0x5E && buf[7] == 0xDF))) {	/* DT */
 		dev_warn(dev, "%s: remote associated refid=%02X\n",
 			 __func__, buf[1]);
-		ictx->rf_isassociating = 0;
+		ictx->rf_isassociating = false;
 	}
 }
 
@@ -1790,9 +1791,9 @@ static bool imon_find_endpoints(struct imon_context *ictx,
 	int ifnum = iface_desc->desc.bInterfaceNumber;
 	int num_endpts = iface_desc->desc.bNumEndpoints;
 	int i, ep_dir, ep_type;
-	bool ir_ep_found = 0;
-	bool display_ep_found = 0;
-	bool tx_control = 0;
+	bool ir_ep_found = false;
+	bool display_ep_found = false;
+	bool tx_control = false;
 
 	/*
 	 * Scan the endpoint list and set:
@@ -1808,13 +1809,13 @@ static bool imon_find_endpoints(struct imon_context *ictx,
 		    ep_type == USB_ENDPOINT_XFER_INT) {
 
 			rx_endpoint = ep;
-			ir_ep_found = 1;
+			ir_ep_found = true;
 			dev_dbg(ictx->dev, "%s: found IR endpoint\n", __func__);
 
 		} else if (!display_ep_found && ep_dir == USB_DIR_OUT &&
 			   ep_type == USB_ENDPOINT_XFER_INT) {
 			tx_endpoint = ep;
-			display_ep_found = 1;
+			display_ep_found = true;
 			dev_dbg(ictx->dev, "%s: found display endpoint\n", __func__);
 		}
 	}
@@ -1835,8 +1836,8 @@ static bool imon_find_endpoints(struct imon_context *ictx,
 	 * newer iMON devices that use control urb instead of interrupt
 	 */
 	if (!display_ep_found) {
-		tx_control = 1;
-		display_ep_found = 1;
+		tx_control = true;
+		display_ep_found = true;
 		dev_dbg(ictx->dev, "%s: device uses control endpoint, not "
 			"interface OUT endpoint\n", __func__);
 	}
@@ -1847,7 +1848,7 @@ static bool imon_find_endpoints(struct imon_context *ictx,
 	 * and without... :\
 	 */
 	if (ictx->display_type == IMON_DISPLAY_TYPE_NONE) {
-		display_ep_found = 0;
+		display_ep_found = false;
 		dev_dbg(ictx->dev, "%s: device has no display\n", __func__);
 	}
 
@@ -1856,7 +1857,7 @@ static bool imon_find_endpoints(struct imon_context *ictx,
 	 * that refers to e.g. /dev/lcd0 (a character device LCD or VFD).
 	 */
 	if (ictx->display_type == IMON_DISPLAY_TYPE_VGA) {
-		display_ep_found = 0;
+		display_ep_found = false;
 		dev_dbg(ictx->dev, "%s: iMON Touch device found\n", __func__);
 	}
 
@@ -1905,9 +1906,10 @@ static struct imon_context *imon_init_intf0(struct usb_interface *intf)
 
 	ictx->dev = dev;
 	ictx->usbdev_intf0 = usb_get_dev(interface_to_usbdev(intf));
-	ictx->dev_present_intf0 = 1;
+	ictx->dev_present_intf0 = true;
 	ictx->rx_urb_intf0 = rx_urb;
 	ictx->tx_urb = tx_urb;
+	ictx->rf_device = false;
 
 	ictx->vendor  = le16_to_cpu(ictx->usbdev_intf0->descriptor.idVendor);
 	ictx->product = le16_to_cpu(ictx->usbdev_intf0->descriptor.idProduct);
@@ -1979,7 +1981,7 @@ static struct imon_context *imon_init_intf1(struct usb_interface *intf,
 	}
 
 	ictx->usbdev_intf1 = usb_get_dev(interface_to_usbdev(intf));
-	ictx->dev_present_intf1 = 1;
+	ictx->dev_present_intf1 = true;
 	ictx->rx_urb_intf1 = rx_urb;
 
 	ret = -ENODEV;
@@ -2047,6 +2049,12 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
 		dev_info(ictx->dev, "0xffdc iMON Knob, iMON IR");
 		ictx->display_supported = false;
 		break;
+	/* iMON 2.4G LT (usb stick), no display, iMON RF */
+	case 0x4e:
+		dev_info(ictx->dev, "0xffdc iMON 2.4G LT, iMON RF");
+		ictx->display_supported = false;
+		ictx->rf_device = true;
+		break;
 	/* iMON VFD, no IR (does have vol knob tho) */
 	case 0x35:
 		dev_info(ictx->dev, "0xffdc iMON VFD + knob, no IR");
@@ -2197,15 +2205,6 @@ static int __devinit imon_probe(struct usb_interface *interface,
 			goto fail;
 		}
 
-		if (product == 0xffdc) {
-			/* RF products *also* use 0xffdc... sigh... */
-			sysfs_err = sysfs_create_group(&interface->dev.kobj,
-						       &imon_rf_attribute_group);
-			if (sysfs_err)
-				err("%s: Could not create RF sysfs entries(%d)",
-				    __func__, sysfs_err);
-		}
-
 	} else {
 	/* this is the secondary interface on the device */
 		ictx = imon_init_intf1(interface, first_if_ctx);
@@ -2233,6 +2232,14 @@ static int __devinit imon_probe(struct usb_interface *interface,
 
 		imon_set_display_type(ictx, interface);
 
+		if (product == 0xffdc && ictx->rf_device) {
+			sysfs_err = sysfs_create_group(&interface->dev.kobj,
+						       &imon_rf_attribute_group);
+			if (sysfs_err)
+				err("%s: Could not create RF sysfs entries(%d)",
+				    __func__, sysfs_err);
+		}
+
 		if (ictx->display_supported)
 			imon_init_display(ictx, interface);
 	}
@@ -2297,7 +2304,7 @@ static void __devexit imon_disconnect(struct usb_interface *interface)
 	}
 
 	if (ifnum == 0) {
-		ictx->dev_present_intf0 = 0;
+		ictx->dev_present_intf0 = false;
 		usb_kill_urb(ictx->rx_urb_intf0);
 		input_unregister_device(ictx->idev);
 		if (ictx->display_supported) {
@@ -2307,7 +2314,7 @@ static void __devexit imon_disconnect(struct usb_interface *interface)
 				usb_deregister_dev(interface, &imon_vfd_class);
 		}
 	} else {
-		ictx->dev_present_intf1 = 0;
+		ictx->dev_present_intf1 = false;
 		usb_kill_urb(ictx->rx_urb_intf1);
 		if (ictx->display_type == IMON_DISPLAY_TYPE_VGA)
 			input_unregister_device(ictx->touch);

drivers/media/IR/ir-keytable.c

View file

diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c
index 9374a00..94a8577 100644
--- a/drivers/media/IR/ir-keytable.c
+++ b/drivers/media/IR/ir-keytable.c
@@ -490,11 +490,12 @@ int __ir_input_register(struct input_dev *input_dev,
 	if (rc < 0)
 		goto out_table;
 
-	if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW) {
-		rc = ir_raw_event_register(input_dev);
-		if (rc < 0)
-			goto out_event;
-	}
+	if (ir_dev->props)
+		if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW) {
+			rc = ir_raw_event_register(input_dev);
+			if (rc < 0)
+				goto out_event;
+		}
 
 	IR_dprintk(1, "Registered input device on %s for %s remote.\n",
 		   driver_name, rc_tab->name);
@@ -530,8 +531,10 @@ void ir_input_unregister(struct input_dev *input_dev)
 	IR_dprintk(1, "Freed keycode table\n");
 
 	del_timer_sync(&ir_dev->timer_keyup);
-	if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW)
-		ir_raw_event_unregister(input_dev);
+	if (ir_dev->props)
+		if (ir_dev->props->driver_type == RC_DRIVER_IR_RAW)
+			ir_raw_event_unregister(input_dev);
+
 	rc_tab = &ir_dev->rc_tab;
 	rc_tab->size = 0;
 	kfree(rc_tab->scan);

drivers/media/IR/ir-sysfs.c

View file

diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c
index d7da63e..2098dd1 100644
--- a/drivers/media/IR/ir-sysfs.c
+++ b/drivers/media/IR/ir-sysfs.c
@@ -221,9 +221,10 @@ int ir_register_class(struct input_dev *input_dev)
 	if (unlikely(devno < 0))
 		return devno;
 
-	if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)
-		ir_dev->dev.type = &rc_dev_type;
-	else
+	if (ir_dev->props) {
+		if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)
+			ir_dev->dev.type = &rc_dev_type;
+	} else
 		ir_dev->dev.type = &ir_raw_dev_type;
 
 	ir_dev->dev.class = &ir_input_class;

drivers/media/IR/keymaps/Makefile

View file

diff --git a/drivers/media/IR/keymaps/Makefile b/drivers/media/IR/keymaps/Makefile
index ec25258..aea649f 100644
--- a/drivers/media/IR/keymaps/Makefile
+++ b/drivers/media/IR/keymaps/Makefile
@@ -6,7 +6,8 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
 			rc-avermedia.o \
 			rc-avermedia-cardbus.o \
 			rc-avermedia-dvbt.o \
-			rc-avermedia-m135a-rm-jx.o \
+			rc-avermedia-m135a.o \
+			rc-avermedia-m733a-rm-k6.o \
 			rc-avertv-303.o \
 			rc-behold.o \
 			rc-behold-columbus.o \

drivers/media/IR/keymaps/rc-avermedia-m135a.c

View file

diff --git a/drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c b/drivers/media/IR/keymaps/rc-avermedia-m135a.c
similarity index 58%
rename from drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c
rename to drivers/media/IR/keymaps/rc-avermedia-m135a.c
index 101e7ea..e4471fb 100644
--- a/drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c
+++ b/drivers/media/IR/keymaps/rc-avermedia-m135a.c
@@ -1,8 +1,7 @@
-/* avermedia-m135a-rm-jx.h - Keytable for avermedia_m135a_rm_jx Remote Controller
- *
- * keymap imported from ir-keymaps.c
+/* avermedia-m135a.c - Keytable for Avermedia M135A Remote Controllers
  *
  * Copyright (c) 2010 by Mauro Carvalho Chehab <[email protected]>
+ * Copyright (c) 2010 by Herton Ronaldo Krzesinski <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,12 +12,18 @@
 #include <media/rc-map.h>
 
 /*
- * Avermedia M135A with IR model RM-JX
- * The same codes exist on both Positivo (BR) and original IR
- * Mauro Carvalho Chehab <[email protected]>
+ * Avermedia M135A with RM-JX and RM-K6 remote controls
+ *
+ * On Avermedia M135A with IR model RM-JX, the same codes exist on both
+ * Positivo (BR) and original IR, initial version and remote control codes
+ * added by Mauro Carvalho Chehab <[email protected]>
+ *
+ * Positivo also ships Avermedia M135A with model RM-K6, extra control
+ * codes added by Herton Ronaldo Krzesinski <[email protected]>
  */
 
-static struct ir_scancode avermedia_m135a_rm_jx[] = {
+static struct ir_scancode avermedia_m135a[] = {
+	/* RM-JX */
 	{ 0x0200, KEY_POWER2 },
 	{ 0x022e, KEY_DOT },		/* '.' */
 	{ 0x0201, KEY_MODE },		/* TV/FM or SOURCE */
@@ -62,29 +67,81 @@ static struct ir_scancode avermedia_m135a_rm_jx[] = {
 	{ 0x0219, KEY_RECORD },
 	{ 0x0218, KEY_PLAY },
 	{ 0x021b, KEY_STOP },
+
+	/* RM-K6 */
+	{ 0x0401, KEY_POWER2 },
+	{ 0x0406, KEY_MUTE },
+	{ 0x0408, KEY_MODE },     /* TV/FM */
+
+	{ 0x0409, KEY_1 },
+	{ 0x040a, KEY_2 },
+	{ 0x040b, KEY_3 },
+	{ 0x040c, KEY_4 },
+	{ 0x040d, KEY_5 },
+	{ 0x040e, KEY_6 },
+	{ 0x040f, KEY_7 },
+	{ 0x0410, KEY_8 },
+	{ 0x0411, KEY_9 },
+	{ 0x044c, KEY_DOT },      /* '.' */
+	{ 0x0412, KEY_0 },
+	{ 0x0407, KEY_REFRESH },  /* Refresh/Reload */
+
+	{ 0x0413, KEY_AUDIO },
+	{ 0x0440, KEY_SCREEN },   /* Full Screen toggle */
+	{ 0x0441, KEY_HOME },
+	{ 0x0442, KEY_BACK },
+	{ 0x0447, KEY_UP },
+	{ 0x0448, KEY_DOWN },
+	{ 0x0449, KEY_LEFT },
+	{ 0x044a, KEY_RIGHT },
+	{ 0x044b, KEY_OK },
+	{ 0x0404, KEY_VOLUMEUP },
+	{ 0x0405, KEY_VOLUMEDOWN },
+	{ 0x0402, KEY_CHANNELUP },
+	{ 0x0403, KEY_CHANNELDOWN },
+
+	{ 0x0443, KEY_RED },
+	{ 0x0444, KEY_GREEN },
+	{ 0x0445, KEY_YELLOW },
+	{ 0x0446, KEY_BLUE },
+
+	{ 0x0414, KEY_TEXT },
+	{ 0x0415, KEY_EPG },
+	{ 0x041a, KEY_TV2 },      /* PIP */
+	{ 0x041b, KEY_MHP },      /* Snapshot */
+
+	{ 0x0417, KEY_RECORD },
+	{ 0x0416, KEY_PLAYPAUSE },
+	{ 0x0418, KEY_STOP },
+	{ 0x0419, KEY_PAUSE },
+
+	{ 0x041f, KEY_PREVIOUS },
+	{ 0x041c, KEY_REWIND },
+	{ 0x041d, KEY_FORWARD },
+	{ 0x041e, KEY_NEXT },
 };
 
-static struct rc_keymap avermedia_m135a_rm_jx_map = {
+static struct rc_keymap avermedia_m135a_map = {
 	.map = {
-		.scan    = avermedia_m135a_rm_jx,
-		.size    = ARRAY_SIZE(avermedia_m135a_rm_jx),
+		.scan    = avermedia_m135a,
+		.size    = ARRAY_SIZE(avermedia_m135a),
 		.ir_type = IR_TYPE_NEC,
-		.name    = RC_MAP_AVERMEDIA_M135A_RM_JX,
+		.name    = RC_MAP_AVERMEDIA_M135A,
 	}
 };
 
-static int __init init_rc_map_avermedia_m135a_rm_jx(void)
+static int __init init_rc_map_avermedia_m135a(void)
 {
-	return ir_register_map(&avermedia_m135a_rm_jx_map);
+	return ir_register_map(&avermedia_m135a_map);
 }
 
-static void __exit exit_rc_map_avermedia_m135a_rm_jx(void)
+static void __exit exit_rc_map_avermedia_m135a(void)
 {
-	ir_unregister_map(&avermedia_m135a_rm_jx_map);
+	ir_unregister_map(&avermedia_m135a_map);
 }
 
-module_init(init_rc_map_avermedia_m135a_rm_jx)
-module_exit(exit_rc_map_avermedia_m135a_rm_jx)
+module_init(init_rc_map_avermedia_m135a)
+module_exit(exit_rc_map_avermedia_m135a)
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Mauro Carvalho Chehab <[email protected]>");

drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c

View file

diff --git a/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c b/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c
new file mode 100644
index 0000000..cf8d457
--- /dev/null
+++ b/drivers/media/IR/keymaps/rc-avermedia-m733a-rm-k6.c
@@ -0,0 +1,95 @@
+/* avermedia-m733a-rm-k6.h - Keytable for avermedia_m733a_rm_k6 Remote Controller
+ *
+ * Copyright (c) 2010 by Herton Ronaldo Krzesinski <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <media/rc-map.h>
+
+/*
+ * Avermedia M733A with IR model RM-K6
+ * This is the stock remote controller used with Positivo machines with M733A
+ * Herton Ronaldo Krzesinski <[email protected]>
+ */
+
+static struct ir_scancode avermedia_m733a_rm_k6[] = {
+	{ 0x0401, KEY_POWER2 },
+	{ 0x0406, KEY_MUTE },
+	{ 0x0408, KEY_MODE },     /* TV/FM */
+
+	{ 0x0409, KEY_1 },
+	{ 0x040a, KEY_2 },
+	{ 0x040b, KEY_3 },
+	{ 0x040c, KEY_4 },
+	{ 0x040d, KEY_5 },
+	{ 0x040e, KEY_6 },
+	{ 0x040f, KEY_7 },
+	{ 0x0410, KEY_8 },
+	{ 0x0411, KEY_9 },
+	{ 0x044c, KEY_DOT },      /* '.' */
+	{ 0x0412, KEY_0 },
+	{ 0x0407, KEY_REFRESH },  /* Refresh/Reload */
+
+	{ 0x0413, KEY_AUDIO },
+	{ 0x0440, KEY_SCREEN },   /* Full Screen toggle */
+	{ 0x0441, KEY_HOME },