first bits of jornada 720 device code

2 files changed, 20 insertions, 5 deletions

diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h
index 96a41fc..c434216 100644
--- a/libopie2/opiecore/device/odevice.h
+++ b/libopie2/opiecore/device/odevice.h
@@ -1,169 +1,170 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 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.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #ifndef ODEVICE_H_
 #define ODEVICE_H_
 
 /* OPIE */
 #include <opie2/odevicebutton.h>
 #include <qpe/qpeapplication.h> /* for Transformation enum.. */
 
 /* QT */
 #include <qnamespace.h>
 #include <qobject.h>
 #include <qstring.h>
 
 
 #include <qstrlist.h>
 #include <qwindowsystem_qws.h>
 
 
 class Sound;
 
 namespace Opie{
 namespace Core{
 
 class ODeviceData;
 /**
  * The available devices
  */
 enum OModel {
     Model_Unknown, // = 0
 
     Model_Series_Mask   = 0xff000000,
 
     Model_iPAQ          = ( 1 << 24 ),
 
     Model_iPAQ_All      = ( Model_iPAQ | 0xffffff ),
     Model_iPAQ_H31xx    = ( Model_iPAQ | 0x000001 ),
     Model_iPAQ_H36xx    = ( Model_iPAQ | 0x000002 ),
     Model_iPAQ_H37xx    = ( Model_iPAQ | 0x000004 ),
     Model_iPAQ_H38xx    = ( Model_iPAQ | 0x000008 ),
     Model_iPAQ_H39xx    = ( Model_iPAQ | 0x000010 ),
     Model_iPAQ_H5xxx    = ( Model_iPAQ | 0x000020 ),
     Model_iPAQ_H22xx    = ( Model_iPAQ | 0x000040 ),
 
     Model_Jornada       = ( 6 << 24 ),
     Model_Jornada_56x   = ( Model_Jornada | 0x000001 ),
+    Model_Jornada_720   = ( Model_Jornada | 0x000002 ),
 
     Model_Zaurus        = ( 2 << 24 ),
 
     Model_Zaurus_SL5000 = ( Model_Zaurus | 0x000001 ),
     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_SIMpad        = ( 3 << 24 ),
 
     Model_SIMpad_All    = ( Model_SIMpad | 0xffffff ),
     Model_SIMpad_CL4    = ( Model_SIMpad | 0x000001 ),
     Model_SIMpad_SL4    = ( Model_SIMpad | 0x000002 ),
     Model_SIMpad_SLC    = ( Model_SIMpad | 0x000004 ),
     Model_SIMpad_TSinus = ( Model_SIMpad | 0x000008 ),
 
     Model_Ramses        = ( 4 << 24 ),
 
     Model_Ramses_All    = ( Model_Ramses | 0xffffff ),
     Model_Ramses_MNCI   = ( Model_Ramses | 0x000001 ),
     Model_Ramses_MNCIRX = ( Model_Ramses | 0x000002 ),
 
     Model_Yopy          = ( 5 << 24 ),
 
     Model_Yopy_All      = ( Model_Yopy | 0xffffff ),
     Model_Yopy_3000     = ( Model_Yopy | 0x000001 ),
     Model_Yopy_3500     = ( Model_Yopy | 0x000002 ),
     Model_Yopy_3700     = ( Model_Yopy | 0x000003 ),
 
     Model_Beagle        = ( 6 << 24 ),
 
     Model_Beagle_All    = ( Model_Beagle | 0xffffff ),
     Model_Beagle_PA100  = ( Model_Beagle | 0x000001 ),
 
     Model_GenuineIntel  = ( 7 << 24 )
 
 };
 
 /**
  * The vendor of the device
  */
 enum OVendor {
     Vendor_Unknown,
 
     Vendor_HP,
     Vendor_Sharp,
     Vendor_SIEMENS,
     Vendor_MundN,
     Vendor_GMate,
     Vendor_MasterIA,
     Vendor_GenuineIntel
 };
 
 /**
  * The System used
  */
 enum OSystem {
     System_Unknown,
 
     System_Familiar,
     System_Zaurus,
     System_OpenZaurus,
     System_Linupy,
     System_OpenEmbedded,
     System_PC
 };
 
 typedef struct {
     OSystem system;
     char* sysstr;
     char* sysvfile;
 } ODistribution;
 
 extern ODistribution distributions[];
 
 
 enum OLedState {
     Led_Off,
     Led_On,
     Led_BlinkSlow,
     Led_BlinkFast
 };
 
 enum OLed {
     Led_Mail,
     Led_Power,
     Led_BlueTooth
 };
 
 enum OHardKey {
     HardKey_Datebook  = Qt::Key_F9,
     HardKey_Contacts  = Qt::Key_F10,
     HardKey_Menu      = Qt::Key_F11,
diff --git a/libopie2/opiecore/device/odevice_jornada.cpp b/libopie2/opiecore/device/odevice_jornada.cpp
index 7d080ba..c7ed4bc 100644
--- a/libopie2/opiecore/device/odevice_jornada.cpp
+++ b/libopie2/opiecore/device/odevice_jornada.cpp
@@ -15,170 +15,184 @@
      +  .  -:.       =       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_jornada.h"
 
 /* QT */
 #include <qapplication.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qwindowsystem_qws.h>
 
 /* OPIE */
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 
 /* STD */
 #include <fcntl.h>
 #include <math.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
 
 /* KERNEL */
 #define OD_IOC(dir,type,number,size)    (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
 
 #define OD_IO(type,number)              OD_IOC(0,type,number,0)
 #define OD_IOW(type,number,size)        OD_IOC(1,type,number,sizeof(size))
 #define OD_IOR(type,number,size)        OD_IOC(2,type,number,sizeof(size))
 #define OD_IORW(type,number,size)       OD_IOC(3,type,number,sizeof(size))
 
 typedef struct {
   unsigned char OffOnBlink;       /* 0=off 1=on 2=Blink */
   unsigned char TotalTime;        /* Units of 5 seconds */
   unsigned char OnTime;           /* units of 100m/s */
   unsigned char OffTime;          /* units of 100m/s */
 } LED_IN;
 
 typedef struct {
         unsigned char mode;
         unsigned char pwr;
         unsigned char brightness;
 } FLITE_IN;
 
 #define LED_ON    OD_IOW( 'f', 5, LED_IN )
 #define FLITE_ON  OD_IOW( 'f', 7, FLITE_IN )
 
 using namespace Opie::Core;
 using namespace Opie::Core::Internal;
 
 struct j_button jornada56x_buttons [] = {
     { Model_Jornada_56x,
     Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
     "devicebuttons/jornada56x_calendar",
     "datebook", "nextView()",
     "today", "raise()" },
     { Model_Jornada_56x,
     Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
     "devicebuttons/jornada56x_contact",
     "addressbook", "raise()",
     "addressbook", "beamBusinessCard()" },
     { Model_Jornada_56x,
     Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Todo Button"),
     "devicebuttons/jornada56x_todo",
     "todolist", "raise()",
     "todolist", "create()" },
     { Model_Jornada_56x,
     Qt::Key_F8, QT_TRANSLATE_NOOP("Button", "Home Button"),
     "devicebuttons/jornada56x_home",
     "QPE/Launcher", "home()",
     "buttonsettings", "raise()" },
     { Model_Jornada_56x,
     Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Record Button"),
     "devicebuttons/jornada56x_record",
     "QPE/VMemo", "toggleRecord()",
     "sound", "raise()" },
 };
 
-void Jornada::init(const QString&)
+void Jornada::init(const QString& cpu_info)
 {
     d->m_vendorstr = "HP";
     d->m_vendor = Vendor_HP;
+    
+    QString model;
+    int loc = cpu_info.find( ":" );
+    if ( loc != -1 )
+        model = cpu_info.mid( loc+2 ).simplifyWhiteSpace();
+    else
+        model = cpu_info;
+    
+    if ( model == "HP Jornada 56x" ) {
     d->m_modelstr = "Jornada 56x";
     d->m_model = Model_Jornada_56x;
-    d->m_rotation = Rot0;
+    } else if ( model == "HP Jornada 720" ) {
+        d->m_modelstr = "Jornada 720";
+	d->m_model = Model_Jornada_720;
+    }
+    
+    d->m_rotation = Rot0; //all Jornadas need this rotation
     //Distribution detecting code is now in base class
 }
 
 void Jornada::initButtons()
 {
     if ( d->m_buttons )
         return;
 
     d->m_buttons = new QValueList <ODeviceButton>;
 
     for ( uint i = 0; i < ( sizeof( jornada56x_buttons ) / sizeof( j_button )); i++ ) {
         j_button *ib = jornada56x_buttons + i;
         ODeviceButton b;
 
         if (( ib->model & d->m_model ) == d->m_model ) {
             b. setKeycode ( ib->code );
             b. setUserText ( QObject::tr ( "Button", ib->utext ));
             b. setPixmap ( Resource::loadPixmap ( ib->pix ));
             b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib->fpressedservice ), ib->fpressedaction ));
             b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib->fheldservice ), ib->fheldaction ));
 
             d->m_buttons->append ( b );
         }
     }
     reloadButtonMapping();
 }
 
 int Jornada::displayBrightnessResolution() const
 {
     return 255;
 }
 
 
 bool Jornada::setDisplayBrightness( int bright )
 {
     bool res = false;
 
     if ( bright > 255 )
         bright = 255;
     if ( bright < 0 )
         bright = 0;
 
     QString cmdline;
 
     if ( !bright )
-    	cmdline = QString::fromLatin1( "echo 4 > /sys/class/backlight/sa1100fb/power");
+    	cmdline = QString::fromLatin1( "echo 4 > /sys/class/backlight/*/power");
     else
-    	cmdline = QString::fromLatin1( "echo 0 > /sys/class/backlight/sa1100fb/power; echo %1 > /sys/class/backlight/sa1100fb/brightness" ).arg( bright );
+    	cmdline = QString::fromLatin1( "echo 0 > /sys/class/backlight/*/power; echo %1 > /sys/class/backlight/*/brightness" ).arg( bright );
 
     // No Global::shellQuote as we gurantee it to be sane
     res = ( ::system( QFile::encodeName(cmdline) ) == 0 );
 
     return res;
 }
 
 
 bool Jornada::setDisplayStatus ( bool on )
 {
     bool res = false;
 
-    QString cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/sa1100fb/power; echo %2 > /sys/class/backlight/sa1100fb/power").arg( on ? "0" : "4" ).arg( on ? "0" : "4" );
+    QString cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/*/power; echo %2 > /sys/class/backlight/*/power").arg( on ? "0" : "4" ).arg( on ? "0" : "4" );
 
     res = ( ::system( QFile::encodeName(cmdline) ) == 0 );
 
     return res;
 }