rc_keymaps: Sync with kernel 2.6.38-rc2 + linux-next changes for drivers/media

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/utils/keytable/parse.h b/utils/keytable/parse.h
index eea6072..ff6df12 100644 (file)
--- a/utils/keytable/parse.h
+++ b/utils/keytable/parse.h
@@ -451,6 +451,9 @@ struct parse_key {
        {"KEY_NUMERIC_POUND", 0x20b},
        {"KEY_CAMERA_FOCUS", 0x210},
        {"KEY_WPS_BUTTON", 0x211},
+       {"KEY_TOUCHPAD_TOGGLE", 0x212},
+       {"KEY_TOUCHPAD_ON", 0x213},
+       {"KEY_TOUCHPAD_OFF", 0x214},
        {"BTN_TRIGGER_HAPPY", 0x2c0},
        {"BTN_TRIGGER_HAPPY1", 0x2c0},
        {"BTN_TRIGGER_HAPPY2", 0x2c1},

diff --git a/utils/keytable/rc_keymaps/dib0700_nec b/utils/keytable/rc_keymaps/dib0700_nec
index 8b8e06f..a1daa9c 100644 (file)
--- a/utils/keytable/rc_keymaps/dib0700_nec
+++ b/utils/keytable/rc_keymaps/dib0700_nec
@@ -1,30 +1,30 @@
 # table dib0700_nec, type: NEC
-0x8613 KEY_MUTE
-0x8612 KEY_POWER
-0x8601 KEY_1
-0x8602 KEY_2
-0x8603 KEY_3
-0x8604 KEY_4
-0x8605 KEY_5
-0x8606 KEY_6
-0x8607 KEY_7
-0x8608 KEY_8
-0x8609 KEY_9
-0x8600 KEY_0
-0x860d KEY_CHANNELUP
-0x8619 KEY_CHANNELDOWN
-0x8610 KEY_VOLUMEUP
-0x860c KEY_VOLUMEDOWN
-0x860a KEY_CAMERA
-0x860b KEY_ZOOM
-0x861b KEY_BACKSPACE
-0x8615 KEY_ENTER
-0x861d KEY_UP
-0x861e KEY_DOWN
-0x860e KEY_LEFT
-0x860f KEY_RIGHT
-0x8618 KEY_RECORD
-0x861a KEY_STOP
+0x866b13 KEY_MUTE
+0x866b12 KEY_POWER
+0x866b01 KEY_1
+0x866b02 KEY_2
+0x866b03 KEY_3
+0x866b04 KEY_4
+0x866b05 KEY_5
+0x866b06 KEY_6
+0x866b07 KEY_7
+0x866b08 KEY_8
+0x866b09 KEY_9
+0x866b00 KEY_0
+0x866b0d KEY_CHANNELUP
+0x866b19 KEY_CHANNELDOWN
+0x866b10 KEY_VOLUMEUP
+0x866b0c KEY_VOLUMEDOWN
+0x866b0a KEY_CAMERA
+0x866b0b KEY_ZOOM
+0x866b1b KEY_BACKSPACE
+0x866b15 KEY_ENTER
+0x866b1d KEY_UP
+0x866b1e KEY_DOWN
+0x866b0e KEY_LEFT
+0x866b0f KEY_RIGHT
+0x866b18 KEY_RECORD
+0x866b1a KEY_STOP
 0x7a00 KEY_MENU
 0x7a01 KEY_RECORD
 0x7a02 KEY_PLAY

diff --git a/utils/keytable/rc_keymaps/technisat_usb2 b/utils/keytable/rc_keymaps/technisat_usb2
new file mode 100644 (file)
index 0000000..d5c0a44
--- /dev/null
+++ b/utils/keytable/rc_keymaps/technisat_usb2
@@ -0,0 +1,34 @@
+# table technisat_usb2, type: RC5
+0x0a0c KEY_POWER
+0x0a01 KEY_1
+0x0a02 KEY_2
+0x0a03 KEY_3
+0x0a0d KEY_MUTE
+0x0a04 KEY_4
+0x0a05 KEY_5
+0x0a06 KEY_6
+0x0a38 KEY_VIDEO
+0x0a07 KEY_7
+0x0a08 KEY_8
+0x0a09 KEY_9
+0x0a00 KEY_0
+0x0a4f KEY_INFO
+0x0a20 KEY_CHANNELUP
+0x0a52 KEY_MENU
+0x0a11 KEY_VOLUMEUP
+0x0a57 KEY_OK
+0x0a10 KEY_VOLUMEDOWN
+0x0a2f KEY_EPG
+0x0a21 KEY_CHANNELDOWN
+0x0a22 KEY_REFRESH
+0x0a3c KEY_TEXT
+0x0a76 KEY_ENTER
+0x0a0f KEY_HELP
+0x0a6b KEY_RED
+0x0a6c KEY_GREEN
+0x0a6d KEY_YELLOW
+0x0a6e KEY_BLUE
+0x0a29 KEY_STOP
+0x0a23 KEY_LANGUAGE
+0x0a53 KEY_TV
+0x0a0a KEY_PROGRAM

diff --git a/utils/keytable/rc_keymaps/tt_1500 b/utils/keytable/rc_keymaps/tt_1500
index cd526f7..8a1e28c 100644 (file)
--- a/utils/keytable/rc_keymaps/tt_1500
+++ b/utils/keytable/rc_keymaps/tt_1500
@@ -1,40 +1,40 @@
 # table tt_1500, type: UNKNOWN
-0x01 KEY_POWER
-0x02 KEY_SHUFFLE
-0x03 KEY_1
-0x04 KEY_2
-0x05 KEY_3
-0x06 KEY_4
-0x07 KEY_5
-0x08 KEY_6
-0x09 KEY_7
-0x0a KEY_8
-0x0b KEY_9
-0x0c KEY_0
-0x0d KEY_UP
-0x0e KEY_LEFT
-0x0f KEY_OK
-0x10 KEY_RIGHT
-0x11 KEY_DOWN
-0x12 KEY_INFO
-0x13 KEY_EXIT
-0x14 KEY_RED
-0x15 KEY_GREEN
-0x16 KEY_YELLOW
-0x17 KEY_BLUE
-0x18 KEY_MUTE
-0x19 KEY_TEXT
-0x1a KEY_MODE
-0x21 KEY_OPTION
-0x22 KEY_EPG
-0x23 KEY_CHANNELUP
-0x24 KEY_CHANNELDOWN
-0x25 KEY_VOLUMEUP
-0x26 KEY_VOLUMEDOWN
-0x27 KEY_SETUP
-0x3a KEY_RECORD
-0x3b KEY_PLAY
-0x3c KEY_STOP
-0x3d KEY_REWIND
-0x3e KEY_PAUSE
-0x3f KEY_FORWARD
+0x1501 KEY_POWER
+0x1502 KEY_SHUFFLE
+0x1503 KEY_1
+0x1504 KEY_2
+0x1505 KEY_3
+0x1506 KEY_4
+0x1507 KEY_5
+0x1508 KEY_6
+0x1509 KEY_7
+0x150a KEY_8
+0x150b KEY_9
+0x150c KEY_0
+0x150d KEY_UP
+0x150e KEY_LEFT
+0x150f KEY_OK
+0x1510 KEY_RIGHT
+0x1511 KEY_DOWN
+0x1512 KEY_INFO
+0x1513 KEY_EXIT
+0x1514 KEY_RED
+0x1515 KEY_GREEN
+0x1516 KEY_YELLOW
+0x1517 KEY_BLUE
+0x1518 KEY_MUTE
+0x1519 KEY_TEXT
+0x151a KEY_MODE
+0x1521 KEY_OPTION
+0x1522 KEY_EPG
+0x1523 KEY_CHANNELUP
+0x1524 KEY_CHANNELDOWN
+0x1525 KEY_VOLUMEUP
+0x1526 KEY_VOLUMEDOWN
+0x1527 KEY_SETUP
+0x153a KEY_RECORD
+0x153b KEY_PLAY
+0x153c KEY_STOP
+0x153d KEY_REWIND
+0x153e KEY_PAUSE
+0x153f KEY_FORWARD

diff --git a/utils/keytable/rc_keymaps/videomate_m1f b/utils/keytable/rc_keymaps/videomate_m1f
new file mode 100644 (file)
index 0000000..c76b6a0
--- /dev/null
+++ b/utils/keytable/rc_keymaps/videomate_m1f
@@ -0,0 +1,52 @@
+# table videomate_m1f, type: UNKNOWN
+0x01 KEY_POWER
+0x31 KEY_TUNER
+0x33 KEY_VIDEO
+0x2f KEY_RADIO
+0x30 KEY_CAMERA
+0x2d KEY_NEW
+0x17 KEY_CYCLEWINDOWS
+0x2c KEY_ANGLE
+0x2b KEY_LANGUAGE
+0x32 KEY_SEARCH
+0x11 KEY_UP
+0x13 KEY_LEFT
+0x15 KEY_OK
+0x14 KEY_RIGHT
+0x12 KEY_DOWN
+0x16 KEY_BACKSPACE
+0x02 KEY_ZOOM
+0x04 KEY_INFO
+0x05 KEY_VOLUMEUP
+0x03 KEY_MUTE
+0x07 KEY_CHANNELUP
+0x06 KEY_VOLUMEDOWN
+0x08 KEY_CHANNELDOWN
+0x0c KEY_RECORD
+0x0e KEY_STOP
+0x0a KEY_BACK
+0x0b KEY_PLAY
+0x09 KEY_FORWARD
+0x10 KEY_PREVIOUS
+0x0d KEY_PAUSE
+0x0f KEY_NEXT
+0x1e KEY_1
+0x1f KEY_2
+0x20 KEY_3
+0x21 KEY_4
+0x22 KEY_5
+0x23 KEY_6
+0x24 KEY_7
+0x25 KEY_8
+0x26 KEY_9
+0x2a KEY_NUMERIC_STAR
+0x1d KEY_0
+0x29 KEY_SUBTITLE
+0x27 KEY_CLEAR
+0x34 KEY_SCREEN
+0x28 KEY_ENTER
+0x19 KEY_RED
+0x1a KEY_GREEN
+0x1b KEY_YELLOW
+0x1c KEY_BLUE
+0x18 KEY_TEXT

diff --git a/utils/keytable/rc_maps.cfg b/utils/keytable/rc_maps.cfg
new file mode 100644 (file)
index 0000000..014c58e
--- /dev/null
+++ b/utils/keytable/rc_maps.cfg
@@ -0,0 +1,139 @@
+#
+# Keymaps table
+#
+# This table creates an association between a keycode file and a kernel
+# driver. It can be used to automatically override a keycode definition.
+#
+# Although not yet tested, it is mented to be added at udev.
+#
+# To use, you just need to run:
+#      ./ir-keytable -a
+#
+# Or, if the remote is not the first device:
+#      ./ir-keytable -a -s rc1         # for RC at rc1
+#
+
+# Format:
+#      driver - name of the driver provided via uevent - use * for any driver
+#      table -  RC keymap table, provided via uevent - use * for any table
+#      file - file name. If directory is not specified, it will default to
+#              /etc/rc_keymaps.
+# For example:
+# driver       table                           file
+# cx8800       *                               ./keycodes/rc5_hauppauge_new
+# *            rc-avermedia-m135a-rm-jx        ./keycodes/kworld_315u
+# saa7134      rc-avermedia-m135a-rm-jx        ./keycodes/keycodes/nec_terratec_cinergy_xs
+# em28xx       *                               ./keycodes/kworld_315u
+# *            *                               ./keycodes/rc5_hauppauge_new
+
+# Table to automatically load the rc maps for the bundled IR's provided with the
+# devices supported by the linux kernel
+
+#driver table                    file
+*      rc-twinhan1027           twinhan_vp1027_dvbs
+*      rc-videomate-s350        videomate_s350
+*      rc-msi-tvanywhere-plus   msi_tvanywhere_plus
+*      rc-msi-digivox-iii       msi_digivox_iii
+*      rc-eztv                  eztv
+*      rc-msi-digivox-ii        msi_digivox_ii
+*      rc-azurewave-ad-tu700    azurewave_ad_tu700
+*      rc-gotview7135           gotview7135
+*      rc-dib0700-nec           dib0700_nec
+*      rc-lme2510               lme2510
+*      rc-dntv-live-dvbt-pro    dntv_live_dvbt_pro
+*      rc-tbs-nec               tbs_nec
+*      rc-encore-enltv          encore_enltv
+*      rc-nec-terratec-cinergy-xs nec_terratec_cinergy_xs
+*      rc-proteus-2309          proteus_2309
+*      rc-msi-tvanywhere        msi_tvanywhere
+*      rc-fusionhdtv-mce        fusionhdtv_mce
+*      rc-avermedia-cardbus     avermedia_cardbus
+*      rc-cinergy               cinergy
+*      rc-imon-pad              imon_pad
+*      rc-em-terratec           em_terratec
+*      rc-behold                behold
+*      rc-rc5-tv                rc5_tv
+*      rc-gadmei-rm008z         gadmei_rm008z
+*      rc-behold-columbus       behold_columbus
+*      rc-genius-tvgo-a11mce    genius_tvgo_a11mce
+*      rc-kaiomy                kaiomy
+*      rc-flydvb                flydvb
+*      rc-leadtek-y04g0051      leadtek_y04g0051
+*      rc-videomate-tv-pvr      videomate_tv_pvr
+*      rc-iodata-bctv7e         iodata_bctv7e
+*      rc-budget-ci-old         budget_ci_old
+*      rc-dm1105-nec            dm1105_nec
+*      rc-dntv-live-dvb-t       dntv_live_dvb_t
+*      rc-anysee                anysee
+*      rc-tt-1500               tt_1500
+*      rc-flyvideo              flyvideo
+*      rc-pixelview             pixelview
+*      rc-streamzap             streamzap
+*      rc-kworld-plus-tv-analog kworld_plus_tv_analog
+*      rc-apac-viewcomp         apac_viewcomp
+*      rc-rc5-hauppauge-new     rc5_hauppauge_new
+*      rc-avermedia-a16d        avermedia_a16d
+*      rc-digitalnow-tinytwin   digitalnow_tinytwin
+*      rc-real-audio-220-32-keys real_audio_220_32_keys
+*      rc-avermedia-m733a-rm-k6 avermedia_m733a_rm_k6
+*      rc-winfast-usbii-deluxe  winfast_usbii_deluxe
+*      rc-pixelview-mk12        pixelview_mk12
+*      rc-pinnacle-color        pinnacle_color
+*      rc-pinnacle-pctv-hd      pinnacle_pctv_hd
+*      rc-terratec-cinergy-xs   terratec_cinergy_xs
+*      rc-alink-dtu-m           alink_dtu_m
+*      rc-imon-mce              imon_mce
+*      rc-rc6-mce               rc6_mce
+*      rc-pv951                 pv951
+*      rc-kworld-315u           kworld_315u
+*      rc-nebula                nebula
+*      rc-encore-enltv-fm53     encore_enltv_fm53
+*      rc-asus-pc39             asus_pc39
+*      rc-dib0700-rc5           dib0700_rc5
+*      rc-pinnacle-grey         pinnacle_grey
+*      rc-pctv-sedna            pctv_sedna
+*      rc-ati-tv-wonder-hd-600  ati_tv_wonder_hd_600
+*      rc-videomate-m1f         videomate_m1f
+*      rc-cinergy-1400          cinergy_1400
+*      rc-adstech-dvb-t-pci     adstech_dvb_t_pci
+*      rc-terratec-slim         terratec_slim
+*      rc-purpletv              purpletv
+*      rc-total-media-in-hand   total_media_in_hand
+*      rc-powercolor-real-angel powercolor_real_angel
+*      rc-manli                 manli
+*      rc-digittrade            digittrade
+*      rc-pixelview-002t        pixelview_002t
+*      rc-norwood               norwood
+*      rc-pixelview-new         pixelview_new
+*      rc-avermedia             avermedia
+*      rc-technisat-usb2        technisat_usb2
+*      rc-trekstor              trekstor
+*      rc-avertv-303            avertv_303
+*      rc-evga-indtube          evga_indtube
+*      rc-avermedia-dvbt        avermedia_dvbt
+*      rc-avermedia-rm-ks       avermedia_rm_ks
+*      rc-hauppauge-new         hauppauge_new
+*      rc-winfast               winfast
+*      rc-avermedia-m135a       avermedia_m135a
+*      rc-npgtech               npgtech
+*      rc-encore-enltv2         encore_enltv2
+*      rc-tevii-nec             tevii_nec
+# *    *                        a800                 # found in a800.c
+# *    *                        af9005               # found in af9005-remote.c
+# *    *                        cinergyt2            # found in cinergyT2-core.c
+# *    *                        dvico_mce            # found in cxusb.c
+# *    *                        dvico_portable       # found in cxusb.c
+# *    *                        d680_dmb             # found in cxusb.c
+# *    *                        dibusb               # found in dibusb-common.c
+# *    *                        digitv               # found in digitv.c
+# *    *                        dtt200u              # found in dtt200u.c
+# *    *                        dw210x               # found in dw2102.c
+# *    *                        tevii                # found in dw2102.c
+# *    *                        tbs                  # found in dw2102.c
+# *    *                        megasky              # found in m920x.c
+# *    *                        tvwalkertwin         # found in m920x.c
+# *    *                        pinnacle310e         # found in m920x.c
+# *    *                        haupp                # found in nova-t-usb2.c
+# *    *                        opera1               # found in opera1.c
+# *    *                        vp702x               # found in vp702x.c
+# *    *                        vp7045               # found in vp7045.c