summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice.cpp6
-rw-r--r--libopie2/opiecore/device/odevice.h5
-rw-r--r--libopie2/opiecore/device/odevice_ipaq.cpp24
-rw-r--r--libopie2/opiecore/device/odevice_ipaq.h2
-rw-r--r--libopie2/opiecore/device/odevice_jornada.cpp2
-rw-r--r--libopie2/opiecore/device/odevice_jornada.h2
-rw-r--r--libopie2/opiecore/device/odevice_ramses.cpp2
-rw-r--r--libopie2/opiecore/device/odevice_ramses.h2
-rw-r--r--libopie2/opiecore/device/odevice_simpad.cpp2
-rw-r--r--libopie2/opiecore/device/odevice_simpad.h2
-rw-r--r--libopie2/opiecore/device/odevice_yopy.cpp2
-rw-r--r--libopie2/opiecore/device/odevice_yopy.h2
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.cpp2
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.h2
14 files changed, 29 insertions, 28 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index 62a2e03..cef7f63 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -90,6 +90,7 @@ ODevice *ODevice::inst()
static ODevice *dev = 0;
// rewrite this to only use /proc/cpuinfo or so
+ QString cpu_info;
if ( !dev )
{
@@ -104,6 +105,7 @@ ODevice *ODevice::inst()
if ( line.startsWith( "Hardware" ) )
{
qDebug( "ODevice() - found '%s'", (const char*) line );
+ cpu_info = line;
if ( line.contains( "sharp", false ) ) dev = new Internal::Zaurus();
else if ( line.contains( "ipaq", false ) ) dev = new Internal::iPAQ();
else if ( line.contains( "simpad", false ) ) dev = new Internal::SIMpad();
@@ -119,7 +121,7 @@ ODevice *ODevice::inst()
qWarning( "ODevice() - can't open '%s' - unknown hardware - using default.", PATH_PROC_CPUINFO );
}
if ( !dev ) dev = new ODevice();
- dev->init();
+ dev->init(cpu_info);
}
return dev;
}
@@ -150,7 +152,7 @@ void ODevice::systemMessage ( const QCString &msg, const QByteArray & )
}
}
-void ODevice::init()
+void ODevice::init(const QString&)
{
}
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h
index 0ba58f0..aaebde3 100644
--- a/libopie2/opiecore/device/odevice.h
+++ b/libopie2/opiecore/device/odevice.h
@@ -60,7 +60,8 @@ enum OModel {
Model_iPAQ_H37xx = ( Model_iPAQ | 0x000004 ),
Model_iPAQ_H38xx = ( Model_iPAQ | 0x000008 ),
Model_iPAQ_H39xx = ( Model_iPAQ | 0x000010 ),
- Model_iPAQ_H5xxx = ( Model_iPAQ | 0x000011 ),
+ Model_iPAQ_H5xxx = ( Model_iPAQ | 0x000020 ),
+ Model_iPAQ_H22xx = ( Model_iPAQ | 0x000040 ),
Model_Jornada = ( 6 << 24 ),
Model_Jornada_56x = ( Model_Jornada | 0x000001 ),
@@ -195,7 +196,7 @@ private:
protected:
ODevice();
- virtual void init();
+ virtual void init(const QString&);
virtual void initButtons();
static void sendSuspendmsg();
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 98e2ffa..efe35e7 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -114,17 +114,12 @@ struct i_button ipaq_buttons [] = {
"sound", "raise()" },
};
-void iPAQ::init()
+void iPAQ::init(const QString& model)
{
d->m_vendorstr = "HP";
d->m_vendor = Vendor_HP;
- QFile f ( "/proc/hal/model" );
-
- if ( f. open ( IO_ReadOnly )) {
- QTextStream ts ( &f );
-
- d->m_modelstr = "H" + ts. readLine();
+ d->m_modelstr = model.mid(model.findRev('H'));
if ( d->m_modelstr == "H3100" )
d->m_model = Model_iPAQ_H31xx;
@@ -138,29 +133,32 @@ void iPAQ::init()
d->m_model = Model_iPAQ_H39xx;
else if ( d->m_modelstr == "H5400" )
d->m_model = Model_iPAQ_H5xxx;
+ else if ( d->m_modelstr == "H2200" )
+ d->m_model = Model_iPAQ_H22xx;
else
d->m_model = Model_Unknown;
- f. close();
- }
+
switch ( d->m_model ) {
case Model_iPAQ_H31xx:
case Model_iPAQ_H38xx:
d->m_rotation = Rot90;
break;
+ case Model_iPAQ_H5xxx:
+ case Model_iPAQ_H22xx:
+ d->m_rotation = Rot0;
+ break;
case Model_iPAQ_H36xx:
case Model_iPAQ_H37xx:
case Model_iPAQ_H39xx:
-
default:
d->m_rotation = Rot270;
break;
- case Model_iPAQ_H5xxx:
- d->m_rotation = Rot0;
+
}
- f. setName ( "/etc/familiar-version" );
+ QFile f( "/etc/familiar-version" );
if ( f. open ( IO_ReadOnly )) {
d->m_systemstr = "Familiar";
d->m_system = System_Familiar;
diff --git a/libopie2/opiecore/device/odevice_ipaq.h b/libopie2/opiecore/device/odevice_ipaq.h
index 968f715..cc0b8ac 100644
--- a/libopie2/opiecore/device/odevice_ipaq.h
+++ b/libopie2/opiecore/device/odevice_ipaq.h
@@ -43,7 +43,7 @@ class iPAQ : public ODevice, public QWSServer::KeyboardFilter
{
protected:
- virtual void init();
+ virtual void init(const QString&);
virtual void initButtons();
public:
diff --git a/libopie2/opiecore/device/odevice_jornada.cpp b/libopie2/opiecore/device/odevice_jornada.cpp
index eaa93ca..ad2f830 100644
--- a/libopie2/opiecore/device/odevice_jornada.cpp
+++ b/libopie2/opiecore/device/odevice_jornada.cpp
@@ -79,7 +79,7 @@ typedef struct {
using namespace Opie::Core::Internal;
-void Jornada::init()
+void Jornada::init(const QString&)
{
d->m_vendorstr = "HP";
d->m_vendor = Vendor_HP;
diff --git a/libopie2/opiecore/device/odevice_jornada.h b/libopie2/opiecore/device/odevice_jornada.h
index e2e67af..fddfe34 100644
--- a/libopie2/opiecore/device/odevice_jornada.h
+++ b/libopie2/opiecore/device/odevice_jornada.h
@@ -39,7 +39,7 @@ class Jornada : public ODevice
{
protected:
- virtual void init();
+ virtual void init(const QString&);
public:
virtual bool setSoftSuspend ( bool soft );
diff --git a/libopie2/opiecore/device/odevice_ramses.cpp b/libopie2/opiecore/device/odevice_ramses.cpp
index 10b7b61..32467f1 100644
--- a/libopie2/opiecore/device/odevice_ramses.cpp
+++ b/libopie2/opiecore/device/odevice_ramses.cpp
@@ -69,7 +69,7 @@ struct r_button ramses_buttons [] = {
"buttonsettings", "raise()" },
};
-void Ramses::init()
+void Ramses::init(const QString&)
{
d->m_vendorstr = "M und N";
d->m_vendor = Vendor_MundN;
diff --git a/libopie2/opiecore/device/odevice_ramses.h b/libopie2/opiecore/device/odevice_ramses.h
index aea9e2a..3cf5e92 100644
--- a/libopie2/opiecore/device/odevice_ramses.h
+++ b/libopie2/opiecore/device/odevice_ramses.h
@@ -41,7 +41,7 @@ namespace Internal {
class Ramses : public ODevice, public QWSServer::KeyboardFilter
{
protected:
- virtual void init();
+ virtual void init(const QString&);
public:
virtual bool setSoftSuspend( bool soft );
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp
index e9481bb..6630763 100644
--- a/libopie2/opiecore/device/odevice_simpad.cpp
+++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -112,7 +112,7 @@ struct s_button simpad_buttons [] = {
*/
};
-void SIMpad::init()
+void SIMpad::init(const QString&)
{
d->m_vendorstr = "SIEMENS";
d->m_vendor = Vendor_SIEMENS;
diff --git a/libopie2/opiecore/device/odevice_simpad.h b/libopie2/opiecore/device/odevice_simpad.h
index 3d5acb5..0f4e66f 100644
--- a/libopie2/opiecore/device/odevice_simpad.h
+++ b/libopie2/opiecore/device/odevice_simpad.h
@@ -42,7 +42,7 @@ namespace Internal {
class SIMpad : public ODevice, public QWSServer::KeyboardFilter
{
protected:
- virtual void init();
+ virtual void init(const QString&);
virtual void initButtons();
public:
diff --git a/libopie2/opiecore/device/odevice_yopy.cpp b/libopie2/opiecore/device/odevice_yopy.cpp
index 4e9f227..493ed25 100644
--- a/libopie2/opiecore/device/odevice_yopy.cpp
+++ b/libopie2/opiecore/device/odevice_yopy.cpp
@@ -71,7 +71,7 @@ struct yopy_button yopy_buttons [] = {
"buttonsettings", "raise()" },
};
-void Yopy::init()
+void Yopy::init(const QString&)
{
d->m_vendorstr = "G.Mate";
d->m_vendor = Vendor_GMate;
diff --git a/libopie2/opiecore/device/odevice_yopy.h b/libopie2/opiecore/device/odevice_yopy.h
index 6e1db88..f6bf061 100644
--- a/libopie2/opiecore/device/odevice_yopy.h
+++ b/libopie2/opiecore/device/odevice_yopy.h
@@ -39,7 +39,7 @@ class Yopy : public ODevice
{
protected:
- virtual void init();
+ virtual void init(const QString&);
virtual void initButtons();
public:
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 1434e69..e8b813e 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -115,7 +115,7 @@ struct z_button z_buttons_c700 [] = {
//
// Comments? - mickeyl.
-void Zaurus::init()
+void Zaurus::init(const QString&)
{
d->m_vendorstr = "Sharp";
d->m_vendor = Vendor_Sharp;
diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h
index a0b1787..76a40d6 100644
--- a/libopie2/opiecore/device/odevice_zaurus.h
+++ b/libopie2/opiecore/device/odevice_zaurus.h
@@ -53,7 +53,7 @@ class Zaurus : public ODevice
{
protected:
- virtual void init();
+ virtual void init(const QString&);
virtual void initButtons();
public: