Proper zaurus model checking for ODevice

2 files changed, 18 insertions, 2 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index bc43c52..a33d4ad 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -714,8 +714,6 @@ int iPAQ::lightSensorResolution ( ) const
 
 void Zaurus::init ( )
 {
-        d-> m_modelstr = "Zaurus SL5000";
-        d-> m_model = Model_Zaurus_SL5000;
         d-> m_vendorstr = "Sharp";
         d-> m_vendor = Vendor_Sharp;
 
@@ -739,6 +737,23 @@ void Zaurus::init ( )
                 d-> m_system = System_Zaurus;
         }
 
+        f. setName ( "/proc/deviceinfo/product" );
+        if ( f. open ( IO_ReadOnly ) ) {
+                QTextStream ts ( &f );
+                QString model = ts. readLine ( );
+                f. close ( );
+                if ( model == "SL-5000D" ) {
+                        d-> m_model = Model_Zaurus_SL5000;
+                        d-> m_modelstr = "Zaurus SL-5000D";
+                } else if ( model == "SL-5500" ) {
+                        d-> m_model = Model_Zaurus_SL5500;
+                        d-> m_modelstr = "Zaurus SL-5500";
+                }
+        }
+        else {
+                d-> m_model = Model_Zaurus_SL5000;
+                d-> m_modelstr = "Zaurus SL-5000D (unverified)";
+        }
 
         m_leds [0] = Led_Off;
 }
diff --git a/libopie/odevice.h b/libopie/odevice.h
index e50009c..86491d4 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -44,6 +44,7 @@ enum OModel {
         Model_Zaurus        = ( 2 << 24 ),
 
         Model_Zaurus_SL5000 = ( Model_Zaurus | 0x000001 ),
+        Model_Zaurus_SL5500 = ( Model_Zaurus | 0x000002 ),
 };
 
         enum OVendor {