Diffstat (limited to 'libopie2/opiecore/device/odevice_zaurus.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index 82e127e..67dfa41 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp | |||
@@ -111,48 +111,52 @@ struct z_button z_buttons_c700 [] = { | |||
111 | "QPE/Rotation", "rotateDefault()", | 111 | "QPE/Rotation", "rotateDefault()", |
112 | "QPE/Rotation", "rotateDefault()" }, | 112 | "QPE/Rotation", "rotateDefault()" }, |
113 | { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), | 113 | { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), |
114 | "devicebuttons/z_hinge3", | 114 | "devicebuttons/z_hinge3", |
115 | "QPE/Rotation", "rotateDefault()", | 115 | "QPE/Rotation", "rotateDefault()", |
116 | "QPE/Rotation", "rotateDefault()" }, | 116 | "QPE/Rotation", "rotateDefault()" }, |
117 | }; | 117 | }; |
118 | 118 | ||
119 | // FIXME This gets unnecessary complicated. We should think about splitting the Zaurus | 119 | // FIXME This gets unnecessary complicated. We should think about splitting the Zaurus |
120 | // class up into individual classes. We need three classes | 120 | // class up into individual classes. We need three classes |
121 | // | 121 | // |
122 | // Zaurus-Collie (SA-model w/ 320x240 lcd, for SL5500 and SL5000) | 122 | // Zaurus-Collie (SA-model w/ 320x240 lcd, for SL5500 and SL5000) |
123 | // Zaurus-Poodle (PXA-model w/ 320x240 lcd, for SL5600) | 123 | // Zaurus-Poodle (PXA-model w/ 320x240 lcd, for SL5600) |
124 | // Zaurus-Corgi (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000) | 124 | // Zaurus-Corgi (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000) |
125 | // Zaurus-Tosa (PXA-model w/ 480x640 lcd, for SL6000) | 125 | // Zaurus-Tosa (PXA-model w/ 480x640 lcd, for SL6000) |
126 | // | 126 | // |
127 | // Only question right now is: Do we really need to do it? Because as soon | 127 | // Only question right now is: Do we really need to do it? Because as soon |
128 | // as the OpenZaurus kernel is ready, there will be a unified interface for all | 128 | // as the OpenZaurus kernel is ready, there will be a unified interface for all |
129 | // Zaurus models (concerning apm, backlight, buttons, etc.) | 129 | // Zaurus models (concerning apm, backlight, buttons, etc.) |
130 | // | 130 | // |
131 | // Comments? - mickeyl. | 131 | // Comments? - mickeyl. |
132 | 132 | ||
133 | void Zaurus::init(const QString& cpu_info) | 133 | void Zaurus::init(const QString& cpu_info) |
134 | { | 134 | { |
135 | // Set the time to wait until the system is realy suspended | ||
136 | // the delta between apm --suspend and sleeping | ||
137 | setAPMTimeOut( 15000 ); | ||
138 | |||
135 | // generic distribution code already scanned /etc/issue at that point - | 139 | // generic distribution code already scanned /etc/issue at that point - |
136 | // embedix releases contain "Embedix <version> | Linux for Embedded Devices" | 140 | // embedix releases contain "Embedix <version> | Linux for Embedded Devices" |
137 | if ( d->m_sysverstr.contains( "embedix", false ) ) | 141 | if ( d->m_sysverstr.contains( "embedix", false ) ) |
138 | { | 142 | { |
139 | d->m_vendorstr = "Sharp"; | 143 | d->m_vendorstr = "Sharp"; |
140 | d->m_vendor = Vendor_Sharp; | 144 | d->m_vendor = Vendor_Sharp; |
141 | d->m_systemstr = "Zaurus"; | 145 | d->m_systemstr = "Zaurus"; |
142 | d->m_system = System_Zaurus; | 146 | d->m_system = System_Zaurus; |
143 | m_embedix = true; | 147 | m_embedix = true; |
144 | } | 148 | } |
145 | else | 149 | else |
146 | { | 150 | { |
147 | d->m_vendorstr = "OpenZaurus Team"; | 151 | d->m_vendorstr = "OpenZaurus Team"; |
148 | d->m_systemstr = "OpenZaurus"; | 152 | d->m_systemstr = "OpenZaurus"; |
149 | d->m_system = System_OpenZaurus; | 153 | d->m_system = System_OpenZaurus; |
150 | // sysver already gathered | 154 | // sysver already gathered |
151 | 155 | ||
152 | // OpenZaurus sometimes uses the embedix kernel, check if this is one | 156 | // OpenZaurus sometimes uses the embedix kernel, check if this is one |
153 | FILE *uname = popen("uname -r", "r"); | 157 | FILE *uname = popen("uname -r", "r"); |
154 | QFile f; | 158 | QFile f; |
155 | QString line; | 159 | QString line; |
156 | if ( f.open(IO_ReadOnly, uname) ) { | 160 | if ( f.open(IO_ReadOnly, uname) ) { |
157 | QTextStream ts ( &f ); | 161 | QTextStream ts ( &f ); |
158 | line = ts. readLine(); | 162 | line = ts. readLine(); |
@@ -461,80 +465,48 @@ bool Zaurus::setDisplayStatus( bool on ) | |||
461 | { | 465 | { |
462 | int fd = ::open( SHARP_FL_IOCTL_DEVICE, O_WRONLY|O_NONBLOCK ); | 466 | int fd = ::open( SHARP_FL_IOCTL_DEVICE, O_WRONLY|O_NONBLOCK ); |
463 | if ( fd ) | 467 | if ( fd ) |
464 | { | 468 | { |
465 | int ioctlnum = on ? SHARP_FL_IOCTL_ON : SHARP_FL_IOCTL_OFF; | 469 | int ioctlnum = on ? SHARP_FL_IOCTL_ON : SHARP_FL_IOCTL_OFF; |
466 | res = ( ::ioctl ( fd, ioctlnum, 0 ) == 0 ); | 470 | res = ( ::ioctl ( fd, ioctlnum, 0 ) == 0 ); |
467 | ::close ( fd ); | 471 | ::close ( fd ); |
468 | } | 472 | } |
469 | } | 473 | } |
470 | else | 474 | else |
471 | { | 475 | { |
472 | int fd = ::open( "/sys/class/backlight/corgi-bl/power", O_WRONLY|O_NONBLOCK ); | 476 | int fd = ::open( "/sys/class/backlight/corgi-bl/power", O_WRONLY|O_NONBLOCK ); |
473 | if ( fd ) | 477 | if ( fd ) |
474 | { | 478 | { |
475 | char buf[10]; | 479 | char buf[10]; |
476 | buf[0] = on ? FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN; | 480 | buf[0] = on ? FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN; |
477 | buf[1] = '\0'; | 481 | buf[1] = '\0'; |
478 | res = ( ::write( fd, &buf[0], 2 ) == 0 ); | 482 | res = ( ::write( fd, &buf[0], 2 ) == 0 ); |
479 | ::close( fd ); | 483 | ::close( fd ); |
480 | } | 484 | } |
481 | } | 485 | } |
482 | return res; | 486 | return res; |
483 | } | 487 | } |
484 | 488 | ||
485 | bool Zaurus::suspend() | ||
486 | { | ||
487 | qDebug("ODevice::suspend"); | ||
488 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend | ||
489 | return false; | ||
490 | |||
491 | if ( d->m_model == Model_Unknown ) // better don't suspend on unknown devices | ||
492 | return false; | ||
493 | |||
494 | bool res = false; | ||
495 | ODevice::sendSuspendmsg(); | ||
496 | |||
497 | struct timeval tvs, tvn; | ||
498 | ::gettimeofday ( &tvs, 0 ); | ||
499 | |||
500 | ::sync(); // flush fs caches | ||
501 | res = ( ::system ( "apm --suspend" ) == 0 ); | ||
502 | |||
503 | // This is needed because the apm implementation is asynchronous and we | ||
504 | // can not be sure when exactly the device is really suspended | ||
505 | if ( res ) { | ||
506 | do { // Yes, wait 15 seconds. This APM sucks big time. | ||
507 | ::usleep ( 200 * 1000 ); | ||
508 | ::gettimeofday ( &tvn, 0 ); | ||
509 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 15000 ); | ||
510 | } | ||
511 | |||
512 | QCopEnvelope ( "QPE/Rotation", "rotateDefault()" ); | ||
513 | return res; | ||
514 | } | ||
515 | |||
516 | |||
517 | Transformation Zaurus::rotation() const | 489 | Transformation Zaurus::rotation() const |
518 | { | 490 | { |
519 | qDebug( "Zaurus::rotation()" ); | 491 | qDebug( "Zaurus::rotation()" ); |
520 | Transformation rot; | 492 | Transformation rot; |
521 | 493 | ||
522 | switch ( d->m_model ) { | 494 | switch ( d->m_model ) { |
523 | case Model_Zaurus_SLC3000: // fallthrough | 495 | case Model_Zaurus_SLC3000: // fallthrough |
524 | case Model_Zaurus_SLC7x0: | 496 | case Model_Zaurus_SLC7x0: |
525 | { | 497 | { |
526 | OHingeStatus hs = readHingeSensor(); | 498 | OHingeStatus hs = readHingeSensor(); |
527 | qDebug( "Zaurus::rotation() - hinge sensor = %d", (int) hs ); | 499 | qDebug( "Zaurus::rotation() - hinge sensor = %d", (int) hs ); |
528 | 500 | ||
529 | if ( m_embedix ) | 501 | if ( m_embedix ) |
530 | { | 502 | { |
531 | if ( hs == CASE_PORTRAIT ) rot = Rot0; | 503 | if ( hs == CASE_PORTRAIT ) rot = Rot0; |
532 | else if ( hs == CASE_UNKNOWN ) rot = Rot0; | 504 | else if ( hs == CASE_UNKNOWN ) rot = Rot0; |
533 | else rot = Rot270; | 505 | else rot = Rot270; |
534 | } | 506 | } |
535 | else | 507 | else |
536 | { | 508 | { |
537 | if ( hs == CASE_PORTRAIT ) rot = Rot90; | 509 | if ( hs == CASE_PORTRAIT ) rot = Rot90; |
538 | else if ( hs == CASE_UNKNOWN ) rot = Rot0; | 510 | else if ( hs == CASE_UNKNOWN ) rot = Rot0; |
539 | else rot = Rot0; | 511 | else rot = Rot0; |
540 | } | 512 | } |