diff options
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/dtt200u.c')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dtt200u.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dtt200u.c b/linux/drivers/media/dvb/dvb-usb/dtt200u.c index 5fcde0538..75bd054d2 100644 --- a/linux/drivers/media/dvb/dvb-usb/dtt200u.c +++ b/linux/drivers/media/dvb/dvb-usb/dtt200u.c @@ -43,7 +43,7 @@ static int dtt200u_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int /* remote control */ /* key list for the tiny remote control (Yakumo, don't know about the others) */ -static struct dvb_usb_nec_rc_key dtt200u_rc_keys[] = { +static struct dvb_usb_rc_key dtt200u_rc_keys[] = { { 0x80, 0x01, KEY_MUTE }, { 0x80, 0x02, KEY_CHANNELDOWN }, { 0x80, 0x03, KEY_VOLUMEDOWN }, @@ -64,20 +64,11 @@ static struct dvb_usb_nec_rc_key dtt200u_rc_keys[] = { { 0x80, 0x1f, KEY_9 }, }; -static int dtt200u_rc_init(struct dvb_usb_device *d) -{ - int i; - for (i = 0; i < sizeof(dtt200u_rc_keys)/sizeof(struct dvb_usb_nec_rc_key); i++) - set_bit(dtt200u_rc_keys[i].event, d->rc_input_dev.keybit); - return 0; -} - static int dtt200u_rc_query(struct dvb_usb_device *d, u32 *event, int *state) { u8 key[5],cmd = GET_RC_KEY; dvb_usb_generic_rw(d,&cmd,1,key,5,0); - dvb_usb_nec_rc_key_to_event(d,dtt200u_rc_keys,sizeof(dtt200u_rc_keys)/sizeof(struct dvb_usb_nec_rc_key), - key,event,state); + dvb_usb_nec_rc_key_to_event(d,key,event,state); if (key[0] != 0) deb_info("key: %x %x %x %x %x\n",key[0],key[1],key[2],key[3],key[4]); return 0; @@ -113,13 +104,11 @@ static struct dvb_usb_properties dtt200u_properties = { .streaming_ctrl = dtt200u_streaming_ctrl, .pid_filter = dtt200u_pid_filter, - .pid_filter_ctrl = NULL, - .power_ctrl = NULL, .frontend_attach = dtt200u_frontend_attach, .rc_interval = 200, + .rc_key_map = dtt200u_rc_keys, .query_rc = dtt200u_rc_query, - .init_rc = dtt200u_rc_init, .generic_bulk_ctrl_endpoint = 0x01, @@ -177,5 +166,5 @@ module_exit(dtt200u_usb_module_exit); MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>"); MODULE_DESCRIPTION("Driver for the Yakumo/Hama/Typhoon DVB-T USB2.0 device"); -MODULE_VERSION("0.2"); +MODULE_VERSION("1.0"); MODULE_LICENSE("GPL"); |