[Pommed-commits] r500 - trunk/pommed

[jblache at alioth.debian.org]

Author: jblache
Date: 2008-07-13 17:53:17 +0000 (Sun, 13 Jul 2008)
New Revision: 500

Modified:
   trunk/pommed/evdev.c
   trunk/pommed/evdev.h
Log:
Use key definitions from linux/input.h instead of redefining our owns.


Modified: trunk/pommed/evdev.c
===================================================================
--- trunk/pommed/evdev.c	2008-07-09 17:35:51 UTC (rev 499)
+++ trunk/pommed/evdev.c	2008-07-13 17:53:17 UTC (rev 500)
@@ -109,43 +109,43 @@
 
       switch (ev.code)
 	{
-	  case K_LCD_BCK_DOWN:
+	  case KEY_BRIGHTNESSDOWN:
 	    logdebug("\nKEY: LCD backlight down\n");
 
 	    mops->lcd_backlight_step(STEP_DOWN);
 	    break;
 
-	  case K_LCD_BCK_UP:
+	  case KEY_BRIGHTNESSUP:
 	    logdebug("\nKEY: LCD backlight up\n");
 
 	    mops->lcd_backlight_step(STEP_UP);
 	    break;
 
-	  case K_AUDIO_MUTE:
+	  case KEY_MUTE:
 	    logdebug("\nKEY: audio mute\n");
 
 	    audio_toggle_mute();
 	    break;
 
-	  case K_AUDIO_DOWN:
+	  case KEY_VOLUMEDOWN:
 	    logdebug("\nKEY: audio down\n");
 
 	    audio_step(STEP_DOWN);
 	    break;
 
-	  case K_AUDIO_UP:
+	  case KEY_VOLUMEUP:
 	    logdebug("\nKEY: audio up\n");
 
 	    audio_step(STEP_UP);
 	    break;
 
-	  case K_VIDEO_TOGGLE:
+	  case KEY_SWITCHVIDEOMODE:
 	    logdebug("\nKEY: video toggle\n");
 
 	    video_switch();
 	    break;
 
-	  case K_KBD_BCK_OFF:
+	  case KEY_KBDILLUMTOGGLE:
 	    logdebug("\nKEY: keyboard backlight off\n");
 
 	    if (!has_kbd_backlight())
@@ -157,7 +157,7 @@
 	      kbd_backlight_toggle();
 	    break;
 
-	  case K_KBD_BCK_DOWN:
+	  case KEY_KBDILLUMDOWN:
 	    logdebug("\nKEY: keyboard backlight down\n");
 
 	    if (!has_kbd_backlight())
@@ -166,7 +166,7 @@
 	    kbd_backlight_step(STEP_DOWN);
 	    break;
 
-	  case K_KBD_BCK_UP:
+	  case KEY_KBDILLUMUP:
 	    logdebug("\nKEY: keyboard backlight up\n");
 
 	    if (!has_kbd_backlight())
@@ -175,25 +175,25 @@
 	    kbd_backlight_step(STEP_UP);
 	    break;
 
-	  case K_CD_EJECT:
+	  case KEY_EJECTCD:
 	    logdebug("\nKEY: CD eject\n");
 
 	    cd_eject();
 	    break;
 
-	  case K_IR_FFWD:
+	  case KEY_NEXTSONG:
 	    logdebug("\nKEY: IR fast forward\n");
 	    break;
 
-	  case K_IR_REWD:
+	  case KEY_PREVIOUSSONG:
 	    logdebug("\nKEY: IR rewind\n");
 	    break;
 
-	  case K_IR_PLAY:
+	  case KEY_PLAYPAUSE:
 	    logdebug("\nKEY: IR play/pause\n");
 	    break;
 
-	  case K_IR_MENU:
+	  case KEY_MENU:
 	    logdebug("\nKEY: IR menu\n");
 	    break;
 

Modified: trunk/pommed/evdev.h
===================================================================
--- trunk/pommed/evdev.h	2008-07-09 17:35:51 UTC (rev 499)
+++ trunk/pommed/evdev.h	2008-07-13 17:53:17 UTC (rev 500)
@@ -76,26 +76,6 @@
 #define USB_PRODUCT_ID_APPLEIR_2      0x8242
 
 
-/* Keyboard hotkeys */
-#define K_LCD_BCK_DOWN          0xe0
-#define K_LCD_BCK_UP            0xe1
-#define K_AUDIO_MUTE            0x71
-#define K_AUDIO_DOWN            0x72
-#define K_AUDIO_UP              0x73
-#define K_VIDEO_TOGGLE          0xe3
-#define K_KBD_BCK_OFF           0xe4
-#define K_KBD_BCK_DOWN          0xe5
-#define K_KBD_BCK_UP            0xe6
-#define K_CD_EJECT              0xa1
-
-/* Apple Remote controller keys */
-/* audio up/down use the same codes as the keyboard */
-#define K_IR_FFWD               0xa3
-#define K_IR_REWD               0xa5
-#define K_IR_PLAY               0xa4
-#define K_IR_MENU               0x8b
-
-
 #define EVDEV_DIR               "/dev/input"
 #define EVDEV_BASE              "/dev/input/event"
 #define EVDEV_MAX               32