summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-08-23 12:25:35 (UTC)
committer mickeyl <mickeyl>2005-08-23 12:25:35 (UTC)
commit95210ac41729a4c264e830963cdae3a4cdd218fb (patch) (side-by-side diff)
treec73284a5aebdeb2f56d11cec6ecda80e9b41cec8
parentd6e8e6bf49bb176ec54efed5eb0d012098f056d7 (diff)
downloadopie-95210ac41729a4c264e830963cdae3a4cdd218fb.zip
opie-95210ac41729a4c264e830963cdae3a4cdd218fb.tar.gz
opie-95210ac41729a4c264e830963cdae3a4cdd218fb.tar.bz2
add support for the Sharp SL-C3100 "Borzoi"
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog14
-rw-r--r--libopie2/opiecore/device/odevice.h1
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.cpp16
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.h2
4 files changed, 22 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index aa546ba..cc3f1a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,3 +20,2 @@
-
Fixed Bugs
@@ -40,8 +39,8 @@
* #1682 - Properly resize tab control in OTabWidget (drw)
- * n.a. - always show volume and wireless applet popups inside visible screen (deller)
+ * n.a. - always show volume and wireless applet popups inside visible screen (deller)
* n.a. - scale O-Menu-Applets appropriately (mickeyl)
- * n.a. - libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
- * n.a. - Wellenreiter: relax WE version matching test a bit (mickeyl)
- * n.a. - scale BluezApplet appropriately and use larger icons (mickeyl)
- * n.a. - memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
+ * n.a. - libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
+ * n.a. - Wellenreiter: relax WE version matching test a bit (mickeyl)
+ * n.a. - scale BluezApplet appropriately and use larger icons (mickeyl)
+ * n.a. - memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
* n.a. - networksettings: ignore hostap control interfaces wifi* (mickeyl)
@@ -63,4 +62,5 @@
* libopiecore: ODevice now knows the default gfx driver to use (mteira,mickeyl)
+ * libopiecore: Add support for the Sharp SL-C3100 "Borzoi" (mickeyl)
* Remove assumptions about default gfx driver ("Transformed") all over the place (mteira,mickeyl)
- * fix / optimize number of scanned directories. (ljp)
+ * Fix / Optimize number of scanned directories (ljp)
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
@@ -86,2 +86,3 @@ enum OModel {
Model_Zaurus_SLC1000 = ( Model_Zaurus | 0x0008 ),
+ Model_Zaurus_SLC3100 = ( Model_Zaurus | 0x0009 ),
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
@@ -3,3 +3,3 @@
              Copyright (C) 2002-2005 The Opie Team <opie-devel@handhelds.org>
- =.
+ =. Copyright (C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
.=l.
@@ -226,2 +226,5 @@ void Zaurus::init(const QString& cpu_info)
d->m_modelstr = "Zaurus SL-C1000";
+ } else if ( model == "SHARP Borzoi" ) {
+ d->m_model = Model_Zaurus_SLC3100;
+ d->m_modelstr = "Zaurus SL-C3100";
} else {
@@ -252,2 +255,3 @@ void Zaurus::init(const QString& cpu_info)
break;
+ case Model_Zaurus_SLC3100: // fallthrough
case Model_Zaurus_SLC3000: // fallthrough
@@ -298,2 +302,3 @@ void Zaurus::initButtons()
break;
+ case Model_Zaurus_SLC3100: // fallthrough
case Model_Zaurus_SLC3000: // fallthrough
@@ -551,2 +556,3 @@ Transformation Zaurus::rotation() const
switch ( d->m_model ) {
+ case Model_Zaurus_SLC3100: // fallthrough
case Model_Zaurus_SLC3000: // fallthrough
@@ -600,2 +606,3 @@ ODirection Zaurus::direction() const
switch ( d->m_model ) {
+ case Model_Zaurus_SLC3100: // fallthrough
case Model_Zaurus_SLC3000: // fallthrough
@@ -623,3 +630,6 @@ bool Zaurus::hasHingeSensor() const
{
- return d->m_model == Model_Zaurus_SLC7x0 || d->m_model == Model_Zaurus_SLC3000 || d->m_model == Model_Zaurus_SLC1000;
+ return d->m_model == Model_Zaurus_SLC7x0 ||
+ d->m_model == Model_Zaurus_SLC3100 ||
+ d->m_model == Model_Zaurus_SLC3000 ||
+ d->m_model == Model_Zaurus_SLC1000;
}
@@ -673,3 +683,3 @@ bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress,
- if (d->m_model != Model_Zaurus_SLC7x0 && d->m_model != Model_Zaurus_SLC3000 && d->m_model != Model_Zaurus_SLC1000) return false;
+ if ( !hasHingeSensor() ) return false;
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
@@ -3,3 +3,3 @@
              Copyright (C) 2002-2005 The Opie Team <opie-devel@handhelds.org>
- =.
+ =. Copyright (C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
.=l.