summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-03-31 20:03:31 (UTC)
committer mickeyl <mickeyl>2005-03-31 20:03:31 (UTC)
commit629c1c9a366f56e9d98940f8dcd0778d039f1421 (patch) (unidiff)
treeb54e1da270ada28f0127585d4d9dcf46e36c3de1
parent44bfce59cd3cfb2fa6d75675dee5db5edb36e522 (diff)
downloadopie-629c1c9a366f56e9d98940f8dcd0778d039f1421.zip
opie-629c1c9a366f56e9d98940f8dcd0778d039f1421.tar.gz
opie-629c1c9a366f56e9d98940f8dcd0778d039f1421.tar.bz2
check for '2.4' kernel rather than for an Embedix version, since we will
most likely neither see a unified 2.4 OZ kernel, nor a Embedix 2.6.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice.cpp2
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.cpp26
2 files changed, 8 insertions, 20 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index cf2061b..af77ed1 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -120,4 +120,2 @@ ODevice *ODevice::inst()
120 static ODevice *dev = 0; 120 static ODevice *dev = 0;
121
122 // rewrite this to only use /proc/cpuinfo or so
123 QString cpu_info; 121 QString cpu_info;
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 3bd7f6e..e9b163a 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -116,3 +116,3 @@ struct z_button z_buttons_c700 [] = {
116// FIXME This gets unnecessary complicated. We should think about splitting the Zaurus 116// FIXME This gets unnecessary complicated. We should think about splitting the Zaurus
117// class up into individual classes. We need three classes 117// class up into individual classes. We would need three classes
118// 118//
@@ -120,10 +120,4 @@ struct z_button z_buttons_c700 [] = {
120// Zaurus-Poodle (PXA-model w/ 320x240 lcd, for SL5600) 120// Zaurus-Poodle (PXA-model w/ 320x240 lcd, for SL5600)
121// Zaurus-Corgi (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000) 121// Zaurus-Corgi (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000, C1000)
122// Zaurus-Tosa (PXA-model w/ 480x640 lcd, for SL6000) 122// Zaurus-Tosa (PXA-model w/ 480x640 lcd, for SL6000)
123//
124// Only question right now is: Do we really need to do it? Because as soon
125// as the OpenZaurus kernel is ready, there will be a unified interface for all
126// Zaurus models (concerning apm, backlight, buttons, etc.)
127//
128// Comments? - mickeyl.
129 123
@@ -131,3 +125,3 @@ void Zaurus::init(const QString& cpu_info)
131{ 125{
132 // Set the time to wait until the system is realy suspended 126 // Set the time to wait until the system is really suspended
133 // the delta between apm --suspend and sleeping 127 // the delta between apm --suspend and sleeping
@@ -152,3 +146,3 @@ void Zaurus::init(const QString& cpu_info)
152 146
153 // OpenZaurus sometimes uses the embedix kernel, check if this is one 147 // OpenZaurus sometimes uses the 2.4 (embedix) kernel, check if this is one
154 FILE *uname = popen("uname -r", "r"); 148 FILE *uname = popen("uname -r", "r");
@@ -158,8 +152,4 @@ void Zaurus::init(const QString& cpu_info)
158 QTextStream ts ( &f ); 152 QTextStream ts ( &f );
159 line = ts. readLine(); 153 line = ts.readLine();
160 int loc = line. find ( "embedix" ); 154 m_embedix = line.startsWith( "2.4." );
161 if ( loc != -1 )
162 m_embedix = true;
163 else
164 m_embedix = false;
165 f.close(); 155 f.close();
@@ -231,5 +221,5 @@ void Zaurus::init(const QString& cpu_info)
231 if ( m_embedix ) 221 if ( m_embedix )
232 qDebug( "Zaurus::init() - Using the Embedix HAL on a %s", (const char*) d->m_modelstr ); 222 qDebug( "Zaurus::init() - Using the 2.4 Embedix HAL on a %s", (const char*) d->m_modelstr );
233 else 223 else
234 qDebug( "Zaurus::init() - Using the OpenZaurus HAL on a %s", (const char*) d->m_modelstr ); 224 qDebug( "Zaurus::init() - Using the 2.6 OpenZaurus HAL on a %s", (const char*) d->m_modelstr );
235} 225}