add basic support for the Sharp SL-C1000 (Akita) PDA

3 files changed, 52 insertions, 44 deletions

diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h
index e7cd82a..5db43ff 100644
--- a/libopie2/opiecore/device/odevice.h
+++ b/libopie2/opiecore/device/odevice.h
@@ -79,12 +79,13 @@ enum OModel {
     Model_Zaurus_SL5500 = ( Model_Zaurus | 0x000002 ),
     Model_Zaurus_SLA300 = ( Model_Zaurus | 0x000003 ),
     Model_Zaurus_SLB600 = ( Model_Zaurus | 0x000004 ),
     Model_Zaurus_SLC7x0 = ( Model_Zaurus | 0x000005 ),
     Model_Zaurus_SL6000 = ( Model_Zaurus | 0x000006 ),
     Model_Zaurus_SLC3000 = ( Model_Zaurus | 0x000007 ),
+    Model_Zaurus_SLC1000 = ( Model_Zaurus | 0x000008 ),
 
     Model_SIMpad        = ( 3 << 24 ),
 
     Model_SIMpad_All    = ( Model_SIMpad | 0xffffff ),
     Model_SIMpad_CL4    = ( Model_SIMpad | 0x000001 ),
     Model_SIMpad_SL4    = ( Model_SIMpad | 0x000002 ),
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 8aefc13..3bd7f6e 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -1,30 +1,30 @@
 /*
-                             This file is part of the Opie Project
-                             Copyright (C) 2002,2003,2004 The Opie Team <opie-devel@handhelds.org>
+                             This file is part of the Opie Project
+                             Copyright (C) 2002-2005 The Opie Team <opie-devel@handhelds.org>
               =.
             .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program is distributed in the hope that
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
-++=   -.     .`     .:       details.
- :     =  ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #include "odevice_zaurus.h"
@@ -196,24 +196,28 @@ void Zaurus::init(const QString& cpu_info)
     } else if ( model == "SHARP Tosa" ) {
         d->m_model = Model_Zaurus_SL6000;
         d->m_modelstr = "Zaurus SL-6000";
     } else if ( model == "SHARP Spitz" ) {
         d->m_model = Model_Zaurus_SLC3000;
         d->m_modelstr = "Zaurus SL-C3000";
+    } else if ( model == "SHARP Akita" ) {
+        d->m_model = Model_Zaurus_SLC1000;
+        d->m_modelstr = "Zaurus SL-C1000";
     } else {
         d->m_model = Model_Zaurus_SL5500;
         d->m_modelstr = "Unknown Zaurus";
     }
 
     // set initial rotation
     switch( d->m_model ) {
         case Model_Zaurus_SL6000: // fallthrough
         case Model_Zaurus_SLA300:
             d->m_rotation = Rot0;
             break;
         case Model_Zaurus_SLC3000: // fallthrough
+        case Model_Zaurus_SLC1000: // fallthrough
         case Model_Zaurus_SLC7x0:
             d->m_rotation = rotation();
             d->m_direction = direction();
             break;
         case Model_Zaurus_SLB600: // fallthrough
         case Model_Zaurus_SL5000: // fallthrough
@@ -239,12 +243,13 @@ void Zaurus::initButtons()
     d->m_buttons = new QValueList <ODeviceButton>;
 
     struct z_button * pz_buttons;
     int buttoncount;
     switch ( d->m_model ) {
         case Model_Zaurus_SLC3000: // fallthrough
+        case Model_Zaurus_SLC1000: // fallthrough       
         case Model_Zaurus_SLC7x0:
             if ( isQWS( ) ) {
                 addPreHandler(this); // hinge-sensor-handler
             }
             pz_buttons = z_buttons_c700;
             buttoncount = ARRAY_SIZE(z_buttons_c700);
@@ -491,12 +496,13 @@ Transformation Zaurus::rotation() const
 {
     qDebug( "Zaurus::rotation()" );
     Transformation rot;
 
     switch ( d->m_model ) {
         case Model_Zaurus_SLC3000: // fallthrough
+        case Model_Zaurus_SLC1000: // fallthrough       
         case Model_Zaurus_SLC7x0:
         {
             OHingeStatus hs = readHingeSensor();
             qDebug( "Zaurus::rotation() - hinge sensor = %d", (int) hs );
 
             if ( m_embedix )
@@ -528,12 +534,13 @@ Transformation Zaurus::rotation() const
 ODirection Zaurus::direction() const
 {
     ODirection dir;
 
     switch ( d->m_model ) {
         case Model_Zaurus_SLC3000: // fallthrough
+        case Model_Zaurus_SLC1000: // fallthrough        
         case Model_Zaurus_SLC7x0: {
                 OHingeStatus hs = readHingeSensor();
                 if ( hs == CASE_PORTRAIT ) dir = CCW;
                 else if ( hs == CASE_UNKNOWN ) dir = CCW;
                 else dir = CW;
             }
@@ -549,13 +556,13 @@ ODirection Zaurus::direction() const
     return dir;
 
 }
 
 bool Zaurus::hasHingeSensor() const
 {
-    return d->m_model == Model_Zaurus_SLC7x0 || d->m_model == Model_Zaurus_SLC3000;
+    return d->m_model == Model_Zaurus_SLC7x0 || d->m_model == Model_Zaurus_SLC3000 || d->m_model == Model_Zaurus_SLC1000;
 }
 
 OHingeStatus Zaurus::readHingeSensor() const
 {
     if (m_embedix)
     {
@@ -599,13 +606,13 @@ OHingeStatus Zaurus::readHingeSensor() const
  * I hope that is ok - Alwin
  */
 bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
 {
     int newkeycode = keycode;
 
-    if (d->m_model!=Model_Zaurus_SLC3000 && d->m_model!=Model_Zaurus_SLC7x0) return false;
+    if (d->m_model != Model_Zaurus_SLC7x0 && d->m_model != Model_Zaurus_SLC3000 && d->m_model != Model_Zaurus_SLC1000) return false;
 
     /* map cursor keys depending on the hinge status */
     switch ( keycode ) {
         // Rotate cursor keys
         case Key_Left :
         case Key_Right:
diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h
index 4548e35..4250356 100644
--- a/libopie2/opiecore/device/odevice_zaurus.h
+++ b/libopie2/opiecore/device/odevice_zaurus.h
@@ -1,30 +1,30 @@
 /*
-                             This file is part of the Opie Project
-                             Copyright (C) 2002,2003,2004 The Opie Team <opie-devel@handhelds.org>
+                             This file is part of the Opie Project
+                             Copyright (C) 2002-2005 The Opie Team <opie-devel@handhelds.org>
               =.
             .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program is distributed in the hope that
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
-++=   -.     .`     .:       details.
- :     =  ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #ifndef ODEVICE_ZAURUS