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
@@ -141,104 +141,104 @@ void HTC::init(const QString& cpu_info)
     QString model;
     int loc = cpu_info.find( ":" );
     if ( loc != -1 )
         model = cpu_info.mid( loc+2 ).simplifyWhiteSpace();
     else
         model = cpu_info;
 
     d->m_model = Model_HTC_Universal;
     d->m_modelstr = "Unknown HTC";
 
     if ( model == "HTC Universal" ) {
         d->m_model = Model_HTC_Universal;
         d->m_modelstr = "HTC Universal";
     }
     if ( model == "HTC Alpine" ) {
         d->m_model = Model_HTC_Alpine;
         d->m_modelstr = "HTC Alpine";
     }
     if ( model == "HTC Apache" ) {
         d->m_model = Model_HTC_Apache;
         d->m_modelstr = "HTC Apache";
     }
     if ( model == "HTC Beetles" ) {
         d->m_model = Model_HTC_Beetles;
         d->m_modelstr = "HTC Beetles";
     }
     if ( model == "HTC Blueangel" ) {
         d->m_model = Model_HTC_Blueangel;
         d->m_modelstr = "HTC Blueangel";
     }
     if ( model == "HTC Himalaya" ) {
         d->m_model = Model_HTC_Himalaya;
         d->m_modelstr = "HTC Himalaya";
     }
     if ( model == "HTC Magician" ) {
         d->m_model = Model_HTC_Magician;
         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;
     }
 
     // set default qte driver
     switch( d->m_model )
     {
         default:
             d->m_qteDriver = "Transformed";
     }
 
     m_leds[0] = Led_Off;
 
     qDebug( "HTC::init() - Using the 2.6 Xanadux on a %s", (const char*) d->m_modelstr );
 }
 
 void HTC::initButtons()
 {
     qDebug( "HTC::initButtons()" );
     if ( d->m_buttons )
         return;
 
     d->m_buttons = new QValueList <ODeviceButton>;
 
     struct htc_button * phtc_buttons;
     int buttoncount;
     switch ( d->m_model )
     {
         case Model_HTC_Universal:
             if ( isQWS( ) )
             {
                 addPreHandler(this);
             }
             phtc_buttons = htc_buttons_universal;
             buttoncount = ARRAY_SIZE(htc_buttons_universal);
             break;
         default:
             phtc_buttons = htc_buttons;
@@ -255,97 +255,97 @@ void HTC::initButtons()
         b.setPixmap( OResource::loadPixmap( zb->pix ));
         b.setFactoryPresetPressedAction( OQCopMessage( makeChannel ( zb->fpressedservice ), zb->fpressedaction ));
         b.setFactoryPresetHeldAction( OQCopMessage( makeChannel ( zb->fheldservice ), zb->fheldaction ));
         d->m_buttons->append( b );
     }
 
     reloadButtonMapping();
 }
 
 
 
 typedef struct sharp_led_status {
     int which;   /* select which LED status is wanted. */
     int status;  /* set new led status if you call SHARP_LED_SETSTATUS */
 } sharp_led_status;
 
 void HTC::buzzer( int sound )
 {
 #ifndef QT_NO_SOUND
     Sound *snd = 0;
 
     // All devices except SL5500 have a DSP device
     if ( d->m_model == Model_HTC_Universal ) {
 
         switch ( sound ){
         case SHARP_BUZ_TOUCHSOUND: {
             static Sound touch_sound("touchsound");
             snd = &touch_sound;
     }
             break;
         case SHARP_BUZ_KEYSOUND: {
             static Sound key_sound( "keysound" );
             snd = &key_sound;
     }
             break;
         case SHARP_BUZ_SCHEDULE_ALARM:
         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
 }
 
 
 void HTC::playAlarmSound()
 {
     buzzer( SHARP_BUZ_SCHEDULE_ALARM );
 }
 
 void HTC::playTouchSound()
 {
     buzzer( SHARP_BUZ_TOUCHSOUND );
 }
 
 void HTC::playKeySound()
 {
     buzzer( SHARP_BUZ_KEYSOUND );
 }
 
 
 QValueList <OLed> HTC::ledList() const
 {
     QValueList <OLed> vl;
     vl << Led_Mail;
     return vl;
 }
 
 QValueList <OLedState> HTC::ledStateList( OLed l ) const
 {
     QValueList <OLedState> vl;
 
     if ( l == Led_Mail )
         vl << Led_Off << Led_On << Led_BlinkSlow;
     return vl;
 }
 
 OLedState HTC::ledState( OLed which ) const
 {