Diffstat (limited to 'libopie2/opiecore/device/odevice_zaurus.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 96 |
1 files changed, 59 insertions, 37 deletions
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index fb23e1d..75a2fdc 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp | |||
@@ -170,4 +170,7 @@ void Zaurus::init(const QString& cpu_info) | |||
170 | d->m_model = Model_Zaurus_SLC7x0; | 170 | d->m_model = Model_Zaurus_SLC7x0; |
171 | d->m_modelstr = "Zaurus SL-C760 or SL-C860"; | 171 | d->m_modelstr = "Zaurus SL-C760 or SL-C860"; |
172 | } else if ( model == "SHARP Boxer" ) { | ||
173 | d->m_model = Model_Zaurus_SLC7x0; | ||
174 | d->m_modelstr = "Zaurus SL-C760 or SL-C860"; | ||
172 | } else if ( model == "SHARP Poodle" ) { | 175 | } else if ( model == "SHARP Poodle" ) { |
173 | d->m_model = Model_Zaurus_SLB600; | 176 | d->m_model = Model_Zaurus_SLB600; |
@@ -179,7 +182,10 @@ void Zaurus::init(const QString& cpu_info) | |||
179 | d->m_model = Model_Zaurus_SL6000; | 182 | d->m_model = Model_Zaurus_SL6000; |
180 | d->m_modelstr = "Zaurus SL-6000"; | 183 | d->m_modelstr = "Zaurus SL-6000"; |
184 | } else if ( model == "SHARP Spitz" ) { | ||
185 | d->m_model = Model_Zaurus_SLC3000; | ||
186 | d->m_modelstr = "Zaurus SL-C3000"; | ||
181 | } else { | 187 | } else { |
182 | d->m_model = Model_Zaurus_SL5500; | 188 | d->m_model = Model_Zaurus_SL5500; |
183 | d->m_modelstr = "Unkown Zaurus"; | 189 | d->m_modelstr = "Unknown Zaurus"; |
184 | } | 190 | } |
185 | 191 | ||
@@ -190,4 +196,5 @@ void Zaurus::init(const QString& cpu_info) | |||
190 | d->m_rotation = Rot0; | 196 | d->m_rotation = Rot0; |
191 | break; | 197 | break; |
198 | case Model_Zaurus_SLC3000: // fallthrough | ||
192 | case Model_Zaurus_SLC7x0: | 199 | case Model_Zaurus_SLC7x0: |
193 | d->m_rotation = rotation(); | 200 | d->m_rotation = rotation(); |
@@ -195,11 +202,11 @@ void Zaurus::init(const QString& cpu_info) | |||
195 | break; | 202 | break; |
196 | case Model_Zaurus_SLB600: // fallthrough | 203 | case Model_Zaurus_SLB600: // fallthrough |
204 | case Model_Zaurus_SL5000: // fallthrough | ||
197 | case Model_Zaurus_SL5500: // fallthrough | 205 | case Model_Zaurus_SL5500: // fallthrough |
198 | case Model_Zaurus_SL5000: | ||
199 | default: | 206 | default: |
200 | d->m_rotation = Rot270; | 207 | d->m_rotation = Rot270; |
201 | break; | 208 | break; |
202 | } | 209 | } |
203 | m_leds [0] = Led_Off; | 210 | m_leds[0] = Led_Off; |
204 | } | 211 | } |
205 | 212 | ||
@@ -254,8 +261,7 @@ void Zaurus::buzzer( int sound ) | |||
254 | Sound *snd = 0; | 261 | Sound *snd = 0; |
255 | 262 | ||
256 | // Not all devices have real sound | 263 | // All devices except SL5500 have a DSP device |
257 | if ( d->m_model == Model_Zaurus_SLC7x0 | 264 | if ( d->m_model != Model_Zaurus_SL5000 |
258 | || d->m_model == Model_Zaurus_SLB600 | 265 | && d->m_model != Model_Zaurus_SL5500 ) { |
259 | || d->m_model == Model_Zaurus_SL6000 ) { | ||
260 | 266 | ||
261 | switch ( sound ){ | 267 | switch ( sound ){ |
@@ -263,10 +269,10 @@ void Zaurus::buzzer( int sound ) | |||
263 | static Sound touch_sound("touchsound"); | 269 | static Sound touch_sound("touchsound"); |
264 | snd = &touch_sound; | 270 | snd = &touch_sound; |
265 | } | 271 | } |
266 | break; | 272 | break; |
267 | case SHARP_BUZ_KEYSOUND: { | 273 | case SHARP_BUZ_KEYSOUND: { |
268 | static Sound key_sound( "keysound" ); | 274 | static Sound key_sound( "keysound" ); |
269 | snd = &key_sound; | 275 | snd = &key_sound; |
270 | } | 276 | } |
271 | break; | 277 | break; |
272 | case SHARP_BUZ_SCHEDULE_ALARM: | 278 | case SHARP_BUZ_SCHEDULE_ALARM: |
@@ -274,5 +280,5 @@ void Zaurus::buzzer( int sound ) | |||
274 | static Sound alarm_sound("alarm"); | 280 | static Sound alarm_sound("alarm"); |
275 | snd = &alarm_sound; | 281 | snd = &alarm_sound; |
276 | } | 282 | } |
277 | break; | 283 | break; |
278 | } | 284 | } |
@@ -321,5 +327,5 @@ QValueList <OLed> Zaurus::ledList() const | |||
321 | } | 327 | } |
322 | 328 | ||
323 | QValueList <OLedState> Zaurus::ledStateList ( OLed l ) const | 329 | QValueList <OLedState> Zaurus::ledStateList( OLed l ) const |
324 | { | 330 | { |
325 | QValueList <OLedState> vl; | 331 | QValueList <OLedState> vl; |
@@ -330,5 +336,5 @@ QValueList <OLedState> Zaurus::ledStateList ( OLed l ) const | |||
330 | } | 336 | } |
331 | 337 | ||
332 | OLedState Zaurus::ledState ( OLed which ) const | 338 | OLedState Zaurus::ledState( OLed which ) const |
333 | { | 339 | { |
334 | if ( which == Led_Mail ) | 340 | if ( which == Led_Mail ) |
@@ -338,8 +344,12 @@ OLedState Zaurus::ledState ( OLed which ) const | |||
338 | } | 344 | } |
339 | 345 | ||
340 | bool Zaurus::setLedState ( OLed which, OLedState st ) | 346 | bool Zaurus::setLedState( OLed which, OLedState st ) |
341 | { | 347 | { |
342 | if (!m_embedix) // Currently not supported on non_embedix kernels | 348 | // Currently not supported on non_embedix kernels |
349 | if (!m_embedix) | ||
350 | { | ||
351 | qDebug( "Zaurus::setLedState: ODevice handling for non-embedix kernels not yet implemented" ); | ||
343 | return false; | 352 | return false; |
353 | } | ||
344 | 354 | ||
345 | static int fd = ::open ( "/dev/sharp_led", O_RDWR|O_NONBLOCK ); | 355 | static int fd = ::open ( "/dev/sharp_led", O_RDWR|O_NONBLOCK ); |
@@ -416,5 +426,5 @@ bool Zaurus::setDisplayBrightness( int bright ) | |||
416 | { | 426 | { |
417 | int numberOfSteps = displayBrightnessResolution(); | 427 | int numberOfSteps = displayBrightnessResolution(); |
418 | int fd = ::open( SHARP_FL_IOCTL_DEVICE, O_WRONLY|O_NONBLOCK ); | 428 | int fd = ::open( SHARP_FL_IOCTL_DEVICE, O_WRONLY|O_NONBLOCK ); |
419 | if ( fd ) | 429 | if ( fd ) |
420 | { | 430 | { |
@@ -426,5 +436,5 @@ bool Zaurus::setDisplayBrightness( int bright ) | |||
426 | else | 436 | else |
427 | { | 437 | { |
428 | qDebug( "ODevice handling for non-embedix kernels not yet implemented" ); | 438 | qDebug( "Zaurus::setDisplayBrightness: ODevice handling for non-embedix kernels not yet implemented" ); |
429 | } | 439 | } |
430 | return res; | 440 | return res; |
@@ -436,5 +446,5 @@ bool Zaurus::setDisplayStatus( bool on ) | |||
436 | if ( m_embedix ) | 446 | if ( m_embedix ) |
437 | { | 447 | { |
438 | int fd = ::open( SHARP_FL_IOCTL_DEVICE, O_WRONLY|O_NONBLOCK ); | 448 | int fd = ::open( SHARP_FL_IOCTL_DEVICE, O_WRONLY|O_NONBLOCK ); |
439 | if ( fd ) | 449 | if ( fd ) |
440 | { | 450 | { |
@@ -446,8 +456,8 @@ bool Zaurus::setDisplayStatus( bool on ) | |||
446 | else | 456 | else |
447 | { | 457 | { |
448 | qDebug( "ODevice handling for non-embedix kernels not yet implemented" ); | 458 | qDebug( "Zaurus::setDisplayStatus: ODevice handling for non-embedix kernels not yet implemented" ); |
449 | } | 459 | } |
450 | return res; | 460 | return res; |
451 | } | 461 | } |
452 | 462 | ||
453 | bool Zaurus::suspend() | 463 | bool Zaurus::suspend() |
@@ -490,4 +500,5 @@ Transformation Zaurus::rotation() const | |||
490 | 500 | ||
491 | switch ( d->m_model ) { | 501 | switch ( d->m_model ) { |
502 | case Model_Zaurus_SLC3000: // fallthrough | ||
492 | case Model_Zaurus_SLC7x0: | 503 | case Model_Zaurus_SLC7x0: |
493 | handle = ::open("/dev/apm_bios", O_RDWR|O_NONBLOCK); | 504 | handle = ::open("/dev/apm_bios", O_RDWR|O_NONBLOCK); |
@@ -504,6 +515,7 @@ Transformation Zaurus::rotation() const | |||
504 | } | 515 | } |
505 | break; | 516 | break; |
506 | case Model_Zaurus_SLA300: | 517 | case Model_Zaurus_SL6000: |
507 | case Model_Zaurus_SLB600: | 518 | case Model_Zaurus_SLB600: |
519 | case Model_Zaurus_SLA300: | ||
508 | case Model_Zaurus_SL5500: | 520 | case Model_Zaurus_SL5500: |
509 | case Model_Zaurus_SL5000: | 521 | case Model_Zaurus_SL5000: |
@@ -521,4 +533,5 @@ ODirection Zaurus::direction() const | |||
521 | int retval = 0; | 533 | int retval = 0; |
522 | switch ( d->m_model ) { | 534 | switch ( d->m_model ) { |
535 | case Model_Zaurus_SLC3000: // fallthrough | ||
523 | case Model_Zaurus_SLC7x0: | 536 | case Model_Zaurus_SLC7x0: |
524 | handle = ::open( "/dev/apm_bios", O_RDWR|O_NONBLOCK ); | 537 | handle = ::open( "/dev/apm_bios", O_RDWR|O_NONBLOCK ); |
@@ -534,9 +547,10 @@ ODirection Zaurus::direction() const | |||
534 | } | 547 | } |
535 | break; | 548 | break; |
549 | case Model_Zaurus_SL6000: | ||
536 | case Model_Zaurus_SLA300: | 550 | case Model_Zaurus_SLA300: |
537 | case Model_Zaurus_SLB600: | 551 | case Model_Zaurus_SLB600: |
538 | case Model_Zaurus_SL5500: | 552 | case Model_Zaurus_SL5500: |
539 | case Model_Zaurus_SL5000: | 553 | case Model_Zaurus_SL5000: |
540 | default: dir = d->m_direction; | 554 | default: dir = d->m_direction; |
541 | break; | 555 | break; |
542 | } | 556 | } |
@@ -555,5 +569,5 @@ int Zaurus::displayBrightnessResolution() const | |||
555 | else | 569 | else |
556 | { | 570 | { |
557 | qDebug( "ODevice handling for non-embedix kernels not yet implemented" ); | 571 | qDebug( "Zaurus::displayBrightnessResolution: ODevice handling for non-embedix kernels not yet implemented" ); |
558 | return 1; | 572 | return 1; |
559 | } | 573 | } |
@@ -562,29 +576,37 @@ int Zaurus::displayBrightnessResolution() const | |||
562 | bool Zaurus::hasHingeSensor() const | 576 | bool Zaurus::hasHingeSensor() const |
563 | { | 577 | { |
564 | return d->m_model == Model_Zaurus_SLC7x0; | 578 | return d->m_model == Model_Zaurus_SLC7x0 || d->m_model == Model_Zaurus_SLC3000; |
565 | } | 579 | } |
566 | 580 | ||
567 | OHingeStatus Zaurus::readHingeSensor() | 581 | OHingeStatus Zaurus::readHingeSensor() |
568 | { | 582 | { |
569 | int handle = ::open("/dev/apm_bios", O_RDWR|O_NONBLOCK); | 583 | if (m_embedix) |
570 | if (handle == -1) | ||
571 | { | ||
572 | qWarning("Zaurus::readHingeSensor() - failed (%s)", "unknown reason" ); //FIXME: use strerror | ||
573 | return CASE_UNKNOWN; | ||
574 | } | ||
575 | else | ||
576 | { | 584 | { |
577 | int retval = ::ioctl(handle, SHARP_IOCTL_GET_ROTATION); | 585 | int handle = ::open("/dev/apm_bios", O_RDWR|O_NONBLOCK); |
578 | ::close (handle); | 586 | if (handle == -1) |
579 | if ( retval == CASE_CLOSED || retval == CASE_PORTRAIT || retval == CASE_LANDSCAPE ) | ||
580 | { | 587 | { |
581 | qDebug( "Zaurus::readHingeSensor() - result = %d", retval ); | 588 | qWarning("Zaurus::readHingeSensor() - failed (%s)", "unknown reason" ); //FIXME: use strerror |
582 | return static_cast<OHingeStatus>( retval ); | 589 | return CASE_UNKNOWN; |
583 | } | 590 | } |
584 | else | 591 | else |
585 | { | 592 | { |
586 | qWarning("Zaurus::readHingeSensor() - couldn't compute hinge status!" ); | 593 | int retval = ::ioctl(handle, SHARP_IOCTL_GET_ROTATION); |
587 | return CASE_UNKNOWN; | 594 | ::close (handle); |
595 | if ( retval == CASE_CLOSED || retval == CASE_PORTRAIT || retval == CASE_LANDSCAPE ) | ||
596 | { | ||
597 | qDebug( "Zaurus::readHingeSensor() - result = %d", retval ); | ||
598 | return static_cast<OHingeStatus>( retval ); | ||
599 | } | ||
600 | else | ||
601 | { | ||
602 | qWarning("Zaurus::readHingeSensor() - couldn't compute hinge status!" ); | ||
603 | return CASE_UNKNOWN; | ||
604 | } | ||
588 | } | 605 | } |
589 | } | 606 | } |
607 | else | ||
608 | { | ||
609 | qDebug( "Zaurus::readHingeSensor: ODevice handling for non-embedix kernels not yet implemented" ); | ||
610 | return CASE_UNKNOWN; | ||
611 | } | ||
590 | } | 612 | } |