ODevice now features a method to gather the preferred qte driver.

The default driver is "Transformed". C7x0 Zaurus devices use "W100" from now on.

3 files changed, 24 insertions, 5 deletions

diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index 5e91d8b..56f305f 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -176,8 +176,9 @@ ODevice::ODevice()
     d->m_system = System_Unknown;
     d->m_sysverstr = "0.0";
     d->m_rotation = Rot0;
     d->m_direction = CW;
+    d->m_qteDriver = "Transformed";
 
     d->m_holdtime = 1000; // 1000ms
     d->m_buttons = 0;
     d->m_cpu_frequencies = new QStrList;
@@ -401,8 +402,13 @@ ODirection ODevice::direction() const
 {
     return d->m_direction;
 }
 
+QString ODevice::qteDriver() const
+{
+    return d->m_qteDriver;
+}
+
 /**
 * This plays an alarm sound
 */
 void ODevice::playAlarmSound()
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h
index 5db43ff..b8478b9 100644
--- a/libopie2/opiecore/device/odevice.h
+++ b/libopie2/opiecore/device/odevice.h
@@ -235,13 +235,11 @@ protected:
 
 public:
     // sandman do we want to allow destructions? -zecke?
     virtual ~ODevice();
-
     static ODevice *inst();
 
     // information
-
     QString modelString() const;
     OModel model() const;
     inline OModel series() const { return (OModel) ( model() & Model_Series_Mask ); }
 
@@ -255,8 +253,10 @@ public:
 
     virtual Transformation rotation() const;
     virtual ODirection direction() const;
 
+    QString qteDriver() const;
+
     // system
     virtual bool suspend();
 
     virtual bool setDisplayStatus ( bool on );
@@ -358,8 +358,10 @@ class ODeviceData {
 
     Transformation m_rotation;
     ODirection m_direction;
 
+    QString m_qteDriver;
+
     QValueList <ODeviceButton> *m_buttons;
     uint                        m_holdtime;
     QStrList                   *m_cpu_frequencies;
     bool    m_initializedButtonQcop : 1;
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 21d2342..0c421e3 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -198,9 +198,10 @@ void Zaurus::init(const QString& cpu_info)
         d->m_modelstr = "Unknown Zaurus";
     }
 
     // set path to backlight device in kernel 2.6
-    switch ( d->m_model ) {
+    switch ( d->m_model )
+    {
         case Model_Zaurus_SLB600: // fallthrough
         case Model_Zaurus_SL5500:
             m_backlightdev = "/sys/class/backlight/locomo-backlight/";
             break;
@@ -208,13 +209,13 @@ void Zaurus::init(const QString& cpu_info)
             m_backlightdev = "/sys/class/backlight/tosa-bl/";
             break;
         default:
             m_backlightdev = "/sys/class/backlight/corgi-bl/";
-            break;
     }
 
     // set initial rotation
-    switch( d->m_model ) {
+    switch( d->m_model )
+    {
         case Model_Zaurus_SL6000: // fallthrough
         case Model_Zaurus_SLA300:
             d->m_rotation = Rot0;
             break;
@@ -228,10 +229,20 @@ void Zaurus::init(const QString& cpu_info)
         case Model_Zaurus_SL5000: // fallthrough
         case Model_Zaurus_SL5500: // fallthrough
         default:
             d->m_rotation = Rot270;
+    }
+
+    // set default qte driver
+    switch( d->m_model )
+    {
+        case Model_Zaurus_SLC7x0:
+            d->m_qteDriver = "W100";
             break;
+        default:
+            d->m_qteDriver = "Transformed";
     }
+
     m_leds[0] = Led_Off;
 
     if ( m_embedix )
         qDebug( "Zaurus::init() - Using the 2.4 Embedix HAL on a %s", (const char*) d->m_modelstr );