Re: Asus P7131 Remote Control (includes patch)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



> Yes, to get all keys unique is the difficult part now,
> but very nice progress.
> 

It looks like remote doesn't pass carrier, instead is just starts with
toggle bit. After some analysis I think that the attached patch should
do the work. The key difference between it and previous one is:

    code = (code << 2) | 1;

in rc5_decode instead of 

    code = (code << 1) | 1;

Keytable is empty for now, but values will change anyhow. The check for
middle bit and carrier don't have any sense.


diff -upr v4l-dvb.old/linux/drivers/media/common/ir-keymaps.c v4l-dvb/linux/drivers/media/common/ir-keymaps.c
--- v4l-dvb.old/linux/drivers/media/common/ir-keymaps.c	Fri Sep  1 15:03:50 2006
+++ v4l-dvb/linux/drivers/media/common/ir-keymaps.c	Fri Sep  1 15:06:49 2006
@@ -1564,3 +1564,58 @@ IR_KEYTAB_TYPE ir_codes_norwood[IR_KEYTA
 };
 
 EXPORT_SYMBOL_GPL(ir_codes_norwood);
+
+/*
+ * Marc Fargas <telenieko@xxxxxxxxxxxxx> 
+ * this is the remote control that comes with the asus p7131
+ * which has a label saying is "Model PC-39"
+ */
+IR_KEYTAB_TYPE ir_codes_asus_pc39[IR_KEYTAB_SIZE] = {
+ 	/* Keys 0 to 9 */
+ 	[ 0x00 ] = KEY_0,
+ 	[ 0x00 ] = KEY_1,
+ 	[ 0x00 ] = KEY_2,
+ 	[ 0x00 ] = KEY_3,
+ 	[ 0x00 ] = KEY_4,
+ 	[ 0x00 ] = KEY_5,
+ 	[ 0x00 ] = KEY_6,
+ 	[ 0x00 ] = KEY_7,
+ 	[ 0x00 ] = KEY_8,
+ 	[ 0x00 ] = KEY_9,
+ 
+ 	[ 0x00 ] = KEY_RADIO,		/* radio */
+ 	[ 0x00 ] = KEY_MENU,		/* dvd/menu */
+ 	[ 0x00 ] = KEY_VOLUMEUP,
+ 	[ 0x00 ] = KEY_VOLUMEDOWN,
+ 	[ 0x00 ] = KEY_UP,
+ 	[ 0x00 ] = KEY_DOWN,
+	[ 0x00 ] = KEY_LEFT,
+ 	[ 0x00 ] = KEY_RIGHT,
+ 	[ 0x00 ] = KEY_VIDEO,		/* video */
+ 	[ 0x00 ] = KEY_AUDIO,		/* music */
+ 
+ 	[ 0x00 ] = KEY_TV,		/* tv */
+ 	[ 0x00 ] = KEY_EXIT,		/* back */
+ 	[ 0x00 ] = KEY_CHANNELUP,	/* channel / program + */
+ 	[ 0x00 ] = KEY_CHANNELDOWN,	/* channel / program - */
+ 	[ 0x00 ] = KEY_ENTER,		/* enter */
+ 
+ 	[ 0x00 ] = KEY_PAUSE,		/* play/pause */
+ 	[ 0x00 ] = KEY_PREVIOUS,	/* rew */
+ 	[ 0x00 ] = KEY_NEXT,		/* forward */
+ 	[ 0x00 ] = KEY_REWIND,		/* backward << */
+ 	[ 0x00 ] = KEY_FASTFORWARD,	/* forward >> */
+ 	[ 0x00 ] = KEY_STOP,
+ 	[ 0x00 ] = KEY_RECORD,		/* recording */
+ 	[ 0x00 ] = KEY_POWER,		/* the button that reads "close" */
+ 
+ 	[ 0x00 ] = KEY_ZOOM,		/* full screen */
+ 	[ 0x00 ] = KEY_MACRO,		/* recall */
+ 	[ 0x00 ] = KEY_HOME,		/* home */
+ 	[ 0x00 ] = KEY_PVR,		/* picture */
+ 	[ 0x00 ] = KEY_MUTE,		/* mute */
+ 	[ 0x00 ] = KEY_DVD,		/* dvd */
+ 	
+};
+ 
+EXPORT_SYMBOL_GPL(ir_codes_asus_pc39);
diff -upr v4l-dvb.old/linux/drivers/media/video/saa7134/saa7134-cards.c v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c
--- v4l-dvb.old/linux/drivers/media/video/saa7134/saa7134-cards.c	Fri Sep  1 15:03:50 2006
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c	Fri Sep  1 15:04:31 2006
@@ -3704,6 +3704,7 @@ int saa7134_board_init1(struct saa7134_d
 	case SAA7134_BOARD_KWORLD_TERMINATOR:
 	case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
 	case SAA7134_BOARD_FLYDVBT_LR301:
+	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
 	case SAA7134_BOARD_FLYDVBTDUO:
 		dev->has_remote = SAA7134_REMOTE_GPIO;
 		break;
diff -upr v4l-dvb.old/linux/drivers/media/video/saa7134/saa7134-input.c v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c
--- v4l-dvb.old/linux/drivers/media/video/saa7134/saa7134-input.c	Fri Sep  1 15:03:50 2006
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c	Fri Sep  1 15:34:13 2006
@@ -47,6 +47,11 @@ MODULE_PARM_DESC(pinnacle_remote, "Speci
 #define i2cdprintk(fmt, arg...)    if (ir_debug) \
 	printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg)
 
+/** rc5 functions */
+static int saa7134_rc5_irq(struct saa7134_dev *btv);
+static void saa7134_rc5_timer_keyup(unsigned long data);
+static void saa7134_rc5_timer_end(unsigned long data);
+
 /* -------------------- GPIO generic keycode builder -------------------- */
 
 static int build_key(struct saa7134_dev *dev)
@@ -116,9 +121,12 @@ static int get_key_purpletv(struct IR_i2
 void saa7134_input_irq(struct saa7134_dev *dev)
 {
 	struct saa7134_ir *ir = dev->remote;
-
-	if (!ir->polling)
+        
+	if (!ir->polling && !ir->rc5_gpio) {
 		build_key(dev);
+	} else if (ir->rc5_gpio) {
+		saa7134_rc5_irq(dev);
+	}
 }
 
 static void saa7134_input_timer(unsigned long data)
@@ -141,6 +149,7 @@ int saa7134_input_init1(struct saa7134_d
 	u32 mask_keydown = 0;
 	u32 mask_keyup   = 0;
 	int polling      = 0;
+	int rc5_gpio	 = 0;
 	int ir_type      = IR_TYPE_OTHER;
 
 	if (dev->has_remote != SAA7134_REMOTE_GPIO)
@@ -241,6 +250,11 @@ int saa7134_input_init1(struct saa7134_d
 		mask_keycode = 0x0001F00;
 		mask_keydown = 0x0040000;
 		break;
+	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
+		ir_codes     = ir_codes_asus_pc39;
+		mask_keydown = 0x0040000;
+		rc5_gpio = 1;
+		break;
 	}
 	if (NULL == ir_codes) {
 		printk("%s: Oops: IR config error [card=%d]\n",
@@ -263,6 +277,7 @@ int saa7134_input_init1(struct saa7134_d
 	ir->mask_keydown = mask_keydown;
 	ir->mask_keyup   = mask_keyup;
 	ir->polling      = polling;
+	ir->rc5_gpio	 = rc5_gpio;
 
 	/* init input device */
 	snprintf(ir->name, sizeof(ir->name), "saa7134 IR (%s)",
@@ -290,16 +305,26 @@ int saa7134_input_init1(struct saa7134_d
 #endif
 #endif
 
-	/* all done */
-	dev->remote = ir;
+
 	if (ir->polling) {
 		init_timer(&ir->timer);
 		ir->timer.function = saa7134_input_timer;
 		ir->timer.data     = (unsigned long)dev;
 		ir->timer.expires  = jiffies + HZ;
 		add_timer(&ir->timer);
+	} else if (ir->rc5_gpio) {
+		/* set timer_end for code completion */
+		init_timer(&ir->timer_end);
+		ir->timer_end.function = saa7134_rc5_timer_end;
+		ir->timer_end.data = (unsigned long)ir;
+		init_timer(&ir->timer_keyup);
+		ir->timer_keyup.function = saa7134_rc5_timer_keyup;
+		ir->timer_keyup.data = (unsigned long)ir;
 	}
 
+	/* all done */
+	dev->remote = ir;
+	
 	input_register_device(ir->dev);
 	return 0;
 }
@@ -346,6 +371,154 @@ void saa7134_set_i2c_ir(struct saa7134_d
 	}
 
 }
+
+/* Code to collect and decode rc5 sequence 
+ * Used in Asus 7134 Dual.
+ */
+
+static int rc5_remote_gap = 885;
+module_param(rc5_remote_gap, int, 0644);
+static int rc5_key_timeout = 200;
+module_param(rc5_key_timeout, int, 0644);
+
+#define RC5_TOGGLE(x)	(((x)>>12)&1)
+#define RC5_INSTR(x)	((x)&63)
+
+static u32 rc5_decode(unsigned int code)
+{
+	unsigned int org_code = code;
+	unsigned int pair;
+	unsigned int rc5 = 0;
+	int i;
+
+	code = (code << 2) | 1;
+	for (i = 0; i < 14; ++i) {
+		pair = code & 0x3;
+
+		code >>= 2;
+		rc5 <<= 1;
+
+		switch (pair) {
+		case 0:
+		case 2:
+			break;
+		case 1:
+			rc5 |= 1;
+			break;
+		case 3:
+			dprintk("bad code: %x\n", org_code);
+			return 0;
+		}
+	}
+	dprintk ("code=%x, rc5=%x, toggle=%x, address=%x, instr=%x\n",
+		  rc5, org_code, RC5_TOGGLE(rc5), RC5_ADDR(rc5), RC5_INSTR(rc5));
+	return rc5;
+}
+
+static int saa7134_rc5_irq(struct saa7134_dev *btv)
+{
+	struct saa7134_ir *ir = btv->remote;
+	struct timeval tv;
+	u32 gap;
+	unsigned long current_jiffies, timeout;
+
+	/* get time of bit */
+	current_jiffies = jiffies;
+	do_gettimeofday(&tv);
+
+	/* avoid overflow with gap >1s */
+	if (tv.tv_sec - ir->base_time.tv_sec > 1) {
+		gap = 200000;
+	} else {
+		gap = 1000000 * (tv.tv_sec - ir->base_time.tv_sec) +
+		    tv.tv_usec - ir->base_time.tv_usec;
+	}
+
+	/* active code => add bit */
+	if (ir->active) {
+		/* only if in the code (otherwise spurious IRQ or timer
+		   late) */
+		if (ir->last_bit < 28) {
+			ir->last_bit = (gap - rc5_remote_gap / 2) /
+			    rc5_remote_gap;
+			ir->code |= 1 << ir->last_bit;
+		}
+		/* starting new code */
+	} else {
+		ir->active = 1;
+		ir->code = 0;
+		ir->base_time = tv;
+		ir->last_bit = 0;
+
+		timeout = current_jiffies + (500 + 30 * HZ) / 1000;
+		mod_timer(&ir->timer_end, timeout);
+	}
+
+	return 1;
+}
+
+
+static void saa7134_rc5_timer_end(unsigned long data)
+{
+	struct saa7134_ir *ir = (struct saa7134_ir *)data;
+	struct timeval tv;
+	unsigned long current_jiffies, timeout;
+	u32 gap;
+
+	/* get time */
+	current_jiffies = jiffies;
+	do_gettimeofday(&tv);
+
+	/* avoid overflow with gap >1s */
+	if (tv.tv_sec - ir->base_time.tv_sec > 1) {
+		gap = 200000;
+	} else {
+		gap = 1000000 * (tv.tv_sec - ir->base_time.tv_sec) +
+		      tv.tv_usec - ir->base_time.tv_usec;
+	}
+	
+	/* Allow some timmer jitter (RC5 is ~24ms anyway so this is ok) */
+	if (gap < 28000) {
+		dprintk("spurious timer_end\n");
+		return;
+	}
+	
+	ir->active = 0;
+
+	if (ir->last_bit < 20) {
+		/* ignore spurious codes (caused by light/other remotes) */
+		dprintk("short code: %x\n", ir->code);
+	} else {
+		u32 rc5 = rc5_decode(ir->code);
+		u32 toggle = RC5_TOGGLE(rc5);
+		u32 instr = RC5_INSTR(rc5);
+
+		/* Good code, decide if repeat/repress */
+		if (toggle != RC5_TOGGLE(ir->last_rc5) ||
+		    instr != RC5_INSTR(ir->last_rc5)) {
+			ir_input_nokey(ir->dev, &ir->ir);
+			ir_input_keydown(ir->dev, &ir->ir, instr,
+					 instr);
+		}
+
+		/* Set/reset key-up timer */
+		timeout = current_jiffies + (500 + rc5_key_timeout
+					     * HZ) / 1000;
+		mod_timer(&ir->timer_keyup, timeout);
+
+		/* Save code for repeat test */
+		ir->last_rc5 = rc5;
+	}
+}
+
+static void saa7134_rc5_timer_keyup(unsigned long data)
+{
+	struct saa7134_ir *ir = (struct saa7134_ir *)data;
+
+	dprintk("key released\n");
+	ir_input_nokey(ir->dev, &ir->ir);
+}
+
 /* ----------------------------------------------------------------------
  * Local variables:
  * c-basic-offset: 8
diff -upr v4l-dvb.old/linux/drivers/media/video/saa7134/saa7134.h v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h
--- v4l-dvb.old/linux/drivers/media/video/saa7134/saa7134.h	Fri Sep  1 15:03:50 2006
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h	Fri Sep  1 15:04:31 2006
@@ -435,6 +435,16 @@ struct saa7134_ir {
 	int                        polling;
 	u32                        last_gpio;
 	struct timer_list          timer;
+
+	/* RC5 gpio */
+	u32 rc5_gpio;
+	struct timer_list timer_end;	/* timer_end for code completion */
+	struct timer_list timer_keyup;	/* timer_end for key release */
+	u32 last_rc5;			/* last good rc5 code */
+	u32 last_bit;			/* last raw bit seen */
+	u32 code;			/* raw code under construction */
+	struct timeval base_time;	/* time of last seen code */
+	int active;			/* building raw code */
 };
 
 /* ts/mpeg status */
@@ -713,6 +723,7 @@ void saa7134_input_fini(struct saa7134_d
 void saa7134_input_irq(struct saa7134_dev *dev);
 void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir);
 
+
 /*
  * Local variables:
  * c-basic-offset: 8
diff -upr v4l-dvb.old/linux/include/media/ir-common.h v4l-dvb/linux/include/media/ir-common.h
--- v4l-dvb.old/linux/include/media/ir-common.h	Fri Sep  1 15:03:49 2006
+++ v4l-dvb/linux/include/media/ir-common.h	Fri Sep  1 15:08:13 2006
@@ -91,6 +91,7 @@ extern IR_KEYTAB_TYPE ir_codes_pinnacle_
 extern IR_KEYTAB_TYPE ir_codes_hauppauge_new[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_npgtech[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_norwood[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_asus_pc39[IR_KEYTAB_SIZE];
 
 #endif
 

Attachment: signature.asc
Description: =?koi8-r?Q?=FC=D4=C1?= =?koi8-r?Q?_=DE=C1=D3=D4=D8?= =?koi8-r?Q?_=D3=CF=CF=C2=DD=C5=CE=C9=D1?= =?koi8-r?Q?_=D0=CF=C4=D0=C9=D3=C1=CE=C1?= =?koi8-r?Q?_=C3=C9=C6=D2=CF=D7=CF=CA?= =?koi8-r?Q?_=D0=CF=C4=D0=C9=D3=D8=C0?=

--

Unsubscribe mailto:video4linux-list-request@xxxxxxxxxx?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

[Index of Archives]     [Linux Media]     [Older V4L]     [Linux DVB]     [Video Disk Recorder]     [Linux Kernel]     [Asterisk]     [DCCP]     [Netdev]     [X.org]     [Util Linux]     [Xfree86]     [Free Photo Albums]     [Fedora Users]     [Fedora Women]     [ALSA Users]     [ALSA Devel]     [SSH]     [DVB Maintainers]     [Linux USB]     [Yosemite Information]
  Powered by Linux