aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/dw2102.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dw2102.c')
-rw-r--r--drivers/media/dvb/dvb-usb/dw2102.c222
1 files changed, 111 insertions, 111 deletions
diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
index d9424c31472..5bb9479d154 100644
--- a/drivers/media/dvb/dvb-usb/dw2102.c
+++ b/drivers/media/dvb/dvb-usb/dw2102.c
@@ -749,122 +749,122 @@ static int s630_zl10039_tuner_attach(struct dvb_usb_adapter *adap)
749} 749}
750 750
751static struct dvb_usb_rc_key dw210x_rc_keys[] = { 751static struct dvb_usb_rc_key dw210x_rc_keys[] = {
752 { 0xf8, 0x0a, KEY_Q }, /*power*/ 752 { 0xf80a, KEY_Q }, /*power*/
753 { 0xf8, 0x0c, KEY_M }, /*mute*/ 753 { 0xf80c, KEY_M }, /*mute*/
754 { 0xf8, 0x11, KEY_1 }, 754 { 0xf811, KEY_1 },
755 { 0xf8, 0x12, KEY_2 }, 755 { 0xf812, KEY_2 },
756 { 0xf8, 0x13, KEY_3 }, 756 { 0xf813, KEY_3 },
757 { 0xf8, 0x14, KEY_4 }, 757 { 0xf814, KEY_4 },
758 { 0xf8, 0x15, KEY_5 }, 758 { 0xf815, KEY_5 },
759 { 0xf8, 0x16, KEY_6 }, 759 { 0xf816, KEY_6 },
760 { 0xf8, 0x17, KEY_7 }, 760 { 0xf817, KEY_7 },
761 { 0xf8, 0x18, KEY_8 }, 761 { 0xf818, KEY_8 },
762 { 0xf8, 0x19, KEY_9 }, 762 { 0xf819, KEY_9 },
763 { 0xf8, 0x10, KEY_0 }, 763 { 0xf810, KEY_0 },
764 { 0xf8, 0x1c, KEY_PAGEUP }, /*ch+*/ 764 { 0xf81c, KEY_PAGEUP }, /*ch+*/
765 { 0xf8, 0x0f, KEY_PAGEDOWN }, /*ch-*/ 765 { 0xf80f, KEY_PAGEDOWN }, /*ch-*/
766 { 0xf8, 0x1a, KEY_O }, /*vol+*/ 766 { 0xf81a, KEY_O }, /*vol+*/
767 { 0xf8, 0x0e, KEY_Z }, /*vol-*/ 767 { 0xf80e, KEY_Z }, /*vol-*/
768 { 0xf8, 0x04, KEY_R }, /*rec*/ 768 { 0xf804, KEY_R }, /*rec*/
769 { 0xf8, 0x09, KEY_D }, /*fav*/ 769 { 0xf809, KEY_D }, /*fav*/
770 { 0xf8, 0x08, KEY_BACKSPACE }, /*rewind*/ 770 { 0xf808, KEY_BACKSPACE }, /*rewind*/
771 { 0xf8, 0x07, KEY_A }, /*fast*/ 771 { 0xf807, KEY_A }, /*fast*/
772 { 0xf8, 0x0b, KEY_P }, /*pause*/ 772 { 0xf80b, KEY_P }, /*pause*/
773 { 0xf8, 0x02, KEY_ESC }, /*cancel*/ 773 { 0xf802, KEY_ESC }, /*cancel*/
774 { 0xf8, 0x03, KEY_G }, /*tab*/ 774 { 0xf803, KEY_G }, /*tab*/
775 { 0xf8, 0x00, KEY_UP }, /*up*/ 775 { 0xf800, KEY_UP }, /*up*/
776 { 0xf8, 0x1f, KEY_ENTER }, /*ok*/ 776 { 0xf81f, KEY_ENTER }, /*ok*/
777 { 0xf8, 0x01, KEY_DOWN }, /*down*/ 777 { 0xf801, KEY_DOWN }, /*down*/
778 { 0xf8, 0x05, KEY_C }, /*cap*/ 778 { 0xf805, KEY_C }, /*cap*/
779 { 0xf8, 0x06, KEY_S }, /*stop*/ 779 { 0xf806, KEY_S }, /*stop*/
780 { 0xf8, 0x40, KEY_F }, /*full*/ 780 { 0xf840, KEY_F }, /*full*/
781 { 0xf8, 0x1e, KEY_W }, /*tvmode*/ 781 { 0xf81e, KEY_W }, /*tvmode*/
782 { 0xf8, 0x1b, KEY_B }, /*recall*/ 782 { 0xf81b, KEY_B }, /*recall*/
783}; 783};
784 784
785static struct dvb_usb_rc_key tevii_rc_keys[] = { 785static struct dvb_usb_rc_key tevii_rc_keys[] = {
786 { 0xf8, 0x0a, KEY_POWER }, 786 { 0xf80a, KEY_POWER },
787 { 0xf8, 0x0c, KEY_MUTE }, 787 { 0xf80c, KEY_MUTE },
788 { 0xf8, 0x11, KEY_1 }, 788 { 0xf811, KEY_1 },
789 { 0xf8, 0x12, KEY_2 }, 789 { 0xf812, KEY_2 },
790 { 0xf8, 0x13, KEY_3 }, 790 { 0xf813, KEY_3 },
791 { 0xf8, 0x14, KEY_4 }, 791 { 0xf814, KEY_4 },
792 { 0xf8, 0x15, KEY_5 }, 792 { 0xf815, KEY_5 },
793 { 0xf8, 0x16, KEY_6 }, 793 { 0xf816, KEY_6 },
794 { 0xf8, 0x17, KEY_7 }, 794 { 0xf817, KEY_7 },
795 { 0xf8, 0x18, KEY_8 }, 795 { 0xf818, KEY_8 },
796 { 0xf8, 0x19, KEY_9 }, 796 { 0xf819, KEY_9 },
797 { 0xf8, 0x10, KEY_0 }, 797 { 0xf810, KEY_0 },
798 { 0xf8, 0x1c, KEY_MENU }, 798 { 0xf81c, KEY_MENU },
799 { 0xf8, 0x0f, KEY_VOLUMEDOWN }, 799 { 0xf80f, KEY_VOLUMEDOWN },
800 { 0xf8, 0x1a, KEY_LAST }, 800 { 0xf81a, KEY_LAST },
801 { 0xf8, 0x0e, KEY_OPEN }, 801 { 0xf80e, KEY_OPEN },
802 { 0xf8, 0x04, KEY_RECORD }, 802 { 0xf804, KEY_RECORD },
803 { 0xf8, 0x09, KEY_VOLUMEUP }, 803 { 0xf809, KEY_VOLUMEUP },
804 { 0xf8, 0x08, KEY_CHANNELUP }, 804 { 0xf808, KEY_CHANNELUP },
805 { 0xf8, 0x07, KEY_PVR }, 805 { 0xf807, KEY_PVR },
806 { 0xf8, 0x0b, KEY_TIME }, 806 { 0xf80b, KEY_TIME },
807 { 0xf8, 0x02, KEY_RIGHT }, 807 { 0xf802, KEY_RIGHT },
808 { 0xf8, 0x03, KEY_LEFT }, 808 { 0xf803, KEY_LEFT },
809 { 0xf8, 0x00, KEY_UP }, 809 { 0xf800, KEY_UP },
810 { 0xf8, 0x1f, KEY_OK }, 810 { 0xf81f, KEY_OK },
811 { 0xf8, 0x01, KEY_DOWN }, 811 { 0xf801, KEY_DOWN },
812 { 0xf8, 0x05, KEY_TUNER }, 812 { 0xf805, KEY_TUNER },
813 { 0xf8, 0x06, KEY_CHANNELDOWN }, 813 { 0xf806, KEY_CHANNELDOWN },
814 { 0xf8, 0x40, KEY_PLAYPAUSE }, 814 { 0xf840, KEY_PLAYPAUSE },
815 { 0xf8, 0x1e, KEY_REWIND }, 815 { 0xf81e, KEY_REWIND },
816 { 0xf8, 0x1b, KEY_FAVORITES }, 816 { 0xf81b, KEY_FAVORITES },
817 { 0xf8, 0x1d, KEY_BACK }, 817 { 0xf81d, KEY_BACK },
818 { 0xf8, 0x4d, KEY_FASTFORWARD }, 818 { 0xf84d, KEY_FASTFORWARD },
819 { 0xf8, 0x44, KEY_EPG }, 819 { 0xf844, KEY_EPG },
820 { 0xf8, 0x4c, KEY_INFO }, 820 { 0xf84c, KEY_INFO },
821 { 0xf8, 0x41, KEY_AB }, 821 { 0xf841, KEY_AB },
822 { 0xf8, 0x43, KEY_AUDIO }, 822 { 0xf843, KEY_AUDIO },
823 { 0xf8, 0x45, KEY_SUBTITLE }, 823 { 0xf845, KEY_SUBTITLE },
824 { 0xf8, 0x4a, KEY_LIST }, 824 { 0xf84a, KEY_LIST },
825 { 0xf8, 0x46, KEY_F1 }, 825 { 0xf846, KEY_F1 },
826 { 0xf8, 0x47, KEY_F2 }, 826 { 0xf847, KEY_F2 },
827 { 0xf8, 0x5e, KEY_F3 }, 827 { 0xf85e, KEY_F3 },
828 { 0xf8, 0x5c, KEY_F4 }, 828 { 0xf85c, KEY_F4 },
829 { 0xf8, 0x52, KEY_F5 }, 829 { 0xf852, KEY_F5 },
830 { 0xf8, 0x5a, KEY_F6 }, 830 { 0xf85a, KEY_F6 },
831 { 0xf8, 0x56, KEY_MODE }, 831 { 0xf856, KEY_MODE },
832 { 0xf8, 0x58, KEY_SWITCHVIDEOMODE }, 832 { 0xf858, KEY_SWITCHVIDEOMODE },
833}; 833};
834 834
835static struct dvb_usb_rc_key tbs_rc_keys[] = { 835static struct dvb_usb_rc_key tbs_rc_keys[] = {
836 { 0xf8, 0x84, KEY_POWER }, 836 { 0xf884, KEY_POWER },
837 { 0xf8, 0x94, KEY_MUTE }, 837 { 0xf894, KEY_MUTE },
838 { 0xf8, 0x87, KEY_1 }, 838 { 0xf887, KEY_1 },
839 { 0xf8, 0x86, KEY_2 }, 839 { 0xf886, KEY_2 },
840 { 0xf8, 0x85, KEY_3 }, 840 { 0xf885, KEY_3 },
841 { 0xf8, 0x8b, KEY_4 }, 841 { 0xf88b, KEY_4 },
842 { 0xf8, 0x8a, KEY_5 }, 842 { 0xf88a, KEY_5 },
843 { 0xf8, 0x89, KEY_6 }, 843 { 0xf889, KEY_6 },
844 { 0xf8, 0x8f, KEY_7 }, 844 { 0xf88f, KEY_7 },
845 { 0xf8, 0x8e, KEY_8 }, 845 { 0xf88e, KEY_8 },
846 { 0xf8, 0x8d, KEY_9 }, 846 { 0xf88d, KEY_9 },
847 { 0xf8, 0x92, KEY_0 }, 847 { 0xf892, KEY_0 },
848 { 0xf8, 0x96, KEY_CHANNELUP }, 848 { 0xf896, KEY_CHANNELUP },
849 { 0xf8, 0x91, KEY_CHANNELDOWN }, 849 { 0xf891, KEY_CHANNELDOWN },
850 { 0xf8, 0x93, KEY_VOLUMEUP }, 850 { 0xf893, KEY_VOLUMEUP },
851 { 0xf8, 0x8c, KEY_VOLUMEDOWN }, 851 { 0xf88c, KEY_VOLUMEDOWN },
852 { 0xf8, 0x83, KEY_RECORD }, 852 { 0xf883, KEY_RECORD },
853 { 0xf8, 0x98, KEY_PAUSE }, 853 { 0xf898, KEY_PAUSE },
854 { 0xf8, 0x99, KEY_OK }, 854 { 0xf899, KEY_OK },
855 { 0xf8, 0x9a, KEY_SHUFFLE }, 855 { 0xf89a, KEY_SHUFFLE },
856 { 0xf8, 0x81, KEY_UP }, 856 { 0xf881, KEY_UP },
857 { 0xf8, 0x90, KEY_LEFT }, 857 { 0xf890, KEY_LEFT },
858 { 0xf8, 0x82, KEY_RIGHT }, 858 { 0xf882, KEY_RIGHT },
859 { 0xf8, 0x88, KEY_DOWN }, 859 { 0xf888, KEY_DOWN },
860 { 0xf8, 0x95, KEY_FAVORITES }, 860 { 0xf895, KEY_FAVORITES },
861 { 0xf8, 0x97, KEY_SUBTITLE }, 861 { 0xf897, KEY_SUBTITLE },
862 { 0xf8, 0x9d, KEY_ZOOM }, 862 { 0xf89d, KEY_ZOOM },
863 { 0xf8, 0x9f, KEY_EXIT }, 863 { 0xf89f, KEY_EXIT },
864 { 0xf8, 0x9e, KEY_MENU }, 864 { 0xf89e, KEY_MENU },
865 { 0xf8, 0x9c, KEY_EPG }, 865 { 0xf89c, KEY_EPG },
866 { 0xf8, 0x80, KEY_PREVIOUS }, 866 { 0xf880, KEY_PREVIOUS },
867 { 0xf8, 0x9b, KEY_MODE } 867 { 0xf89b, KEY_MODE }
868}; 868};
869 869
870static struct dvb_usb_rc_keys_table keys_tables[] = { 870static struct dvb_usb_rc_keys_table keys_tables[] = {
@@ -894,7 +894,7 @@ static int dw2102_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
894 *state = REMOTE_NO_KEY_PRESSED; 894 *state = REMOTE_NO_KEY_PRESSED;
895 if (d->props.i2c_algo->master_xfer(&d->i2c_adap, &msg, 1) == 1) { 895 if (d->props.i2c_algo->master_xfer(&d->i2c_adap, &msg, 1) == 1) {
896 for (i = 0; i < keymap_size ; i++) { 896 for (i = 0; i < keymap_size ; i++) {
897 if (keymap[i].data == msg.buf[0]) { 897 if (rc5_data(&keymap[i]) == msg.buf[0]) {
898 *state = REMOTE_KEY_PRESSED; 898 *state = REMOTE_KEY_PRESSED;
899 *event = keymap[i].event; 899 *event = keymap[i].event;
900 break; 900 break;