- consolidate reading hinge sensor into one place

- return proper rotation and direction if hinge sensor not present (like in 2.6 atm.)

2 files changed, 10 insertions, 25 deletions

diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index d3ab63a..b22ee70 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -453,190 +453,175 @@ bool Zaurus::setDisplayBrightness( int bright )
 
     int numberOfSteps = displayBrightnessResolution();
     int val = ( bright == 1 ) ? 1 : ( bright * numberOfSteps ) / 255;
 
     if ( m_embedix )
     {
         int fd = ::open( SHARP_FL_IOCTL_DEVICE, O_WRONLY|O_NONBLOCK );
         if ( fd )
         {
             res = ( ::ioctl( fd, SHARP_FL_IOCTL_STEP_CONTRAST, val ) == 0 );
             ::close( fd );
         }
     }
     else
     {
         int fd = ::open( "/sys/class/backlight/corgi-bl/brightness", O_WRONLY|O_NONBLOCK );
         if ( fd )
         {
             char buf[100];
             int len = ::snprintf( &buf[0], sizeof buf, "%d", val );
             res = ( ::write( fd, &buf[0], len ) == 0 );
             ::close( fd );
         }
     }
     return res;
 }
 
 bool Zaurus::setDisplayStatus( bool on )
 {
     bool res = false;
     if ( m_embedix )
     {
         int fd = ::open( SHARP_FL_IOCTL_DEVICE, O_WRONLY|O_NONBLOCK );
         if ( fd )
         {
             int ioctlnum = on ? SHARP_FL_IOCTL_ON : SHARP_FL_IOCTL_OFF;
             res = ( ::ioctl ( fd, ioctlnum, 0 ) == 0 );
             ::close ( fd );
         }
     }
     else
     {
         int fd = ::open( "/sys/class/backlight/corgi-bl/power", O_WRONLY|O_NONBLOCK );
         if ( fd )
         {
             char buf[10];
             buf[0] = on ? '1' : '0';
             buf[1] = '\0';
             res = ( ::write( fd, &buf[0], 2 ) == 0 );
             ::close( fd );
         }
     }
     return res;
 }
 
 bool Zaurus::suspend()
 {
     qDebug("ODevice::suspend");
     if ( !isQWS( ) ) // only qwsserver is allowed to suspend
         return false;
 
     if ( d->m_model == Model_Unknown ) // better don't suspend in qvfb / on unkown devices
         return false;
 
     bool res = false;
     ODevice::sendSuspendmsg();
 
     struct timeval tvs, tvn;
     ::gettimeofday ( &tvs, 0 );
 
     ::sync(); // flush fs caches
     res = ( ::system ( "apm --suspend" ) == 0 );
 
     // This is needed because the apm implementation is asynchronous and we
     // can not be sure when exactly the device is really suspended
     if ( res ) {
         do { // Yes, wait 15 seconds. This APM sucks big time.
             ::usleep ( 200 * 1000 );
             ::gettimeofday ( &tvn, 0 );
         } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 15000 );
     }
 
     QCopEnvelope ( "QPE/Rotation", "rotateDefault()" );
     return res;
 }
 
 
 Transformation Zaurus::rotation() const
 {
     Transformation rot;
     int handle = 0;
     int retval = 0;
 
     switch ( d->m_model ) {
         case Model_Zaurus_SLC3000: // fallthrough
         case Model_Zaurus_SLC7x0:
-            handle = ::open("/dev/apm_bios", O_RDWR|O_NONBLOCK);
-            if (handle == -1) {
-                return Rot270;
-            } else {
-                retval = ::ioctl(handle, SHARP_IOCTL_GET_ROTATION);
-                ::close (handle);
-
-                if (retval == 2 )
-                    rot = Rot0;
-                else
-                    rot = Rot270;
-            }
+            OHingeStatus hs = readHingeSensor();
+            if ( hs == CASE_PORTRAIT ) rot = Rot0;
+            else if ( hs == CASE_UNKNOWN ) rot = Rot0;
+            else rot = Rot270;
             break;
         case Model_Zaurus_SL6000:
         case Model_Zaurus_SLB600:
         case Model_Zaurus_SLA300:
         case Model_Zaurus_SL5500:
         case Model_Zaurus_SL5000:
         default:
             rot = d->m_rotation;
             break;
     }
 
     return rot;
 }
 ODirection Zaurus::direction() const
 {
     ODirection dir;
     int handle = 0;
     int retval = 0;
     switch ( d->m_model ) {
         case Model_Zaurus_SLC3000: // fallthrough
         case Model_Zaurus_SLC7x0:
-            handle = ::open( "/dev/apm_bios", O_RDWR|O_NONBLOCK );
-            if (handle == -1) {
-                dir = CW;
-            } else {
-                retval = ::ioctl( handle, SHARP_IOCTL_GET_ROTATION );
-                ::close (handle);
-                if (retval == 2 )
-                    dir = CCW;
-                else
-                    dir = CW;
-            }
+            OHingeStatus hs = readHingeSensor();
+            if ( hs == CASE_PORTRAIT ) dir = CCW;
+            else if ( hs == CASE_UNKNOWN ) dir = CCW;
+            else dir = CW;        
             break;
         case Model_Zaurus_SL6000:
         case Model_Zaurus_SLA300:
         case Model_Zaurus_SLB600:
         case Model_Zaurus_SL5500:
         case Model_Zaurus_SL5000:
         default: dir = d->m_direction;
             break;
     }
     return dir;
 
 }
 
 bool Zaurus::hasHingeSensor() const
 {
     return d->m_model == Model_Zaurus_SLC7x0 || d->m_model == Model_Zaurus_SLC3000;
 }
 
