| author | eilers <eilers> | 2003-11-17 17:27:44 (UTC) |
|---|---|---|
| committer | eilers <eilers> | 2003-11-17 17:27:44 (UTC) |
| commit | e8bba52dc9443d3aadcc2c221fa62ba37ea5c712 (patch) (side-by-side diff) | |
| tree | ddd09027e169cecb392fb7d956f55631d5bf4ef7 | |
| parent | 2e6030553ecc21845ebb9987dffd6c252760a94d (diff) | |
| download | opie-e8bba52dc9443d3aadcc2c221fa62ba37ea5c712.zip opie-e8bba52dc9443d3aadcc2c221fa62ba37ea5c712.tar.gz opie-e8bba52dc9443d3aadcc2c221fa62ba37ea5c712.tar.bz2 | |
Merging the corgie-patches from Branch manually.. (no cvs -j would caused
a big mess .. ;) )
Changed the keysound handling for zaurus: Just all C7x0 and the 5600 will
use the sounddevice.. All other will use the old /dev/sharp_buz device..
| -rw-r--r-- | libopie/odevice.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index fef623a..58254a7 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp @@ -1137,4 +1137,5 @@ void iPAQ::init ( ) case Model_iPAQ_H37xx: case Model_iPAQ_H39xx: + default: d-> m_rotation = Rot270; @@ -1501,5 +1502,5 @@ bool Zaurus::isZaurus() } - // On non-embedix kenrnels, we have too look closer. + // On non-embedix kernels, we have to look closer. bool is_zaurus = false; QFile f ( "/proc/cpuinfo" ); @@ -1523,4 +1524,5 @@ bool Zaurus::isZaurus() || model == "SHARP Shepherd" || model == "SHARP Poodle" + || model == "SHARP Husky" ) ) is_zaurus = true; @@ -1593,9 +1595,12 @@ void Zaurus::init ( ) if ( model == "SHARP Corgi" ) { - d-> m_model = Model_Zaurus_SLC700; + d-> m_model = Model_Zaurus_SLC7x0; d-> m_modelstr = "Zaurus SL-C700"; } else if ( model == "SHARP Shepherd" ) { - d-> m_model = Model_Zaurus_SLC700; // Do we need a special type for the C750 ? (eilers) + d-> m_model = Model_Zaurus_SLC7x0; d-> m_modelstr = "Zaurus SL-C750"; + } else if ( model == "SHARP Husky" ) { + d-> m_model = Model_Zaurus_SLC7x0; + d-> m_modelstr = "Zaurus SL-C760"; } else if ( model == "SHARP Poodle" ) { d-> m_model = Model_Zaurus_SLB600; @@ -1614,5 +1619,5 @@ void Zaurus::init ( ) d-> m_rotation = Rot0; break; - case Model_Zaurus_SLC700: + case Model_Zaurus_SLC7x0: // Note: need to 1) set flipstate based on physical screen orientation // and 2) check to see if the user overrode the rotation direction @@ -1649,5 +1654,5 @@ void Zaurus::initButtons ( ) int buttoncount; switch ( d-> m_model ) { - case Model_Zaurus_SLC700: + case Model_Zaurus_SLC7x0: pz_buttons = z_buttons_c700; buttoncount = ARRAY_SIZE(z_buttons_c700); @@ -1753,9 +1758,7 @@ void Zaurus::buzzer ( int sound ) QString soundname; - // Not all devices have real sound. But I expect - // that Openzaurus now has a sound driver which - // I will use instead the buzzer... - if ( ( d->m_model == Model_Zaurus_SLC700 ) - || d->m_system == System_OpenZaurus ){ + // Not all devices have real sound + if ( d->m_model == Model_Zaurus_SLC7x0 + || d->m_model == Model_Zaurus_SLB600 ){ switch ( sound ){ |