author | zecke <zecke> | 2004-05-01 18:13:29 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-05-01 18:13:29 (UTC) |
commit | 7a2cac7a65be07c1e82508e00c2d3d61e0823dc1 (patch) (side-by-side diff) | |
tree | 70381a30c784957b22d9e644272ac96a0fced5a4 /libopie2/opiecore/device/odevice_ipaq.cpp | |
parent | ec6a887d8abddbab085a0a3aecae5760ff85dbe8 (diff) | |
download | opie-7a2cac7a65be07c1e82508e00c2d3d61e0823dc1.zip opie-7a2cac7a65be07c1e82508e00c2d3d61e0823dc1.tar.gz opie-7a2cac7a65be07c1e82508e00c2d3d61e0823dc1.tar.bz2 |
Pass on the Hardware line of proc/cpuinfo so we don't need to parse the file again..
only adjusted iPAQ backend to use it
Beginning of hh22xx Linux2.6 support
Diffstat (limited to 'libopie2/opiecore/device/odevice_ipaq.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice_ipaq.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
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 @@ -116,3 +116,3 @@ struct i_button ipaq_buttons [] = { -void iPAQ::init() +void iPAQ::init(const QString& model) { @@ -121,8 +121,3 @@ void iPAQ::init() - 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')); @@ -140,2 +135,4 @@ void iPAQ::init() d->m_model = Model_iPAQ_H5xxx; + else if ( d->m_modelstr == "H2200" ) + d->m_model = Model_iPAQ_H22xx; else @@ -143,4 +140,3 @@ void iPAQ::init() - f. close(); - } + @@ -151,2 +147,6 @@ void iPAQ::init() break; + case Model_iPAQ_H5xxx: + case Model_iPAQ_H22xx: + d->m_rotation = Rot0; + break; case Model_iPAQ_H36xx: @@ -154,3 +154,2 @@ void iPAQ::init() case Model_iPAQ_H39xx: - default: @@ -158,7 +157,6 @@ void iPAQ::init() break; - case Model_iPAQ_H5xxx: - d->m_rotation = Rot0; + } - f. setName ( "/etc/familiar-version" ); + QFile f( "/etc/familiar-version" ); if ( f. open ( IO_ReadOnly )) { |