-rw-r--r-- | libopie2/opiecore/device/odevice.h | 1 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 16 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.h | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h index 76cf97d..0eed1c9 100644 --- a/libopie2/opiecore/device/odevice.h +++ b/libopie2/opiecore/device/odevice.h | |||
@@ -85,4 +85,5 @@ enum OModel { | |||
85 | Model_Zaurus_SLC3000 = ( Model_Zaurus | 0x0007 ), | 85 | Model_Zaurus_SLC3000 = ( Model_Zaurus | 0x0007 ), |
86 | Model_Zaurus_SLC1000 = ( Model_Zaurus | 0x0008 ), | 86 | Model_Zaurus_SLC1000 = ( Model_Zaurus | 0x0008 ), |
87 | Model_Zaurus_SLC3100 = ( Model_Zaurus | 0x0009 ), | ||
87 | 88 | ||
88 | Model_SIMpad = ( 3 << 16 ), | 89 | Model_SIMpad = ( 3 << 16 ), |
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index b7f3104..4a80a7e 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp | |||
@@ -2,5 +2,5 @@ | |||
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | Copyright (C) 2002-2005 The Opie Team <opie-devel@handhelds.org> | 3 | Copyright (C) 2002-2005 The Opie Team <opie-devel@handhelds.org> |
4 | =. | 4 | =. Copyright (C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de> |
5 | .=l. | 5 | .=l. |
6 | .>+-= | 6 | .>+-= |
@@ -225,4 +225,7 @@ void Zaurus::init(const QString& cpu_info) | |||
225 | d->m_model = Model_Zaurus_SLC1000; | 225 | d->m_model = Model_Zaurus_SLC1000; |
226 | d->m_modelstr = "Zaurus SL-C1000"; | 226 | d->m_modelstr = "Zaurus SL-C1000"; |
227 | } else if ( model == "SHARP Borzoi" ) { | ||
228 | d->m_model = Model_Zaurus_SLC3100; | ||
229 | d->m_modelstr = "Zaurus SL-C3100"; | ||
227 | } else { | 230 | } else { |
228 | d->m_model = Model_Zaurus_SL5500; | 231 | d->m_model = Model_Zaurus_SL5500; |
@@ -251,4 +254,5 @@ void Zaurus::init(const QString& cpu_info) | |||
251 | d->m_rotation = Rot0; | 254 | d->m_rotation = Rot0; |
252 | break; | 255 | break; |
256 | case Model_Zaurus_SLC3100: // fallthrough | ||
253 | case Model_Zaurus_SLC3000: // fallthrough | 257 | case Model_Zaurus_SLC3000: // fallthrough |
254 | case Model_Zaurus_SLC1000: // fallthrough | 258 | case Model_Zaurus_SLC1000: // fallthrough |
@@ -297,4 +301,5 @@ void Zaurus::initButtons() | |||
297 | buttoncount = ARRAY_SIZE(z_buttons_6000); | 301 | buttoncount = ARRAY_SIZE(z_buttons_6000); |
298 | break; | 302 | break; |
303 | case Model_Zaurus_SLC3100: // fallthrough | ||
299 | case Model_Zaurus_SLC3000: // fallthrough | 304 | case Model_Zaurus_SLC3000: // fallthrough |
300 | case Model_Zaurus_SLC1000: // fallthrough | 305 | case Model_Zaurus_SLC1000: // fallthrough |
@@ -550,4 +555,5 @@ Transformation Zaurus::rotation() const | |||
550 | 555 | ||
551 | switch ( d->m_model ) { | 556 | switch ( d->m_model ) { |
557 | case Model_Zaurus_SLC3100: // fallthrough | ||
552 | case Model_Zaurus_SLC3000: // fallthrough | 558 | case Model_Zaurus_SLC3000: // fallthrough |
553 | case Model_Zaurus_SLC1000: | 559 | case Model_Zaurus_SLC1000: |
@@ -599,4 +605,5 @@ ODirection Zaurus::direction() const | |||
599 | 605 | ||
600 | switch ( d->m_model ) { | 606 | switch ( d->m_model ) { |
607 | case Model_Zaurus_SLC3100: // fallthrough | ||
601 | case Model_Zaurus_SLC3000: // fallthrough | 608 | case Model_Zaurus_SLC3000: // fallthrough |
602 | case Model_Zaurus_SLC1000: // fallthrough | 609 | case Model_Zaurus_SLC1000: // fallthrough |
@@ -622,5 +629,8 @@ ODirection Zaurus::direction() const | |||
622 | bool Zaurus::hasHingeSensor() const | 629 | bool Zaurus::hasHingeSensor() const |
623 | { | 630 | { |
624 | return d->m_model == Model_Zaurus_SLC7x0 || d->m_model == Model_Zaurus_SLC3000 || d->m_model == Model_Zaurus_SLC1000; | 631 | return d->m_model == Model_Zaurus_SLC7x0 || |
632 | d->m_model == Model_Zaurus_SLC3100 || | ||
633 | d->m_model == Model_Zaurus_SLC3000 || | ||
634 | d->m_model == Model_Zaurus_SLC1000; | ||
625 | } | 635 | } |
626 | 636 | ||
@@ -672,5 +682,5 @@ bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, | |||
672 | int newkeycode = keycode; | 682 | int newkeycode = keycode; |
673 | 683 | ||
674 | if (d->m_model != Model_Zaurus_SLC7x0 && d->m_model != Model_Zaurus_SLC3000 && d->m_model != Model_Zaurus_SLC1000) return false; | 684 | if ( !hasHingeSensor() ) return false; |
675 | 685 | ||
676 | /* map cursor keys depending on the hinge status */ | 686 | /* map cursor keys depending on the hinge status */ |
diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h index 4314aff..677e29f 100644 --- a/libopie2/opiecore/device/odevice_zaurus.h +++ b/libopie2/opiecore/device/odevice_zaurus.h | |||
@@ -2,5 +2,5 @@ | |||
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | Copyright (C) 2002-2005 The Opie Team <opie-devel@handhelds.org> | 3 | Copyright (C) 2002-2005 The Opie Team <opie-devel@handhelds.org> |
4 | =. | 4 | =. Copyright (C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de> |
5 | .=l. | 5 | .=l. |
6 | .>+-= | 6 | .>+-= |