From 2283017c2cd13c33fb97643db8975fa76d24159a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 23 Oct 2010 07:21:24 +0200 Subject: [PATCH] lirc: remove unneeded patches, cleanup Signed-off-by: Stephan Raue --- packages/sysutils/remote/lirc/build | 1 - packages/sysutils/remote/lirc/install | 1 - packages/sysutils/remote/lirc/need_unpack | 14 - ...rc-0.8.4-make-remote-names-all-unique.diff | 134 - .../lirc/patches/lirc-0.8.6-firefly-def.diff | 175 - ...rc-0.8.6-standardized-remote-keycodes.diff | 4764 ----------------- ...iff.old => lirc-0.8.7-uinput_key_fix.diff} | 0 7 files changed, 5089 deletions(-) delete mode 100755 packages/sysutils/remote/lirc/need_unpack delete mode 100644 packages/sysutils/remote/lirc/patches/lirc-0.8.4-make-remote-names-all-unique.diff delete mode 100644 packages/sysutils/remote/lirc/patches/lirc-0.8.6-firefly-def.diff delete mode 100644 packages/sysutils/remote/lirc/patches/lirc-0.8.6-standardized-remote-keycodes.diff rename packages/sysutils/remote/lirc/patches/{lirc-0.8.7-uinput_key_fix.diff.old => lirc-0.8.7-uinput_key_fix.diff} (100%) diff --git a/packages/sysutils/remote/lirc/build b/packages/sysutils/remote/lirc/build index 12cbb7cf8d..05f761b423 100755 --- a/packages/sysutils/remote/lirc/build +++ b/packages/sysutils/remote/lirc/build @@ -14,7 +14,6 @@ export ac_cv_lib_util_forkpty=no export MAKEFLAGS=-j1 cd $PKG_BUILD -$AUTORECONF ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/sysutils/remote/lirc/install b/packages/sysutils/remote/lirc/install index ef839db162..6d26fa49e1 100755 --- a/packages/sysutils/remote/lirc/install +++ b/packages/sysutils/remote/lirc/install @@ -10,7 +10,6 @@ mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/tools/irpty $INSTALL/usr/bin mkdir -p $INSTALL/etc/lirc - cp $PKG_BUILD/remotes/mceusb/lircd.conf.mceusb $INSTALL/etc/lirc cp $PKG_BUILD/remotes/devinput/lircd.conf.devinput $INSTALL/etc/lirc if [ "$DEVTOOLS" = yes ]; then diff --git a/packages/sysutils/remote/lirc/need_unpack b/packages/sysutils/remote/lirc/need_unpack deleted file mode 100755 index 8be9db1963..0000000000 --- a/packages/sysutils/remote/lirc/need_unpack +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -. config/options - -PKG_DIR=`find $PACKAGES -type d -name $1` -STAMP=$STAMPS/$1/unpack - -test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \ - $PKG_DIR/config/linux.$TARGET_PLATFORM.conf -nt $STAMP -o \ - $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \ - $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_PLATFORM.conf -nt $STAMP -o \ - $PKG_DIR/url -nt $STAMP && rm -f $STAMP - -exit 0 diff --git a/packages/sysutils/remote/lirc/patches/lirc-0.8.4-make-remote-names-all-unique.diff b/packages/sysutils/remote/lirc/patches/lirc-0.8.4-make-remote-names-all-unique.diff deleted file mode 100644 index 4f8f4347a0..0000000000 --- a/packages/sysutils/remote/lirc/patches/lirc-0.8.4-make-remote-names-all-unique.diff +++ /dev/null @@ -1,134 +0,0 @@ -Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atiusb -+++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb -@@ -1865,7 +1865,7 @@ end remote - - begin remote - -- name Medion_X10 -+ name Medion_X10_V2 - bits 16 - eps 30 - aeps 100 -@@ -1943,7 +1943,7 @@ end remote - - begin remote - -- name Medion_X10 -+ name Medion_X10_V3 - bits 16 - eps 30 - aeps 100 -Index: lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2 -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2 -+++ lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2 -@@ -11,7 +11,7 @@ - - begin remote - -- name BESTBUY -+ name BESTBUY2 - bits 7 - eps 30 - aeps 100 -Index: lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/dvico/lircd.conf.fusionHDTV -+++ lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV -@@ -153,7 +153,7 @@ end remote - - begin remote - -- name DVICO_MCE -+ name DVICO_MCE2 - bits 8 - eps 30 - aeps 100 -Index: lirc-0.8.7pre2/remotes/generic/NEC-pulse.conf -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/generic/NEC-pulse.conf -+++ lirc-0.8.7pre2/remotes/generic/NEC-pulse.conf -@@ -7,7 +7,7 @@ - - begin remote - -- name NEC -+ name NEC_PULSE - bits 16 - flags SPACE_ENC|CONST_LENGTH - eps 30 -Index: lirc-0.8.7pre2/remotes/generic/NEC-short-pulse.conf -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/generic/NEC-short-pulse.conf -+++ lirc-0.8.7pre2/remotes/generic/NEC-short-pulse.conf -@@ -9,7 +9,7 @@ - - begin remote - -- name NEC -+ name NEC_SHORT_PULSE - bits 16 - flags SPACE_ENC|CONST_LENGTH - eps 30 -Index: lirc-0.8.7pre2/remotes/generic/SONY12.conf -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/generic/SONY12.conf -+++ lirc-0.8.7pre2/remotes/generic/SONY12.conf -@@ -6,7 +6,7 @@ - - begin remote - -- name SONY -+ name SONY_12 - bits 7 - flags SPACE_ENC|CONST_LENGTH - eps 30 -Index: lirc-0.8.7pre2/remotes/generic/SONY20.conf -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/generic/SONY20.conf -+++ lirc-0.8.7pre2/remotes/generic/SONY20.conf -@@ -6,7 +6,7 @@ - - begin remote - -- name SONY -+ name SONY_20 - bits 7 - flags SPACE_ENC|CONST_LENGTH - eps 30 -Index: lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/hauppauge/lircd.conf.hauppauge -+++ lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge -@@ -278,14 +278,14 @@ end remote - # - # contributed by Matthew Wright - # --# brand: Hauppauge (HRV-1600 RT Remote) -+# brand: Hauppauge (HVR-1600 RT Remote) - # model no. of remote control: A415-HPG-A - # devices being controlled by this remote: - # - - begin remote - -- name Hauppauge -+ name Hauppauge_HVR_1600 - bits 13 - flags RC5|CONST_LENGTH - eps 30 -Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000 -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.PVR2000 -+++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000 -@@ -74,7 +74,7 @@ end remote - - begin remote - -- name PVR2000 -+ name PVR2000_V2 - bits 8 - flags SHIFT_ENC - gap 120000 diff --git a/packages/sysutils/remote/lirc/patches/lirc-0.8.6-firefly-def.diff b/packages/sysutils/remote/lirc/patches/lirc-0.8.6-firefly-def.diff deleted file mode 100644 index cd86dddb2e..0000000000 --- a/packages/sysutils/remote/lirc/patches/lirc-0.8.6-firefly-def.diff +++ /dev/null @@ -1,175 +0,0 @@ -Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atiusb -+++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb -@@ -2195,7 +2195,7 @@ end remote - # this config file was automatically generated - # using lirc-0.8.2(default) on Wed Feb 6 01:32:32 2008 - # --# contributed by -+# contributed by http://www.mythtv.org/wiki/Snapstream_Firefly - # - # brand: Snapstream Firefly - # model no. of remote control: R1000 -@@ -2215,63 +2215,111 @@ begin remote - pre_data 0x14 - post_data_bits 16 - post_data 0x0 -- gap 235978 -+ gap 147992 -+ min_repeat 5 - toggle_bit_mask 0x80800000 - - begin codes -- maximize 0x81AC -- close 0xD702 -- 1 0x628D -- 2 0xE30E -- 3 0x648F -- 4 0xE510 -- 5 0x6691 -- 6 0xE712 -- 7 0x6893 -- 8 0xE914 -- 9 0x6A95 -- 0 0xEC17 -- back 0x6B96 -- ent 0xED18 -- volup 0x5E89 -- voldown 0xDD08 -- mute 0x5F8A -- chup 0xE00B -- chdown 0x618C -- firefly 0xD500 -- info 0x83AE -- option 0x042F -- up 0x6F9A -- down 0xF722 -- left 0x729D -- right 0xF41F -- ok 0x739E -- menu 0xF11C -- exit 0x75A0 -- rec 0xFC27 -- play 0x7AA5 -- stop 0xFD28 -- rew 0x79A4 -- prev 0x002B -- pause 0x7EA9 -- ffwd 0xFB26 -- next 0x7FAA -- music 0xDB06 -- photo 0x5A85 -- dvd 0xD904 -- tv 0x5883 -- video 0xDC07 -- help 0x5681 -- mouse 0x022D -- a 0x6E99 -- b 0xF01B -- c 0x76A1 -- d 0xF823 -+ KEY_MAX 0x812C -+ KEY_MAX 0x01AC -+ KEY_CLOSE 0x5702 -+ KEY_CLOSE 0xD782 -+ KEY_1 0x620D -+ KEY_1 0xE28D -+ KEY_2 0x630E -+ KEY_2 0xE38E -+ KEY_3 0x640F -+ KEY_3 0xE48F -+ KEY_4 0x6510 -+ KEY_4 0xE590 -+ KEY_5 0x6611 -+ KEY_5 0xE691 -+ KEY_6 0x6712 -+ KEY_6 0xE792 -+ KEY_7 0x6813 -+ KEY_7 0xE893 -+ KEY_8 0x6914 -+ KEY_8 0xE994 -+ KEY_9 0x6A15 -+ KEY_9 0xEA95 -+ KEY_0 0x6C17 -+ KEY_0 0xEC97 -+ KEY_BACK 0x6B16 -+ KEY_BACK 0xEB96 -+ KEY_ENTER 0x6D18 -+ KEY_ENTER 0xED98 -+ KEY_VOLUMEUP 0x5E09 -+ KEY_VOLUMEUP 0xDE89 -+ KEY_VOLUMEDOWN 0x5D08 -+ KEY_VOLUMEDOWN 0xDD88 -+ KEY_MUTE 0x5F0A -+ KEY_MUTE 0xDF8A -+ KEY_VENDOR 0x5500 -+ KEY_VENDOR 0xD580 -+ KEY_CHANNELUP 0x600B -+ KEY_CHANNELUP 0xE08B -+ KEY_CHANNELDOWN 0x610C -+ KEY_CHANNELDOWN 0xE18C -+ KEY_INFO 0x832E -+ KEY_INFO 0x03AE -+ KEY_OPTION 0x842F -+ KEY_OPTION 0x04AF -+ KEY_UP 0x6F1A -+ KEY_UP 0xEF9A -+ KEY_LEFT 0x721D -+ KEY_LEFT 0xF29D -+ KEY_DOWN 0x7722 -+ KEY_DOWN 0xF7A2 -+ KEY_RIGHT 0x741F -+ KEY_RIGHT 0xF49F -+ KEY_OK 0x731E -+ KEY_OK 0xF39E -+ KEY_MENU 0x711C -+ KEY_MENU 0xF19C -+ KEY_EXIT 0x7520 -+ KEY_EXIT 0xF5A0 -+ KEY_RECORD 0x7C27 -+ KEY_RECORD 0xFCA7 -+ KEY_PLAY 0x7A25 -+ KEY_PLAY 0xFAA5 -+ KEY_STOP 0x7D28 -+ KEY_STOP 0xFDA8 -+ KEY_REWIND 0x7924 -+ KEY_REWIND 0xF9A4 -+ KEY_FORWARD 0x7B26 -+ KEY_FORWARD 0xFBA6 -+ KEY_PREVIOUS 0x802B -+ KEY_PREVIOUS 0x00AB -+ KEY_PAUSE 0x7E29 -+ KEY_PAUSE 0xFEA9 -+ KEY_NEXT 0x7F2A -+ KEY_NEXT 0xFFAA -+ KEY_AUDIO 0x5B06 -+ KEY_AUDIO 0xDB86 -+ PHOTOS 0x5A05 -+ PHOTOS 0xDA85 -+ KEY_DVD 0x5904 -+ KEY_DVD 0xD984 -+ KEY_TV 0x5803 -+ KEY_TV 0xD883 -+ KEY_VIDEO 0x5C07 -+ KEY_VIDEO 0xDC87 -+ KEY_HELP 0x5601 -+ KEY_HELP 0xD681 -+ MOUSE 0x822D -+ MOUSE 0x02AD -+ KEY_A 0x6E19 -+ KEY_A 0xEE99 -+ KEY_B 0x701B -+ KEY_B 0xF09B -+ KEY_C 0x7621 -+ KEY_C 0xF6A1 -+ KEY_D 0x7823 -+ KEY_D 0xF8A3 - end codes - - end remote - -- - # - # this config file was automatically generated - # using lirc-0.8.2(default) on Thu Oct 4 17:42:33 2007 diff --git a/packages/sysutils/remote/lirc/patches/lirc-0.8.6-standardized-remote-keycodes.diff b/packages/sysutils/remote/lirc/patches/lirc-0.8.6-standardized-remote-keycodes.diff deleted file mode 100644 index 5e537a6fb5..0000000000 --- a/packages/sysutils/remote/lirc/patches/lirc-0.8.6-standardized-remote-keycodes.diff +++ /dev/null @@ -1,4764 +0,0 @@ -Index: lirc-0.8.7pre2/remotes/adstech/lircd.conf.usbx-707 -=================================================================== -Index: lirc-0.8.7pre2/remotes/animax/lircd.conf.animax -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/animax/lircd.conf.animax -+++ lirc-0.8.7pre2/remotes/animax/lircd.conf.animax -@@ -38,79 +38,79 @@ begin remote - - begin codes - CD_DOWN 0x000000000000DB24 -- CD_UP 0x0000000000005BA4 -+ KEY_CD 0x0000000000005BA4 - TV_DOWN 0x000000000000DC23 -- TV_UP 0x0000000000005CA3 -+ KEY_TV 0x0000000000005CA3 - PHONE_DOWN 0x000000000000DD22 -- PHONE_UP 0x0000000000005DA2 -+ KEY_PHONE 0x0000000000005DA2 - RADIO_DOWN 0x000000000000DE21 -- RADIO_UP 0x0000000000005EA1 -+ KEY_RADIO 0x0000000000005EA1 - VIDEO_DOWN 0x000000000000DF20 -- VIDEO_UP 0x0000000000005FA0 -+ KEY_VIDEO 0x0000000000005FA0 - AUX1_DOWN 0x000000000000E01F -- AUX1_UP 0x000000000000609F -+ KEY_AUX 0x000000000000609F - MAIL_DOWN 0x000000000000E11E -- MAIL_UP 0x000000000000619E -+ KEY_MAIL 0x000000000000619E - AUX2_DOWN 0x000000000000E21D - AUX2_UP 0x000000000000629D - POWER_DOWN 0x000000000000E31C -- POWER_UP 0x000000000000639C -+ KEY_POWER 0x000000000000639C - LEFT_MOUSE_BUTTON_TOUCH_DOWN 0x000000000000E41B - LEFT_MOUSE_BUTTON_TOUCH_UP 0x000000000000649B - REWIND_DOWN 0x000000000000E51A -- REWIND_UP 0x000000000000659A -+ KEY_REWIND 0x000000000000659A - PLAY_DOWN 0x000000000000E619 -- PLAY_UP 0x0000000000006699 -+ KEY_PLAY 0x0000000000006699 - FORWARD_DOWN 0x000000000000E718 -- FORWARD_UP 0x0000000000006798 -+ KEY_FORWARD 0x0000000000006798 - SKIP_BACKWARD_DOWN 0x000000000000E817 - SKIP_BACKWARD 0x0000000000006897 - STOP_DOWN 0x000000000000E916 -- STOP_UP 0x0000000000006996 -+ KEY_STOP 0x0000000000006996 - SKIP_FORWARD_DOWN 0x000000000000EA15 - SKIP_FORWARD_UP 0x0000000000006A95 - CHANNEL_UP_DOWN 0x000000000000EB14 -- CHANNEL_UP_UP 0x0000000000006B94 -+ KEY_CHANNELUP 0x0000000000006B94 - MENU_DOWN 0x000000000000EC13 -- MENU_UP 0x0000000000006C93 -+ KEY_MENU 0x0000000000006C93 - VOLUME_UP_DOWN 0x000000000000ED12 -- VOLUME_UP_UP 0x0000000000006D92 -+ KEY_VOLUMEUP 0x0000000000006D92 - BLUE_BUTTON_DOWN 0x000000000000EE11 -- BLUE_BUTTON_UP 0x0000000000006E91 -+ KEY_BLUE 0x0000000000006E91 - MUTE_DOWN 0x000000000000EF10 -- MUTE_UP 0x0000000000006F90 -+ KEY_MUTE 0x0000000000006F90 - VOLUME_DOWN_DOWN 0x000000000000F00F -- VOLUME_DOWN_UP 0x000000000000708F -+ KEY_VOLUMEDOWN 0x000000000000708F - RED_BUTTON_DOWN 0x000000000000F10E -- RED_BUTTON_UP 0x000000000000718E -+ KEY_RED 0x000000000000718E - GREEN_BUTTON_DOWN 0x000000000000F20D -- GREEN_BUTTON_UP 0x000000000000728D -+ KEY_GREEN 0x000000000000728D - CHANNEL_DOWN_DOWN 0x000000000000F30C -- CHANNEL_DOWN_UP 0x000000000000738C -+ KEY_CHANNELDOWN 0x000000000000738C - 1_DOWN 0x000000000000F40B -- 1_UP 0x000000000000748B -+ KEY_1 0x000000000000748B - 2_DOWN 0x000000000000F50A -- 2_UP 0x000000000000758A -+ KEY_2 0x000000000000758A - 3_DOWN 0x000000000000F609 -- 3_UP 0x0000000000007689 -+ KEY_3 0x0000000000007689 - 4_DOWN 0x000000000000F708 -- 4_UP 0x0000000000007788 -+ KEY_4 0x0000000000007788 - 5_DOWN 0x000000000000F807 -- 5_UP 0x0000000000007887 -+ KEY_5 0x0000000000007887 - 6_DOWN 0x000000000000F906 -- 6_UP 0x0000000000007986 -+ KEY_6 0x0000000000007986 - 7_DOWN 0x000000000000FA05 -- 7_UP 0x0000000000007A85 -+ KEY_7 0x0000000000007A85 - 8_DOWN 0x000000000000FB04 -- 8_UP 0x0000000000007B84 -+ KEY_8 0x0000000000007B84 - 9_DOWN 0x000000000000FC03 -- 9_UP 0x0000000000007C83 -+ KEY_9 0x0000000000007C83 - SLASH_DOWN 0x000000000000FD02 -- SLASH_UP 0x0000000000007D82 -+ KEY_SLASH 0x0000000000007D82 - 0_DOWN 0x000000000000FE01 -- 0_UP 0x0000000000007E81 -+ KEY_0 0x0000000000007E81 - MINUS_DOWN 0x000000000000FF00 -- MINUS_UP 0x0000000000007F80 -+ KEY_KPMINUS 0x0000000000007F80 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/apple/lircd.conf.macmini -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/apple/lircd.conf.macmini -+++ lirc-0.8.7pre2/remotes/apple/lircd.conf.macmini -@@ -26,12 +26,12 @@ begin remote - ignore_mask 0x0000ff01 - - begin codes -- VOLUP 0x0B -- VOLDOWN 0x0D -- BACKWARD 0x08 -- FORWARD 0x07 -- PLAY 0x04 -- MENU 0x02 -+ KEY_VOLUMEUP 0x0B -+ KEY_VOLUMEDOWN 0x0D -+ KEY_REWIND 0x08 -+ KEY_FORWARD 0x07 -+ KEY_PLAYPAUSE 0x04 -+ KEY_MENU 0x02 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/asus/lircd.conf.asus -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/asus/lircd.conf.asus -+++ lirc-0.8.7pre2/remotes/asus/lircd.conf.asus -@@ -19,38 +19,38 @@ begin remote - toggle_bit 0 - - begin codes -- 0 0x0000000000000000 -- 1 0x0000000000000008 -- 2 0x0000000000000010 -- 3 0x0000000000000018 -- 4 0x0000000000000020 -- 5 0x0000000000000028 -- 6 0x0000000000000030 -- 7 0x0000000000000038 -- 8 0x0000000000000040 -- 9 0x0000000000000048 -- PREV 0x0000000000000050 -- ENTER 0x0000000000000058 -- CH+ 0x0000000000000060 -- CH- 0x0000000000000068 -- VOL+ 0x0000000000000070 -- VOL- 0x0000000000000078 -- MAXIMIZE 0x0000000000000080 -- MUTE 0x0000000000000088 -- POWER 0x0000000000000090 -- MENU 0x0000000000000098 -- UP 0x00000000000000A0 -- DOWN 0x00000000000000A8 -- LEFT 0x00000000000000B0 -- RIGHT 0x00000000000000B8 -+ KEY_0 0x0000000000000000 -+ KEY_1 0x0000000000000008 -+ KEY_2 0x0000000000000010 -+ KEY_3 0x0000000000000018 -+ KEY_4 0x0000000000000020 -+ KEY_5 0x0000000000000028 -+ KEY_6 0x0000000000000030 -+ KEY_7 0x0000000000000038 -+ KEY_8 0x0000000000000040 -+ KEY_9 0x0000000000000048 -+ KEY_PREVIOUS 0x0000000000000050 -+ KEY_ENTER 0x0000000000000058 -+ KEY_CHANNELUP 0x0000000000000060 -+ KEY_CHANNELDOWN 0x0000000000000068 -+ KEY_VOLUMEUP 0x0000000000000070 -+ KEY_VOLUMEDOWN 0x0000000000000078 -+ KEY_MAX 0x0000000000000080 -+ KEY_MUTE 0x0000000000000088 -+ KEY_POWER 0x0000000000000090 -+ KEY_MENU 0x0000000000000098 -+ KEY_UP 0x00000000000000A0 -+ KEY_DOWN 0x00000000000000A8 -+ KEY_LEFT 0x00000000000000B0 -+ KEY_RIGHT 0x00000000000000B8 - CAPTION 0x00000000000000C0 - MTS/SAP 0x00000000000000C8 - DISPLAY 0x00000000000000D0 - SCAN 0x00000000000000D8 -- RED 0x00000000000000E0 -- GREEN 0x00000000000000E8 -- YELLOW 0x00000000000000F0 -- BLUE 0x00000000000000F8 -+ KEY_RED 0x00000000000000E0 -+ KEY_GREEN 0x00000000000000E8 -+ KEY_YELLOW 0x00000000000000F0 -+ KEY_BLUE 0x00000000000000F8 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/asus/lircd.conf.asusdh -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/asus/lircd.conf.asusdh -+++ lirc-0.8.7pre2/remotes/asus/lircd.conf.asusdh -@@ -14,17 +14,17 @@ begin remote - post_data_bits 0 - - begin codes -- POWER 0x01 -+ KEY_POWER 0x01 - QUICK_POWER 0x02 - NOISE_OFF 0x03 - WIFI 0x04 - AP_LAUNCH 0x05 -- MAXIMIZE 0x06 -- PLUS 0x07 -+ KEY_MAX 0x06 -+ KEY_KPPLUS 0x07 - REV 0x08 -- PLAY/PAUSE 0x09 -- FWD 0x0A -- MINUS 0x0B -+ KEY_PLAYPAUSE 0x09 -+ KEY_FORWARD 0x0A -+ KEY_KPMINUS 0x0B - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/asus/lircd.conf.digimatrix -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/asus/lircd.conf.digimatrix -+++ lirc-0.8.7pre2/remotes/asus/lircd.conf.digimatrix -@@ -28,43 +28,43 @@ begin remote - - - begin codes -- up 0x000000000000E817 -- down 0x00000000000018E7 -- enter 0x000000000000D02F -- left 0x0000000000009867 -- right 0x00000000000058A7 -- 1 0x00000000000000FF -- 2 0x000000000000807F -- 3 0x00000000000040BF -- 4 0x000000000000C03F -- 5 0x00000000000020DF -- 6 0x000000000000A05F -- 7 0x000000000000609F -- 8 0x000000000000E01F -- 9 0x00000000000010EF -- 0 0x000000000000906F -- on_off 0x000000000000B04F -+ KEY_UP 0x000000000000E817 -+ KEY_DOWN 0x00000000000018E7 -+ KEY_ENTER 0x000000000000D02F -+ KEY_LEFT 0x0000000000009867 -+ KEY_RIGHT 0x00000000000058A7 -+ KEY_1 0x00000000000000FF -+ KEY_2 0x000000000000807F -+ KEY_3 0x00000000000040BF -+ KEY_4 0x000000000000C03F -+ KEY_5 0x00000000000020DF -+ KEY_6 0x000000000000A05F -+ KEY_7 0x000000000000609F -+ KEY_8 0x000000000000E01F -+ KEY_9 0x00000000000010EF -+ KEY_0 0x000000000000906F -+ KEY_POWER 0x000000000000B04F - dvd_vcd 0x000000000000F00F -- tv 0x00000000000008F7 -+ KEY_TV 0x00000000000008F7 - os_start 0x00000000000030CF - photo 0x00000000000048B7 -- home 0x00000000000044BB -- back 0x000000000000A857 -- ch+ 0x000000000000B847 -- stop 0x000000000000946B -- play 0x000000000000C43B -- vol+ 0x000000000000F807 -- ch- 0x0000000000007887 -+ KEY_HOME 0x00000000000044BB -+ KEY_BACK 0x000000000000A857 -+ KEY_CHANNELUP 0x000000000000B847 -+ KEY_STOP 0x000000000000946B -+ KEY_PLAY 0x000000000000C43B -+ KEY_VOLUMEUP 0x000000000000F807 -+ KEY_CHANNELDOWN 0x0000000000007887 - step- 0x000000000000E41B - step+ 0x000000000000649B -- vol- 0x00000000000004FB -- pause 0x00000000000024DB -- pre 0x00000000000014EB -- next 0x000000000000A45B -- mute 0x000000000000847B -- rec 0x000000000000D42B -- subtitle 0x000000000000C837 -- menu 0x00000000000038C7 -+ KEY_VOLUMEDOWN 0x00000000000004FB -+ KEY_PAUSE 0x00000000000024DB -+ KEY_PREVIOUS 0x00000000000014EB -+ KEY_NEXT 0x000000000000A45B -+ KEY_MUTE 0x000000000000847B -+ KEY_RECORD 0x000000000000D42B -+ KEY_SUBTITLE 0x000000000000C837 -+ KEY_MENU 0x00000000000038C7 - dvd_audio 0x00000000000050AF - ui_size 0x0000000000008877 - ui_on_off 0x00000000000028D7 -Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atilibusb -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atilibusb -+++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atilibusb -@@ -30,58 +30,58 @@ begin remote - - - begin codes -- stop 0x000231 -- pause 0x000230 -- fforward 0x000228 -- rec 0x000237 -- rewind 0x000229 -- play 0x00022C -- d 0x00027B -- c 0x00027A -- e 0x00027C -- f 0x00027D -- right 0x00025B -- left 0x00025A -- up 0x000258 -- down 0x000259 -- ok 0x00025C -- info 0x0002F9 -- timer 0x000296 -- menu 0x000254 -- check 0x000282 -- 0 0x000200 -- 1 0x000201 -- 2 0x000202 -- 3 0x000203 -- 4 0x000204 -- 5 0x000205 -- 6 0x000206 -- 7 0x000207 -- 8 0x000208 -- 9 0x000209 -- volup 0x000210 -- voldown 0x000211 -- mute 0x00020D -- chup 0x000220 -- chdown 0x000221 -- mouse_up 0x0001FF -- mouse_down 0x0002FF -- mouse_left 0x0020FF -- mouse_right 0x0010FF -- mouse_up_right 0x0011FF -- mouse_down_right 0x0012FF -- mouse_up_left 0x0021FF -- mouse_down_left 0x0022FF -- right_click 0x0002AA -- left_click 0x0002A9 -- hand 0x0002D0 -- shrink_resize 0x0002D5 -- ? 0x0002BE -- dvd 0x000238 -- tv 0x000239 -- a 0x000278 -- b 0x000279 -- power 0x00020C -+ KEY_STOP 0x000231 -+ KEY_PAUSE 0x000230 -+ KEY_FASTFORWARD 0x000228 -+ KEY_RECORD 0x000237 -+ KEY_REWIND 0x000229 -+ KEY_PLAY 0x00022C -+ KEY_D 0x00027B -+ KEY_C 0x00027A -+ KEY_E 0x00027C -+ KEY_F 0x00027D -+ KEY_RIGHT 0x00025B -+ KEY_LEFT 0x00025A -+ KEY_UP 0x000258 -+ KEY_DOWN 0x000259 -+ KEY_OK 0x00025C -+ KEY_INFO 0x0002F9 -+ timer 0x000296 -+ KEY_MENU 0x000254 -+ check 0x000282 -+ KEY_0 0x000200 -+ KEY_1 0x000201 -+ KEY_2 0x000202 -+ KEY_3 0x000203 -+ KEY_4 0x000204 -+ KEY_5 0x000205 -+ KEY_6 0x000206 -+ KEY_7 0x000207 -+ KEY_8 0x000208 -+ KEY_9 0x000209 -+ KEY_VOLUMEUP 0x000210 -+ KEY_VOLUMEDOWN 0x000211 -+ KEY_MUTE 0x00020D -+ KEY_CHANNELUP 0x000220 -+ KEY_CHANNELDOWN 0x000221 -+ mouse_up 0x0001FF -+ mouse_down 0x0002FF -+ BTN_LEFT 0x0020FF -+ BTN_RIGHT 0x0010FF -+ BTN_RIGHT 0x0011FF -+ mouse_down_right 0x0012FF -+ BTN_LEFT 0x0021FF -+ mouse_down_left 0x0022FF -+ right_click 0x0002AA -+ left_click 0x0002A9 -+ hand 0x0002D0 -+ shrink_resize 0x0002D5 -+ ? 0x0002BE -+ KEY_DVD 0x000238 -+ KEY_TV 0x000239 -+ KEY_A 0x000278 -+ KEY_B 0x000279 -+ KEY_POWER 0x00020C - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atiusb -+++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb -@@ -37,54 +37,54 @@ begin remote - - - begin codes -- A 0x000000000000F500 -- B 0x000000000000F601 -- C 0x0000000000000E19 -- D 0x000000000000101B -- E 0x0000000000001621 -- F 0x0000000000001823 -- TV 0x000000000000F803 -- DVD 0x000000000000F904 -- WEB 0x000000000000FA05 -+ KEY_A 0x000000000000F500 -+ KEY_B 0x000000000000F601 -+ KEY_C 0x0000000000000E19 -+ KEY_D 0x000000000000101B -+ KEY_E 0x0000000000001621 -+ KEY_F 0x0000000000001823 -+ KEY_TV 0x000000000000F803 -+ KEY_DVD 0x000000000000F904 -+ KEY_WWW 0x000000000000FA05 - BOOK 0x000000000000FB06 - HAND 0x000000000000FC07 -- POWER 0x000000000000F702 -- MOUSE_LEFT_BTN 0x0000000000006D78 -- MOUSE_RIGHT_BTN 0x000000000000717C -+ KEY_POWER 0x000000000000F702 -+ BTN_LEFT 0x0000000000006D78 -+ BTN_RIGHT 0x000000000000717C - MOUSE_UP 0x0000000000006772 - MOUSE_DOWN 0x0000000000006B76 -- MOUSE_LEFT 0x0000000000006C77 -- MOUSE_RIGHT 0x0000000000006B76 -- VOL_UP 0x000000000000FD08 -- VOL_DOWN 0x000000000000FE09 -- MUTE 0x000000000000FF0A -- CH_UP 0x000000000000000B -- CH_DOWN 0x000000000000010C -- 1 0x000000000000020D -- 2 0x000000000000030E -- 3 0x000000000000040F -- 4 0x0000000000000510 -- 5 0x0000000000000611 -- 6 0x0000000000000712 -- 7 0x0000000000000813 -- 8 0x0000000000000914 -- 9 0x0000000000000A15 -- 0 0x0000000000000C17 -- LIST 0x0000000000000B16 -+ BTN_LEFT 0x0000000000006C77 -+ BTN_RIGHT 0x0000000000006B76 -+ KEY_VOLUMEUP 0x000000000000FD08 -+ KEY_VOLUMEDOWN 0x000000000000FE09 -+ KEY_MUTE 0x000000000000FF0A -+ KEY_CHANNELUP 0x000000000000000B -+ KEY_CHANNELDOWN 0x000000000000010C -+ KEY_1 0x000000000000020D -+ KEY_2 0x000000000000030E -+ KEY_3 0x000000000000040F -+ KEY_4 0x0000000000000510 -+ KEY_5 0x0000000000000611 -+ KEY_6 0x0000000000000712 -+ KEY_7 0x0000000000000813 -+ KEY_8 0x0000000000000914 -+ KEY_9 0x0000000000000A15 -+ KEY_0 0x0000000000000C17 -+ KEY_LIST 0x0000000000000B16 - CHECK 0x0000000000000D18 -- UP 0x0000000000000F1A -- DOWN 0x0000000000001722 -- LEFT 0x000000000000121D -- RIGHT 0x000000000000141F -- OK 0x000000000000131E -+ KEY_UP 0x0000000000000F1A -+ KEY_DOWN 0x0000000000001722 -+ KEY_LEFT 0x000000000000121D -+ KEY_RIGHT 0x000000000000141F -+ KEY_OK 0x000000000000131E - TIMER 0x000000000000111C -- MAX 0x0000000000001520 -- REWIND 0x0000000000001924 -- PLAY 0x0000000000001A25 -- FFWD 0x0000000000001B26 -- REC 0x0000000000001C27 -- STOP 0x0000000000001D28 -- PAUSE 0x0000000000001E29 -+ KEY_MAX 0x0000000000001520 -+ KEY_REWIND 0x0000000000001924 -+ KEY_PLAY 0x0000000000001A25 -+ KEY_FASTFORWARD 0x0000000000001B26 -+ KEY_RECORD 0x0000000000001C27 -+ KEY_STOP 0x0000000000001D28 -+ KEY_PAUSE 0x0000000000001E29 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/avermedia/lircd.conf.avermedia -+++ lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia -@@ -34,37 +34,37 @@ begin remote - - - begin codes -- TV 0x0000000000006897 -- FM 0x000000000000A857 -- EXIT 0x00000000000048B7 -+ KEY_TV 0x0000000000006897 -+ KEY_RADIO 0x000000000000A857 -+ KEY_EXIT 0x00000000000048B7 - DISPLAY 0x00000000000030CF - FREEZE 0x00000000000028D7 - CAPTURE 0x0000000000008877 -- VIDEO 0x00000000000038C7 -- 1 0x000000000000807F -- 2 0x00000000000040BF -- 3 0x000000000000C03F -- AUDIO 0x00000000000018E7 -- 4 0x00000000000020DF -- 5 0x000000000000A05F -- 6 0x000000000000609F -+ KEY_VIDEO 0x00000000000038C7 -+ KEY_1 0x000000000000807F -+ KEY_2 0x00000000000040BF -+ KEY_3 0x000000000000C03F -+ KEY_AUDIO 0x00000000000018E7 -+ KEY_4 0x00000000000020DF -+ KEY_5 0x000000000000A05F -+ KEY_6 0x000000000000609F - FULLSCREEN 0x000000000000F00F -- 7 0x000000000000E01F -- 8 0x00000000000010EF -- 9 0x000000000000906F -+ KEY_7 0x000000000000E01F -+ KEY_8 0x00000000000010EF -+ KEY_9 0x000000000000906F - LOOP 0x000000000000C837 -- 0 0x00000000000050AF -- LEFTARROW 0x00000000000000FF -- RIGHTARROW 0x000000000000E817 -- MUTE 0x00000000000008F7 -+ KEY_0 0x00000000000050AF -+ KEY_LEFT 0x00000000000000FF -+ KEY_RIGHT 0x000000000000E817 -+ KEY_MUTE 0x00000000000008F7 - COLOR 0x000000000000B04F -- PREVIEW 0x000000000000708F -- CHANNELUP 0x000000000000D827 -- VOL_UP 0x00000000000058A7 -+ KEY_PREVIOUS 0x000000000000708F -+ KEY_CHANNELUP 0x000000000000D827 -+ KEY_VOLUMEUP 0x00000000000058A7 - AUTOSCAN 0x000000000000B847 -- ENTER 0x0000000000009867 -- CHANNELDOWN 0x000000000000F807 -- VOL_DOWN 0x0000000000007887 -+ KEY_ENTER 0x0000000000009867 -+ KEY_CHANNELDOWN 0x000000000000F807 -+ KEY_VOLUMEDOWN 0x0000000000007887 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia98 -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/avermedia/lircd.conf.avermedia98 -+++ lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia98 -@@ -29,49 +29,49 @@ begin remote - - begin codes - TV/FM 0x0000000000000023 -- CD 0x0000000000000022 -+ KEY_CD 0x0000000000000022 - # TELETEXT 0x000000000000C03F -- POWER 0x0000000000000027 -+ KEY_POWER 0x0000000000000027 - -- 1 0x0000000000000018 -- 2 0x0000000000000010 -- 3 0x0000000000000008 -- VIDEO 0x0000000000000000 -- -- 4 0x0000000000000019 -- 5 0x0000000000000011 -- 6 0x0000000000000009 -- AUDIO 0x0000000000000001 -- -- 7 0x000000000000001A -- 8 0x0000000000000012 -- 9 0x000000000000000A -+ KEY_1 0x0000000000000018 -+ KEY_2 0x0000000000000010 -+ KEY_3 0x0000000000000008 -+ KEY_VIDEO 0x0000000000000000 -+ -+ KEY_4 0x0000000000000019 -+ KEY_5 0x0000000000000011 -+ KEY_6 0x0000000000000009 -+ KEY_AUDIO 0x0000000000000001 -+ -+ KEY_7 0x000000000000001A -+ KEY_8 0x0000000000000012 -+ KEY_9 0x000000000000000A - FULLSCREEN 0x0000000000000002 - -- 0 0x000000000000001B -+ KEY_0 0x000000000000001B - DISPLAY 0x0000000000000013 - COLOR 0x000000000000000B - LOOP 0x0000000000000003 - - UNLABELED 0x000000000000001C -- LEFT 0x0000000000000014 -- RIGHT 0x000000000000000C -- PREVIEW 0x0000000000000004 -+ KEY_LEFT 0x0000000000000014 -+ KEY_RIGHT 0x000000000000000C -+ KEY_PREVIOUS 0x0000000000000004 - - AUTOSCAN 0x000000000000001D - FREEZE 0x0000000000000015 - CAPTURE 0x000000000000000D -- MUTE 0x0000000000000005 -+ KEY_MUTE 0x0000000000000005 - -- RED 0x000000000000001E -- VOL_DOWN 0x0000000000000016 -- VOL_UP 0x000000000000000E -- YELLOW 0x0000000000000006 -- -- GREEN 0x000000000000001F -- CH_DOWN 0x0000000000000017 -- CH_UP 0x000000000000000F -- BLUE 0x0000000000000007 -+ KEY_RED 0x000000000000001E -+ KEY_VOLUMEDOWN 0x0000000000000016 -+ KEY_VOLUMEUP 0x000000000000000E -+ KEY_YELLOW 0x0000000000000006 -+ -+ KEY_GREEN 0x000000000000001F -+ KEY_CHANNELDOWN 0x0000000000000017 -+ KEY_CHANNELUP 0x000000000000000F -+ KEY_BLUE 0x0000000000000007 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/avermedia/lircd.conf.vdomate -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/avermedia/lircd.conf.vdomate -+++ lirc-0.8.7pre2/remotes/avermedia/lircd.conf.vdomate -@@ -27,33 +27,33 @@ begin remote - - - begin codes -- power 0x0000000040BF00FF -- one 0x0000000040BFA05F -- two 0x0000000040BF609F -- three 0x0000000040BFE01F -- four 0x0000000040BF906F -- five 0x0000000040BF50AF -- six 0x0000000040BFD02F -- seven 0x0000000040BFB04F -- eight 0x0000000040BF708F -- nine 0x0000000040BFF00F -- zero 0x0000000040BF8877 -- video 0x0000000040BF20DF -+ KEY_POWER 0x0000000040BF00FF -+ KEY_1 0x0000000040BFA05F -+ KEY_2 0x0000000040BF609F -+ KEY_3 0x0000000040BFE01F -+ KEY_4 0x0000000040BF906F -+ KEY_5 0x0000000040BF50AF -+ KEY_6 0x0000000040BFD02F -+ KEY_7 0x0000000040BFB04F -+ KEY_8 0x0000000040BF708F -+ KEY_9 0x0000000040BFF00F -+ KEY_0 0x0000000040BF8877 -+ KEY_VIDEO 0x0000000040BF20DF - fullscreen 0x0000000040BF30CF - display 0x0000000040BF48B7 - color 0x0000000040BFC837 - loop 0x0000000040BF08F7 - coloup 0x0000000040BF6897 - colordn 0x0000000040BFE817 -- preview 0x0000000040BF28D7 -+ KEY_PREVIOUS 0x0000000040BF28D7 - autoscan 0x0000000040BF9867 - freeze 0x0000000040BF58A7 - capture 0x0000000040BFD827 -- mute 0x0000000040BF18E7 -- volumeup 0x0000000040BF7887 -- volumedown 0x0000000040BFF807 -- chnldown 0x00000000C03F40BF -- chnlup 0x00000000C03FC03F -+ KEY_MUTE 0x0000000040BF18E7 -+ KEY_VOLUMEUP 0x0000000040BF7887 -+ KEY_VOLUMEDOWN 0x0000000040BFF807 -+ KEY_CHANNELDOWN 0x00000000C03F40BF -+ KEY_CHANNELUP 0x00000000C03FC03F - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/bestbuy/lircd.conf.bestbuy -+++ lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy -@@ -26,36 +26,36 @@ begin remote - - - begin codes -- 0 0x0000000000000000 -- 1 0x0000000000000001 -- 2 0x0000000000000002 -- 3 0x0000000000000003 -- 4 0x0000000000000004 -- 5 0x0000000000000005 -- 6 0x0000000000000006 -- 7 0x0000000000000007 -- 8 0x0000000000000008 -- 9 0x0000000000000009 -- TV 0x000000000000001C -- POWER 0x0000000000000012 -- VIDEO 0x0000000000000011 -- PREVIEW 0x000000000000000F -- MUTE 0x0000000000000013 -+ KEY_0 0x0000000000000000 -+ KEY_1 0x0000000000000001 -+ KEY_2 0x0000000000000002 -+ KEY_3 0x0000000000000003 -+ KEY_4 0x0000000000000004 -+ KEY_5 0x0000000000000005 -+ KEY_6 0x0000000000000006 -+ KEY_7 0x0000000000000007 -+ KEY_8 0x0000000000000008 -+ KEY_9 0x0000000000000009 -+ KEY_TV 0x000000000000001C -+ KEY_POWER 0x0000000000000012 -+ KEY_VIDEO 0x0000000000000011 -+ KEY_PREVIOUS 0x000000000000000F -+ KEY_MUTE 0x0000000000000013 - SCAN 0x0000000000000010 -- CHANNEL_UP 0x000000000000001A -- CHANNEL_DOWN 0x000000000000001E -- VOL_UP 0x000000000000001B -- VOL_DOWN 0x000000000000001F -+ KEY_CHANNELUP 0x000000000000001A -+ KEY_CHANNELDOWN 0x000000000000001E -+ KEY_VOLUMEUP 0x000000000000001B -+ KEY_VOLUMEDOWN 0x000000000000001F - LOOP 0x000000000000000A - 100 0x0000000000000017 -- ZOOM 0x000000000000000D -- RECORD 0x000000000000000E -- STOP 0x000000000000001D -- PLAY 0x0000000000000019 -+ KEY_ZOOM 0x000000000000000D -+ KEY_RECORD 0x000000000000000E -+ KEY_STOP 0x000000000000001D -+ KEY_PLAY 0x0000000000000019 - FREEZE 0x0000000000000016 - COLOR 0x0000000000000014 -- LEFT 0x0000000000000018 -- RIGHT 0x000000000000000C -+ KEY_LEFT 0x0000000000000018 -+ KEY_RIGHT 0x000000000000000C - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2 -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2 -+++ lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2 -@@ -27,29 +27,29 @@ begin remote - begin codes - TV/FM 0x0000000000000043 - SCAN 0x0000000000000047 -- ZOOM 0x000000000000005C -- POWER 0x000000000000005E -- 1 0x0000000000000041 -- 2 0x000000000000004B -- 3 0x000000000000005B -- VOL+ 0x000000000000005F -- 4 0x0000000000000045 -- 5 0x0000000000000049 -- 6 0x0000000000000055 -- VOL- 0x0000000000000057 -- 7 0x0000000000000046 -- 8 0x000000000000004A -- 9 0x0000000000000052 -- CH+ 0x0000000000000056 -- 0 0x0000000000000042 -+ KEY_ZOOM 0x000000000000005C -+ KEY_POWER 0x000000000000005E -+ KEY_1 0x0000000000000041 -+ KEY_2 0x000000000000004B -+ KEY_3 0x000000000000005B -+ KEY_VOLUMEUP 0x000000000000005F -+ KEY_4 0x0000000000000045 -+ KEY_5 0x0000000000000049 -+ KEY_6 0x0000000000000055 -+ KEY_VOLUMEDOWN 0x0000000000000057 -+ KEY_7 0x0000000000000046 -+ KEY_8 0x000000000000004A -+ KEY_9 0x0000000000000052 -+ KEY_CHANNELUP 0x0000000000000056 -+ KEY_0 0x0000000000000042 - LOOP 0x0000000000000053 - +100 0x0000000000000050 -- CH- 0x0000000000000054 -+ KEY_CHANNELDOWN 0x0000000000000054 - SOURCE 0x0000000000000040 -- MUTE 0x0000000000000058 -- - 0x0000000000000044 -+ KEY_MUTE 0x0000000000000058 -+ KEY_KPMINUS 0x0000000000000044 - FUNCTION 0x000000000000004E -- + 0x000000000000004C -+ KEY_KPPLUS 0x000000000000004C - RESET 0x000000000000004D - FREEZE 0x000000000000004F - end codes -Index: lirc-0.8.7pre2/remotes/caraca/lircd.conf.caraca -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/caraca/lircd.conf.caraca -+++ lirc-0.8.7pre2/remotes/caraca/lircd.conf.caraca -@@ -17,29 +17,29 @@ begin remote - bits 16 - - begin codes -- POWER 0x3ff3 -- 1 0x3ffe -- 2 0x3ffd -- 3 0x3ffc -- 4 0x3ffb -- 5 0x3ffa -- 6 0x3ff9 -- 7 0x3ff8 -- 8 0x3ff7 -- 9 0x3ff6 -- 0 0x3ff5 -- PAUSE 0x3fcf -- EJECT 0x3fe2 -+ KEY_POWER 0x3ff3 -+ KEY_1 0x3ffe -+ KEY_2 0x3ffd -+ KEY_3 0x3ffc -+ KEY_4 0x3ffb -+ KEY_5 0x3ffa -+ KEY_6 0x3ff9 -+ KEY_7 0x3ff8 -+ KEY_8 0x3ff7 -+ KEY_9 0x3ff6 -+ KEY_0 0x3ff5 -+ KEY_PAUSE 0x3fcf -+ KEY_EJECTCD 0x3fe2 - SEEK- 0x3fcd -- PLAY 0x3fca -+ KEY_PLAY 0x3fca - SEEK+ 0x3fcb -- RECORD 0x3fd2 -- STOP 0x3fc9 -- CH- 0x3fde -- CH+ 0x3fdf -- VOL- 0x3fee -- VOL+ 0x3fef -- MUTE 0x3ff2 -+ KEY_RECORD 0x3fd2 -+ KEY_STOP 0x3fc9 -+ KEY_CHANNELDOWN 0x3fde -+ KEY_CHANNELUP 0x3fdf -+ KEY_VOLUMEDOWN 0x3fee -+ KEY_VOLUMEUP 0x3fef -+ KEY_MUTE 0x3ff2 - TV/FM 0x3fe3 - end codes - -Index: lirc-0.8.7pre2/remotes/chronos/lircd.conf.chronos -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/chronos/lircd.conf.chronos -+++ lirc-0.8.7pre2/remotes/chronos/lircd.conf.chronos -@@ -20,37 +20,37 @@ begin remote - toggle_bit 0 - - begin codes -- POWER 0x0000000000000000 -- MOUSE_MODE 0x0000000000000010 -+ KEY_POWER 0x0000000000000000 -+ BTN_MODE 0x0000000000000010 - FULL_SCREEN 0x0000000000000008 -- CH+ 0x0000000000000009 -- CH- 0x0000000000000019 -- 1 0x0000000000000018 -- 2 0x0000000000000004 -- 3 0x0000000000000014 -- 4 0x000000000000001C -- 5 0x0000000000000002 -- 6 0x0000000000000012 -- 7 0x000000000000001A -- 8 0x0000000000000006 -- 9 0x0000000000000016 -- 0 0x000000000000001E -- VOL+ 0x0000000000000005 -- VOL- 0x000000000000001D -+ KEY_CHANNELUP 0x0000000000000009 -+ KEY_CHANNELDOWN 0x0000000000000019 -+ KEY_1 0x0000000000000018 -+ KEY_2 0x0000000000000004 -+ KEY_3 0x0000000000000014 -+ KEY_4 0x000000000000001C -+ KEY_5 0x0000000000000002 -+ KEY_6 0x0000000000000012 -+ KEY_7 0x000000000000001A -+ KEY_8 0x0000000000000006 -+ KEY_9 0x0000000000000016 -+ KEY_0 0x000000000000001E -+ KEY_VOLUMEUP 0x0000000000000005 -+ KEY_VOLUMEDOWN 0x000000000000001D - SOURCE 0x0000000000000003 -- MUTE 0x000000000000001B -- AUDIO 0x0000000000000015 -- VIDEO 0x0000000000000011 -- CANCEL 0x000000000000001F -- ENTER 0x0000000000000001 -- ESC 0x000000000000000B -+ KEY_MUTE 0x000000000000001B -+ KEY_AUDIO 0x0000000000000015 -+ KEY_VIDEO 0x0000000000000011 -+ KEY_CANCEL 0x000000000000001F -+ KEY_ENTER 0x0000000000000001 -+ KEY_ESC 0x000000000000000B - RECALL 0x000000000000000C - AIR_CATV 0x000000000000000E - INC 0x000000000000000A - DEC 0x000000000000000D - BOX 0x0000000000000017 -- DOWN_ARROW 0x0000000000000013 -- LEFT_ARROW_TERM 0x000000000000000F -- RIGHT_ARROW_TERM 0x0000000000000007 -+ KEY_DOWN 0x0000000000000013 -+ KEY_LEFT 0x000000000000000F -+ KEY_RIGHT 0x0000000000000007 - end codes - end remote -Index: lirc-0.8.7pre2/remotes/cph03x/lircd.conf.cph03x -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/cph03x/lircd.conf.cph03x -+++ lirc-0.8.7pre2/remotes/cph03x/lircd.conf.cph03x -@@ -32,39 +32,39 @@ begin remote - repeat_bit 0 - - begin codes -- 0 0x00000000000000FF -- 1 0x000000000000807F -- 2 0x00000000000040BF -- 3 0x000000000000C03F -- 4 0x00000000000020DF -- 5 0x000000000000A05F -- 6 0x000000000000609F -- 7 0x000000000000E01F -- 8 0x00000000000010EF -- 9 0x000000000000906F -+ KEY_0 0x00000000000000FF -+ KEY_1 0x000000000000807F -+ KEY_2 0x00000000000040BF -+ KEY_3 0x000000000000C03F -+ KEY_4 0x00000000000020DF -+ KEY_5 0x000000000000A05F -+ KEY_6 0x000000000000609F -+ KEY_7 0x000000000000E01F -+ KEY_8 0x00000000000010EF -+ KEY_9 0x000000000000906F - LOOP 0x00000000000050AF - # unused - FINE_UP(PLUS) 0x00000000000030CF -- ZOOM 0x000000000000B04F -- RECORD 0x000000000000708F -- PREVIEW 0x000000000000F00F -+ KEY_ZOOM 0x000000000000B04F -+ KEY_RECORD 0x000000000000708F -+ KEY_PREVIOUS 0x000000000000F00F - - SCAN 0x00000000000008F7 -- VIDEO 0x0000000000008877 -- POWER 0x00000000000048B7 -- MUTE 0x000000000000C837 -+ KEY_VIDEO 0x0000000000008877 -+ KEY_POWER 0x00000000000048B7 -+ KEY_MUTE 0x000000000000C837 - COLOR 0x00000000000028D7 - #unused - FREEZE 0x0000000000006897 - 100 0x000000000000E817 - FINE_DOWN(MINUS) 0x00000000000018E7 -- PLAY 0x0000000000009867 -- CH_UP 0x00000000000058A7 -- VOL_UP 0x000000000000D827 -- TV 0x00000000000038C7 -- STOP 0x000000000000B847 -- CH_DOWN 0x0000000000007887 -- VOL_DOWN 0x000000000000F807 -+ KEY_PLAY 0x0000000000009867 -+ KEY_CHANNELUP 0x00000000000058A7 -+ KEY_VOLUMEUP 0x000000000000D827 -+ KEY_TV 0x00000000000038C7 -+ KEY_STOP 0x000000000000B847 -+ KEY_CHANNELDOWN 0x0000000000007887 -+ KEY_VOLUMEDOWN 0x000000000000F807 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.alsa_usb -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.alsa_usb -+++ lirc-0.8.7pre2/remotes/creative/lircd.conf.alsa_usb -@@ -34,38 +34,38 @@ begin remote - - - begin codes -- Power 0x000000000000619E -- 1 0x0000000000008B74 -- 2 0x0000000000008F70 -- 3 0x000000000000906F -- 4 0x0000000000008A75 -- 5 0x000000000000847B -- 6 0x0000000000007887 -- 7 0x0000000000008976 -- 8 0x000000000000837C -- 9 0x0000000000007788 -- 0 0x000000000000807F -+ KEY_POWER 0x000000000000619E -+ KEY_1 0x0000000000008B74 -+ KEY_2 0x0000000000008F70 -+ KEY_3 0x000000000000906F -+ KEY_4 0x0000000000008A75 -+ KEY_5 0x000000000000847B -+ KEY_6 0x0000000000007887 -+ KEY_7 0x0000000000008976 -+ KEY_8 0x000000000000837C -+ KEY_9 0x0000000000007788 -+ KEY_0 0x000000000000807F - CMSS 0x000000000000718E - EAX 0x0000000000008C73 -- Mute 0x0000000000006E91 -- Vol_Down 0x000000000000639C -- Vol_Up 0x000000000000629D -- Up 0x0000000000007B84 -- Left 0x0000000000008778 -- Ok 0x000000000000817E -- Right 0x000000000000758A -- Down 0x0000000000008D72 -+ KEY_MUTE 0x0000000000006E91 -+ KEY_VOLUMEDOWN 0x000000000000639C -+ KEY_VOLUMEUP 0x000000000000629D -+ KEY_UP 0x0000000000007B84 -+ KEY_LEFT 0x0000000000008778 -+ KEY_OK 0x000000000000817E -+ KEY_RIGHT 0x000000000000758A -+ KEY_DOWN 0x0000000000008D72 - Return 0x0000000000008E71 - Start 0x0000000000008877 -- Cancel 0x0000000000007C83 -- Rec 0x000000000000738C -- Options 0x000000000000827D -+ KEY_CANCEL 0x0000000000007C83 -+ KEY_RECORD 0x000000000000738C -+ KEY_OPTION 0x000000000000827D - Display 0x0000000000007689 -- Previous 0x0000000000007F80 -- Play 0x0000000000007986 -- Next 0x0000000000007A85 -- Slow 0x0000000000007D82 -- Stop 0x000000000000857A -+ KEY_PREVIOUS 0x0000000000007F80 -+ KEY_PLAY 0x0000000000007986 -+ KEY_NEXT 0x0000000000007A85 -+ KEY_SLOW 0x0000000000007D82 -+ KEY_STOP 0x000000000000857A - Step 0x0000000000007E81 - end codes - -Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.breakoutbox -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.breakoutbox -+++ lirc-0.8.7pre2/remotes/creative/lircd.conf.breakoutbox -@@ -19,37 +19,37 @@ begin remote - begin codes - DVD/CD 0x0000000000000001 - DVR/TV 0x0000000000000000 -- MENU 0x0000000000000003 -- LANG 0x0000000000000005 -+ KEY_MENU 0x0000000000000003 -+ KEY_LANGUAGE 0x0000000000000005 - PLAYLIST 0x0000000000000011 -- BACKWARD 0x000000000000000A -- PLAY 0x0000000000000008 -- FORWARD 0x000000000000000F -+ KEY_REWIND 0x000000000000000A -+ KEY_PLAY 0x0000000000000008 -+ KEY_FORWARD 0x000000000000000F - LAST 0x0000000000000002 -- STOP 0x0000000000000007 -- NEXT 0x0000000000000006 -- MUTE 0x0000000000000014 -+ KEY_STOP 0x0000000000000007 -+ KEY_NEXT 0x0000000000000006 -+ KEY_MUTE 0x0000000000000014 - STEP 0x0000000000000009 -- UP 0x000000000000000C -- LEFT 0x000000000000000B -- RIGHT 0x000000000000000D -- DOWN 0x000000000000000E -- VOL+ 0x0000000000000012 -- VOL- 0x0000000000000015 -- OK 0x0000000000000011 -+ KEY_UP 0x000000000000000C -+ KEY_LEFT 0x000000000000000B -+ KEY_RIGHT 0x000000000000000D -+ KEY_DOWN 0x000000000000000E -+ KEY_VOLUMEUP 0x0000000000000012 -+ KEY_VOLUMEDOWN 0x0000000000000015 -+ KEY_OK 0x0000000000000011 - ANGLE+ 0x0000000000000010 - ANGLE- 0x0000000000000013 -- REC 0x0000000000000004 -- 1 0x0000000000000016 -- 2 0x0000000000000017 -- 3 0x0000000000000018 -- 4 0x0000000000000019 -- 5 0x000000000000001A -- 6 0x000000000000001B -- 7 0x000000000000001C -- 8 0x000000000000001D -- 9 0x000000000000001E -- 0 0x000000000000001F -+ KEY_RECORD 0x0000000000000004 -+ KEY_1 0x0000000000000016 -+ KEY_2 0x0000000000000017 -+ KEY_3 0x0000000000000018 -+ KEY_4 0x0000000000000019 -+ KEY_5 0x000000000000001A -+ KEY_6 0x000000000000001B -+ KEY_7 0x000000000000001C -+ KEY_8 0x000000000000001D -+ KEY_9 0x000000000000001E -+ KEY_0 0x000000000000001F - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.creative -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.creative -+++ lirc-0.8.7pre2/remotes/creative/lircd.conf.creative -@@ -23,30 +23,30 @@ begin remote - toggle_bit 0 - - begin codes -- play 0x19e6 -- stop 0x1ae5 -- pause 0x1be4 -- eject 0x1ce3 -+ KEY_PLAY 0x19e6 -+ KEY_STOP 0x1ae5 -+ KEY_PAUSE 0x1be4 -+ KEY_EJECTCD 0x1ce3 - last 0x1de2 - rrev 0x1ee1 -- ffwd 0x1fe0 -- next 0x20df -- 1 0x21de -- 2 0x22dd -- 3 0x23dc -+ KEY_FASTFORWARD 0x1fe0 -+ KEY_NEXT 0x20df -+ KEY_1 0x21de -+ KEY_2 0x22dd -+ KEY_3 0x23dc - shift 0x24db -- 4 0x25da -- 5 0x26d9 -- 6 0x27d8 -+ KEY_4 0x25da -+ KEY_5 0x26d9 -+ KEY_6 0x27d8 - mouse 0x28d7 -- 7 0x29d6 -- 8 0x2ad5 -- 9 0x2bd4 -- vol+ 0x2cd3 -+ KEY_7 0x29d6 -+ KEY_8 0x2ad5 -+ KEY_9 0x2bd4 -+ KEY_VOLUMEUP 0x2cd3 - start 0x2dd2 -- 0 0x2ed1 -- mute 0x2fd0 -- vol- 0x30cf -+ KEY_0 0x2ed1 -+ KEY_MUTE 0x2fd0 -+ KEY_VOLUMEDOWN 0x30cf - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.livedrive -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.livedrive -+++ lirc-0.8.7pre2/remotes/creative/lircd.conf.livedrive -@@ -29,40 +29,40 @@ begin remote - - - begin codes -- 1 0x0000000000008B74 -- 2 0x0000000000008F70 -- 3 0x000000000000906F -- 4 0x0000000000008A75 -- 5 0x000000000000847B -- 6 0x0000000000007887 -- 7 0x0000000000008976 -- 8 0x000000000000837C -- 9 0x0000000000007788 -- 0 0x000000000000807F -- stop 0x000000000000857A -- play 0x0000000000007986 -- pause 0x0000000000007986 -- slow 0x0000000000007D82 -+ KEY_1 0x0000000000008B74 -+ KEY_2 0x0000000000008F70 -+ KEY_3 0x000000000000906F -+ KEY_4 0x0000000000008A75 -+ KEY_5 0x000000000000847B -+ KEY_6 0x0000000000007887 -+ KEY_7 0x0000000000008976 -+ KEY_8 0x000000000000837C -+ KEY_9 0x0000000000007788 -+ KEY_0 0x000000000000807F -+ KEY_STOP 0x000000000000857A -+ KEY_PLAY 0x0000000000007986 -+ KEY_PAUSE 0x0000000000007986 -+ KEY_SLOW 0x0000000000007D82 - step 0x0000000000007E81 -- prev 0x0000000000007F80 -- next 0x0000000000007A85 -- mute 0x0000000000006E91 -- vol- 0x000000000000639C -- vol+ 0x000000000000629D -+ KEY_PREVIOUS 0x0000000000007F80 -+ KEY_NEXT 0x0000000000007A85 -+ KEY_MUTE 0x0000000000006E91 -+ KEY_VOLUMEDOWN 0x000000000000639C -+ KEY_VOLUMEUP 0x000000000000629D - eax 0x0000000000008C73 -- options 0x000000000000827D -+ KEY_OPTION 0x000000000000827D - display 0x0000000000007689 - return 0x0000000000008E71 - start 0x0000000000008877 -- close 0x0000000000007C83 -- up 0x0000000000007B84 -- down 0x0000000000008D72 -- left 0x0000000000008778 -- right 0x000000000000758A -- ok 0x000000000000817E -- power 0x000000000000619e -+ KEY_CLOSE 0x0000000000007C83 -+ KEY_UP 0x0000000000007B84 -+ KEY_DOWN 0x0000000000008D72 -+ KEY_LEFT 0x0000000000008778 -+ KEY_RIGHT 0x000000000000758A -+ KEY_OK 0x000000000000817E -+ KEY_POWER 0x000000000000619e - cmss 0x000000000000718e -- record 0x000000000000738c -+ KEY_RECORD 0x000000000000738c - - end codes - -Index: lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/dvico/lircd.conf.fusionHDTV -+++ lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV -@@ -22,42 +22,42 @@ begin remote - toggle_bit 0 - - begin codes -- 1 0x00000000000011F9 -- 2 0x00000000000012F9 -- 3 0x00000000000013F9 -- 4 0x00000000000014F9 -- 5 0x00000000000015F9 -- 6 0x00000000000016F9 -- 7 0x00000000000017F9 -- 8 0x00000000000018F9 -- 9 0x00000000000019F9 -- 0 0x00000000000010F9 -- power 0x0000000000000AF9 -+ KEY_1 0x00000000000011F9 -+ KEY_2 0x00000000000012F9 -+ KEY_3 0x00000000000013F9 -+ KEY_4 0x00000000000014F9 -+ KEY_5 0x00000000000015F9 -+ KEY_6 0x00000000000016F9 -+ KEY_7 0x00000000000017F9 -+ KEY_8 0x00000000000018F9 -+ KEY_9 0x00000000000019F9 -+ KEY_0 0x00000000000010F9 -+ KEY_POWER 0x0000000000000AF9 - pcoff 0x0000000000000CF9 -- camera 0x0000000000001AF9 -- record 0x0000000000001BF9 -- chup 0x00000000000000F9 -- chdown 0x00000000000001F9 -- volup 0x00000000000002F9 -- voldown 0x00000000000003F9 -- playpause 0x0000000000001FF9 -- rew 0x0000000000001CF9 -- stop 0x0000000000001EF9 -- ff 0x0000000000001DF9 -- folder 0x00000000000040F9 -+ KEY_CAMERA 0x0000000000001AF9 -+ KEY_RECORD 0x0000000000001BF9 -+ KEY_CHANNELUP 0x00000000000000F9 -+ KEY_CHANNELDOWN 0x00000000000001F9 -+ KEY_VOLUMEUP 0x00000000000002F9 -+ KEY_VOLUMEDOWN 0x00000000000003F9 -+ KEY_PLAYPAUSE 0x0000000000001FF9 -+ KEY_REWIND 0x0000000000001CF9 -+ KEY_STOP 0x0000000000001EF9 -+ KEY_FASTFORWARD 0x0000000000001DF9 -+ KEY_DIRECTORY 0x00000000000040F9 - atvdtv 0x00000000000006F9 - dvhs 0x00000000000041F9 -- menu 0x00000000000008F9 -+ KEY_MENU 0x00000000000008F9 - aspect 0x00000000000007F9 -- zoom 0x00000000000004F9 -- epg 0x0000000000000BF9 -- mute 0x0000000000000DF9 -- back 0x0000000000000EF9 -+ KEY_ZOOM 0x00000000000004F9 -+ KEY_EPG 0x0000000000000BF9 -+ KEY_MUTE 0x0000000000000DF9 -+ KEY_BACK 0x0000000000000EF9 - hd 0x0000000000000FF9 -- red 0x00000000000005F9 -- green 0x00000000000009F9 -- yellow 0x00000000000042F9 -- blue 0x00000000000043F9 -+ KEY_RED 0x00000000000005F9 -+ KEY_GREEN 0x00000000000009F9 -+ KEY_YELLOW 0x00000000000042F9 -+ KEY_BLUE 0x00000000000043F9 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/ea65/lircd.conf.ea65 -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/ea65/lircd.conf.ea65 -+++ lirc-0.8.7pre2/remotes/ea65/lircd.conf.ea65 -@@ -18,53 +18,53 @@ begin remote - htpc 0x0011811b - dvd/vcd 0x00128100 - cd/mp3 0x00138152 -- fm 0x00158111 -- video 0x0016810f -+ KEY_RADIO 0x00158111 -+ KEY_VIDEO 0x0016810f - -- 1 0x0041810b -- 2 0x00428115 -- 3 0x00438112 -- 4 0x00448141 -- 5 0x00458119 -- 6 0x00468116 -- 7 0x00478150 -- 8 0x0048811a -- 9 0x00498155 -+ KEY_1 0x0041810b -+ KEY_2 0x00428115 -+ KEY_3 0x00438112 -+ KEY_4 0x00448141 -+ KEY_5 0x00458119 -+ KEY_6 0x00468116 -+ KEY_7 0x00478150 -+ KEY_8 0x0048811a -+ KEY_9 0x00498155 - * 0x00328156 -- 0 0x00408158 -+ KEY_0 0x00408158 - # 0x0030814d - -- menu 0x00188104 -- exit 0x001d8154 -- enter 0x001e8101 -- up 0x00198159 -- down 0x001a811c -- left 0x001c8102 -- right 0x001b815d -+ KEY_MENU 0x00188104 -+ KEY_EXIT 0x001d8154 -+ KEY_ENTER 0x001e8101 -+ KEY_UP 0x00198159 -+ KEY_DOWN 0x001a811c -+ KEY_LEFT 0x001c8102 -+ KEY_RIGHT 0x001b815d - -- vol+ 0x00298103 -- vol- 0x002a814e -- ch+ 0x002c8113 -- ch- 0x002d8117 -- mute 0x00288105 -+ KEY_VOLUMEUP 0x00298103 -+ KEY_VOLUMEDOWN 0x002a814e -+ KEY_CHANNELUP 0x002c8113 -+ KEY_CHANNELDOWN 0x002d8117 -+ KEY_MUTE 0x00288105 - tune+ 0x002e8144 - tune- 0x002f8148 - mem 0x00318145 - scan 0x00278151 - - display 0x0034811f -- eject 0x0035815c -- rwnd 0x00228118 -- ffwd 0x00218110 -- rec 0x002b810a -- repeate 0x0038815a -- prev 0x00238107 -- next 0x00248114 -+ KEY_EJECTCD 0x0035815c -+ KEY_REWIND 0x00228118 -+ KEY_FASTFORWARD 0x00218110 -+ KEY_RECORD 0x002b810a -+ KEY_AGAIN 0x0038815a -+ KEY_PREVIOUS 0x00238107 -+ KEY_NEXT 0x00248114 - time/shift 0x00338108 -- stop 0x0020811d -- play/pause 0x001f8109 -+ KEY_STOP 0x0020811d -+ KEY_PLAYPAUSE 0x001f8109 - -- play-pause 0x0080811d -+ KEY_PLAYPAUSE 0x0080811d - stop-eject 0x00238107 - mode- 0x00ff1080 - mode+ 0x00ff1180 -Index: lirc-0.8.7pre2/remotes/ericsson/lircd.conf.bte -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/ericsson/lircd.conf.bte -+++ lirc-0.8.7pre2/remotes/ericsson/lircd.conf.bte -@@ -11,29 +11,29 @@ - - begin remote - -- name bte -+ name bte - bits 16 - - begin codes -- 0 0x0030 -- 1 0x0031 -- 2 0x0032 -- 3 0x0033 -- 4 0x0034 -- 5 0x0035 -- 6 0x0036 -- 7 0x0037 -- 8 0x0038 -- 9 0x0039 -- STAR 0x002a # '*' -- HASH 0x0023 # '#' -- UP 0x005e # '^' -- DOWN 0x0076 # 'v' -- LEFT 0x003c # '<' -- RIGHT 0x003e # '>' -- CANCEL 0x0063 # 'c' -- VOL_UP 0x0075 # 'u' -- VOL_DOWN 0x0064 # 'd' -+ KEY_0 0x0030 -+ KEY_1 0x0031 -+ KEY_2 0x0032 -+ KEY_3 0x0033 -+ KEY_4 0x0034 -+ KEY_5 0x0035 -+ KEY_6 0x0036 -+ KEY_7 0x0037 -+ KEY_8 0x0038 -+ KEY_9 0x0039 -+ STAR 0x002a # '*' -+ HASH 0x0023 # '#' -+ KEY_UP 0x005e # '^' -+ KEY_DOWN 0x0076 # 'v' -+ KEY_LEFT 0x003c # '<' -+ KEY_RIGHT 0x003e # '>' -+ KEY_CANCEL 0x0063 # 'c' -+ KEY_VOLUMEUP 0x0075 # 'u' -+ KEY_VOLUMEDOWN 0x0064 # 'd' - - # t520m - NO 0x0065 # 'e' -@@ -45,8 +45,8 @@ begin remote - F_LEFT 0x005b # '[' - F_RIGHT 0x005d # ']' - triggers 'e' - J_CLICK 0x3a4a # ':J' - triggers 'e' -- RETURN 0x3a52 # ':R' - triggers 'e' -- CAMERA 0x3a43 # ':C' -+ KEY_ENTER 0x3a52 # ':R' - triggers 'e' -+ KEY_CAMERA 0x3a43 # ':C' - WAP 0x3a4f # ':O' - - end codes -Index: lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/hauppauge/lircd.conf.hauppauge -+++ lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge -@@ -27,25 +27,25 @@ begin remote - repeat_bit 2 - - begin codes -- TV 0x000000000000100F -- RADIO 0x000000000000100C -+ KEY_TV 0x000000000000100F -+ KEY_RADIO 0x000000000000100C - FULL_SCREEN 0x000000000000102E -- CH+ 0x0000000000001020 -- CH- 0x0000000000001021 -- VOL- 0x0000000000001011 -- VOL+ 0x0000000000001010 -- MUTE 0x000000000000100D -+ KEY_CHANNELUP 0x0000000000001020 -+ KEY_CHANNELDOWN 0x0000000000001021 -+ KEY_VOLUMEDOWN 0x0000000000001011 -+ KEY_VOLUMEUP 0x0000000000001010 -+ KEY_MUTE 0x000000000000100D - SOURCE 0x0000000000001022 -- 1 0x0000000000001001 -- 2 0x0000000000001002 -- 3 0x0000000000001003 -- 4 0x0000000000001004 -- 5 0x0000000000001005 -- 6 0x0000000000001006 -- 7 0x0000000000001007 -- 8 0x0000000000001008 -- 9 0x0000000000001009 -- 0 0x0000000000001000 -+ KEY_1 0x0000000000001001 -+ KEY_2 0x0000000000001002 -+ KEY_3 0x0000000000001003 -+ KEY_4 0x0000000000001004 -+ KEY_5 0x0000000000001005 -+ KEY_6 0x0000000000001006 -+ KEY_7 0x0000000000001007 -+ KEY_8 0x0000000000001008 -+ KEY_9 0x0000000000001009 -+ KEY_0 0x0000000000001000 - RESERVED 0x000000000000101E - MINIMIZE 0x0000000000001026 - end codes -Index: lirc-0.8.7pre2/remotes/hercules/lircd.conf.smarttv_stereo -=================================================================== -Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon -+++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon -@@ -29,48 +29,48 @@ begin remote - duty_cycle 33 - - begin codes -- App.Exit 0x00000000000000FF -- Power 0x000000000000807F -- 1 0x00000000000040BF -- 2 0x000000000000C03F -- 3 0x00000000000020DF -- 4 0x000000000000A05F -- 5 0x000000000000609F -- 6 0x000000000000E01F -- 7 0x00000000000010EF -- 8 0x000000000000906F -- 9 0x00000000000050AF -- 0 0x000000000000D02F -+ KEY_EXIT 0x00000000000000FF -+ KEY_POWER 0x000000000000807F -+ KEY_1 0x00000000000040BF -+ KEY_2 0x000000000000C03F -+ KEY_3 0x00000000000020DF -+ KEY_4 0x000000000000A05F -+ KEY_5 0x000000000000609F -+ KEY_6 0x000000000000E01F -+ KEY_7 0x00000000000010EF -+ KEY_8 0x000000000000906F -+ KEY_9 0x00000000000050AF -+ KEY_0 0x000000000000D02F - Windows 0x00000000000030CF -- Menu 0x000000000000B04F -+ KEY_MENU 0x000000000000B04F - App.Launcher 0x000000000000708F - Function 0x000000000000F00F - Task.Switcher 0x00000000000008F7 -- Back 0x0000000000008877 -- Select 0x00000000000048B7 -- Eject 0x0000000000009867 -- Delete 0x00000000000018E7 -- Up 0x000000000000C837 -- Right 0x0000000000006897 -- Down 0x000000000000E817 -- Left 0x00000000000028D7 -- Enter 0x000000000000A857 -- Vol- 0x00000000000058A7 -- Vol+ 0x000000000000D827 -- Mute 0x00000000000038C7 -- Play 0x000000000000B847 -- Pause 0x0000000000007887 -- Prev 0x000000000000F807 -- Next 0x00000000000002FD -- Rew 0x000000000000827D -- Fwd 0x00000000000042BD -- Stop 0x000000000000C23D -- Open 0x00000000000022DD -- Rec 0x000000000000A25D -- Bookmark 0x000000000000629D -+ KEY_BACK 0x0000000000008877 -+ KEY_SELECT 0x00000000000048B7 -+ KEY_EJECTCD 0x0000000000009867 -+ KEY_DELETE 0x00000000000018E7 -+ KEY_UP 0x000000000000C837 -+ KEY_RIGHT 0x0000000000006897 -+ KEY_DOWN 0x000000000000E817 -+ KEY_LEFT 0x00000000000028D7 -+ KEY_ENTER 0x000000000000A857 -+ KEY_VOLUMEDOWN 0x00000000000058A7 -+ KEY_VOLUMEUP 0x000000000000D827 -+ KEY_MUTE 0x00000000000038C7 -+ KEY_PLAY 0x000000000000B847 -+ KEY_PAUSE 0x0000000000007887 -+ KEY_PREVIOUS 0x000000000000F807 -+ KEY_NEXT 0x00000000000002FD -+ KEY_REWIND 0x000000000000827D -+ KEY_FORWARD 0x00000000000042BD -+ KEY_STOP 0x000000000000C23D -+ KEY_OPEN 0x00000000000022DD -+ KEY_RECORD 0x000000000000A25D -+ KEY_BOOKMARKS 0x000000000000629D - Thumbnail 0x000000000000E21D - Aspect 0x00000000000012ED -- DVD.Menu 0x000000000000926D -+ KEY_DVD 0x000000000000926D - DVD.Caption 0x00000000000052AD - DVD.Language 0x000000000000D22D - Full.Screen 0x00000000000032CD -Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-knob -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon-knob -+++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-knob -@@ -23,83 +23,77 @@ begin remote - - - begin codes -- AppExit 0x288195B7 -- Power 0x289115B7 -- Record 0x298115B7 -- Play 0x2A8115B7 -- Open 0x29B195B7 -- KnobVolUp 0x000100FF -- KnobVolDown 0x010000FF -- KnobMute 0x000008FF -- Rewind 0x2A8195B7 -- Pause 0x2A9115B7 -- FastForward 0x2B8115B7 -- PrevChapter 0x2B9115B7 -- Stop 0x2B9715B7 -- NextChapter 0x298195B7 -+ KEY_EXIT 0x288195B7 -+ KEY_POWER 0x289115B7 -+ KEY_RECORD 0x298115B7 -+ KEY_PLAY 0x2A8115B7 -+ KEY_OPEN 0x29B195B7 -+ KEY_VOLUMEUP 0x000100FF -+ KEYVOLUMEDOWN 0x010000FF -+ KEY_MUTE 0x000008FF -+ KEY_REWIND 0x2A8195B7 -+ KEY_PAUSE 0x2A9115B7 -+ KEY_FASTFORWARD 0x2B8115B7 -+ KEY_PREVIOUS 0x2B9115B7 -+ KEY_STOP 0x2B9715B7 -+ KEY_NEXT 0x298195B7 - WindowsKey 0x2B8195B7 -- Backspace 0x28A115B7 -+ KEY_BACKSPACE 0x28A115B7 - MouseKeyboard 0x299115B7 -- SelectSpace 0x2A9315B7 -+ KEY_SELECT 0x2A9315B7 - MouseMenu 0x28B715B7 -- MouseRightClick 0x688481B7 -- Enter 0x28A195B7 -- MouseLeftClick 0x688301B7 -- CursorLeft 0x6ABA81B7 -- CursorUp 0x6902F9B7 -- CursorRight 0x68A281B7 -- CursorDown 0x6882A1B7 -+ BTN_RIGHT 0x688481B7 -+ KEY_ENTER 0x28A195B7 -+ BTN_LEFT 0x688301B7 -+ KEY_LEFT 0x6ABA81B7 -+ KEY_UP 0x6902F9B7 -+ KEY_RIGHT 0x68A281B7 -+ KEY_DOWN 0x6882A1B7 - # version 2 of keypad -- CursorUp 0x2aa515b7 -- CursorDown 0x289515b7 -- CursorLeft 0x29a515b7 -- CursorRight 0x2ba515b7 -+ KEY_UP 0x2aa515b7 -+ KEY_DOWN 0x289515b7 -+ KEY_LEFT 0x29a515b7 -+ KEY_RIGHT 0x2ba515b7 - # version 3 of keypad -- CursorUp 0x01008000 -- CursorDown 0x01007f00 -- CursorLeft 0x01000080 -- CursorRight 0x0100007f -- Esc 0x2BB715B7 -- Eject 0x299395B7 -+ KEY_UP 0x01008000 -+ KEY_DOWN 0x01007f00 -+ KEY_LEFT 0x01000080 -+ KEY_RIGHT 0x0100007f -+ KEY_ESC 0x2BB715B7 -+ KEY_EJECT 0x299395B7 - AppLauncher 0x29B715B7 - MultiMon 0x2AB195B7 - TaskSwitcher 0x2A9395B7 -- Mute 0x2B9595B7 -- VolUp 0x28A395B7 -- VolDown 0x28A595B7 -- ChUp 0x289395B7 -- ChDown 0x288795B7 -+ KEY_MUTE 0x2B9595B7 -+ KEY_VOLUMEUP 0x28A395B7 -+ KEY_VOLUMEDOWN 0x28A595B7 -+ KEY_CHANNELUP 0x289395B7 -+ KEY_CHANNELDOWN 0x288795B7 - Timer 0x2B8395B7 -- 1 0x28B595B7 -- 2 0x2BB195B7 -- 3 0x28B195B7 -- 4 0x2A8595B7 -- 5 0x299595B7 -- 6 0x2AA595B7 -- 7 0x2B9395B7 -- 8 0x2A8515B7 -- 9 0x2AA115B7 -+ KEY_1 0x28B595B7 -+ KEY_2 0x2BB195B7 -+ KEY_3 0x28B195B7 -+ KEY_4 0x2A8595B7 -+ KEY_5 0x299595B7 -+ KEY_6 0x2AA595B7 -+ KEY_7 0x2B9395B7 -+ KEY_8 0x2A8515B7 -+ KEY_9 0x2AA115B7 - ShiftTab 0x28B515B7 -- 0 0x2BA595B7 -- Tab 0x29A115B7 -- MyMovie 0x2B8515B7 -- MyMusic 0x299195B7 -- MyPhoto 0x2BA115B7 -- MyTV 0x28A515B7 -- Bookmark 0x288515B7 -+ KEY_0 0x2BA595B7 -+ KEY_TAB 0x29A115B7 -+ KEY_VIDEO 0x2B8515B7 -+ KEY_AUDIO 0x299195B7 -+ KEY_PHOTO 0x2BA115B7 -+ KEY_TV 0x28A515B7 -+ KEY_BOOKMARKS 0x288515B7 - Thumbnail 0x2AB715B7 - AspectRatio 0x29A595B7 - FullScreen 0x2AA395B7 -- MyDVD 0x29A295B7 -- Menu 0x2BA385B7 -+ KEY_DVD 0x29A295B7 -+ KEY_MENU 0x2BA385B7 - Caption 0x298595B7 -- Language 0x2B8595B7 --# these codes may be wrong, but they were included in the first version of --# this config file -- 0 0x2BA595BF -- NextChapter 0x298195BF -- Thumbnail 0x2AB715BF -- FullScreen 0x2AA395BF -+ KEY_LANGUAGE 0x2B8595B7 - - end codes - -@@ -124,83 +118,77 @@ begin remote - - - begin codes -- AppExit 0x288195B7 -- Power 0x289115B7 -- Record 0x298115B7 -- Play 0x2A8115B7 -- Open 0x29B195B7 -- KnobVolUp 0x000100FF -- KnobVolDown 0x010000FF -- KnobMute 0x000008FF -- Rewind 0x2A8195B7 -- Pause 0x2A9115B7 -- FastForward 0x2B8115B7 -- PrevChapter 0x2B9115B7 -- Stop 0x2B9715B7 -- NextChapter 0x298195B7 -+ KEY_EXIT 0x288195B7 -+ KEY_POWER 0x289115B7 -+ KEY_RECORD 0x298115B7 -+ KEY_PLAY 0x2A8115B7 -+ KEY_OPEN 0x29B195B7 -+ KEY_VOLUMEUP 0x000100FF -+ KEYVOLUMEDOWN 0x010000FF -+ KEY_MUTE 0x000008FF -+ KEY_REWIND 0x2A8195B7 -+ KEY_PAUSE 0x2A9115B7 -+ KEY_FASTFORWARD 0x2B8115B7 -+ KEY_PREVIOUS 0x2B9115B7 -+ KEY_STOP 0x2B9715B7 -+ KEY_NEXT 0x298195B7 - WindowsKey 0x2B8195B7 -- Backspace 0x28A115B7 -+ KEY_BACKSPACE 0x28A115B7 - MouseKeyboard 0x299115B7 -- SelectSpace 0x2A9315B7 -+ KEY_SELECT 0x2A9315B7 - MouseMenu 0x28B715B7 -- MouseRightClick 0x688481B7 -- Enter 0x28A195B7 -- MouseLeftClick 0x688301B7 -- CursorLeft 0x6ABA81B7 -- CursorUp 0x6902F9B7 -- CursorRight 0x68A281B7 -- CursorDown 0x6882A1B7 -+ BTN_RIGHT 0x688481B7 -+ KEY_ENTER 0x28A195B7 -+ BTN_LEFT 0x688301B7 -+ KEY_LEFT 0x6ABA81B7 -+ KEY_UP 0x6902F9B7 -+ KEY_RIGHT 0x68A281B7 -+ KEY_DOWN 0x6882A1B7 - # version 2 of keypad -- CursorUp 0x2aa515b7 -- CursorDown 0x289515b7 -- CursorLeft 0x29a515b7 -- CursorRight 0x2ba515b7 -+ KEY_UP 0x2aa515b7 -+ KEY_DOWN 0x289515b7 -+ KEY_LEFT 0x29a515b7 -+ KEY_RIGHT 0x2ba515b7 - # version 3 of keypad -- CursorUp 0x01008000 -- CursorDown 0x01007f00 -- CursorLeft 0x01000080 -- CursorRight 0x0100007f -- Esc 0x2BB715B7 -- Eject 0x299395B7 -+ KEY_UP 0x01008000 -+ KEY_DOWN 0x01007f00 -+ KEY_LEFT 0x01000080 -+ KEY_RIGHT 0x0100007f -+ KEY_ESC 0x2BB715B7 -+ KEY_EJECT 0x299395B7 - AppLauncher 0x29B715B7 - MultiMon 0x2AB195B7 - TaskSwitcher 0x2A9395B7 -- Mute 0x2B9595B7 -- VolUp 0x28A395B7 -- VolDown 0x28A595B7 -- ChUp 0x289395B7 -- ChDown 0x288795B7 -+ KEY_MUTE 0x2B9595B7 -+ KEY_VOLUMEUP 0x28A395B7 -+ KEY_VOLUMEDOWN 0x28A595B7 -+ KEY_CHANNELUP 0x289395B7 -+ KEY_CHANNELDOWN 0x288795B7 - Timer 0x2B8395B7 -- 1 0x28B595B7 -- 2 0x2BB195B7 -- 3 0x28B195B7 -- 4 0x2A8595B7 -- 5 0x299595B7 -- 6 0x2AA595B7 -- 7 0x2B9395B7 -- 8 0x2A8515B7 -- 9 0x2AA115B7 -+ KEY_1 0x28B595B7 -+ KEY_2 0x2BB195B7 -+ KEY_3 0x28B195B7 -+ KEY_4 0x2A8595B7 -+ KEY_5 0x299595B7 -+ KEY_6 0x2AA595B7 -+ KEY_7 0x2B9395B7 -+ KEY_8 0x2A8515B7 -+ KEY_9 0x2AA115B7 - ShiftTab 0x28B515B7 -- 0 0x2BA595B7 -- Tab 0x29A115B7 -- MyMovie 0x2B8515B7 -- MyMusic 0x299195B7 -- MyPhoto 0x2BA115B7 -- MyTV 0x28A515B7 -- Bookmark 0x288515B7 -+ KEY_0 0x2BA595B7 -+ KEY_TAB 0x29A115B7 -+ KEY_VIDEO 0x2B8515B7 -+ KEY_AUDIO 0x299195B7 -+ KEY_PHOTO 0x2BA115B7 -+ KEY_TV 0x28A515B7 -+ KEY_BOOKMARKS 0x288515B7 - Thumbnail 0x2AB715B7 - AspectRatio 0x29A595B7 - FullScreen 0x2AA395B7 -- MyDVD 0x29A295B7 -- Menu 0x2BA385B7 -+ KEY_DVD 0x29A295B7 -+ KEY_MENU 0x2BA385B7 - Caption 0x298595B7 -- Language 0x2B8595B7 --# these codes may be wrong, but they were included in the first version of --# this config file -- 0 0x2BA595BF -- NextChapter 0x298195BF -- Thumbnail 0x2AB715BF -- FullScreen 0x2AA395BF -+ KEY_LANGUAGE 0x2B8595B7 - - end codes - -Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-pad -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon-pad -+++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-pad -@@ -24,99 +24,99 @@ begin remote - - - begin codes -- AppExit 0x288195B7 -- Power 0x289115B7 -- Record 0x298115B7 -- Play 0x2A8115B7 -+ KEY_EXIT 0x288195B7 -+ KEY_POWER 0x289115B7 -+ KEY_RECORD 0x298115B7 -+ KEY_PLAY 0x2A8115B7 - SlowMotion 0x29B195B7 -- Rewind 0x2A8195B7 -- Pause 0x2A9115B7 -- FastForward 0x2B8115B7 -- PrevChapter 0x2B9115B7 -- Stop 0x2B9715B7 -- NextChapter 0x298195B7 -- Esc 0x2BB715B7 -+ KEY_REWIND 0x2A8195B7 -+ KEY_PAUSE 0x2A9115B7 -+ KEY_FASTFORWARD 0x2B8115B7 -+ KEY_PREVIOUS 0x2B9115B7 -+ KEY_STOP 0x2B9715B7 -+ KEY_NEXT 0x298195B7 -+ KEY_ESC 0x2BB715B7 - Eject 0x299395B7 - AppLauncher 0x29B715B7 - MultiMon 0x2AB195B7 - TaskSwitcher 0x2A9395B7 -- Mute 0x2B9595B7 -- Vol+ 0x28A395B7 -- Vol- 0x28A595B7 -- Ch+ 0x289395B7 -- Ch- 0x288795B7 -+ KEY_MUTE 0x2B9595B7 -+ KEY_VOLUMEUP 0x28A395B7 -+ KEY_VOLUMEDOWN 0x28A595B7 -+ KEY_CHANNELUP 0x289395B7 -+ KEY_CHANNELDOWN 0x288795B7 - Timer 0x2B8395B7 -- 1 0x28B595B7 -- 2 0x2BB195B7 -- 3 0x28B195B7 -- 4 0x2A8595B7 -- 5 0x299595B7 -- 6 0x2AA595B7 -- 7 0x2B9395B7 -- 8 0x2A8515B7 -- 9 0x2AA115B7 -- 0 0x2BA595B7 -+ KEY_1 0x28B595B7 -+ KEY_2 0x2BB195B7 -+ KEY_3 0x28B195B7 -+ KEY_4 0x2A8595B7 -+ KEY_5 0x299595B7 -+ KEY_6 0x2AA595B7 -+ KEY_7 0x2B9395B7 -+ KEY_8 0x2A8515B7 -+ KEY_9 0x2AA115B7 -+ KEY_0 0x2BA595B7 - ShiftTab 0x28B515B7 -- Tab 0x29A115B7 -- MyMovie 0x2B8515B7 -- MyMusic 0x299195B7 -- MyPhoto 0x2BA115B7 -- MyTV 0x28A515B7 -- Bookmark 0x288515B7 -+ KEY_TAB 0x29A115B7 -+ KEY_VIDEO 0x2B8515B7 -+ KEY_AUDIO 0x299195B7 -+ KEY_PHOTO 0x2BA115B7 -+ KEY_TV 0x28A515B7 -+ KEY_BOOKMARKS 0x288515B7 - Thumbnail 0x2AB715B7 - AspectRatio 0x29A595B7 - FullScreen 0x2AA395B7 - -- MyDVD 0x29A295B7 -- Menu 0x2BA385B7 -+ KEY_DVD 0x29A295B7 -+ KEY_MENU 0x2BA385B7 - # different codes -- MyDVD 0x29A3D5B7 -- Menu 0x2BA3D5B7 -+ KEY_DVD 0x29A3D5B7 -+ KEY_MENU 0x2BA3D5B7 - - Caption 0x298595B7 -- Language 0x2B8595B7 -+ KEY_LANGUAGE 0x2B8595B7 - MouseKeyboard 0x299115B7 - SelectSpace 0x2A9315B7 - MouseMenu 0x28B715B7 -- MouseRightClick 0x688481B7 -- Enter 0x28A195B7 -- MouseLeftClick 0x688301B7 -+ BTN_RIGHT 0x688481B7 -+ KEY_ENTER 0x28A195B7 -+ BTN_LEFT 0x688301B7 - WindowsKey 0x2B8195B7 -- Backspace 0x28A115B7 -+ KEY_BACKSPACE 0x28A115B7 - # Corrin added -- Space 0x2B9B15F7 -- Up 0xEB53F9B7 -- Left 0x6ABAFFBF -- Down 0x6F9ECBB7 -- Right 0x69A281B7 -+ KEY_SPACE 0x2B9B15F7 -+ KEY_UP 0xEB53F9B7 -+ KEY_LEFT 0x6ABAFFBF -+ KEY_DOWN 0x6F9ECBB7 -+ KEY_RIGHT 0x69A281B7 - # Variants and additions of keys reported by Ryan Gardner -- 1 0x0200001E -- 2 0x0200001F -- 3 0x02000020 -- 4 0x02000021 -- 5 0x02000022 -- 6 0x02000023 -- 7 0x02000024 -- 8 0x02000025 -- 9 0x02000026 -+ KEY_1 0x0200001E -+ KEY_2 0x0200001F -+ KEY_3 0x02000020 -+ KEY_4 0x02000021 -+ KEY_5 0x02000022 -+ KEY_6 0x02000023 -+ KEY_7 0x02000024 -+ KEY_8 0x02000025 -+ KEY_9 0x02000026 - Star 0x02200025 -- 0 0x02000027 -+ KEY_0 0x02000027 - Hash 0x02200020 -- Backspace 0x0200002A -- Select 0x0200002C -+ KEY_BACKSPACE 0x0200002A -+ KEY_SELECT 0x0200002C - LeftMenu 0x02800000 - RightMenu 0x02000065 -- Enter 0x02000028 -- Escape 0x02000029 -- LeftClick 0x01010000 -- RightClick 0x01020000 -- Up 0x01008000 -- Down 0x01007F00 -- Left 0x01000080 -- Right 0x0100007F -+ KEY_ENTER 0x02000028 -+ KEY_ESC 0x02000029 -+ BTN_LEFT 0x01010000 -+ BTN_RIGHT 0x01020000 -+ KEY_UP 0x01008000 -+ KEY_DOWN 0x01007F00 -+ KEY_LEFT 0x01000080 -+ KEY_RIGHT 0x0100007F - # Variations on the mouse buttons from Jan Schneider -- LeftClick 0x01010080 -- RightClick 0x01020080 -+ BTN_LEFT 0x01010080 -+ BTN_RIGHT 0x01020080 - - end codes - -@@ -170,7 +170,7 @@ end remote - - begin remote - -- name iMON-PAD -+ name iMON-PAD64 - bits 64 - eps 30 - aeps 100 -@@ -182,98 +182,98 @@ begin remote - ignore_mask 0x00000000FFFFFFFF - - begin codes -- AppExit 0x288195B700002401 -- Power 0x289115B700002401 -- Record 0x298115B700002401 -- Play 0x2A8115B700002401 -+ KEY_EXIT 0x288195B700002401 -+ KEY_POWER 0x289115B700002401 -+ KEY_RECORD 0x298115B700002401 -+ KEY_PLAY 0x2A8115B700002401 - SlowMotion 0x29B195B700002401 -- Rewind 0x2A8195B700002401 -- Pause 0x2A9115B700002401 -- FastForward 0x2B8115B700002401 -- PrevChapter 0x2B9115B700002401 -- Stop 0x2B9715B700002401 -- NextChapter 0x298195B700002401 -- Esc 0x2BB715B700002401 -- Eject 0x299395B700002401 -+ KEY_REWIND 0x2A8195B700002401 -+ KEY_PAUSE 0x2A9115B700002401 -+ KEY_FASTFORWARD 0x2B8115B700002401 -+ KEY_PREVIOUS 0x2B9115B700002401 -+ KEY_STOP 0x2B9715B700002401 -+ KEY_NEXT 0x298195B700002401 -+ KEY_ESC 0x2BB715B700002401 -+ KEY_EJECT 0x299395B700002401 - AppLauncher 0x29B715B700002401 - MultiMon 0x2AB195B700002401 - TaskSwitcher 0x2A9395B700002401 -- Mute 0x2B9595B700002401 -- Vol+ 0x28A395B700002401 -- Vol- 0x28A595B700002401 -- Ch+ 0x289395B700002401 -- Ch- 0x288795B700002401 -+ KEY_MUTE 0x2B9595B700002401 -+ KEY_VOLUMEUP 0x28A395B700002401 -+ KEY_VOLUMEDOWN 0x28A595B700002401 -+ KEY_CHANNELUP 0x289395B700002401 -+ KEY_CHANNELDOWN 0x288795B700002401 - Timer 0x2B8395B700002401 -- 1 0x28B595B700002401 -- 2 0x2BB195B700002401 -- 3 0x28B195B700002401 -- 4 0x2A8595B700002401 -- 5 0x299595B700002401 -- 6 0x2AA595B700002401 -- 7 0x2B9395B700002401 -- 8 0x2A8515B700002401 -- 9 0x2AA115B700002401 -- 0 0x2BA595B700002401 -+ KEY_1 0x28B595B700002401 -+ KEY_2 0x2BB195B700002401 -+ KEY_3 0x28B195B700002401 -+ KEY_4 0x2A8595B700002401 -+ KEY_5 0x299595B700002401 -+ KEY_6 0x2AA595B700002401 -+ KEY_7 0x2B9395B700002401 -+ KEY_8 0x2A8515B700002401 -+ KEY_9 0x2AA115B700002401 -+ KEY_0 0x2BA595B700002401 - ShiftTab 0x28B515B700002401 -- Tab 0x29A115B700002401 -- MyMovie 0x2B8515B700002401 -- MyMusic 0x299195B700002401 -- MyPhoto 0x2BA115B700002401 -- MyTV 0x28A515B700002401 -- Bookmark 0x288515B700002401 -+ KEY_TAB 0x29A115B700002401 -+ KEY_VIDEO 0x2B8515B700002401 -+ KEY_AUDIO 0x299195B700002401 -+ KEY_PHOTO 0x2BA115B700002401 -+ KEY_TV 0x28A515B700002401 -+ KEY_BOOKMARKS 0x288515B700002401 - Thumbnail 0x2AB715B700002401 - AspectRatio 0x29A595B700002401 - FullScreen 0x2AA395B700002401 - -- MyDVD 0x29A295B700002401 -- Menu 0x2BA385B700002401 -+ KEY_DVD 0x29A295B700002401 -+ KEY_MENU 0x2BA385B700002401 - # different codes - # These codes are the button release codes, which will cause duplicate - # events, so they are commented out here. --# MyDVD 0x29A3D5B700002401 --# Menu 0x2BA3D5B700002401 -+# KEY_DVD 0x29A3D5B700002401 -+# KEY_MENU 0x2BA3D5B700002401 - - Caption 0x298595B700002401 -- Language 0x2B8595B700002401 -+ KEY_LANGUAGE 0x2B8595B700002401 - MouseKeyboard 0x299115B700002401 - SelectSpace 0x2A9315B700002401 - MouseMenu 0x28B715B700002401 -- MouseRightClick 0x688481B700002401 -- Enter 0x28A195B700002401 -- MouseLeftClick 0x688301B700002401 -+ BTN_RIGHT 0x688481B700002401 -+ KEY_ENTER 0x28A195B700002401 -+ BTN_LEFT 0x688301B700002401 - WindowsKey 0x2B8195B700002401 -- Backspace 0x28A115B700002401 -+ KEY_BACKSPACE 0x28A115B700002401 - # Corrin added -- Space 0x2B9B15F700002401 -- Up 0xEB53F9B700002401 -- Left 0x6ABAFFBF00002401 -- Down 0x6F9ECBB700002401 -- Right 0x69A281B700002401 -+ KEY_SPACE 0x2B9B15F700002401 -+ KEY_UP 0xEB53F9B700002401 -+ KEY_LEFT 0x6ABAFFBF00002401 -+ KEY_DOWN 0x6F9ECBB700002401 -+ KEY_RIGHT 0x69A281B700002401 - # Variants and additions of keys reported by Ryan Gardner -- 1 0x0200001E00000000 -- 2 0x0200001F00000000 -- 3 0x0200002000000000 -- 4 0x0200002100000000 -- 5 0x0200002200000000 -- 6 0x0200002300000000 -- 7 0x0200002400000000 -- 8 0x0200002500000000 -- 9 0x0200002600000000 -+ KEY_1 0x0200001E00000000 -+ KEY_2 0x0200001F00000000 -+ KEY_3 0x0200002000000000 -+ KEY_4 0x0200002100000000 -+ KEY_5 0x0200002200000000 -+ KEY_6 0x0200002300000000 -+ KEY_7 0x0200002400000000 -+ KEY_8 0x0200002500000000 -+ KEY_9 0x0200002600000000 - Star 0x0220002500000000 -- 0 0x0200002700000000 -+ KEY_0 0x0200002700000000 - Hash 0x0220002000000000 -- Backspace 0x0200002A00000000 -- Select 0x0200002C00000000 -+ KEY_BACKSPACE 0x0200002A00000000 -+ KEY_SELECT 0x0200002C00000000 - LeftMenu 0x0280000000000000 - RightMenu 0x0200006500000000 -- Enter 0x0200002800000000 -- Escape 0x0200002900000000 -- LeftClick 0x0101000000000000 -- RightClick 0x0102000000000000 -- Up 0x0100800000000000 -- Down 0x01007F0000000000 -- Left 0x0100008000000000 -- Right 0x0100007F00000000 -+ KEY_ENTER 0x0200002800000000 -+ KEY_ESC 0x0200002900000000 -+ BTN_LEFT 0x0101000000000000 -+ BTN_RIGHT 0x0102000000000000 -+ KEY_UP 0x0100800000000000 -+ KEY_DOWN 0x01007F0000000000 -+ KEY_LEFT 0x0100008000000000 -+ KEY_RIGHT 0x0100007F00000000 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-rsc -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon-rsc -+++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-rsc -@@ -27,48 +27,48 @@ begin remote - gap 100000 - - begin codes -- App.Exit 0x00000000000008F7 -- Power 0x000000000000F40B -+ KEY_EXIT 0x00000000000008F7 -+ KEY_POWER 0x000000000000F40B - ScreenSaver 0x00000000000052AD - Timer 0x000000000000926D -- 1 0x0000000000002AD5 -- 2 0x000000000000AA55 -- 3 0x0000000000006A95 -- 4 0x000000000000EA15 -- 5 0x0000000000001AE5 -- 6 0x0000000000009A65 -- 7 0x0000000000005AA5 -- 8 0x000000000000DA25 -- 9 0x0000000000003AC5 -- 0 0x000000000000BA45 -+ KEY_1 0x0000000000002AD5 -+ KEY_2 0x000000000000AA55 -+ KEY_3 0x0000000000006A95 -+ KEY_4 0x000000000000EA15 -+ KEY_5 0x0000000000001AE5 -+ KEY_6 0x0000000000009A65 -+ KEY_7 0x0000000000005AA5 -+ KEY_8 0x000000000000DA25 -+ KEY_9 0x0000000000003AC5 -+ KEY_0 0x000000000000BA45 - Desktop 0x000000000000817E -- Max/Res 0x00000000000041BE -- Esc 0x00000000000012ED -+ KEY_MAX 0x00000000000041BE -+ KEY_ESC 0x00000000000012ED - Windows 0x000000000000D22D -- Menu 0x000000000000C13E -+ KEY_MENU 0x000000000000C13E - App.Launcher 0x000000000000A25D - Function 0x00000000000021DE - Task.Switcher 0x000000000000629D -- Backspace 0x000000000000A15E -+ KEY_BACKSPACE 0x000000000000A15E - Mouse/Keyboard 0x000000000000619E -- Space 0x000000000000E11E -+ KEY_SPACE 0x000000000000E11E - Shift.Tab 0x0000000000007887 -- Enter 0x00000000000019E6 -- Tab 0x000000000000F807 -- L.Click 0x000000000000d827 -+ KEY_ENTER 0x00000000000019E6 -+ KEY_TAB 0x000000000000F807 -+ BTN_LEFT 0x000000000000d827 - DragNDrop 0x0000000000006897 -- R.Click 0x000000000000b847 -- Mute 0x00000000000011ee -- Vol- 0x0000000000007a85 -- Vol+ 0x000000000000fa05 -- Play 0x00000000000032cd -- Pause 0x000000000000b24d -- Open 0x000000000000f20d -- Prev 0x0000000000000af5 -- Next 0x0000000000008a75 -- Stop 0x000000000000728d -- Rew 0x0000000000004ab5 -- F.Fwd 0x000000000000ca35 -+ BTN_RIGHT 0x000000000000b847 -+ KEY_MUTE 0x00000000000011ee -+ KEY_VOLUMEDOWN 0x0000000000007a85 -+ KEY_VOLUMEUP 0x000000000000fa05 -+ KEY_PLAY 0x00000000000032cd -+ KEY_PAUSE 0x000000000000b24d -+ KEY_OPEN 0x000000000000f20d -+ KEY_PREVIOUS 0x0000000000000af5 -+ KEY_NEXT 0x0000000000008a75 -+ KEY_STOP 0x000000000000728d -+ KEY_REWIND 0x0000000000004ab5 -+ KEY_FORWARD 0x000000000000ca35 - Full.Screen 0x000000000000916e - end codes - -Index: lirc-0.8.7pre2/remotes/iodata/lircd.conf.gvbctv5pci -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/iodata/lircd.conf.gvbctv5pci -+++ lirc-0.8.7pre2/remotes/iodata/lircd.conf.gvbctv5pci -@@ -26,41 +26,41 @@ begin remote - - - begin codes -- TV 0x0000000000000042 -- FM 0x0000000000000022 -- EPG 0x0000000000000062 -- POWER 0x0000000000000002 -- 1 0x0000000000000052 -- 2 0x0000000000000032 -- 3 0x0000000000000072 -- 4 0x000000000000004A -- 5 0x000000000000002A -- 6 0x000000000000006A -- 7 0x000000000000005A -- 8 0x000000000000003A -- 9 0x000000000000007A -+ KEY_TV 0x0000000000000042 -+ KEY_RADIO 0x0000000000000022 -+ KEY_EPG 0x0000000000000062 -+ KEY_POWER 0x0000000000000002 -+ KEY_1 0x0000000000000052 -+ KEY_2 0x0000000000000032 -+ KEY_3 0x0000000000000072 -+ KEY_4 0x000000000000004A -+ KEY_5 0x000000000000002A -+ KEY_6 0x000000000000006A -+ KEY_7 0x000000000000005A -+ KEY_8 0x000000000000003A -+ KEY_9 0x000000000000007A - 10 0x0000000000000046 - 11 0x0000000000000026 - 12 0x0000000000000066 - LIVE 0x0000000000000012 - TIME_SHIFT 0x000000000000000A -- PLAY 0x000000000000001A -+ KEY_PLAY 0x000000000000001A - MULTI 0x0000000000000006 -- VIDEO 0x0000000000000056 -- SVIDEO 0x000000000000004E -- CHANNEL_PLUS 0x0000000000000036 -- CHANNEL_MINUS 0x000000000000002E -- VOLUME_PLUS 0x0000000000000076 -- VOLUME_MINUS 0x000000000000006E -- MUTE 0x0000000000000016 -+ KEY_VIDEO 0x0000000000000056 -+ KEY_VIDEO 0x000000000000004E -+ KEY_CHANNELUP 0x0000000000000036 -+ KEY_CHANNELDOWN 0x000000000000002E -+ KEY_VOLUMEUP 0x0000000000000076 -+ KEY_VOLUMEDOWN 0x000000000000006E -+ KEY_MUTE 0x0000000000000016 - PICTURE_SIZE 0x000000000000000E -- PAUSE 0x000000000000005E -- HALT 0x000000000000003E -- RECORD 0x000000000000007E -- STOP 0x000000000000001E -- REWIND 0x0000000000000043 -+ KEY_PAUSE 0x000000000000005E -+ KEY_POWER 0x000000000000003E -+ KEY_RECORD 0x000000000000007E -+ KEY_STOP 0x000000000000001E -+ KEY_REWIND 0x0000000000000043 - START 0x0000000000000023 -- FORWARD 0x0000000000000063 -+ KEY_FORWARD 0x0000000000000063 - SYNC 0x0000000000000003 - end codes - -Index: lirc-0.8.7pre2/remotes/kanam_accent/lircd.conf.IR-100 -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/kanam_accent/lircd.conf.IR-100 -+++ lirc-0.8.7pre2/remotes/kanam_accent/lircd.conf.IR-100 -@@ -29,47 +29,47 @@ begin remote - - - begin codes -- power 0x62260942 -- eject 0x62662409 -- 1 0x62662209 -- 2 0x22642209 -- 3 0x62641142 -- 4 0x62644209 -- 5 0x22624209 -- 6 0x62629142 -- 7 0x62628942 -- 8 0x22646409 -- 9 0x62646609 -- 0 0x22464226 -- win_key 0x62664226 -- menu_key 0x62660942 -- vol- 0x22896642 -- vol+ 0x62622609 -- esc 0x22662609 -- up 0x22916642 -- close 0x22994642 -- left 0x22994242 -- ent 0x22892642 -- right 0x22914642 -- prev 0x62996242 -- down 0x22192699 -- next 0x22660942 -- mute 0x22622409 -- step 0x62994C42 -- play 0x22246426 -- stop 0x6246894C -- winamp 0x62426409 -- mediaplayer 0x22664409 -- hdtv 0x22992642 -- cdplayer 0x62664609 -- windvd 0x62992299 -- powerdvd 0x62912242 -- internet 0x62264626 -- email 0x22998C99 -- b1 0x22264426 -- b2 0x22426209 -- b3 0x62896442 -- b4 0x22096642 -+ KEY_POWER 0x62260942 -+ KEY_EJECTCD 0x62662409 -+ KEY_1 0x62662209 -+ KEY_2 0x22642209 -+ KEY_3 0x62641142 -+ KEY_4 0x62644209 -+ KEY_5 0x22624209 -+ KEY_6 0x62629142 -+ KEY_7 0x62628942 -+ KEY_8 0x22646409 -+ KEY_9 0x62646609 -+ KEY_0 0x22464226 -+ KEY_WINDOWS 0x62664226 -+ KEY_MENU 0x62660942 -+ KEY_VOLUMEDOWN 0x22896642 -+ KEY_VOLUMEUP 0x62622609 -+ KEY_ESC 0x22662609 -+ KEY_UP 0x22916642 -+ KEY_CLOSE 0x22994642 -+ KEY_LEFT 0x22994242 -+ ent 0x22892642 -+ KEY_RIGHT 0x22914642 -+ KEY_PREVIOUS 0x62996242 -+ KEY_DOWN 0x22192699 -+ KEY_NEXT 0x22660942 -+ KEY_MUTE 0x22622409 -+ step 0x62994C42 -+ KEY_PLAY 0x22246426 -+ KEY_STOP 0x6246894C -+ winamp 0x62426409 -+ mediaplayer 0x22664409 -+ KEY_TV 0x22992642 -+ KEY_DVD 0x62664609 -+ windvd 0x62992299 -+ powerdvd 0x62912242 -+ KEY_WWW 0x62264626 -+ KEY_MAIL 0x22998C99 -+ b1 0x22264426 -+ b2 0x22426209 -+ b3 0x62896442 -+ b4 0x22096642 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/knc_one/lircd.conf.knc_one -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/knc_one/lircd.conf.knc_one -+++ lirc-0.8.7pre2/remotes/knc_one/lircd.conf.knc_one -@@ -26,37 +26,37 @@ begin remote - - begin codes - TV/FM 0x000000000000001C -- OK 0x0000000000000015 -- F1 0x000000000000000B -- POWER 0x0000000000000012 -+ KEY_OK 0x0000000000000015 -+ KEY_F1 0x000000000000000B -+ KEY_POWER 0x0000000000000012 - AV/TV 0x0000000000000011 - TELETEXT 0x000000000000000F - FULLSCREEN 0x0000000000000013 -- MUTE 0x0000000000000010 -- 1 0x0000000000000001 -- 2 0x0000000000000002 -- 3 0x0000000000000003 -- 4 0x0000000000000004 -- 5 0x0000000000000005 -- 6 0x0000000000000006 -- 7 0x0000000000000007 -- 8 0x0000000000000008 -- 9 0x0000000000000009 -- 0 0x0000000000000000 -- CH+ 0x000000000000001A -- CH- 0x000000000000001E -- VOL+ 0x000000000000001B -- VOL- 0x000000000000001F -+ KEY_MUTE 0x0000000000000010 -+ KEY_1 0x0000000000000001 -+ KEY_2 0x0000000000000002 -+ KEY_3 0x0000000000000003 -+ KEY_4 0x0000000000000004 -+ KEY_5 0x0000000000000005 -+ KEY_6 0x0000000000000006 -+ KEY_7 0x0000000000000007 -+ KEY_8 0x0000000000000008 -+ KEY_9 0x0000000000000009 -+ KEY_0 0x0000000000000000 -+ KEY_CHANNELUP 0x000000000000001A -+ KEY_CHANNELDOWN 0x000000000000001E -+ KEY_VOLUMEUP 0x000000000000001B -+ KEY_VOLUMEDOWN 0x000000000000001F - SNAPSHOT 0x000000000000000A - 100+ 0x0000000000000017 -- RECORD 0x000000000000000D -- PAUSE 0x000000000000000E -- PLAY 0x000000000000001D -- STOP 0x0000000000000019 -- MENU 0x0000000000000016 -- ESC 0x0000000000000014 -- - 0x0000000000000018 -- + 0x000000000000000C -+ KEY_RECORD 0x000000000000000D -+ KEY_PAUSE 0x000000000000000E -+ KEY_PLAY 0x000000000000001D -+ KEY_STOP 0x0000000000000019 -+ KEY_MENU 0x0000000000000016 -+ KEY_ESC 0x0000000000000014 -+ KEY_KPMINUS 0x0000000000000018 -+ KEY_KPPLUS 0x000000000000000C - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/kworld/lircd.conf.kworld -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/kworld/lircd.conf.kworld -+++ lirc-0.8.7pre2/remotes/kworld/lircd.conf.kworld -@@ -29,36 +29,36 @@ begin remote - - - begin codes -- power 0x0000000000007887 -+ KEY_POWER 0x0000000000007887 - source 0x000000000000E01F - scan 0x00000000000038C7 -- mute 0x00000000000018E7 -+ KEY_MUTE 0x00000000000018E7 - tv/fm 0x000000000000C03F -- 1 0x000000000000807F -- 2 0x000000000000D02F -- 3 0x000000000000D827 -+ KEY_1 0x000000000000807F -+ KEY_2 0x000000000000D02F -+ KEY_3 0x000000000000D827 - fm_scan+ 0x000000000000F807 -- 4 0x000000000000A05F -- 5 0x000000000000906F -- 6 0x000000000000A857 -+ KEY_4 0x000000000000A05F -+ KEY_5 0x000000000000906F -+ KEY_6 0x000000000000A857 - fm_scan- 0x000000000000E817 -- 7 0x000000000000609F -- 8 0x00000000000050AF -- 9 0x00000000000048B7 -+ KEY_7 0x000000000000609F -+ KEY_8 0x00000000000050AF -+ KEY_9 0x00000000000048B7 - fm_freq+ 0x00000000000030CF -- 0 0x00000000000040BF -- + 0x00000000000008F7 -+ KEY_0 0x00000000000040BF -+ KEY_KPPLUS 0x00000000000008F7 - recall 0x000000000000C837 - fm-freq- 0x00000000000020DF -- record 0x00000000000000FF -- stop 0x00000000000010EF -- play 0x0000000000008877 -+ KEY_RECORD 0x00000000000000FF -+ KEY_STOP 0x00000000000010EF -+ KEY_PLAY 0x0000000000008877 - minimze 0x000000000000F00F -- ch+ 0x000000000000F807 -- zoom 0x0000000000009867 -- vol- 0x00000000000028D7 -- ch- 0x000000000000E817 -- vol+ 0x0000000000006897 -+ KEY_CHANNELUP 0x000000000000F807 -+ KEY_ZOOM 0x0000000000009867 -+ KEY_VOLUMEDOWN 0x00000000000028D7 -+ KEY_CHANNELDOWN 0x000000000000E817 -+ KEY_VOLUMEUP 0x0000000000006897 - snapshot 0x00000000000058A7 - mts 0x000000000000B04F - function- 0x00000000000020DF -Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000 -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.PVR2000 -+++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000 -@@ -18,54 +18,54 @@ begin remote - gap 120000 - - begin codes -- POWER 0x0000000000000070 -- TV 0x0000000000000026 -- FM 0x0000000000000027 -- DVD 0x0000000000000028 -- RED 0x000000000000003B -- GREEN 0x000000000000003C -- YELLOW 0x000000000000003D -- BLUE 0x000000000000003E -+ KEY_POWER 0x0000000000000070 -+ KEY_TV 0x0000000000000026 -+ KEY_RADIO 0x0000000000000027 -+ KEY_DVD 0x0000000000000028 -+ KEY_RED 0x000000000000003B -+ KEY_GREEN 0x000000000000003C -+ KEY_YELLOW 0x000000000000003D -+ KEY_BLUE 0x000000000000003E - TELETEXT 0x000000000000006F -- SLEEP 0x0000000000000030 -- MUTE 0x0000000000000064 -+ KEY_SLEEP 0x0000000000000030 -+ KEY_MUTE 0x0000000000000064 - BOSS_KEY 0x0000000000000039 -- CH_UP 0x000000000000007C -- CH_DOWN 0x0000000000000060 -- VOL_DOWN 0x0000000000000078 -- VOL_UP 0x0000000000000074 -- ENTER 0x0000000000000063 -+ KEY_CHANNELUP 0x000000000000007C -+ KEY_CHANNELDOWN 0x0000000000000060 -+ KEY_VOLUMEDOWN 0x0000000000000078 -+ KEY_VOLUMEUP 0x0000000000000074 -+ KEY_ENTER 0x0000000000000063 - CC 0x0000000000000020 - FULLSCREEN 0x0000000000000073 -- MENU 0x000000000000003F -+ KEY_MENU 0x000000000000003F - SCAN 0x0000000000000021 -- REPLAY 0x0000000000000032 -- PLAY 0x0000000000000033 -- SKIP 0x0000000000000034 -+ KEY_AGAIN 0x0000000000000032 -+ KEY_PLAY 0x0000000000000033 -+ KEY_NEXT 0x0000000000000034 - OSD 0x0000000000000022 -- BACK 0x0000000000000024 -- STOP 0x0000000000000036 -- FORWARD 0x0000000000000025 -- LANGUAGE 0x0000000000000023 -- 1 0x0000000000000075 -- 2 0x0000000000000076 -- 3 0x0000000000000077 -- 4 0x0000000000000079 -- 5 0x000000000000007A -- 6 0x000000000000007B -- 7 0x000000000000007D -- 8 0x000000000000007E -- 9 0x000000000000007F -- 0 0x0000000000000062 -- . 0x0000000000000031 -+ KEY_BACK 0x0000000000000024 -+ KEY_STOP 0x0000000000000036 -+ KEY_FORWARD 0x0000000000000025 -+ KEY_LANGUAGE 0x0000000000000023 -+ KEY_1 0x0000000000000075 -+ KEY_2 0x0000000000000076 -+ KEY_3 0x0000000000000077 -+ KEY_4 0x0000000000000079 -+ KEY_5 0x000000000000007A -+ KEY_6 0x000000000000007B -+ KEY_7 0x000000000000007D -+ KEY_8 0x000000000000007E -+ KEY_9 0x000000000000007F -+ KEY_0 0x0000000000000062 -+ KEY_DOT 0x0000000000000031 - RECALL 0x0000000000000061 -- VIDEO 0x000000000000006E -- AUDIO 0x000000000000006B -+ KEY_VIDEO 0x000000000000006E -+ KEY_AUDIO 0x000000000000006B - DISPLAY 0x0000000000000066 - SNAPSHOT 0x0000000000000038 - PIP 0x000000000000003A - RECSTOP 0x0000000000000036 -- REC 0x0000000000000037 -+ KEY_RECORD 0x0000000000000037 - TIMESHIFT 0x0000000000000035 - - end codes -Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0007 -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.RM-0007 -+++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0007 -@@ -44,43 +44,43 @@ begin remote - - begin codes - # 1st row of buttons -- POWER 0x00000000000000FF -- MENU 0x000000000000807F -- FM 0x00000000000040BF -+ KEY_POWER 0x00000000000000FF -+ KEY_MENU 0x000000000000807F -+ KEY_RADIO 0x00000000000040BF - PC/TV 0x000000000000C03F - # volume/channel -- VOL_UP 0x00000000000020DF -- VOL_DOWN 0x00000000000010EF -- CH_UP 0x00000000000030CF -- CH_DOWN 0x00000000000008F7 -+ KEY_VOLUMEUP 0x00000000000020DF -+ KEY_VOLUMEDOWN 0x00000000000010EF -+ KEY_CHANNELUP 0x00000000000030CF -+ KEY_CHANNELDOWN 0x00000000000008F7 - # numbers pad -- 1 0x000000000000A05F -- 2 0x000000000000609F -- 3 0x000000000000E01F -- 4 0x000000000000906F -- 5 0x00000000000050AF -- 6 0x000000000000D02F -- 7 0x000000000000B04F -- 8 0x000000000000708F -- 9 0x000000000000F00F -+ KEY_1 0x000000000000A05F -+ KEY_2 0x000000000000609F -+ KEY_3 0x000000000000E01F -+ KEY_4 0x000000000000906F -+ KEY_5 0x00000000000050AF -+ KEY_6 0x000000000000D02F -+ KEY_7 0x000000000000B04F -+ KEY_8 0x000000000000708F -+ KEY_9 0x000000000000F00F - RETURN 0x0000000000008877 -- 0 0x00000000000048B7 -+ KEY_0 0x00000000000048B7 - DISPLAY 0x000000000000C837 - # unknown icon buttons -- HELP 0x00000000000038C7 -+ KEY_HELP 0x00000000000038C7 - SCAN 0x000000000000A857 - OSD 0x0000000000006897 -- OPTIONS 0x000000000000E817 -+ KEY_OPTION 0x000000000000E817 - # labeled buttons -- MUTE 0x00000000000028D7 -+ KEY_MUTE 0x00000000000028D7 - MTS 0x000000000000D827 -- VIDEO 0x0000000000007887 -+ KEY_VIDEO 0x0000000000007887 - CC 0x000000000000F807 - # color dots buttons -- RED 0x00000000000018E7 -- GREEN 0x0000000000009867 -- YELLOW 0x00000000000058A7 -- BLUE 0x000000000000B847 -+ KEY_RED 0x00000000000018E7 -+ KEY_GREEN 0x0000000000009867 -+ KEY_YELLOW 0x00000000000058A7 -+ KEY_BLUE 0x000000000000B847 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0010 -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.RM-0010 -+++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0010 -@@ -43,69 +43,69 @@ begin remote - duty_cycle 33 - - begin codes -- POWER 0x00000000000000FF -+ KEY_POWER 0x00000000000000FF - TV/FM 0x00000000000040BF - SCAN 0x000000000000A857 - DISPLAY 0x0000000000006897 -- 1 0x000000000000A05F -- 2 0x000000000000609F -- 3 0x000000000000E01F -- 4 0x000000000000906F -- 5 0x00000000000050AF -- 6 0x000000000000D02F -- 7 0x000000000000B04F -- 8 0x000000000000708F -- 9 0x000000000000F00F -- 0 0x00000000000048B7 -+ KEY_1 0x000000000000A05F -+ KEY_2 0x000000000000609F -+ KEY_3 0x000000000000E01F -+ KEY_4 0x000000000000906F -+ KEY_5 0x00000000000050AF -+ KEY_6 0x000000000000D02F -+ KEY_7 0x000000000000B04F -+ KEY_8 0x000000000000708F -+ KEY_9 0x000000000000F00F -+ KEY_0 0x00000000000048B7 - RECALL 0x0000000000008877 -- ENTER 0x000000000000C837 -+ KEY_ENTER 0x000000000000C837 - CC 0x000000000000F807 - MTS 0x000000000000D827 - FINE_DOWN 0x0000000000009867 - FINE_UP 0x00000000000018E7 -- VIDEO 0x0000000000007887 -- MUTE 0x00000000000028D7 -- CH_UP 0x00000000000030CF -- CH_DOWN 0x00000000000008F7 -- VOL_DOWN 0x00000000000010EF -- VOL_UP 0x00000000000020DF -+ KEY_VIDEO 0x0000000000007887 -+ KEY_MUTE 0x00000000000028D7 -+ KEY_CHANNELUP 0x00000000000030CF -+ KEY_CHANNELDOWN 0x00000000000008F7 -+ KEY_VOLUMEDOWN 0x00000000000010EF -+ KEY_VOLUMEUP 0x00000000000020DF - FULLSCREEN 0x000000000000C03F - - # The following are only supported by the remote control bundled with - # the WinFast TV 2000 XP Deluxe card. - -- SLEEP 0x00000000000002FD -+ KEY_SLEEP 0x00000000000002FD - BOSS_KEY 0x000000000000926D -- RED 0x000000000000D22D -- GREEN 0x00000000000032CD -- YELLOW 0x000000000000B24D -- BLUE 0x000000000000728D -+ KEY_RED 0x000000000000D22D -+ KEY_GREEN 0x00000000000032CD -+ KEY_YELLOW 0x000000000000B24D -+ KEY_BLUE 0x000000000000728D - PIP 0x00000000000052AD -- . 0x000000000000827D -- BACK 0x00000000000042BD -- PLAY 0x000000000000C23D -- NEXT 0x00000000000022DD -+ KEY_DOT 0x000000000000827D -+ KEY_BACK 0x00000000000042BD -+ KEY_PLAY 0x000000000000C23D -+ KEY_NEXT 0x00000000000022DD - TIMESHIFT 0x000000000000A25D -- STOP 0x000000000000629D -- REC 0x000000000000E21D -+ KEY_STOP 0x000000000000629D -+ KEY_RECORD 0x000000000000E21D - SNAPSHOT 0x00000000000012ED - - # Only found on CoolCommand remote - -- REPEAT 0x000000000000884B -+ KEY_AGAIN 0x000000000000884B - TELETEXT 0x000000000000F807 -- TV 0x0000000000006A95 -- FM 0x000000000000EA15 -- DVD 0x0000000000001AE5 -+ KEY_TV 0x0000000000006A95 -+ KEY_RADIO 0x000000000000EA15 -+ KEY_DVD 0x0000000000001AE5 - CLEAR(C) 0x0000000000000AF5 -- MENU 0x000000000000F20D -+ KEY_MENU 0x000000000000F20D - CH_SURF 0x0000000000008A75 -- ENTER 0x000000000000C837 -- AUDIO 0x000000000000D827 -+ KEY_ENTER 0x000000000000C837 -+ KEY_AUDIO 0x000000000000D827 - CC 0x0000000000004AB5 -- REW 0x0000000000002AD5 -- STOP 0x000000000000629D -- FFW 0x000000000000AA55 -+ KEY_REWIND 0x0000000000002AD5 -+ KEY_STOP 0x000000000000629D -+ KEY_FASTFORWARD 0x000000000000AA55 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/life-view/lircd.conf.flyvideo -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/life-view/lircd.conf.flyvideo -+++ lirc-0.8.7pre2/remotes/life-view/lircd.conf.flyvideo -@@ -35,50 +35,50 @@ begin remote - duty_cycle 33 - - begin codes -- 0 0x000000000000F00F -- 1 0x000000000000C03F -- 2 0x00000000000020DF -- 3 0x000000000000A05F -- 4 0x000000000000E01F -- 5 0x00000000000010EF -- 6 0x000000000000906F -- 7 0x000000000000D02F -- 8 0x00000000000030CF -- 9 0x000000000000B04F -- POWER 0x00000000000000FF -- MOUSE_MODE 0x000000000000807F -+ KEY_0 0x000000000000F00F -+ KEY_1 0x000000000000C03F -+ KEY_2 0x00000000000020DF -+ KEY_3 0x000000000000A05F -+ KEY_4 0x000000000000E01F -+ KEY_5 0x00000000000010EF -+ KEY_6 0x000000000000906F -+ KEY_7 0x000000000000D02F -+ KEY_8 0x00000000000030CF -+ KEY_9 0x000000000000B04F -+ KEY_POWER 0x00000000000000FF -+ BTN_MODE 0x000000000000807F - FULL_SCREEN 0x00000000000040BF -- CHAN_PLUS 0x00000000000048B7 -- CHAN_MINUS 0x000000000000C837 -- CANCEL 0x000000000000F807 -- ENTER 0x00000000000008F7 -- VOL_PLUS 0x00000000000028D7 -- VOL_MINUS 0x000000000000E817 -- MENU 0x000000000000609F -- UP 0x000000000000708F -- DOWN 0x0000000000009867 -- LEFT 0x000000000000609F -- RIGHT 0x000000000000A857 -+ KEY_CHANNELUP 0x00000000000048B7 -+ KEY_CHANNELDOWN 0x000000000000C837 -+ KEY_CANCEL 0x000000000000F807 -+ KEY_ENTER 0x00000000000008F7 -+ KEY_VOLUMEUP 0x00000000000028D7 -+ KEY_VOLUMEDOWN 0x000000000000E817 -+ KEY_MENU 0x000000000000609F -+ KEY_UP 0x000000000000708F -+ KEY_DOWN 0x0000000000009867 -+ KEY_LEFT 0x000000000000609F -+ KEY_RIGHT 0x000000000000A857 - INC 0x00000000000050AF - DEC 0x0000000000006897 -- ESC 0x00000000000058A7 -- MUTE 0x000000000000D827 -+ KEY_ESC 0x00000000000058A7 -+ KEY_MUTE 0x000000000000D827 - RETURN 0x00000000000018E7 - CENTER 0x000000000000C837 - - CHANELS 0x00000000000047B8 - REV 0x0000000000008778 -- FWD 0x000000000000C738 -- VIDEO 0x0000000000008877 -+ KEY_FORWARD 0x000000000000C738 -+ KEY_VIDEO 0x0000000000008877 - - # from FlyVideo II config file -- Audio 0x000000000000A857 -+ KEY_AUDIO 0x000000000000A857 - # newly added by Jarek Zuk - SQUARE 0x000000000000B847 - TAB_LEFT 0x0000000000007887 - TAB_RIGHT 0x00000000000038C7 - CENTER 0x000000000000C837 -- LEFT 0x00000000000048B7 -+ KEY_LEFT 0x00000000000048B7 - - end codes - -Index: lirc-0.8.7pre2/remotes/logitech/lircd.conf.logitech -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/logitech/lircd.conf.logitech -+++ lirc-0.8.7pre2/remotes/logitech/lircd.conf.logitech -@@ -23,41 +23,41 @@ begin remote - repeat_bit 0 - - begin codes -- POWER 0x0000000000000002 -- 1 0x0000000000000015 -- 2 0x0000000000000016 -- 3 0x0000000000000014 -- 4 0x0000000000000018 -- 5 0x0000000000000019 -- 6 0x0000000000000017 -- 7 0x000000000000001C -- 8 0x000000000000001B -- 9 0x000000000000001A -- 0 0x000000000000001D -- PAUSE 0x0000000000000013 -- EJECT 0x0000000000000011 -+ KEY_POWER 0x0000000000000002 -+ KEY_1 0x0000000000000015 -+ KEY_2 0x0000000000000016 -+ KEY_3 0x0000000000000014 -+ KEY_4 0x0000000000000018 -+ KEY_5 0x0000000000000019 -+ KEY_6 0x0000000000000017 -+ KEY_7 0x000000000000001C -+ KEY_8 0x000000000000001B -+ KEY_9 0x000000000000001A -+ KEY_0 0x000000000000001D -+ KEY_PAUSE 0x0000000000000013 -+ KEY_EJECTCD 0x0000000000000011 - SEEK- 0x000000000000000E -- PLAY 0x000000000000000F -+ KEY_PLAY 0x000000000000000F - SEEK+ 0x0000000000000010 -- STOP 0x0000000000000012 -- HELP 0x0000000000000001 -- CH- 0x000000000000000D -- CH+ 0x000000000000000A -- VOL- 0x000000000000000C -- VOL+ 0x0000000000000009 -+ KEY_STOP 0x0000000000000012 -+ KEY_HELP 0x0000000000000001 -+ KEY_CHANNELDOWN 0x000000000000000D -+ KEY_CHANNELUP 0x000000000000000A -+ KEY_VOLUMEDOWN 0x000000000000000C -+ KEY_VOLUMEUP 0x0000000000000009 - * 0x000000000000001F - # 0x000000000000001E -- MUTE 0x000000000000000B -+ KEY_MUTE 0x000000000000000B - BUTTONL_DOWN 0x0000000000000039 - BUTTONR_DOWN 0x000000000000003A -- BUTTON_UP 0x0000000000000038 -- ENTER 0x0000000000000008 -- CLOSE 0x0000000000000023 -- TV 0x0000000000000004 -+ KEY_UP 0x0000000000000038 -+ KEY_ENTER 0x0000000000000008 -+ KEY_CLOSE 0x0000000000000023 -+ KEY_TV 0x0000000000000004 - GDE 0x0000000000000005 -- CD 0x0000000000000006 -+ KEY_CD 0x0000000000000006 - MSG 0x0000000000000007 -- PHONE 0x0000000000000003 -+ KEY_PHONE 0x0000000000000003 - MOUSE_N 0x0000000000000040 - MOUSE_NNE 0x0000000000000041 - MOUSE_NE 0x0000000000000042 -Index: lirc-0.8.7pre2/remotes/mceusb/lircd.conf.mceusb -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/mceusb/lircd.conf.mceusb -+++ lirc-0.8.7pre2/remotes/mceusb/lircd.conf.mceusb -@@ -1,7 +1,8 @@ - # --# brand: HP --# model no. of remote control: TSGH-IR01 --# devices being controlled by this remote: HP Slimline S3100y -+# brand: HP/Philips/Microsoft/Other -+# model no. of remote control: Media Center Edition remote -+# devices being controlled by this remote: HP Slimline S3100y and a -+# myriad of devices with Media Center Edition receivers - # - # RC-6 config file - # -@@ -59,10 +60,10 @@ begin remote - - - #unused by HP remote -- Blue 0x00007ba1 -- Yellow 0x00007ba2 -- Green 0x00007ba3 -- Red 0x00007ba4 -+ KEY_BLUE 0x00007ba1 -+ KEY_YELLOW 0x00007ba2 -+ KEY_GREEN 0x00007ba3 -+ KEY_RED 0x00007ba4 - Teletext 0x00007ba5 - - #ba6 - bae unused -@@ -76,7 +77,7 @@ begin remote - BAD 0x00007bad - BAE 0x00007bae - -- Radio 0x00007baf -+ KEY_RADIO 0x00007baf - Print 0x00007bb1 - - #bb2 - bb4 unused -@@ -84,11 +85,11 @@ begin remote - BB3 0x00007bb3 - BB4 0x00007bb4 - -- Videos 0x00007bb5 -+ KEY_VIDEO 0x00007bb5 - Pictures 0x00007bb6 - RecTV 0x00007bb7 -- Music 0x00007bb8 -- TV 0x00007bb9 -+ KEY_AUDIO 0x00007bb8 -+ KEY_TV 0x00007bb9 - - #bba - bbf unused - BBA 0x00007bba -@@ -109,7 +110,7 @@ begin remote - BC9 0x00007bc9 - BCA 0x00007bca - -- Eject 0x00007bcb -+ KEY_EJECTCD 0x00007bcb - SlideShow 0x00007bcc - Visualization 0x00007bcd - -@@ -128,50 +129,50 @@ begin remote - Aspect 0x00007bd8 - Guide 0x00007bd9 - LiveTV 0x00007bda -- DVD 0x00007bdb -+ KEY_DVD 0x00007bdb - #NoGap -- Back 0x00007bdc -- OK 0x00007bdd -- Right 0x00007bde -- Left 0x00007bdf -- Down 0x00007be0 -- Up 0x00007be1 -+ KEY_BACK 0x00007bdc -+ KEY_OK 0x00007bdd -+ KEY_RIGHT 0x00007bde -+ KEY_LEFT 0x00007bdf -+ KEY_DOWN 0x00007be0 -+ KEY_UP 0x00007be1 - #NoGap - Star 0x00007be2 - Hash 0x00007be3 - #NoGap -- Replay 0x00007be4 -- Skip 0x00007be5 -- Stop 0x00007be6 -- Pause 0x00007be7 -- Record 0x00007be8 -- Play 0x00007be9 -- Rewind 0x00007bea -- Forward 0x00007beb -+ KEY_AGAIN 0x00007be4 -+ KEY_NEXT 0x00007be5 -+ KEY_STOP 0x00007be6 -+ KEY_PAUSE 0x00007be7 -+ KEY_RECORD 0x00007be8 -+ KEY_PLAY 0x00007be9 -+ KEY_REWIND 0x00007bea -+ KEY_FORWARD 0x00007beb - #NoGap -- ChanDown 0x00007bec -- ChanUp 0x00007bed -- VolDown 0x00007bee -- VolUp 0x00007bef -+ KEY_CHANNELDOWN 0x00007bec -+ KEY_CHANNELUP 0x00007bed -+ KEY_VOLUMEDOWN 0x00007bee -+ KEY_VOLUMEUP 0x00007bef - #NoGap - More 0x00007bf0 -- Mute 0x00007bf1 -- Home 0x00007bf2 -- Power 0x00007bf3 -+ KEY_MUTE 0x00007bf1 -+ KEY_HOME 0x00007bf2 -+ KEY_POWER 0x00007bf3 - #NoGap -- Enter 0x00007bf4 -- Clear 0x00007bf5 -+ KEY_ENTER 0x00007bf4 -+ KEY_CLEAR 0x00007bf5 - #NoGap -- Nine 0x00007bf6 -- Eight 0x00007bf7 -- Seven 0x00007bf8 -- Six 0x00007bf9 -- Five 0x00007bfa -- Four 0x00007bfb -- Three 0x00007bfc -- Two 0x00007bfd -- One 0x00007bfe -- Zero 0x00007bff -+ KEY_9 0x00007bf6 -+ KEY_8 0x00007bf7 -+ KEY_7 0x00007bf8 -+ KEY_6 0x00007bf9 -+ KEY_5 0x00007bfa -+ KEY_4 0x00007bfb -+ KEY_3 0x00007bfc -+ KEY_2 0x00007bfd -+ KEY_1 0x00007bfe -+ KEY_0 0x00007bff - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/packard_bell/lircd.conf.packard_bell -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/packard_bell/lircd.conf.packard_bell -+++ lirc-0.8.7pre2/remotes/packard_bell/lircd.conf.packard_bell -@@ -53,38 +53,38 @@ begin remote - repeat 9050 2250 - - begin codes -- Help 0x0000000000006F90 -- Phone 0x0000000000004FB0 -+ KEY_HELP 0x0000000000006F90 -+ KEY_PHONE 0x0000000000004FB0 - Message 0x0000000000006E91 - SRS 0x0000000000004EB1 -- CD 0x0000000000002FD0 -- Aux1 0x0000000000000FF0 -+ KEY_CD 0x0000000000002FD0 -+ KEY_AUX 0x0000000000000FF0 - Aux2 0x0000000000002ED1 - Aux3 0x0000000000000EF1 - LMB 0x00000000000023DC - RMB 0x000000000000639C -- Up 0x00000000000037C8 -- Down 0x00000000000057A8 -- Left 0x0000000000007788 -- Right 0x00000000000017E8 -- Menu 0x0000000000007B84 -- Mute 0x0000000000003BC4 -- Enter 0x00000000000047B8 -- CHUp 0x00000000000027D8 -- CHDown 0x0000000000006798 -- VolUp 0x0000000000005BA4 -- VolDown 0x0000000000001BE4 -+ KEY_UP 0x00000000000037C8 -+ KEY_DOWN 0x00000000000057A8 -+ KEY_LEFT 0x0000000000007788 -+ KEY_RIGHT 0x00000000000017E8 -+ KEY_MENU 0x0000000000007B84 -+ KEY_MUTE 0x0000000000003BC4 -+ KEY_ENTER 0x00000000000047B8 -+ KEY_CHANNELUP 0x00000000000027D8 -+ KEY_CHANNELDOWN 0x0000000000006798 -+ KEY_VOLUMEUP 0x0000000000005BA4 -+ KEY_VOLUMEDOWN 0x0000000000001BE4 - Display 0x00000000000007F8 -- One 0x0000000000005EA1 -- Two 0x0000000000001EE1 -- Three 0x0000000000000BF4 -- Four 0x0000000000007E81 -- Five 0x0000000000003EC1 -- Six 0x0000000000004BB4 -- Seven 0x0000000000005FA0 -- Eight 0x0000000000001FE0 -- Nine 0x0000000000002BD4 -- Zero 0x0000000000003FC0 -+ KEY_1 0x0000000000005EA1 -+ KEY_2 0x0000000000001EE1 -+ KEY_3 0x0000000000000BF4 -+ KEY_4 0x0000000000007E81 -+ KEY_5 0x0000000000003EC1 -+ KEY_6 0x0000000000004BB4 -+ KEY_7 0x0000000000005FA0 -+ KEY_8 0x0000000000001FE0 -+ KEY_9 0x0000000000002BD4 -+ KEY_0 0x0000000000003FC0 - Star 0x0000000000007F80 - Hash 0x0000000000006B94 - end codes -Index: lirc-0.8.7pre2/remotes/pcmak/lircd.conf.pcmak -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/pcmak/lircd.conf.pcmak -+++ lirc-0.8.7pre2/remotes/pcmak/lircd.conf.pcmak -@@ -23,18 +23,18 @@ begin remote - repeat_bit 0 - - begin codes -- HOME 0x0000000000000001 -- ARROW_UP 0x0000000000000002 -+ KEY_HOME 0x0000000000000001 -+ KEY_UP 0x0000000000000002 - PG_UP 0x0000000000000003 -- ARROW_LEFT 0x0000000000000004 -- ENTER 0x0000000000000005 -- ARROW_RIGHT 0x0000000000000006 -- END 0x0000000000000007 -- ARROW_DOWN 0x0000000000000008 -+ KEY_LEFT 0x0000000000000004 -+ KEY_ENTER 0x0000000000000005 -+ KEY_RIGHT 0x0000000000000006 -+ KEY_END 0x0000000000000007 -+ KEY_DOWN 0x0000000000000008 - PG_DN 0x0000000000000009 -- SPACE 0x000000000000000A -- TAB 0x000000000000000B -- ESC 0x000000000000000C -+ KEY_SPACE 0x000000000000000A -+ KEY_TAB 0x000000000000000B -+ KEY_ESC 0x000000000000000C - ALT 0x000000000000000D - PLAYLIST 0x000000000000000E - LOAD 0x000000000000000F -@@ -49,36 +49,36 @@ begin remote - FULLSCREEN 0x0000000000000018 - BUTTONL_DOWN 0x0000000000000019 - BUTTONR_DOWN 0x000000000000001A -- POWER 0x000000000000001B -- A 0x000000000000001C -- B 0x000000000000001D -- C 0x000000000000001E -- D 0x000000000000001F -- VOL_DOWN 0x0000000000000020 -- MUTE 0x0000000000000021 -- VOL_UP 0x0000000000000022 -- PLAY 0x0000000000000024 -- PREV 0x0000000000000026 -- PAUSE 0x0000000000000027 -- NEXT 0x0000000000000028 -+ KEY_POWER 0x000000000000001B -+ KEY_A 0x000000000000001C -+ KEY_B 0x000000000000001D -+ KEY_C 0x000000000000001E -+ KEY_D 0x000000000000001F -+ KEY_VOLUMEDOWN 0x0000000000000020 -+ KEY_MUTE 0x0000000000000021 -+ KEY_VOLUMEUP 0x0000000000000022 -+ KEY_PLAY 0x0000000000000024 -+ KEY_PREVIOUS 0x0000000000000026 -+ KEY_PAUSE 0x0000000000000027 -+ KEY_NEXT 0x0000000000000028 - SKIP_BACK 0x0000000000000029 -- STOP 0x000000000000002A -+ KEY_STOP 0x000000000000002A - SKIP_FORW 0x000000000000002B -- 1 0x0000000000000041 -- 2 0x0000000000000042 -- 3 0x0000000000000043 -- 4 0x0000000000000044 -- 5 0x0000000000000045 -- 6 0x0000000000000046 -- 7 0x0000000000000047 -- 8 0x0000000000000048 -- 9 0x0000000000000049 -- 0 0x000000000000004A -- sTAB 0x000000000000004B -- sESC 0x000000000000004C -+ KEY_1 0x0000000000000041 -+ KEY_2 0x0000000000000042 -+ KEY_3 0x0000000000000043 -+ KEY_4 0x0000000000000044 -+ KEY_5 0x0000000000000045 -+ KEY_6 0x0000000000000046 -+ KEY_7 0x0000000000000047 -+ KEY_8 0x0000000000000048 -+ KEY_9 0x0000000000000049 -+ KEY_0 0x000000000000004A -+ KEY_TAB 0x000000000000004B -+ KEY_ESC 0x000000000000004C - sALT 0x000000000000004D - sPLAYLIST 0x000000000000004E -- TXT 0x000000000000004F -+ KEY_TEXT 0x000000000000004F - sMOUSE_N 0x0000000000000050 - sMOUSE_NE 0x0000000000000051 - sMOUSE_E 0x0000000000000052 -@@ -87,30 +87,30 @@ begin remote - sMOUSE_SW 0x0000000000000055 - sMOUSE_W 0x0000000000000056 - sMOUSE_NW 0x0000000000000057 -- sOK 0x0000000000000058 -+ KEY_OK 0x0000000000000058 - BUTTONL_UP 0x0000000000000059 - BUTTONR_UP 0x000000000000005A -- EXIT 0x000000000000005B -- E 0x000000000000005C -- F 0x000000000000005D -- G 0x000000000000005E -- H 0x000000000000005F -- sVOL_DOWN 0x0000000000000060 -- sMUTE 0x0000000000000061 -- sVOL_UP 0x0000000000000062 -- sPLAY 0x0000000000000064 -- sPREV 0x0000000000000066 -- sPAUSE 0x0000000000000067 -- sNEXT 0x0000000000000068 -+ KEY_EXIT 0x000000000000005B -+ KEY_E 0x000000000000005C -+ KEY_F 0x000000000000005D -+ KEY_G 0x000000000000005E -+ KEY_H 0x000000000000005F -+ KEY_VOLUMEDOWN 0x0000000000000060 -+ KEY_MUTE 0x0000000000000061 -+ KEY_VOLUMEUP 0x0000000000000062 -+ KEY_PLAY 0x0000000000000064 -+ KEY_PREVIOUS 0x0000000000000066 -+ KEY_PAUSE 0x0000000000000067 -+ KEY_NEXT 0x0000000000000068 - ZOOM- 0x0000000000000069 -- HELP 0x000000000000006A -+ KEY_HELP 0x000000000000006A - ZOOM+ 0x000000000000006B -- MM_PLAY 0x000000000000002F -- MM_PREV 0x0000000000000030 -- MM_NEXT 0x0000000000000031 -- MM_PAUSE 0x000000000000005F -- MM_BACK 0x0000000000000075 -- MM_FORW 0x0000000000000079 -+ KEY_PLAY 0x000000000000002F -+ KEY_PREVIOUS 0x0000000000000030 -+ KEY_NEXT 0x0000000000000031 -+ KEY_PAUSE 0x000000000000005F -+ KEY_BACK 0x0000000000000075 -+ KEY_FORWARD 0x0000000000000079 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/pinnacle_systems/lircd.conf.pctv -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/pinnacle_systems/lircd.conf.pctv -+++ lirc-0.8.7pre2/remotes/pinnacle_systems/lircd.conf.pctv -@@ -24,30 +24,30 @@ begin remote - toggle_bit 0 - - begin codes -- Mute 0xB53C #Mute 0x000000000000003C -- Power 0x2D2F #Power 0x000000000000002F -+ KEY_MUTE 0xB53C #Mute 0x000000000000003C -+ KEY_POWER 0x2D2F #Power 0x000000000000002F - Chan+Play 0x173F #Chan+Play 0x000000000000003F - Chan-Stop 0xC63E #Chan-Stop 0x000000000000003E - Vol+FF 0xF13B #Vol+FF 0x000000000000003B - Vol-Rew 0x643D #Vol-Rew 0x000000000000003D -- 1 0x9F31 #1 0x0000000000000031 -- 2 0x3D32 #2 0x0000000000000032 -- 3 0xEC33 #3 0x0000000000000033 -- 4 0xA834 #4 0x0000000000000034 -- 5 0x7935 #5 0x0000000000000035 -- 6 0xDB36 #6 0x0000000000000036 -- 7 0x0A37 #7 0x0000000000000037 -- 8 0x5338 #8 0x0000000000000038 -- 9 0x8239 #9 0x0000000000000039 -+ KEY_1 0x9F31 #1 0x0000000000000031 -+ KEY_2 0x3D32 #2 0x0000000000000032 -+ KEY_3 0xEC33 #3 0x0000000000000033 -+ KEY_4 0xA834 #4 0x0000000000000034 -+ KEY_5 0x7935 #5 0x0000000000000035 -+ KEY_6 0xDB36 #6 0x0000000000000036 -+ KEY_7 0x0A37 #7 0x0000000000000037 -+ KEY_8 0x5338 #8 0x0000000000000038 -+ KEY_9 0x8239 #9 0x0000000000000039 - Fullscreen 0x5E2D #Fullscreen 0x000000000000002D -- 0/AV 0x203A #0/AV 0x000000000000003A -- Info 0xCB2B #Info 0x000000000000002B -- Preview 0xFC2E #Preview 0x000000000000002E -- Record 0x3027 #Record 0x0000000000000027 -- Chan_Last 0x4325 #Chan_Last 0x0000000000000025 -- F_TV 0xE126 #F_TV 0x0000000000000026 -+ KEY_0 0x203A #0/AV 0x000000000000003A -+ KEY_INFO 0xCB2B #Info 0x000000000000002B -+ KEY_PREVIOUS 0xFC2E #Preview 0x000000000000002E -+ KEY_RECORD 0x3027 #Record 0x0000000000000027 -+ KEY_CHANNELDOWN 0x4325 #Chan_Last 0x0000000000000025 -+ KEY_TV 0xE126 #F_TV 0x0000000000000026 - F_TELETEXT 0xB829 #F_TELETEXT 0x0000000000000029 -- F_RADIO 0x1A2A #F_RADIO 0x000000000000002A -+ KEY_RADIO 0x1A2A #F_RADIO 0x000000000000002A - - # - # here are some extra buttons a new version of the remote seems to have -@@ -58,23 +58,23 @@ begin remote - # model: PCTV Remote (newest version?) - # supported devices: dongle on serial port (from TV-Card) - # -- L 0x631F #L 0x000000000000001F -- Zoom 0xB21E #Zoom 0x000000000000001E -- vol+ 0x851B #vol+ 0x000000000000001B -- vol- 0x590F #vol- 0x000000000000000F -- channel+ 0x7E17 #channel+ 0x0000000000000017 -- channel- 0xC11C #channel- 0x000000000000001C -+ KEY_L 0x631F #L 0x000000000000001F -+ KEY_ZOOM 0xB21E #Zoom 0x000000000000001E -+ KEY_VOLUMEUP 0x851B #vol+ 0x000000000000001B -+ KEY_VOLUMEDOWN 0x590F #vol- 0x000000000000000F -+ KEY_CHANNELUP 0x7E17 #channel+ 0x0000000000000017 -+ KEY_CHANNELDOWN 0xC11C #channel- 0x000000000000001C - middle 0x541A #middle 0x000000000000001A -- Menu 0x101D #Menu 0x000000000000001D -- next 0xF619 #next 0x0000000000000019 -- undo 0xAF16 #undo 0x0000000000000016 -- pause 0x0D15 #pause 0x0000000000000015 -+ KEY_MENU 0x101D #Menu 0x000000000000001D -+ KEY_NEXT 0xF619 #next 0x0000000000000019 -+ KEY_UNDO 0xAF16 #undo 0x0000000000000016 -+ KEY_PAUSE 0x0D15 #pause 0x0000000000000015 - redo 0x9813 #redo 0x0000000000000013 -- Rewind 0x880E #Rewind 0x000000000000000E -- Play 0x2A0D #Play 0x000000000000000D -- Stop 0xBF0B #Stop 0x000000000000000B -- FForward 0x4407 #FForward 0x0000000000000007 -- EPG 0x2718 #EPG 0x0000000000000018 -+ KEY_REWIND 0x880E #Rewind 0x000000000000000E -+ KEY_PLAY 0x2A0D #Play 0x000000000000000D -+ KEY_STOP 0xBF0B #Stop 0x000000000000000B -+ KEY_FASTFORWARD 0x4407 #FForward 0x0000000000000007 -+ KEY_EPG 0x2718 #EPG 0x0000000000000018 - - # here are some more buttons that seem to be mapped differently from - # the ones above -@@ -86,8 +86,8 @@ begin remote - # supported devices: serial - # - -- 9 0x0000000000000082 -- Zoom 0x00000000000000B2 -+ KEY_9 0x0000000000000082 -+ KEY_ZOOM 0x00000000000000B2 - middle 0x0000000000000014 - - -Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.playtv -+++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv -@@ -13,22 +13,22 @@ begin remote - begin codes - TV/FM 0x00000000000000e7 - FULL_SCREEN 0x00000000000000bf -- CH+ 0x0000000000000049 -- CH- 0x00000000000000c1 -- VOL- 0x000000000000006a -- VOL+ 0x000000000000004a -- MUTE 0x0000000000000047 -+ KEY_CHANNELUP 0x0000000000000049 -+ KEY_CHANNELDOWN 0x00000000000000c1 -+ KEY_VOLUMEDOWN 0x000000000000006a -+ KEY_VOLUMEUP 0x000000000000004a -+ KEY_MUTE 0x0000000000000047 - SOURCE 0x00000000000000e1 -- 1 0x00000000000000e0 -- 2 0x00000000000000c8 -- 3 0x00000000000000e8 -- 4 0x0000000000000060 -- 5 0x0000000000000062 -- 6 0x00000000000000c9 -- 7 0x00000000000000c0 -- 8 0x00000000000000c2 -- 9 0x0000000000000061 -- 0 0x0000000000000040 -+ KEY_1 0x00000000000000e0 -+ KEY_2 0x00000000000000c8 -+ KEY_3 0x00000000000000e8 -+ KEY_4 0x0000000000000060 -+ KEY_5 0x0000000000000062 -+ KEY_6 0x00000000000000c9 -+ KEY_7 0x00000000000000c0 -+ KEY_8 0x00000000000000c2 -+ KEY_9 0x0000000000000061 -+ KEY_0 0x0000000000000040 - end codes - end remote - -Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_bt878 -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.playtv_bt878 -+++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_bt878 -@@ -16,39 +16,39 @@ begin remote - repeat_bit 0 - - begin codes -- POWER 0x00000000000000aa -+ KEY_POWER 0x00000000000000aa - TV/FM 0x00000000000000e7 - TELETEXT 0x000000000000003f - SCAN 0x0000000000000041 - +/- 0x0000000000000069 -- EJECT 0x000000000000002a -- STOP 0x000000000000008a -+ KEY_EJECTCD 0x000000000000002a -+ KEY_STOP 0x000000000000008a - SOURCE 0x00000000000000e1 - STEREO 0x00000000000000df -- ENTER 0x000000000000005f -- SEEK_NEXT 0x0000000000000067 -- SEEK_FWD 0x00000000000000c7 -- CH_UP 0x0000000000000049 -- VOL_UP 0x000000000000004a -+ KEY_ENTER 0x000000000000005f -+ KEY_NEXT 0x0000000000000067 -+ KEY_FORWARD 0x00000000000000c7 -+ KEY_CHANNELUP 0x0000000000000049 -+ KEY_VOLUMEUP 0x000000000000004a - RECALL 0x0000000000000048 -- PAUSE 0x0000000000000068 -- PLAY 0x00000000000000ca -- CH_DOWN 0x00000000000000c1 -- VOL_DOWN 0x000000000000006a -- SEEK_PREV 0x000000000000000a -- SEEK_BACK 0x0000000000000042 -- ZOOM 0x00000000000000bf -- MUTE 0x0000000000000047 -- 1 0x00000000000000e0 -- 2 0x00000000000000c8 -- 3 0x00000000000000e8 -- 4 0x0000000000000060 -- 5 0x0000000000000062 -- 6 0x00000000000000c9 -- 7 0x00000000000000c0 -- 8 0x00000000000000c2 -- 9 0x0000000000000061 -- 0 0x0000000000000040 -+ KEY_PAUSE 0x0000000000000068 -+ KEY_PLAY 0x00000000000000ca -+ KEY_CHANNELDOWN 0x00000000000000c1 -+ KEY_VOLUMEDOWN 0x000000000000006a -+ KEY_PREVIOUS 0x000000000000000a -+ KEY_BACK 0x0000000000000042 -+ KEY_ZOOM 0x00000000000000bf -+ KEY_MUTE 0x0000000000000047 -+ KEY_1 0x00000000000000e0 -+ KEY_2 0x00000000000000c8 -+ KEY_3 0x00000000000000e8 -+ KEY_4 0x0000000000000060 -+ KEY_5 0x0000000000000062 -+ KEY_6 0x00000000000000c9 -+ KEY_7 0x00000000000000c0 -+ KEY_8 0x00000000000000c2 -+ KEY_9 0x0000000000000061 -+ KEY_0 0x0000000000000040 - end codes - end remote - -Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_pro -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.playtv_pro -+++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_pro -@@ -31,15 +31,15 @@ begin remote - - begin codes - -- power 0x0000000000007887 -- zoom 0x00000000000038C7 -+ KEY_POWER 0x0000000000007887 -+ KEY_ZOOM 0x00000000000038C7 - scan 0x000000000000E01F - tv/fm 0x000000000000C03F -- vol+ 0x000000000000F807 -- vol- 0x000000000000E817 -- chan+ 0x0000000000006897 -- chan- 0x00000000000028D7 -- mute 0x00000000000018E7 -+ KEY_VOLUMEUP 0x000000000000F807 -+ KEY_VOLUMEDOWN 0x000000000000E817 -+ KEY_CHANNELUP 0x0000000000006897 -+ KEY_CHANNELDOWN 0x00000000000028D7 -+ KEY_MUTE 0x00000000000018E7 - source 0x00000000000000FF - loop 0x000000000000C837 - +100 0x00000000000008F7 -@@ -48,16 +48,16 @@ begin remote - reset 0x000000000000B04F - freeze 0x000000000000F00F - function 0x000000000000708F -- 0 0x00000000000040BF -- 1 0x000000000000807F -- 2 0x000000000000D02F -- 3 0x000000000000D827 -- 4 0x000000000000A05F -- 5 0x000000000000906F -- 6 0x000000000000A857 -- 7 0x000000000000609F -- 8 0x00000000000050AF -- 9 0x00000000000048B7 -+ KEY_0 0x00000000000040BF -+ KEY_1 0x000000000000807F -+ KEY_2 0x000000000000D02F -+ KEY_3 0x000000000000D827 -+ KEY_4 0x000000000000A05F -+ KEY_5 0x000000000000906F -+ KEY_6 0x000000000000A857 -+ KEY_7 0x000000000000609F -+ KEY_8 0x00000000000050AF -+ KEY_9 0x00000000000048B7 - - end codes - -Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.remotemaster -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.remotemaster -+++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.remotemaster -@@ -25,39 +25,39 @@ begin remote - gap 189264 - - begin codes -- 1 0x0000000000052D2F -- 2 0x0000000000052CCF -- 3 0x0000000000052CAF -- 4 0x0000000000052D37 -- 5 0x0000000000052CDF -- 6 0x000000000005359F -- 7 0x0000000000052D4F -- 8 0x0000000000052D3F -- 9 0x00000000000534DF -- 0 0x0000000000052D57 -- ENTER 0x0000000000052CD7 -+ KEY_1 0x0000000000052D2F -+ KEY_2 0x0000000000052CCF -+ KEY_3 0x0000000000052CAF -+ KEY_4 0x0000000000052D37 -+ KEY_5 0x0000000000052CDF -+ KEY_6 0x000000000005359F -+ KEY_7 0x0000000000052D4F -+ KEY_8 0x0000000000052D3F -+ KEY_9 0x00000000000534DF -+ KEY_0 0x0000000000052D57 -+ KEY_ENTER 0x0000000000052CD7 - +10 0x0000000000053537 -- POWER 0x0000000000054D5F -- MODE 0x00000000000534AF -- TAB 0x0000000000053557 -- ZOOM 0x000000000005355F -+ KEY_POWER 0x0000000000054D5F -+ KEY_MODE 0x00000000000534AF -+ KEY_TAB 0x0000000000053557 -+ KEY_ZOOM 0x000000000005355F - FREEZE 0x000000000005356F - SEEK-- 0x0000000000054DAF -- PAUSE 0x0000000000052CB7 -+ KEY_PAUSE 0x0000000000052CB7 - SEEK++ 0x00000000000534B7 - SEEK- 0x0000000000052D5F -- PLAY 0x0000000000052D9F -+ KEY_PLAY 0x0000000000052D9F - SEEK+ 0x00000000000534CF -- STOP 0x0000000000054D9F -- EJECT 0x0000000000054D6F -- F1 0x000000000005354F -- F2 0x00000000000534D7 -- F3 0x00000000000534BF -- F4 0x000000000005352F -- CH- 0x000000000005353F -- CH+ 0x00000000000535AF -- VOL- 0x0000000000052D6F -- VOL+ 0x0000000000052DAF -+ KEY_STOP 0x0000000000054D9F -+ KEY_EJECTCD 0x0000000000054D6F -+ KEY_F1 0x000000000005354F -+ KEY_F2 0x00000000000534D7 -+ KEY_F3 0x00000000000534BF -+ KEY_F4 0x000000000005352F -+ KEY_CHANNELDOWN 0x000000000005353F -+ KEY_CHANNELUP 0x00000000000535AF -+ KEY_VOLUMEDOWN 0x0000000000052D6F -+ KEY_VOLUMEUP 0x0000000000052DAF - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/provideo/lircd.conf.pv951 -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/provideo/lircd.conf.pv951 -+++ lirc-0.8.7pre2/remotes/provideo/lircd.conf.pv951 -@@ -31,28 +31,28 @@ begin remote - repeat_bit 0 - - begin codes -- power 0x00000000000048B7 -+ KEY_POWER 0x00000000000048B7 - air/cbl 0x000000000000D02F - pc/tv 0x0000000000008877 - source 0x000000000000F00F - mts 0x000000000000C837 -- mute 0x00000000000008F7 -- 1 0x000000000000807F -- 2 0x00000000000040BF -- 3 0x000000000000C03F -- 4 0x00000000000020DF -- 5 0x000000000000A05F -- 6 0x000000000000609F -- 7 0x000000000000E01F -- 8 0x00000000000010EF -- 9 0x000000000000906F -- 0 0x00000000000000FF -+ KEY_MUTE 0x00000000000008F7 -+ KEY_1 0x000000000000807F -+ KEY_2 0x00000000000040BF -+ KEY_3 0x000000000000C03F -+ KEY_4 0x00000000000020DF -+ KEY_5 0x000000000000A05F -+ KEY_6 0x000000000000609F -+ KEY_7 0x000000000000E01F -+ KEY_8 0x00000000000010EF -+ KEY_9 0x000000000000906F -+ KEY_0 0x00000000000000FF - +100 0x00000000000050AF - ch_rtn 0x000000000000E817 -- ch+ 0x00000000000058A7 -- ch- 0x0000000000007887 -- vol+ 0x000000000000D827 -- vol- 0x000000000000F807 -+ KEY_CHANNELUP 0x00000000000058A7 -+ KEY_CHANNELDOWN 0x0000000000007887 -+ KEY_VOLUMEUP 0x000000000000D827 -+ KEY_VOLUMEDOWN 0x000000000000F807 - func 0x0000000000009867 - ttx 0x000000000000B04F - pg+ 0x000000000000708F -Index: lirc-0.8.7pre2/remotes/remotec/lircd.conf.BW6130 -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/remotec/lircd.conf.BW6130 -+++ lirc-0.8.7pre2/remotes/remotec/lircd.conf.BW6130 -@@ -20,20 +20,20 @@ begin remote - toggle_bit 0 - - begin codes -- PRE 0x23 -- NEXT 0x24 -- 1 0X10 -- 2 0x11 -- 3 0x12 -- POWER 0x50 -- VOL+ 0x30 -- VOL- 0x31 -- L 0x42 -- R 0x44 -- PAUSE 0x22 -- PLAY 0x20 -- STOP 0x21 -- MUTE 0x32 -+ KEY_PREVIOUS 0x23 -+ KEY_NEXT 0x24 -+ KEY_1 0X10 -+ KEY_2 0x11 -+ KEY_3 0x12 -+ KEY_POWER 0x50 -+ KEY_VOLUMEUP 0x30 -+ KEY_VOLUMEDOWN 0x31 -+ KEY_L 0x42 -+ KEY_R 0x44 -+ KEY_PAUSE 0x22 -+ KEY_PLAY 0x20 -+ KEY_STOP 0x21 -+ KEY_MUTE 0x32 - MOUSE_SLOW_N 0x95 - MOUSE_SLOW_NNE 0xd1 - MOUSE_SLOW_NE 0xcd -Index: lirc-0.8.7pre2/remotes/samsung/lircd.conf.samsung -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/samsung/lircd.conf.samsung -+++ lirc-0.8.7pre2/remotes/samsung/lircd.conf.samsung -@@ -28,60 +28,60 @@ begin remote - - begin codes - ### Standard keyboard report, type 1 -- OK 0x70028 -- Right 0x7004f -- Left 0x70050 -- Up 0x70052 -- Down 0x70051 -+ KEY_OK 0x70028 -+ KEY_RIGHT 0x7004f -+ KEY_LEFT 0x70050 -+ KEY_UP 0x70052 -+ KEY_DOWN 0x70051 - - ### Standard generic desktop report, type 3 -- Power 0x10001 -+ KEY_POWER 0x10001 - - ### Propietary Samsung report, type 4 -- Mute 0xffcc0001 -- Video_Archive 0xffcc0002 -- 1 0xffcc0003 -- 2 0xffcc0004 -- 3 0xffcc0005 -- Sleep 0xffcc0006 -- 4 0xffcc0007 -- 5 0xffcc0008 -- 6 0xffcc0009 -- Last 0xffcc000a -- 7 0xffcc000b -- 8 0xffcc000c -- 9 0xffcc000d -- Subtitle 0xffcc000e -- Full 0xffcc000f -- 0 0xffcc0010 -- PIP 0xffcc0011 -- Timer 0xffcc0012 -- Source 0xffcc0013 -- TV_Menu 0xffcc0014 -- EPG 0xffcc0015 -- Text 0xffcc0016 -+ KEY_MUTE 0xffcc0001 -+ Video_Archive 0xffcc0002 -+ KEY_1 0xffcc0003 -+ KEY_2 0xffcc0004 -+ KEY_3 0xffcc0005 -+ Sleep 0xffcc0006 -+ KEY_4 0xffcc0007 -+ KEY_5 0xffcc0008 -+ KEY_6 0xffcc0009 -+ Last 0xffcc000a -+ KEY_7 0xffcc000b -+ KEY_8 0xffcc000c -+ KEY_9 0xffcc000d -+ KEY_SUBTITLE 0xffcc000e -+ Full 0xffcc000f -+ KEY_0 0xffcc0010 -+ PIP 0xffcc0011 -+ Timer 0xffcc0012 -+ Source 0xffcc0013 -+ TV_Menu 0xffcc0014 -+ KEY_EPG 0xffcc0015 -+ KEY_TEXT 0xffcc0016 - # gap 17..1b: probably cursor keys were previously planned here -- TV 0xffcc001c -- Radio 0xffcc001d -- DVD 0xffcc001e -- Ch+ 0xffcc001f -- Menu 0xffcc0020 -- Vol+ 0xffcc0021 -- Ch- 0xffcc0022 -- Back 0xffcc0023 -- Vol- 0xffcc0024 -- Play 0xffcc0025 -- Pause 0xffcc0026 -- Stop 0xffcc0027 -- Record 0xffcc0028 -- Prev 0xffcc0029 -- Rewind 0xffcc002a -- Forward 0xffcc002b -- Next 0xffcc002c -- Red 0xffcc002d -- Green 0xffcc002e -- Yellow 0xffcc002f -- Blue 0xffcc0030 -+ KEY_TV 0xffcc001c -+ KEY_RADIO 0xffcc001d -+ KEY_DVD 0xffcc001e -+ KEY_CHANNELUP 0xffcc001f -+ KEY_MENU 0xffcc0020 -+ KEY_VOLUMEUP 0xffcc0021 -+ KEY_CHANNELDOWN 0xffcc0022 -+ KEY_BACK 0xffcc0023 -+ KEY_VOLUMEDOWN 0xffcc0024 -+ KEY_PLAY 0xffcc0025 -+ KEY_PAUSE 0xffcc0026 -+ KEY_STOP 0xffcc0027 -+ KEY_RECORD 0xffcc0028 -+ KEY_PREVIOUS 0xffcc0029 -+ KEY_REWIND 0xffcc002a -+ KEY_FORWARD 0xffcc002b -+ KEY_NEXT 0xffcc002c -+ KEY_RED 0xffcc002d -+ KEY_GREEN 0xffcc002e -+ KEY_YELLOW 0xffcc002f -+ KEY_BLUE 0xffcc0030 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/sasem/lircd.conf.sasem -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/sasem/lircd.conf.sasem -+++ lirc-0.8.7pre2/remotes/sasem/lircd.conf.sasem -@@ -33,47 +33,47 @@ begin remote - - - begin codes -- 1 0x08F7 -- 2 0x09F6 -- 3 0x0AF5 -- 4 0x10EF -- 5 0x11EE -- 6 0x12ED -- 7 0x18E7 -- 8 0x19E6 -- 9 0x1AE5 -+ KEY_1 0x08F7 -+ KEY_2 0x09F6 -+ KEY_3 0x0AF5 -+ KEY_4 0x10EF -+ KEY_5 0x11EE -+ KEY_6 0x12ED -+ KEY_7 0x18E7 -+ KEY_8 0x19E6 -+ KEY_9 0x1AE5 - start 0x40BF -- 0 0x41BE -+ KEY_0 0x41BE - full_down 0x06F9 -- vol- 0x0FF0 -- vol+ 0x0EF1 -- esc 0x05FA -- up 0x0BF4 -- close 0x07F8 -- left 0x03FC -- enter 0x13EC -- right 0x1BE4 -- prev 0x0CF3 -- down 0x43BC -- next 0x01FE -- mute 0x0DF2 -+ KEY_VOLUMEDOWN 0x0FF0 -+ KEY_VOLUMEUP 0x0EF1 -+ KEY_ESC 0x05FA -+ KEY_UP 0x0BF4 -+ KEY_CLOSE 0x07F8 -+ KEY_LEFT 0x03FC -+ KEY_ENTER 0x13EC -+ KEY_RIGHT 0x1BE4 -+ KEY_PREVIOUS 0x0CF3 -+ KEY_DOWN 0x43BC -+ KEY_NEXT 0x01FE -+ KEY_MUTE 0x0DF2 - step 0x04FB -- play_pause 0x49B6 -- stop 0x48B7 -+ KEY_PLAYPAUSE 0x49B6 -+ KEY_STOP 0x48B7 - winamp 0x1EE1 - media_player 0x15EA - hdtv 0x17E8 -- cd_player 0x16E9 -+ KEY_CD 0x16E9 - win_dvd 0x44BB - power_dvd 0x14EB -- internet 0x46B9 -+ KEY_WWW 0x46B9 - email 0x47B8 -- a 0x45BA -- b 0x1DE2 -- c 0x1CE3 -- d 0x1FE0 -- eject 0x02FD -- power 0x00FF -+ KEY_A 0x45BA -+ KEY_B 0x1DE2 -+ KEY_C 0x1CE3 -+ KEY_D 0x1FE0 -+ KEY_EJECTCD 0x02FD -+ KEY_POWER 0x00FF - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/sigma_designs/lircd.conf.realmagic -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/sigma_designs/lircd.conf.realmagic -+++ lirc-0.8.7pre2/remotes/sigma_designs/lircd.conf.realmagic -@@ -30,43 +30,43 @@ begin remote - - begin codes - -- 1 0x0000000000006897 -- 2 0x000000000000E817 -- 3 0x000000000000F807 -- 4 0x00000000000058A7 -- 5 0x000000000000D827 -- 6 0x00000000000018E7 -- 7 0x00000000000002FD -- 8 0x00000000000022DD -- 9 0x00000000000038C7 -- 0 0x00000000000032CD -- VOL+ 0x000000000000A857 -- VOL- 0x0000000000009867 -- MUTE 0x0000000000007887 -+ KEY_1 0x0000000000006897 -+ KEY_2 0x000000000000E817 -+ KEY_3 0x000000000000F807 -+ KEY_4 0x00000000000058A7 -+ KEY_5 0x000000000000D827 -+ KEY_6 0x00000000000018E7 -+ KEY_7 0x00000000000002FD -+ KEY_8 0x00000000000022DD -+ KEY_9 0x00000000000038C7 -+ KEY_0 0x00000000000032CD -+ KEY_VOLUMEUP 0x000000000000A857 -+ KEY_VOLUMEDOWN 0x0000000000009867 -+ KEY_MUTE 0x0000000000007887 - L-R 0x0000000000001AE5 - VGA 0x00000000000012ED -- ENTER 0x0000000000002AD5 -- QUIT 0x00000000000000FF -+ KEY_ENTER 0x0000000000002AD5 -+ KEY_EXIT 0x00000000000000FF - PRG 0x000000000000807F -- UP 0x00000000000040BF -- DOWN 0x000000000000609F -- LEFT 0x00000000000020DF -- RIGHT 0x000000000000C03F -- SELECT 0x000000000000A05F -- MENU 0x000000000000E01F -- TITLE 0x00000000000010EF -+ KEY_UP 0x00000000000040BF -+ KEY_DOWN 0x000000000000609F -+ KEY_LEFT 0x00000000000020DF -+ KEY_RIGHT 0x000000000000C03F -+ KEY_SELECT 0x000000000000A05F -+ KEY_MENU 0x000000000000E01F -+ KEY_TITLE 0x00000000000010EF - OSD 0x000000000000906F -- LANG 0x00000000000050AF -- ANGLE 0x000000000000D02F -- SUB 0x00000000000030CF -- PAUSE 0x000000000000B04F -- STOP 0x000000000000708F -- PLAY 0x000000000000F00F -- EJECT 0x00000000000008F7 -+ KEY_LANGUAGE 0x00000000000050AF -+ KEY_ANGLE 0x000000000000D02F -+ KEY_SUBTITLE 0x00000000000030CF -+ KEY_PAUSE 0x000000000000B04F -+ KEY_STOP 0x000000000000708F -+ KEY_PLAY 0x000000000000F00F -+ KEY_EJECTCD 0x00000000000008F7 - REV 0x0000000000008877 -- FF 0x00000000000048B7 -- PREV 0x000000000000C837 -- NEXT 0x00000000000028D7 -+ KEY_FASTFORWARD 0x00000000000048B7 -+ KEY_PREVIOUS 0x000000000000C837 -+ KEY_NEXT 0x00000000000028D7 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/silitek/lircd.conf.silitek -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/silitek/lircd.conf.silitek -+++ lirc-0.8.7pre2/remotes/silitek/lircd.conf.silitek -@@ -30,68 +30,68 @@ begin remote - MOUSE_SSE 0x0000000000aa0004 - MOUSE_SE 0x0000000000aa0003 - MOUSE_SEE 0x0000000000aa0002 -- MOUSE_R_BUTTON 0x0000000000aaa0bb -- MOUSE_L_BUTTON 0x0000000000aa0abb -+ BTN_RIGHT 0x0000000000aaa0bb -+ BTN_LEFT 0x0000000000aa0abb - MOUSE_L+R_BUTTON 0x0000000000aaaabb - -- 0 0x0000000000bb4a75 -- 1 0x0000000000bbc1fe -- 2 0x0000000000bbc2fd -- 3 0x0000000000bb437c -- 4 0x0000000000bbc4fb -- 5 0x0000000000bb457a -- 6 0x0000000000bb4679 -- 7 0x0000000000bbc7f8 -- 8 0x0000000000bbc8f7 -- 9 0x0000000000bb4976 -+ KEY_0 0x0000000000bb4a75 -+ KEY_1 0x0000000000bbc1fe -+ KEY_2 0x0000000000bbc2fd -+ KEY_3 0x0000000000bb437c -+ KEY_4 0x0000000000bbc4fb -+ KEY_5 0x0000000000bb457a -+ KEY_6 0x0000000000bb4679 -+ KEY_7 0x0000000000bbc7f8 -+ KEY_8 0x0000000000bbc8f7 -+ KEY_9 0x0000000000bb4976 - * 0x0000000000bbcbf4 - # 0x0000000000bb4c73 -- REW 0x0000000000bb516e -- FWD 0x0000000000bbd0ef -- PAUSE 0x0000000000bbcef1 -- PLAY 0x0000000000bbcdf2 -- STOP 0x0000000000bb4f70 -- VOLUME_UP 0x0000000000bbd3ec -- VOLUME_DOWN 0x0000000000bb546b -- MUTE 0x0000000000bb526d -+ KEY_REWIND 0x0000000000bb516e -+ KEY_FORWARD 0x0000000000bbd0ef -+ KEY_PAUSE 0x0000000000bbcef1 -+ KEY_PLAY 0x0000000000bbcdf2 -+ KEY_STOP 0x0000000000bb4f70 -+ KEY_VOLUMEUP 0x0000000000bbd3ec -+ KEY_VOLUMEDOWN 0x0000000000bb546b -+ KEY_MUTE 0x0000000000bb526d - DISPLAY 0x0000000000bbd5ea -- CD 0x0000000000bbdae5 -+ KEY_CD 0x0000000000bbdae5 - SHOW_WIZ 0x0000000000bb5b64 - PG_UP 0x0000000000bbd6e9 - PG_DN 0x0000000000bb5768 -- BACK 0x0000000000bb5867 -- FORWARD 0x0000000000bbd9e6 -- WWW 0x0000000000bbdce3 -- CLOSE 0x0000000000bb5d62 -+ KEY_BACK 0x0000000000bb5867 -+ KEY_FORWARD 0x0000000000bbd9e6 -+ KEY_WWW 0x0000000000bbdce3 -+ KEY_CLOSE 0x0000000000bb5d62 - -- 0_UP 0x0000000000cc4a75 -- 1_UP 0x0000000000ccc1fe -- 2_UP 0x0000000000ccc2fd -- 3_UP 0x0000000000cc437c -- 4_UP 0x0000000000ccc4fb -- 5_UP 0x0000000000cc457a -- 6_UP 0x0000000000cc4679 -- 7_UP 0x0000000000ccc7f8 -- 8_UP 0x0000000000ccc8f7 -- 9_UP 0x0000000000cc4976 -+ KEY_0 0x0000000000cc4a75 -+ KEY_1 0x0000000000ccc1fe -+ KEY_2 0x0000000000ccc2fd -+ KEY_3 0x0000000000cc437c -+ KEY_4 0x0000000000ccc4fb -+ KEY_5 0x0000000000cc457a -+ KEY_6 0x0000000000cc4679 -+ KEY_7 0x0000000000ccc7f8 -+ KEY_8 0x0000000000ccc8f7 -+ KEY_9 0x0000000000cc4976 - *_UP 0x0000000000cccbf4 - #_UP 0x0000000000cc4c73 -- REW_UP 0x0000000000cc516e -- FWD_UP 0x0000000000ccd0ef -- PAUSE_UP 0x0000000000cccef1 -- PLAY_UP 0x0000000000cccdf2 -- STOP_UP 0x0000000000cc4f70 -- VOLUME_UP_UP 0x0000000000ccd3ec -- VOLUME_DOWN_UP 0x0000000000cc546b -- MUTE_UP 0x0000000000cc526d -+ KEY_REWIND 0x0000000000cc516e -+ KEY_FORWARD 0x0000000000ccd0ef -+ KEY_PAUSE 0x0000000000cccef1 -+ KEY_PLAY 0x0000000000cccdf2 -+ KEY_STOP 0x0000000000cc4f70 -+ KEY_VOLUMEUP 0x0000000000ccd3ec -+ KEY_VOLUMEDOWN 0x0000000000cc546b -+ KEY_MUTE 0x0000000000cc526d - DISPLAY_UP 0x0000000000ccd5ea -- CD_UP 0x0000000000ccdae5 -+ KEY_CD 0x0000000000ccdae5 - SHOW_WIZ_UP 0x0000000000cc5b64 - PG_UP_UP 0x0000000000ccd6e9 - PG_DN_UP 0x0000000000cc5768 -- BACK_UP 0x0000000000cc5867 -- FORWARD_UP 0x0000000000ccd9e6 -- WWW_UP 0x0000000000ccdce3 -- CLOSE_UP 0x0000000000cc5d62 -+ KEY_REWIND 0x0000000000cc5867 -+ KEY_FORWARD 0x0000000000ccd9e6 -+ KEY_WWW 0x0000000000ccdce3 -+ KEY_CLOSE 0x0000000000cc5d62 - end codes - end remote -Index: lirc-0.8.7pre2/remotes/streamzap/lircd.conf.streamzap -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/streamzap/lircd.conf.streamzap -+++ lirc-0.8.7pre2/remotes/streamzap/lircd.conf.streamzap -@@ -27,41 +27,41 @@ begin remote - - - begin codes -- 0 0x00 -- 1 0x01 -- 2 0x02 -- 3 0x03 -- 4 0x04 -- 5 0x05 -- 6 0x06 -- 7 0x07 -- 8 0x08 -- 9 0x09 -- POWER 0x0A -- MUTE 0x0B -- CH_UP 0x0C -- VOL_UP 0x0D -- CH_DOWN 0x0E -- VOL_DOWN 0x0F -- UP 0x10 -- LEFT 0x11 -- OK 0x12 -- RIGHT 0x13 -- DOWN 0x14 -- MENU 0x15 -- EXIT 0x16 -- PLAY 0x17 -- PAUSE 0x18 -- STOP 0x19 -- |<< 0x1A -- >>| 0x1B -- RECORD 0x1C -- << 0x1D -- >> 0x1E -- RED 0x20 -- GREEN 0x21 -- YELLOW 0x22 -- BLUE 0x23 -+ KEY_0 0x00 -+ KEY_1 0x01 -+ KEY_2 0x02 -+ KEY_3 0x03 -+ KEY_4 0x04 -+ KEY_5 0x05 -+ KEY_6 0x06 -+ KEY_7 0x07 -+ KEY_8 0x08 -+ KEY_9 0x09 -+ KEY_POWER 0x0A -+ KEY_MUTE 0x0B -+ KEY_CHANNELUP 0x0C -+ KEY_VOLUMEUP 0x0D -+ KEY_CHANNELDOWN 0x0E -+ KEY_VOLUMEDOWN 0x0F -+ KEY_UP 0x10 -+ KEY_LEFT 0x11 -+ KEY_OK 0x12 -+ KEY_RIGHT 0x13 -+ KEY_DOWN 0x14 -+ KEY_MENU 0x15 -+ KEY_EXIT 0x16 -+ KEY_PLAY 0x17 -+ KEY_PAUSE 0x18 -+ KEY_STOP 0x19 -+ KEY_PREVIOUS 0x1A -+ KEY_NEXT 0x1B -+ KEY_RECORD 0x1C -+ KEY_REWIND 0x1D -+ KEY_FORWARD 0x1E -+ KEY_RED 0x20 -+ KEY_GREEN 0x21 -+ KEY_YELLOW 0x22 -+ KEY_BLUE 0x23 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/technisat/lircd.conf.mediafocusI -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/technisat/lircd.conf.mediafocusI -+++ lirc-0.8.7pre2/remotes/technisat/lircd.conf.mediafocusI -@@ -30,11 +30,11 @@ begin remote - duty_cycle 33 - - begin codes -- MUTE 0x0000000000000046 -- VOL+ 0x000000000000006E -- VOL- 0x000000000000006F -- CH+ 0x0000000000000047 -- CH- 0x0000000000000048 -+ KEY_MUTE 0x0000000000000046 -+ KEY_VOLUMEUP 0x000000000000006E -+ KEY_VOLUMEDOWN 0x000000000000006F -+ KEY_CHANNELUP 0x0000000000000047 -+ KEY_CHANNELDOWN 0x0000000000000048 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/tekram/lircd.conf.m230 -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/tekram/lircd.conf.m230 -+++ lirc-0.8.7pre2/remotes/tekram/lircd.conf.m230 -@@ -13,36 +13,36 @@ begin remote - name M230 - bits 8 - begin codes -- 0 0x00 -- 1 0x01 -- 2 0x02 -- 3 0x03 -- 4 0x04 -- 5 0x05 -- 6 0x06 -- 7 0x07 -- 8 0x08 -- 9 0x09 -+ KEY_0 0x00 -+ KEY_1 0x01 -+ KEY_2 0x02 -+ KEY_3 0x03 -+ KEY_4 0x04 -+ KEY_5 0x05 -+ KEY_6 0x06 -+ KEY_7 0x07 -+ KEY_8 0x08 -+ KEY_9 0x09 - RECALL 0x0A -- ENTER 0x17 -- POWER 0x1C -+ KEY_ENTER 0x17 -+ KEY_POWER 0x1C - SOURCE 0x15 - PC_VID 0x12 - STILL 0x11 - TTX 0x0F - FAV 0x13 -- MUTE 0x10 -- VOL_UP 0x1A -- VOL_DN 0x1E -- CH_UP 0x1B -- CH_DN 0x1F -- PLAY 0x0D -- STOP 0x0E -- REW 0x1D -- FFW 0x19 -+ KEY_MUTE 0x10 -+ KEY_VOLUMEUP 0x1A -+ KEY_VOLUMEDOWN 0x1E -+ KEY_CHANNELUP 0x1B -+ KEY_CHANNELDOWN 0x1F -+ KEY_PLAY 0x0D -+ KEY_STOP 0x0E -+ KEY_REWIND 0x1D -+ KEY_FASTFORWARD 0x19 - ADD_ER 0x16 - FUNC 0x14 -- F_PLUS 0x18 -- F_MINUS 0x0C -+ KEY_KPPLUS 0x18 -+ KEY_KPMINUS 0x0C - end codes - end remote -Index: lirc-0.8.7pre2/remotes/vlsystem/lircd.conf.mplay -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/vlsystem/lircd.conf.mplay -+++ lirc-0.8.7pre2/remotes/vlsystem/lircd.conf.mplay -@@ -22,49 +22,49 @@ begin remote - toggle_bit_mask 0x0 - - begin codes -- PwrOff 0x41 -- PwrOn 0x55 -- Movies 0x40 -- Television 0x46 -- Photos 0x45 -- Music 0x56 -- 1 0x4d -- 2 0x4e -- 3 0x4f -- 4 0x50 -- 5 0x51 -- 6 0x52 -- 7 0x53 -- 8 0x03 -- 9 0x07 -- 0 0x4c -- Vol+ 0x0a -- Vol- 0x0e -- Ch+_Lang 0x12 -- Ch-_Page 0x16 -- Guide 0x0f -- Back 0x0b -- Tv 0x13 -- Ok 0x42 -- Up 0x19 -- Left 0x54 -- Right 0x43 -- Down 0x1d -- Exit_Click 0x1f -- Task_Quick 0x17 -- Run_DClick 0x1b -- Rew 0x0d -- Play 0x09 -- Ffwd 0x15 -- Prev 0x1a -- Stop 0x01 -- Next 0x1e -- Pause 0x05 -- Mute 0x4a -- Warp_Mouse 0x47 -- Rec 0x11 -- DVD_Zoom 0x14 -- Detail 0x4b -+ PwrOff 0x41 -+ KEY_POWER 0x55 -+ KEY_VIDEO 0x40 -+ KEY_TV 0x46 -+ KEY_PHOTO 0x45 -+ KEY_AUDIO 0x56 -+ KEY_1 0x4d -+ KEY_2 0x4e -+ KEY_3 0x4f -+ KEY_4 0x50 -+ KEY_5 0x51 -+ KEY_6 0x52 -+ KEY_7 0x53 -+ KEY_8 0x03 -+ KEY_9 0x07 -+ KEY_0 0x4c -+ KEY_VOLUMEUP 0x0a -+ KEY_VOLUMEDOWN 0x0e -+ KEY_CHANNELUP 0x12 -+ KEY_CHANNELDOWN 0x16 -+ Guide 0x0f -+ KEY_BACK 0x0b -+ KEY_TV 0x13 -+ KEY_OK 0x42 -+ KEY_UP 0x19 -+ KEY_LEFT 0x54 -+ KEY_RIGHT 0x43 -+ KEY_DOWN 0x1d -+ Exit_Click 0x1f -+ Task_Quick 0x17 -+ Run_DClick 0x1b -+ KEY_REWIND 0x0d -+ KEY_PLAY 0x09 -+ KEY_FASTFORWARD 0x15 -+ KEY_PREVIOUS 0x1a -+ KEY_STOP 0x01 -+ KEY_NEXT 0x1e -+ KEY_PAUSE 0x05 -+ KEY_MUTE 0x4a -+ Warp_Mouse 0x47 -+ KEY_RECORD 0x11 -+ KEY_ZOOM 0x14 -+ Detail 0x4b - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/x10/lircd.conf.mouseremote -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/x10/lircd.conf.mouseremote -+++ lirc-0.8.7pre2/remotes/x10/lircd.conf.mouseremote -@@ -24,42 +24,42 @@ begin remote - gap 140000 - - begin codes -- POWER 0x000000000000000F -- PC 0x000000000000002B -+ KEY_POWER 0x000000000000000F -+ KEY_PC 0x000000000000002B - LAST 0x000000000000004F -- CHANUP 0x0000000000000002 -- CHANDOWN 0x0000000000000003 -- VOLUP 0x0000000000000006 -- VOLDOWN 0x0000000000000007 -- MUTE 0x0000000000000005 -- 1 0x0000000000000041 -- 2 0x0000000000000042 -- 3 0x0000000000000043 -- 4 0x0000000000000044 -- 5 0x0000000000000045 -- 6 0x0000000000000046 -- 7 0x0000000000000047 -- 8 0x0000000000000048 -- 9 0x0000000000000049 -- 0 0x0000000000000040 -- ENTER 0x000000000000004a -+ KEY_CHANNELUP 0x0000000000000002 -+ KEY_CHANNELDOWN 0x0000000000000003 -+ KEY_VOLUMEUP 0x0000000000000006 -+ KEY_VOLUMEDOWN 0x0000000000000007 -+ KEY_MUTE 0x0000000000000005 -+ KEY_1 0x0000000000000041 -+ KEY_2 0x0000000000000042 -+ KEY_3 0x0000000000000043 -+ KEY_4 0x0000000000000044 -+ KEY_5 0x0000000000000045 -+ KEY_6 0x0000000000000046 -+ KEY_7 0x0000000000000047 -+ KEY_8 0x0000000000000048 -+ KEY_9 0x0000000000000049 -+ KEY_0 0x0000000000000040 -+ KEY_ENTER 0x000000000000004a - ADOTB 0x000000000000005D -- REWIND 0x000000000000001C -- PLAY 0x000000000000000D -- FFWD 0x000000000000001D -- STOP 0x000000000000000E -- PAUSE 0x000000000000004E -- RECORD 0x00000000000000FF -- ENTER 0x000000000000004A -+ KEY_REWIND 0x000000000000001C -+ KEY_PLAY 0x000000000000000D -+ KEY_FASTFORWARD 0x000000000000001D -+ KEY_STOP 0x000000000000000E -+ KEY_PAUSE 0x000000000000004E -+ KEY_RECORD 0x00000000000000FF -+ KEY_ENTER 0x000000000000004A - LAST 0x000000000000004F - DISP 0x000000000000005C - SHIFT 0x000000000000006B - GUIDE 0x000000000000006D -- SELECT 0x0000000000000093 -- PHONE 0x000000000000004B -- WEB 0x000000000000008B -- CD 0x00000000000000AB -- DVD 0x00000000000000CB -+ KEY_SELECT 0x0000000000000093 -+ KEY_PHONE 0x000000000000004B -+ KEY_WWW 0x000000000000008B -+ KEY_CD 0x00000000000000AB -+ KEY_DVD 0x00000000000000CB - MOUSE_SLOW_N 0x0000000000000110 - MOUSE_SLOW_NNE 0x0000000000000131 - MOUSE_SLOW_NE 0x0000000000000111 -@@ -110,7 +110,7 @@ begin remote - MOUSE_FAST_NNW 0x0000000000000539 - BUTTONR_DOWN 0x0000000000000801 - BUTTONL_DOWN 0x0000000000000804 -- BUTTON_UP 0x0000000000000800 -+ KEY_UP 0x0000000000000800 - end codes - - end remote -Index: lirc-0.8.7pre2/remotes/x10/lircd.conf.mp3anywhere -=================================================================== ---- lirc-0.8.7pre2.orig/remotes/x10/lircd.conf.mp3anywhere -+++ lirc-0.8.7pre2/remotes/x10/lircd.conf.mp3anywhere -@@ -22,43 +22,43 @@ begin remote - gap 140000 - - begin codes -- POWER 0x00000000000000F0 -- PC 0x00000000000000D4 -+ KEY_POWER 0x00000000000000F0 -+ KEY_PC 0x00000000000000D4 - LAST 0x00000000000000F2 -- CHANUP 0x0000000000000040 -- CHANDOWN 0x00000000000000C0 -- VOLUP 0x0000000000000060 -- VOLDOWN 0x00000000000000E0 -- MUTE 0x00000000000000A0 -- ONE 0x0000000000000082 -- TWO 0x0000000000000042 -- THREE 0x00000000000000C2 -- FOUR 0x0000000000000022 -- FIVE 0x00000000000000A2 -- SIX 0x0000000000000062 -- SEVEN 0x00000000000000E2 -- EIGHT 0x0000000000000012 -- NINE 0x0000000000000092 -- ZERO 0x0000000000000002 -- ENTER 0x0000000000000052 -+ KEY_CHANNELUP 0x0000000000000040 -+ KEY_CHANNELDOWN 0x00000000000000C0 -+ KEY_VOLUMEUP 0x0000000000000060 -+ KEY_VOLUMEDOWN 0x00000000000000E0 -+ KEY_MUTE 0x00000000000000A0 -+ KEY_1 0x0000000000000082 -+ KEY_2 0x0000000000000042 -+ KEY_3 0x00000000000000C2 -+ KEY_4 0x0000000000000022 -+ KEY_5 0x00000000000000A2 -+ KEY_6 0x0000000000000062 -+ KEY_7 0x00000000000000E2 -+ KEY_8 0x0000000000000012 -+ KEY_9 0x0000000000000092 -+ KEY_0 0x0000000000000002 -+ KEY_ENTER 0x0000000000000052 - ADOTB 0x00000000000000BA -- A 0x000000000000003A -- B 0x00000000000000D8 -- C 0x00000000000000D6 -- D 0x00000000000000D4 -- MENU 0x00000000000000B6 -- EXIT 0x00000000000000C9 -- UP 0x00000000000000D5 -- DOWN 0x00000000000000D3 -- LEFT 0x00000000000000D2 -- RIGHT 0x00000000000000D1 -- OK 0x0000000000000052 -- REWIND 0x0000000000000038 -- PLAY 0x00000000000000B0 -- FFWD 0x00000000000000B8 -- RECORD 0x00000000000000FF -- STOP 0x0000000000000070 -- PAUSE 0x0000000000000072 -+ KEY_A 0x000000000000003A -+ KEY_B 0x00000000000000D8 -+ KEY_C 0x00000000000000D6 -+ KEY_D 0x00000000000000D4 -+ KEY_MENU 0x00000000000000B6 -+ KEY_EXIT 0x00000000000000C9 -+ KEY_UP 0x00000000000000D5 -+ KEY_DOWN 0x00000000000000D3 -+ KEY_LEFT 0x00000000000000D2 -+ KEY_RIGHT 0x00000000000000D1 -+ KEY_OK 0x0000000000000052 -+ KEY_REWIND 0x0000000000000038 -+ KEY_PLAY 0x00000000000000B0 -+ KEY_FASTFORWARD 0x00000000000000B8 -+ KEY_RECORD 0x00000000000000FF -+ KEY_STOP 0x0000000000000070 -+ KEY_PAUSE 0x0000000000000072 - end codes - - end remote diff --git a/packages/sysutils/remote/lirc/patches/lirc-0.8.7-uinput_key_fix.diff.old b/packages/sysutils/remote/lirc/patches/lirc-0.8.7-uinput_key_fix.diff similarity index 100% rename from packages/sysutils/remote/lirc/patches/lirc-0.8.7-uinput_key_fix.diff.old rename to packages/sysutils/remote/lirc/patches/lirc-0.8.7-uinput_key_fix.diff