fix default rotation and direction for SIMpad

1 files changed, 4 insertions, 1 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 02f13b5..2873407 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -1420,193 +1420,196 @@ bool Zaurus::setLedState ( OLed which, OLedState st )
                                 case Led_Off      : leds. status = LED_MAIL_NO_UNREAD_MAIL; break;
                                 case Led_On       : leds. status = LED_MAIL_NEWMAIL_EXISTS; break;
                                 case Led_BlinkSlow: leds. status = LED_MAIL_UNREAD_MAIL_EX; break;
                                 default            : ok = false;
                         }
 
                         if ( ok && ( ::ioctl ( fd, SHARP_LED_SETSTATUS, &leds ) >= 0 )) {
                                 m_leds [0] = st;
                                 return true;
                         }
                 }
         }
         return false;
 }
 
 bool Zaurus::setSoftSuspend ( bool soft )
 {
         bool res = false;
         int fd;
 
         if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) ||
         (( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) {
 
                 int sources = ::ioctl ( fd, APM_IOCGEVTSRC, 0 ); // get current event sources
 
                 if ( sources >= 0 ) {
                         if ( soft )
                                 sources &= ~APM_EVT_POWER_BUTTON;
                         else
                                 sources |= APM_EVT_POWER_BUTTON;
 
                         if ( ::ioctl ( fd, APM_IOCSEVTSRC, sources ) >= 0 ) // set new event sources
                                 res = true;
                         else
                                 perror ( "APM_IOCGEVTSRC" );
                 }
                 else
                         perror ( "APM_IOCGEVTSRC" );
 
                 ::close ( fd );
         }
         else
                 perror ( "/dev/apm_bios or /dev/misc/apm_bios" );
 
     return res;
 }
 
 
 bool Zaurus::setDisplayBrightness ( int bright )
 {
         bool res = false;
         int fd;
 
         if ( bright > 255 )
                 bright = 255;
         if ( bright < 0 )
                 bright = 0;
 
         if (( fd = ::open ( "/dev/fl", O_WRONLY )) >= 0 ) {
                 int bl = ( bright * 4 + 127 ) / 255; // only 4 steps on zaurus
                 if ( bright && !bl )
                         bl = 1;
                 res = ( ::ioctl ( fd, FL_IOCTL_STEP_CONTRAST, bl ) == 0 );
                 ::close ( fd );
         }
         return res;
 }
 
 
 int Zaurus::displayBrightnessResolution ( ) const
 {
         return 5;
 }
 
 
 /**************************************************
  *
  * SIMpad
  *
  **************************************************/
 
 void SIMpad::init ( )
 {
         d-> m_vendorstr = "SIEMENS";
         d-> m_vendor = Vendor_SIEMENS;
 
         QFile f ( "/proc/hal/model" );
 
     //TODO Implement model checking
     //FIXME For now we assume an SL4
 
     d-> m_modelstr = "SL4";
     d-> m_model = Model_SIMpad_SL4;
 
         switch ( d-> m_model ) {
                 default:
-                        d-> m_rotation = Rot270;
+                        d-> m_rotation = Rot0;
+                        d-> m_direction = CCW;
+                        d-> m_holdtime = 1000; // 1000ms
+
                         break;
         }
 
         f. setName ( "/etc/familiar-version" );
         if ( f. open ( IO_ReadOnly )) {
                 d-> m_systemstr = "Familiar";
                 d-> m_system = System_Familiar;
 
                 QTextStream ts ( &f );
                 d-> m_sysverstr = ts. readLine ( ). mid ( 10 );
 
                 f. close ( );
         } else {
             f. setName ( "/etc/oz_version" );
 
                     if ( f. open ( IO_ReadOnly )) {
                     d-> m_systemstr = "OpenEmbedded/SIMpad";
                 d-> m_system = System_OpenZaurus;
 
                     QTextStream ts ( &f );
                     ts.setDevice ( &f );
                     d-> m_sysverstr = ts. readLine ( );
                     f. close ( );
         }
     }
 
         m_leds [0] = m_leds [1] = Led_Off;
 
         m_power_timer = 0;
 
 }
 
 void SIMpad::initButtons ( )
 {
         if ( d-> m_buttons )
                 return;
 
         if ( isQWS( ) )
                 QWSServer::setKeyboardFilter ( this );
 
         d-> m_buttons = new QValueList <ODeviceButton>;
 
         for ( uint i = 0; i < ( sizeof( simpad_buttons ) / sizeof( s_button )); i++ ) {
                 s_button *sb = simpad_buttons + i;
                 ODeviceButton b;
 
                 if (( sb-> model & d-> m_model ) == d-> m_model ) {
                         b. setKeycode ( sb-> code );
                         b. setUserText ( QObject::tr ( "Button", sb-> utext ));
                         b. setPixmap ( Resource::loadPixmap ( sb-> pix ));
                         b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( sb-> fpressedservice ), sb-> fpressedaction ));
                         b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( sb-> fheldservice ), sb-> fheldaction ));
 
                         d-> m_buttons-> append ( b );
                 }
         }
         reloadButtonMapping ( );
 
         QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
         connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
 }
 
 // SIMpad boardcontrol register CS3
 #define SIMPAD_BOARDCONTROL "/proc/cs3"
 #define SIMPAD_VCC_5V_EN                   0x0001 // For 5V PCMCIA
 #define SIMPAD_VCC_3V_EN                   0x0002 // FOR 3.3V PCMCIA
 #define SIMPAD_EN1                         0x0004 // This is only for EPROM's
 #define SIMPAD_EN0                         0x0008 // Both should be enable for 3.3V or 5V
 #define SIMPAD_DISPLAY_ON                  0x0010
 #define SIMPAD_PCMCIA_BUFF_DIS             0x0020
 #define SIMPAD_MQ_RESET                    0x0040
 #define SIMPAD_PCMCIA_RESET                0x0080
 #define SIMPAD_DECT_POWER_ON               0x0100
 #define SIMPAD_IRDA_SD                     0x0200 // Shutdown for powersave
 #define SIMPAD_RS232_ON                    0x0400
 #define SIMPAD_SD_MEDIAQ                   0x0800 // Shutdown for powersave
 #define SIMPAD_LED2_ON                     0x1000
 #define SIMPAD_IRDA_MODE                   0x2000 // Fast/Slow IrDA mode
 #define SIMPAD_ENABLE_5V                   0x4000 // Enable 5V circuit
 #define SIMPAD_RESET_SIMCARD               0x8000
 
 //SIMpad touchscreen backlight strength control
 #define SIMPAD_BACKLIGHT_CONTROL "/proc/driver/mq200/registers/PWM_CONTROL"
 #define SIMPAD_BACKLIGHT_MASK    0x00a10044
 
 QValueList <OLed> SIMpad::ledList ( ) const
 {
         QValueList <OLed> vl;
         vl << Led_Power; //FIXME which LED is LED2 ? The green one or the amber one?
         //vl << Led_Mail; //TODO find out if LED1 is accessible anyway
         return vl;
 }
 
 QValueList <OLedState> SIMpad::ledStateList ( OLed l ) const
 {
         QValueList <OLedState> vl;