author | zecke <zecke> | 2005-10-06 18:58:40 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-10-06 18:58:40 (UTC) |
commit | 0bad2116a1ceed19956b94889cb034781f35146d (patch) (side-by-side diff) | |
tree | a1131b9e026cdf5533c4da6a7f49fcbb139b4e09 | |
parent | 31777172abf127e00594790e4365dfad8772b100 (diff) | |
download | opie-0bad2116a1ceed19956b94889cb034781f35146d.zip opie-0bad2116a1ceed19956b94889cb034781f35146d.tar.gz opie-0bad2116a1ceed19956b94889cb034781f35146d.tar.bz2 |
ODevice patch from #1701 gor hp1940
-Allocate device number
-Some implementation
-rw-r--r-- | libopie2/opiecore/device/odevice.h | 1 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_ipaq.cpp | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h index 492c97b..c70d2af 100644 --- a/libopie2/opiecore/device/odevice.h +++ b/libopie2/opiecore/device/odevice.h @@ -66,12 +66,13 @@ enum OModel { Model_iPAQ_H37xx = ( Model_iPAQ | 0x0003 ), Model_iPAQ_H38xx = ( Model_iPAQ | 0x0004 ), Model_iPAQ_H39xx = ( Model_iPAQ | 0x0005 ), Model_iPAQ_H5xxx = ( Model_iPAQ | 0x0006 ), Model_iPAQ_H22xx = ( Model_iPAQ | 0x0007 ), Model_iPAQ_H191x = ( Model_iPAQ | 0x0008 ), + Model_iPAQ_H1940 = ( Model_iPAQ | 0x0009 ), Model_Jornada = ( 6 << 16 ), Model_Jornada_56x = ( Model_Jornada | 0x0001 ), Model_Jornada_720 = ( Model_Jornada | 0x0002 ), Model_Zaurus = ( 2 << 16 ), diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp index 3cc6cec..52da2d9 100644 --- a/libopie2/opiecore/device/odevice_ipaq.cpp +++ b/libopie2/opiecore/device/odevice_ipaq.cpp @@ -148,23 +148,26 @@ void iPAQ::init(const QString& model) 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 if ( d->m_modelstr == "H1910" ) d->m_model = Model_iPAQ_H191x; + else if ( d->m_modelstr == "H1940" ) + d->m_model = Model_iPAQ_H1940; else d->m_model = Model_Unknown; 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: case Model_iPAQ_H191x: + case Model_iPAQ_H1940: d->m_rotation = Rot0; break; case Model_iPAQ_H36xx: case Model_iPAQ_H37xx: case Model_iPAQ_H39xx: default: @@ -297,13 +300,14 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b } // Rotate the cursor keys by 270 // keycode - Key_Left = position of the button starting from left clockwise // add the rotation to it and modolo. No we've the original offset // add the offset to the Key_Left key if (( d->m_model == Model_iPAQ_H5xxx ) || - ( d->m_model == Model_iPAQ_H191x )) + ( d->m_model == Model_iPAQ_H191x ) || + ( d->m_model == Model_iPAQ_H1940 )) newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; break; } // map Power Button short/long press to F34/F35 case Key_SysReq: { @@ -399,12 +403,14 @@ int iPAQ::displayBrightnessResolution() const case Model_iPAQ_H39xx: return 64; case Model_iPAQ_H5xxx: return 255; case Model_iPAQ_H191x: return 183; + case Model_iPAQ_H191x: + return 44; default: return 2; } } bool iPAQ::setDisplayStatus ( bool on ) |