summaryrefslogtreecommitdiff
Side-by-side diff
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()
static ODevice *dev = 0;
-
- // rewrite this to only use /proc/cpuinfo or so
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 [] = {
// FIXME This gets unnecessary complicated. We should think about splitting the Zaurus
-// class up into individual classes. We need three classes
+// class up into individual classes. We would need three classes
//
@@ -120,10 +120,4 @@ struct z_button z_buttons_c700 [] = {
// Zaurus-Poodle (PXA-model w/ 320x240 lcd, for SL5600)
-// Zaurus-Corgi (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000)
+// Zaurus-Corgi (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000, C1000)
// Zaurus-Tosa (PXA-model w/ 480x640 lcd, for SL6000)
-//
-// Only question right now is: Do we really need to do it? Because as soon
-// as the OpenZaurus kernel is ready, there will be a unified interface for all
-// Zaurus models (concerning apm, backlight, buttons, etc.)
-//
-// Comments? - mickeyl.
@@ -131,3 +125,3 @@ void Zaurus::init(const QString& cpu_info)
{
- // Set the time to wait until the system is realy suspended
+ // Set the time to wait until the system is really suspended
// the delta between apm --suspend and sleeping
@@ -152,3 +146,3 @@ void Zaurus::init(const QString& cpu_info)
- // OpenZaurus sometimes uses the embedix kernel, check if this is one
+ // OpenZaurus sometimes uses the 2.4 (embedix) kernel, check if this is one
FILE *uname = popen("uname -r", "r");
@@ -158,8 +152,4 @@ void Zaurus::init(const QString& cpu_info)
QTextStream ts ( &f );
- line = ts. readLine();
- int loc = line. find ( "embedix" );
- if ( loc != -1 )
- m_embedix = true;
- else
- m_embedix = false;
+ line = ts.readLine();
+ m_embedix = line.startsWith( "2.4." );
f.close();
@@ -231,5 +221,5 @@ void Zaurus::init(const QString& cpu_info)
if ( m_embedix )
- qDebug( "Zaurus::init() - Using the Embedix HAL on a %s", (const char*) d->m_modelstr );
+ qDebug( "Zaurus::init() - Using the 2.4 Embedix HAL on a %s", (const char*) d->m_modelstr );
else
- qDebug( "Zaurus::init() - Using the OpenZaurus HAL on a %s", (const char*) d->m_modelstr );
+ qDebug( "Zaurus::init() - Using the 2.6 OpenZaurus HAL on a %s", (const char*) d->m_modelstr );
}