author | mickeyl <mickeyl> | 2005-08-23 12:25:35 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-08-23 12:25:35 (UTC) |
commit | 95210ac41729a4c264e830963cdae3a4cdd218fb (patch) (unidiff) | |
tree | c73284a5aebdeb2f56d11cec6ecda80e9b41cec8 | |
parent | d6e8e6bf49bb176ec54efed5eb0d012098f056d7 (diff) | |
download | opie-95210ac41729a4c264e830963cdae3a4cdd218fb.zip opie-95210ac41729a4c264e830963cdae3a4cdd218fb.tar.gz opie-95210ac41729a4c264e830963cdae3a4cdd218fb.tar.bz2 |
add support for the Sharp SL-C3100 "Borzoi"
-rw-r--r-- | ChangeLog | 14 | ||||
-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 |
4 files changed, 22 insertions, 11 deletions
@@ -17,9 +17,8 @@ | |||
17 | * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl) | 17 | * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl) |
18 | * Opie-smb: Added Opie front end for Samba (ljp) | 18 | * Opie-smb: Added Opie front end for Samba (ljp) |
19 | * Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie) | 19 | * Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie) |
20 | 20 | ||
21 | |||
22 | Fixed Bugs | 21 | Fixed Bugs |
23 | ---------- | 22 | ---------- |
24 | * #1377 - Suspend Powermanagement when switched to another VT (mickeyl) | 23 | * #1377 - Suspend Powermanagement when switched to another VT (mickeyl) |
25 | - We actually suspend the complete Opie now in that case. | 24 | - We actually suspend the complete Opie now in that case. |
@@ -37,14 +36,14 @@ | |||
37 | * #1666 - Opie-IRC does not allow to add !channels in config asautojoin ones (skyhusker) | 36 | * #1666 - Opie-IRC does not allow to add !channels in config asautojoin ones (skyhusker) |
38 | * #1667 - Opie-IRC does not show messages from !channel (skyhusker) | 37 | * #1667 - Opie-IRC does not show messages from !channel (skyhusker) |
39 | * #1679 - Security PIN plugin is QVGA sized (hrw) | 38 | * #1679 - Security PIN plugin is QVGA sized (hrw) |
40 | * #1682 - Properly resize tab control in OTabWidget (drw) | 39 | * #1682 - Properly resize tab control in OTabWidget (drw) |
41 | * n.a.- always show volume and wireless applet popups inside visible screen (deller) | 40 | * n.a. - always show volume and wireless applet popups inside visible screen (deller) |
42 | * n.a. - scale O-Menu-Applets appropriately (mickeyl) | 41 | * n.a. - scale O-Menu-Applets appropriately (mickeyl) |
43 | * n.a.- libopienet: fix bugs in wireless scanning and setting SSID (skyhusker) | 42 | * n.a. - libopienet: fix bugs in wireless scanning and setting SSID (skyhusker) |
44 | * n.a.- Wellenreiter: relax WE version matching test a bit (mickeyl) | 43 | * n.a. - Wellenreiter: relax WE version matching test a bit (mickeyl) |
45 | * n.a.- scale BluezApplet appropriately and use larger icons (mickeyl) | 44 | * n.a. - scale BluezApplet appropriately and use larger icons (mickeyl) |
46 | * n.a.- memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham) | 45 | * n.a. - memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham) |
47 | * n.a. - networksettings: ignore hostap control interfaces wifi* (mickeyl) | 46 | * n.a. - networksettings: ignore hostap control interfaces wifi* (mickeyl) |
48 | * n.a. - Today Addressbook plugin fix configuration to show/not show birthdays, use checkboxes for selection (hrw) | 47 | * n.a. - Today Addressbook plugin fix configuration to show/not show birthdays, use checkboxes for selection (hrw) |
49 | * n.a. - remove hardcoded font size from netsystemtime (hrw) | 48 | * n.a. - remove hardcoded font size from netsystemtime (hrw) |
50 | * n.a. - remove hardcoded font size from checkbook graphs (hrw) | 49 | * n.a. - remove hardcoded font size from checkbook graphs (hrw) |
@@ -60,10 +59,11 @@ | |||
60 | * libopieui: Remove OVersatileView and OVersatileViewItem (mickeyl) | 59 | * libopieui: Remove OVersatileView and OVersatileViewItem (mickeyl) |
61 | * libopienet: Miscellaneous API cleanups (mickeyl) | 60 | * libopienet: Miscellaneous API cleanups (mickeyl) |
62 | * libopiecore: Add linux pcmcia system abstraction classes (mickeyl) | 61 | * libopiecore: Add linux pcmcia system abstraction classes (mickeyl) |
63 | * libopiecore: ODevice now knows the default gfx driver to use (mteira,mickeyl) | 62 | * libopiecore: ODevice now knows the default gfx driver to use (mteira,mickeyl) |
63 | * libopiecore: Add support for the Sharp SL-C3100 "Borzoi" (mickeyl) | ||
64 | * Remove assumptions about default gfx driver ("Transformed") all over the place (mteira,mickeyl) | 64 | * Remove assumptions about default gfx driver ("Transformed") all over the place (mteira,mickeyl) |
65 | * fix / optimize number of scanned directories. (ljp) | 65 | * Fix / Optimize number of scanned directories (ljp) |
66 | 66 | ||
67 | 2005-03-25Opie 1.2.0 | 67 | 2005-03-25Opie 1.2.0 |
68 | 68 | ||
69 | Fixed Bugs | 69 | Fixed Bugs |
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 | |||
@@ -83,8 +83,9 @@ enum OModel { | |||
83 | Model_Zaurus_SLC7x0 = ( Model_Zaurus | 0x0005 ), | 83 | Model_Zaurus_SLC7x0 = ( Model_Zaurus | 0x0005 ), |
84 | Model_Zaurus_SL6000 = ( Model_Zaurus | 0x0006 ), | 84 | Model_Zaurus_SL6000 = ( Model_Zaurus | 0x0006 ), |
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 ), |
89 | 90 | ||
90 | Model_SIMpad_All = ( Model_SIMpad | 0xffff ), | 91 | Model_SIMpad_All = ( Model_SIMpad | 0xffff ), |
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 | |||
@@ -1,8 +1,8 @@ | |||
1 | /* | 1 | /* |
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 | .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
@@ -223,8 +223,11 @@ void Zaurus::init(const QString& cpu_info) | |||
223 | d->m_modelstr = "Zaurus SL-C3000"; | 223 | d->m_modelstr = "Zaurus SL-C3000"; |
224 | } else if ( model == "SHARP Akita" ) { | 224 | } else if ( model == "SHARP Akita" ) { |
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; |
229 | d->m_modelstr = "Unknown Zaurus"; | 232 | d->m_modelstr = "Unknown Zaurus"; |
230 | } | 233 | } |
@@ -249,8 +252,9 @@ void Zaurus::init(const QString& cpu_info) | |||
249 | case Model_Zaurus_SL6000: // fallthrough | 252 | case Model_Zaurus_SL6000: // fallthrough |
250 | case Model_Zaurus_SLA300: | 253 | case Model_Zaurus_SLA300: |
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 |
255 | case Model_Zaurus_SLC7x0: | 259 | case Model_Zaurus_SLC7x0: |
256 | d->m_rotation = rotation(); | 260 | d->m_rotation = rotation(); |
@@ -295,8 +299,9 @@ void Zaurus::initButtons() | |||
295 | case Model_Zaurus_SL6000: | 299 | case Model_Zaurus_SL6000: |
296 | pz_buttons = z_buttons_6000; | 300 | pz_buttons = z_buttons_6000; |
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 |
301 | case Model_Zaurus_SLC7x0: | 306 | case Model_Zaurus_SLC7x0: |
302 | if ( isQWS( ) ) { | 307 | if ( isQWS( ) ) { |
@@ -548,8 +553,9 @@ Transformation Zaurus::rotation() const | |||
548 | qDebug( "Zaurus::rotation()" ); | 553 | qDebug( "Zaurus::rotation()" ); |
549 | Transformation rot; | 554 | Transformation rot; |
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: |
554 | { | 560 | { |
555 | OHingeStatus hs = readHingeSensor(); | 561 | OHingeStatus hs = readHingeSensor(); |
@@ -597,8 +603,9 @@ ODirection Zaurus::direction() const | |||
597 | { | 603 | { |
598 | ODirection dir; | 604 | ODirection dir; |
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 |
603 | case Model_Zaurus_SLC7x0: { | 610 | case Model_Zaurus_SLC7x0: { |
604 | OHingeStatus hs = readHingeSensor(); | 611 | OHingeStatus hs = readHingeSensor(); |
@@ -620,9 +627,12 @@ ODirection Zaurus::direction() const | |||
620 | } | 627 | } |
621 | 628 | ||
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 | ||
627 | OHingeStatus Zaurus::readHingeSensor() const | 637 | OHingeStatus Zaurus::readHingeSensor() const |
628 | { | 638 | { |
@@ -670,9 +680,9 @@ OHingeStatus Zaurus::readHingeSensor() const | |||
670 | bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat ) | 680 | bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat ) |
671 | { | 681 | { |
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 */ |
677 | switch ( keycode ) { | 687 | switch ( keycode ) { |
678 | // Rotate cursor keys | 688 | // Rotate cursor keys |
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 | |||
@@ -1,8 +1,8 @@ | |||
1 | /* | 1 | /* |
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 | .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |