add support for the Sharp SL-C3100 "Borzoi"

4 files changed, 22 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index aa546ba..cc3f1a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,7 +18,6 @@
 	* Opie-smb: Added Opie front end for Samba (ljp)
 	* Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie)
 
-
 	Fixed Bugs
 	----------
 	* #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
@@ -38,12 +37,12 @@
 	* #1667 - Opie-IRC does not show messages from !channel (skyhusker)
 	* #1679 - Security PIN plugin is QVGA sized (hrw)
 	* #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)
 	* n.a.  - Today Addressbook plugin fix configuration to show/not show birthdays, use checkboxes for selection (hrw)
 	* n.a.  - remove hardcoded font size from netsystemtime (hrw)
@@ -61,8 +60,9 @@
 	* libopienet: Miscellaneous API cleanups (mickeyl)
 	* libopiecore: Add linux pcmcia system abstraction classes (mickeyl)
 	* 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)
 	
 2005-03-25	Opie 1.2.0
 
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
@@ -84,6 +84,7 @@ enum OModel {
     Model_Zaurus_SL6000 = ( Model_Zaurus | 0x0006 ),
     Model_Zaurus_SLC3000 = ( Model_Zaurus | 0x0007 ),
     Model_Zaurus_SLC1000 = ( Model_Zaurus | 0x0008 ),
+    Model_Zaurus_SLC3100 = ( Model_Zaurus | 0x0009 ),
 
     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
@@ -1,7 +1,7 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2002-2005 The Opie Team <opie-devel@handhelds.org>
-              =.
+              =.             Copyright (C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
@@ -224,6 +224,9 @@ void Zaurus::init(const QString& cpu_info)
     } else if ( model == "SHARP Akita" ) {
         d->m_model = Model_Zaurus_SLC1000;
         d->m_modelstr = "Zaurus SL-C1000";
+    } else if ( model == "SHARP Borzoi" ) {
+        d->m_model = Model_Zaurus_SLC3100;
+        d->m_modelstr = "Zaurus SL-C3100";
     } else {
         d->m_model = Model_Zaurus_SL5500;
         d->m_modelstr = "Unknown Zaurus";
@@ -250,6 +253,7 @@ void Zaurus::init(const QString& cpu_info)
         case Model_Zaurus_SLA300:
             d->m_rotation = Rot0;
             break;
+        case Model_Zaurus_SLC3100: // fallthrough
         case Model_Zaurus_SLC3000: // fallthrough
         case Model_Zaurus_SLC1000: // fallthrough
         case Model_Zaurus_SLC7x0:
@@ -296,6 +300,7 @@ void Zaurus::initButtons()
             pz_buttons = z_buttons_6000;
             buttoncount = ARRAY_SIZE(z_buttons_6000);
             break;
+        case Model_Zaurus_SLC3100: // fallthrough
         case Model_Zaurus_SLC3000: // fallthrough
         case Model_Zaurus_SLC1000: // fallthrough
         case Model_Zaurus_SLC7x0:
@@ -549,6 +554,7 @@ Transformation Zaurus::rotation() const
     Transformation rot;
 
     switch ( d->m_model ) {
+        case Model_Zaurus_SLC3100: // fallthrough
         case Model_Zaurus_SLC3000: // fallthrough
         case Model_Zaurus_SLC1000:
         {
@@ -598,6 +604,7 @@ ODirection Zaurus::direction() const
     ODirection dir;
 
     switch ( d->m_model ) {
+        case Model_Zaurus_SLC3100: // fallthrough
         case Model_Zaurus_SLC3000: // fallthrough
         case Model_Zaurus_SLC1000: // fallthrough
         case Model_Zaurus_SLC7x0: {
@@ -621,7 +628,10 @@ ODirection Zaurus::direction() const
 
 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;
 }
 
 OHingeStatus Zaurus::readHingeSensor() const
@@ -671,7 +681,7 @@ bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress,
 {
     int newkeycode = keycode;
 
-    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;
 
     /* map cursor keys depending on the hinge status */
     switch ( keycode ) {
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,7 +1,7 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2002-2005 The Opie Team <opie-devel@handhelds.org>
-              =.
+              =.             Copyright (C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can