-OHingeStatus Zaurus::readHingeSensor()
+OHingeStatus Zaurus::readHingeSensor() const
 {
     if (m_embedix)
     {
         int handle = ::open("/dev/apm_bios", O_RDWR|O_NONBLOCK);
         if (handle == -1)
         {
             qWarning("Zaurus::readHingeSensor() - failed (%s)", "unknown reason" ); //FIXME: use strerror
             return CASE_UNKNOWN;
         }
         else
         {
             int retval = ::ioctl(handle, SHARP_IOCTL_GET_ROTATION);
             ::close (handle);
             if ( retval == CASE_CLOSED || retval == CASE_PORTRAIT || retval == CASE_LANDSCAPE )
             {
                 qDebug( "Zaurus::readHingeSensor() - result = %d", retval );
                 return static_cast<OHingeStatus>( retval );
             }
             else
             {
                 qWarning("Zaurus::readHingeSensor() - couldn't compute hinge status!" );
                 return CASE_UNKNOWN;
             }
         }
     }
     else
     {
         qDebug( "Zaurus::readHingeSensor: ODevice handling for non-embedix kernels not yet implemented" );
         return CASE_UNKNOWN;
     }
 }
diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h
index ed9cf67..c763798 100644
--- a/libopie2/opiecore/device/odevice_zaurus.h
+++ b/libopie2/opiecore/device/odevice_zaurus.h
@@ -17,122 +17,122 @@
     =_        +     =;=|`    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
 #define ODEVICE_ZAURUS
 
 #include <opie2/odevice.h>
 
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #endif
 
 // _IO and friends are only defined in kernel headers ...
 #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))
 
 // Audio
 #define SHARP_DEV_IOCTL_COMMAND_START 0x5680
 
 #define SHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 #define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
 
 #define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
 #define SHARP_BUZ_KEYSOUND         2  /* key sound */
 #define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
 
 #define SHARP_BUZZER_SETVOLUME   (SHARP_BUZZER_IOCTL_START+1)
 #define SHARP_BUZZER_GETVOLUME   (SHARP_BUZZER_IOCTL_START+2)
 #define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3)
 #define SHARP_BUZZER_SETMUTE     (SHARP_BUZZER_IOCTL_START+4)
 #define SHARP_BUZZER_STOPSOUND   (SHARP_BUZZER_IOCTL_START+5)
 
 // LED
 #define SHARP_LED_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 #define SHARP_LED_SETSTATUS   (SHARP_LED_IOCTL_START+1)
 #define SHARP_LED_MAIL_EXISTS  9     /* mail status (exists or not) */
 
 #define LED_MAIL_NO_UNREAD_MAIL  0   /* for SHARP_LED_MAIL_EXISTS */
 #define LED_MAIL_NEWMAIL_EXISTS  1   /* for SHARP_LED_MAIL_EXISTS */
 #define LED_MAIL_UNREAD_MAIL_EX  2   /* for SHARP_LED_MAIL_EXISTS */
 
 // Rotation and Power Management
 #define SHARP_IOCTL_GET_ROTATION 0x413c
 
 #define APM_IOCGEVTSRC          OD_IOR( 'A', 203, int )
 #define APM_IOCSEVTSRC          OD_IORW( 'A', 204, int )
 #define APM_EVT_POWER_BUTTON    (1 << 0)
 
 // Brightness
 #define SHARP_FL_IOCTL_DEVICE   "/dev/sharp_fl"
 #define SHARP_FL_IOCTL_ON                  1
 #define SHARP_FL_IOCTL_OFF                 2
 #define SHARP_FL_IOCTL_STEP_CONTRAST     100
 #define SHARP_FL_IOCTL_GET_STEP_CONTRAST 101
 #define SHARP_FL_IOCTL_GET_STEP          102
 
 namespace Opie {
 namespace Core {
 namespace Internal {
 
 class Zaurus : public ODevice
 {
   protected:
     virtual void init(const QString&);
     virtual void initButtons();
 
   public:
     virtual bool setSoftSuspend( bool soft );
 
     virtual bool setDisplayBrightness( int b );
     virtual bool setDisplayStatus( bool on );
     virtual int displayBrightnessResolution() const;
 
     virtual void playAlarmSound();
     virtual void playKeySound();
     virtual void playTouchSound();
 
     virtual QValueList <OLed> ledList() const;
     virtual QValueList <OLedState> ledStateList ( OLed led ) const;
     virtual OLedState ledState( OLed led ) const;
     virtual bool setLedState( OLed led, OLedState st );
 
     virtual bool hasHingeSensor() const;
-    virtual OHingeStatus readHingeSensor();
+    virtual OHingeStatus readHingeSensor() const;
 
     virtual bool suspend();
     virtual Transformation rotation() const;
     virtual ODirection direction() const;
 
   protected:
     virtual void buzzer( int snd );
 
     OLedState m_leds[1];
     bool m_embedix;
 };
 
 struct z_button {
     Qt::Key code;
     char *utext;
     char *pix;
     char *fpressedservice;
     char *fpressedaction;
     char *fheldservice;
     char *fheldaction;
 };
 }
 }
 }
 #endif