author | eilers <eilers> | 2003-11-17 17:27:44 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-11-17 17:27:44 (UTC) |
commit | e8bba52dc9443d3aadcc2c221fa62ba37ea5c712 (patch) (unidiff) | |
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 | |||
@@ -1138,2 +1138,3 @@ void iPAQ::init ( ) | |||
1138 | case Model_iPAQ_H39xx: | 1138 | case Model_iPAQ_H39xx: |
1139 | |||
1139 | default: | 1140 | default: |
@@ -1502,3 +1503,3 @@ bool Zaurus::isZaurus() | |||
1502 | 1503 | ||
1503 | // On non-embedix kenrnels, we have too look closer. | 1504 | // On non-embedix kernels, we have to look closer. |
1504 | bool is_zaurus = false; | 1505 | bool is_zaurus = false; |
@@ -1524,2 +1525,3 @@ bool Zaurus::isZaurus() | |||
1524 | || model == "SHARP Poodle" | 1525 | || model == "SHARP Poodle" |
1526 | || model == "SHARP Husky" ) | ||
1525 | ) | 1527 | ) |
@@ -1594,7 +1596,10 @@ void Zaurus::init ( ) | |||
1594 | if ( model == "SHARP Corgi" ) { | 1596 | if ( model == "SHARP Corgi" ) { |
1595 | d-> m_model = Model_Zaurus_SLC700; | 1597 | d-> m_model = Model_Zaurus_SLC7x0; |
1596 | d-> m_modelstr = "Zaurus SL-C700"; | 1598 | d-> m_modelstr = "Zaurus SL-C700"; |
1597 | } else if ( model == "SHARP Shepherd" ) { | 1599 | } else if ( model == "SHARP Shepherd" ) { |
1598 | d-> m_model = Model_Zaurus_SLC700; // Do we need a special type for the C750 ? (eilers) | 1600 | d-> m_model = Model_Zaurus_SLC7x0; |
1599 | d-> m_modelstr = "Zaurus SL-C750"; | 1601 | d-> m_modelstr = "Zaurus SL-C750"; |
1602 | } else if ( model == "SHARP Husky" ) { | ||
1603 | d-> m_model = Model_Zaurus_SLC7x0; | ||
1604 | d-> m_modelstr = "Zaurus SL-C760"; | ||
1600 | } else if ( model == "SHARP Poodle" ) { | 1605 | } else if ( model == "SHARP Poodle" ) { |
@@ -1615,3 +1620,3 @@ void Zaurus::init ( ) | |||
1615 | break; | 1620 | break; |
1616 | case Model_Zaurus_SLC700: | 1621 | case Model_Zaurus_SLC7x0: |
1617 | // Note: need to 1) set flipstate based on physical screen orientation | 1622 | // Note: need to 1) set flipstate based on physical screen orientation |
@@ -1650,3 +1655,3 @@ void Zaurus::initButtons ( ) | |||
1650 | switch ( d-> m_model ) { | 1655 | switch ( d-> m_model ) { |
1651 | case Model_Zaurus_SLC700: | 1656 | case Model_Zaurus_SLC7x0: |
1652 | pz_buttons = z_buttons_c700; | 1657 | pz_buttons = z_buttons_c700; |
@@ -1754,7 +1759,5 @@ void Zaurus::buzzer ( int sound ) | |||
1754 | 1759 | ||
1755 | // Not all devices have real sound. But I expect | 1760 | // Not all devices have real sound |
1756 | // that Openzaurus now has a sound driver which | 1761 | if ( d->m_model == Model_Zaurus_SLC7x0 |
1757 | // I will use instead the buzzer... | 1762 | || d->m_model == Model_Zaurus_SLB600 ){ |
1758 | if ( ( d->m_model == Model_Zaurus_SLC700 ) | ||
1759 | || d->m_system == System_OpenZaurus ){ | ||
1760 | 1763 | ||