On Monday 30 July 2007 12:44:44 Nicolas Will wrote:
>
> I get the following when patching a current v4l-dvb tree:
>
> nico@youkaida:~/src/DVB-Stuff/v4l-dvb$ patch -p1 <
> ../4a-keymap_Hauppauge_Nova-TD_Stick.diff patching file
> linux/drivers/media/dvb/dvb-usb/dib0700_devices.c Hunk #1 succeeded
> at 239 with fuzz 1.
> Hunk #2 FAILED at 295.
> Hunk #3 FAILED at 316.
> 2 out of 3 hunks FAILED -- saving rejects to file
> linux/drivers/media/dvb/dvb-usb/dib0700_devices.c.rej
>
>
> nico@youkaida:~/src/DVB-Stuff/v4l-dvb$ patch -p1 <
> ../4b-remote_control_support_Hauppauge_Nova-T_500.diff patching file
> linux/drivers/media/dvb/dvb-usb/dib0700_devices.c Hunk #1 FAILED at
> 643.
> 1 out of 1 hunk FAILED -- saving rejects to file
> linux/drivers/media/dvb/dvb-usb/dib0700_devices.c.rej
>
> what am I doing wrong?
the patches apply cleanly here. Try with attached ones
Janne
Add remote control support for the Hauppauge Nova-T 500
Signed-off-by: Janne Grunau <janne-dvb@xxxxxxxxx>
Index: v4l-dvb/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c
===================================================================
--- v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ v4l-dvb/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -643,7 +643,11 @@ struct dvb_usb_device_properties dib0700
{ &dib0700_usb_id_table[2], &dib0700_usb_id_table[3], NULL },
{ NULL },
},
- }
+ },
+ .rc_interval = DEFAULT_RC_INTERVAL,
+ .rc_key_map = stk7700d_rc_keys,
+ .rc_key_map_size = KEY_MAP_SIZE,
+ .rc_query = stk7700d_rc_query
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
.num_adapters = 2,
Add remote keymap for the Hauppauge Nova-TD Stick
copied from drivers/media/dvb/dvb-usb/nova-t-usb2.c
Signed-off-by: Janne Grunau <janne-dvb@xxxxxxxxx>
Index: v4l-dvb/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c
===================================================================
--- v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ v4l-dvb/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -239,7 +239,7 @@ int stk7700d_rc_query(struct dvb_usb_dev
return 0;
}
-#define KEY_MAP_SIZE (25+48)
+#define KEY_MAP_SIZE (25+48+44)
struct dvb_usb_rc_key stk7700d_rc_keys[] = {
/* Key codes for the tiny Pinnacle remote*/
@@ -295,7 +295,7 @@ struct dvb_usb_rc_key stk7700d_rc_keys[]
{ 0xeb, 0x1a, KEY_BLUE },
{ 0xeb, 0x1b, KEY_CHANNELUP },
{ 0xeb, 0x1c, KEY_VOLUMEUP },
- { 0xeb, 0x1d, KEY_MUTE },
+ { 0xeb, 0x1d, KEY_MUTE },
{ 0xeb, 0x1e, KEY_VOLUMEDOWN },
{ 0xeb, 0x1f, KEY_CHANNELDOWN },
{ 0xeb, 0x40, KEY_PAUSE },
@@ -316,7 +316,53 @@ struct dvb_usb_rc_key stk7700d_rc_keys[]
{ 0xeb, 0x4f, KEY_FASTFORWARD },
{ 0xeb, 0x54, KEY_PREVIOUS },
{ 0xeb, 0x58, KEY_RECORD },
- { 0xeb, 0x5c, KEY_NEXT }
+ { 0xeb, 0x5c, KEY_NEXT },
+ /* Key codes for the Haupauge WinTV Nova-TD, copied from nova-t-usb2.c (Nova-T USB2) */
+ { 0x1e, 0x00, KEY_0 },
+ { 0x1e, 0x01, KEY_1 },
+ { 0x1e, 0x02, KEY_2 },
+ { 0x1e, 0x03, KEY_3 },
+ { 0x1e, 0x04, KEY_4 },
+ { 0x1e, 0x05, KEY_5 },
+ { 0x1e, 0x06, KEY_6 },
+ { 0x1e, 0x07, KEY_7 },
+ { 0x1e, 0x08, KEY_8 },
+ { 0x1e, 0x09, KEY_9 },
+ { 0x1e, 0x0a, KEY_KPASTERISK },
+ { 0x1e, 0x0b, KEY_RED },
+ { 0x1e, 0x0c, KEY_RADIO },
+ { 0x1e, 0x0d, KEY_MENU },
+ { 0x1e, 0x0e, KEY_GRAVE }, /* # */
+ { 0x1e, 0x0f, KEY_MUTE },
+ { 0x1e, 0x10, KEY_VOLUMEUP },
+ { 0x1e, 0x11, KEY_VOLUMEDOWN },
+ { 0x1e, 0x12, KEY_CHANNEL },
+ { 0x1e, 0x14, KEY_UP },
+ { 0x1e, 0x15, KEY_DOWN },
+ { 0x1e, 0x16, KEY_LEFT },
+ { 0x1e, 0x17, KEY_RIGHT },
+ { 0x1e, 0x18, KEY_VIDEO },
+ { 0x1e, 0x19, KEY_AUDIO },
+ { 0x1e, 0x1a, KEY_MEDIA },
+ { 0x1e, 0x1b, KEY_EPG },
+ { 0x1e, 0x1c, KEY_TV },
+ { 0x1e, 0x1e, KEY_NEXT },
+ { 0x1e, 0x1f, KEY_BACK },
+ { 0x1e, 0x20, KEY_CHANNELUP },
+ { 0x1e, 0x21, KEY_CHANNELDOWN },
+ { 0x1e, 0x24, KEY_LAST }, /* Skip backwards */
+ { 0x1e, 0x25, KEY_OK },
+ { 0x1e, 0x29, KEY_BLUE},
+ { 0x1e, 0x2e, KEY_GREEN },
+ { 0x1e, 0x30, KEY_PAUSE },
+ { 0x1e, 0x32, KEY_REWIND },
+ { 0x1e, 0x34, KEY_FASTFORWARD },
+ { 0x1e, 0x35, KEY_PLAY },
+ { 0x1e, 0x36, KEY_STOP },
+ { 0x1e, 0x37, KEY_RECORD },
+ { 0x1e, 0x38, KEY_YELLOW },
+ { 0x1e, 0x3b, KEY_GOTO },
+ { 0x1e, 0x3d, KEY_POWER },
};
/* STK7700P: Hauppauge Nova-T Stick, AVerMedia Volar */
_______________________________________________
linux-dvb mailing list
linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb
