Revamp the zaurus model detection to actually work on the C700.

1 files changed, 23 insertions, 18 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index cb7dd74..d78277f 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -1126,2 +1126,3 @@ void Zaurus::init ( )
         QFile f ( "/proc/filesystems" );
+        QString model;
 
@@ -1146,23 +1147,27 @@ void Zaurus::init ( )
 
-        f. setName ( "/proc/deviceinfo/product" );
+        f. setName ( "/proc/cpuinfo" );
         if ( f. open ( IO_ReadOnly ) ) {
                 QTextStream ts ( &f );
-                QString model = ts. readLine ( );
-                f. close ( );
-
-                d-> m_modelstr = QString("Zaurus ") + model;
-                if ( model == "SL-5500" )
-                        d-> m_model = Model_Zaurus_SL5500;
-                else if ( model == "SL-C700" )
-                        d-> m_model = Model_Zaurus_SLC700;
-                else if ( model == "SL-A300" )
-                        d-> m_model = Model_Zaurus_SLA300;
-                else if ( model == "SL-B600" || model == "SL-5600" )
-                        d-> m_model = Model_Zaurus_SLB600;
-                else
-                        d-> m_model = Model_Zaurus_SL5000;
+                QString line;
+                while( line = ts. readLine ( ) ) {
+                        if ( line. left ( 8 ) == "Hardware" )
+                                break;
+                }
+                int loc = line. find ( ":" );
+                if ( loc != -1 )
+                        model = line. mid ( loc + 2 ). simplifyWhitespace( );
         }
-        else {
-                d-> m_model = Model_Zaurus_SL5000;
-                d-> m_modelstr = "Zaurus (model unknown)";
+
+        if ( model == "SHARP Corgi" ) {
+                d-> m_model = Model_Zaurus_SLC700;
+                d-> m_modelstr = "Zaurus SL-C700";
+        } else if ( model == "SHARP Poodle" ) {
+                d-> m_model = Model_Zaurus_SLB600;
+                d-> m_modelstr = "Zaurus SL-B500 or SL-5600";
+        } else if ( model = "Sharp-Collie" ) {
+                d-> m_model = Model_Zaurus_SL5500;
+                d-> m_modelstr = "Zaurus SL-5500 or SL-5000d";
+        } else {
+                d-> m_model = Model_Zaurus_SL5500;
+                d-> m_modelstr = "Zaurus (Model unknown)";
         }