Commit of GoXbox Live HTC Universal patch. This should make backlight

work with current kernel versions. It also changes the mixer name to the
rightful name for most modern kernels. It is rumored that the mixer in most
HTC devices does not work. But at least it points at the right device now.

Thanks GoXbox Live!

1 files changed, 3 insertions, 3 deletions

diff --git a/libopie2/opiecore/device/odevice_htc.cpp b/libopie2/opiecore/device/odevice_htc.cpp
index 4e5200b..a6ade11 100644
--- a/libopie2/opiecore/device/odevice_htc.cpp
+++ b/libopie2/opiecore/device/odevice_htc.cpp
@@ -177,32 +177,32 @@ void HTC::init(const QString& cpu_info)
         d->m_modelstr = "HTC Magician";
     }
 
 
     // set path to backlight device
     switch ( d->m_model )
     {
         case Model_HTC_Universal:
         case Model_HTC_Magician:
         case Model_HTC_Alpine:
         case Model_HTC_Beetles:
         case Model_HTC_Apache:
-            m_backlightdev = "/sys/class/backlight/pxa2xx-fb/";
+            m_backlightdev = "/sys/class/backlight/corgi-bl/";
         break;
         case Model_HTC_Blueangel:
         case Model_HTC_Himalaya:
             m_backlightdev = "/sys/class/backlight/w100fb/";
         break;
         default:
-            m_backlightdev = "/sys/class/backlight/pxafb/";
+            m_backlightdev = "/sys/class/backlight/corgi-bl/";
     }
 
     // set initial rotation
     switch( d->m_model )
     {
         case Model_HTC_Universal:
             initHingeSensor();
             d->m_rotation = rotation();
             d->m_direction = direction();
             break;
         default:
             d->m_rotation = Rot270;
@@ -291,25 +291,25 @@ void HTC::buzzer( int sound )
         default: {
             static Sound alarm_sound("alarm");
             snd = &alarm_sound;
     }
             break;
         }
     }
 
     // If a soundname is defined, we expect that this device has
     // sound capabilities.. Otherwise we expect to have the buzzer
     // device..
     if ( snd && snd->isFinished() ){
-        changeMixerForAlarm( 0, "/dev/sound/mixer", snd );
+        changeMixerForAlarm( 0, "/dev/mixer", snd );
         snd->play();
     } else if( !snd ) {
         int fd = ::open ( "/dev/sharp_buz", O_WRONLY|O_NONBLOCK );
 
         if ( fd >= 0 ) {
             ::ioctl ( fd, SHARP_BUZZER_MAKESOUND, sound );
             ::close ( fd );
         }
 
     }
 #endif
 }