-rw-r--r-- | libopie/odevice.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 6ea4d45..2b7e927 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp | |||
@@ -653,75 +653,75 @@ bool iPAQ::setDisplayBrightness ( int bright ) | |||
653 | if ( bright > 255 ) | 653 | if ( bright > 255 ) |
654 | bright = 255; | 654 | bright = 255; |
655 | if ( bright < 0 ) | 655 | if ( bright < 0 ) |
656 | bright = 0; | 656 | bright = 0; |
657 | 657 | ||
658 | // 128 is the maximum if you want a decent lifetime for the LCD | 658 | // 128 is the maximum if you want a decent lifetime for the LCD |
659 | 659 | ||
660 | if ( bright > 1 ) | 660 | if ( bright > 1 ) |
661 | bright = (int) ( 0.5 + ( ::pow ( 2, double( bright ) / 255.0 ) - 1 ) * 128.0 ); // logarithmic | 661 | bright = (int) ( 0.5 + ( ::pow ( 2, double( bright ) / 255.0 ) - 1 ) * 128.0 ); // logarithmic |
662 | //bright = ( bright + 1 ) / 2; | 662 | //bright = ( bright + 1 ) / 2; |
663 | 663 | ||
664 | if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) { | 664 | if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) { |
665 | FLITE_IN bl; | 665 | FLITE_IN bl; |
666 | bl. mode = 1; | 666 | bl. mode = 1; |
667 | bl. pwr = bright ? 1 : 0; | 667 | bl. pwr = bright ? 1 : 0; |
668 | bl. brightness = bright; | 668 | bl. brightness = bright; |
669 | res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 ); | 669 | res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 ); |
670 | ::close ( fd ); | 670 | ::close ( fd ); |
671 | } | 671 | } |
672 | return res; | 672 | return res; |
673 | } | 673 | } |
674 | 674 | ||
675 | int iPAQ::displayBrightnessResolution ( ) const | 675 | int iPAQ::displayBrightnessResolution ( ) const |
676 | { | 676 | { |
677 | return 255; // really 128, but logarithmic control is smoother this way | 677 | return 256; // really 128, but logarithmic control is smoother this way |
678 | } | 678 | } |
679 | 679 | ||
680 | 680 | ||
681 | bool iPAQ::hasLightSensor ( ) const | 681 | bool iPAQ::hasLightSensor ( ) const |
682 | { | 682 | { |
683 | return true; | 683 | return true; |
684 | } | 684 | } |
685 | 685 | #include <errno.h> | |
686 | #include <string.h> | ||
686 | int iPAQ::readLightSensor ( ) | 687 | int iPAQ::readLightSensor ( ) |
687 | { | 688 | { |
688 | int fd; | 689 | int fd; |
689 | int val = -1; | 690 | int val = -1; |
690 | 691 | ||
691 | if (( fd = ::open ( "/proc/hal/light_sensor", O_RDONLY )) >= 0 ) { | 692 | if (( fd = ::open ( "/proc/hal/light_sensor", O_RDONLY )) >= 0 ) { |
692 | char buffer [5]; | 693 | char buffer [8]; |
693 | 694 | ||
694 | if ( ::read ( fd, buffer, 4 ) == 4 ) { | 695 | if ( ::read ( fd, buffer, 5 ) == 5 ) |
695 | char *endptr; | 696 | char *endptr; |
696 | 697 | ||
697 | buffer [4] = 0; | 698 | buffer [4] = 0; |
698 | val = ::strtol ( buffer + 2, &endptr, 16 ); | 699 | val = ::strtol ( buffer + 2, &endptr, 16 ); |
699 | 700 | ||
700 | if ( *endptr != 0 ) | 701 | if ( *endptr != 0 ) |
701 | val = -1; | 702 | val = -1; |
702 | } | 703 | } |
703 | |||
704 | ::close ( fd ); | 704 | ::close ( fd ); |
705 | } | 705 | } |
706 | 706 | ||
707 | return val; | 707 | return val; |
708 | } | 708 | } |
709 | 709 | ||
710 | 710 | ||
711 | /************************************************** | 711 | /************************************************** |
712 | * | 712 | * |
713 | * Zaurus | 713 | * Zaurus |
714 | * | 714 | * |
715 | **************************************************/ | 715 | **************************************************/ |
716 | 716 | ||
717 | 717 | ||
718 | 718 | ||
719 | void Zaurus::init ( ) | 719 | void Zaurus::init ( ) |
720 | { | 720 | { |
721 | d-> m_modelstr = "Zaurus SL5000"; | 721 | d-> m_modelstr = "Zaurus SL5000"; |
722 | d-> m_model = Model_Zaurus_SL5000; | 722 | d-> m_model = Model_Zaurus_SL5000; |
723 | d-> m_vendorstr = "Sharp"; | 723 | d-> m_vendorstr = "Sharp"; |
724 | d-> m_vendor = Vendor_Sharp; | 724 | d-> m_vendor = Vendor_Sharp; |
725 | 725 | ||
726 | QFile f ( "/proc/filesystems" ); | 726 | QFile f ( "/proc/filesystems" ); |
727 | 727 | ||
@@ -925,34 +925,34 @@ bool Zaurus::setSoftSuspend ( bool soft ) | |||
925 | 925 | ||
926 | bool Zaurus::setDisplayBrightness ( int bright ) | 926 | bool Zaurus::setDisplayBrightness ( int bright ) |
927 | { | 927 | { |
928 | bool res = false; | 928 | bool res = false; |
929 | int fd; | 929 | int fd; |
930 | 930 | ||
931 | if ( bright > 255 ) | 931 | if ( bright > 255 ) |
932 | bright = 255; | 932 | bright = 255; |
933 | if ( bright < 0 ) | 933 | if ( bright < 0 ) |
934 | bright = 0; | 934 | bright = 0; |
935 | 935 | ||
936 | if (( fd = ::open ( "/dev/fl", O_WRONLY )) >= 0 ) { | 936 | if (( fd = ::open ( "/dev/fl", O_WRONLY )) >= 0 ) { |
937 | int bl = ( bright * 4 + 127 ) / 255; // only 4 steps on zaurus | 937 | int bl = ( bright * 4 + 127 ) / 255; // only 4 steps on zaurus |
938 | if ( bright && !bl ) | 938 | if ( bright && !bl ) |
939 | bl = 1; | 939 | bl = 1; |
940 | res = ( ::ioctl ( fd, FL_IOCTL_STEP_CONTRAST, bl ) == 0 ); | 940 | res = ( ::ioctl ( fd, FL_IOCTL_STEP_CONTRAST, bl ) == 0 ); |
941 | ::close ( fd ); | 941 | ::close ( fd ); |
942 | } | 942 | } |
943 | return res; | 943 | return res; |
944 | } | 944 | } |
945 | 945 | ||
946 | 946 | ||
947 | int Zaurus::displayBrightnessResolution ( ) const | 947 | int Zaurus::displayBrightnessResolution ( ) const |
948 | { | 948 | { |
949 | return 4; | 949 | return 5; |
950 | } | 950 | } |
951 | 951 | ||
952 | //QValueList <int> Zaurus::keyList ( ) const | 952 | //QValueList <int> Zaurus::keyList ( ) const |
953 | //{ | 953 | //{ |
954 | //QValueList <int> vl; | 954 | //QValueList <int> vl; |
955 | //vl << HardKey_Datebook << HardKey_Contacts << HardKey_Mail << HardKey_Menu << HardKey_Home << HardKey_Suspend << HardKey_Backlight; | 955 | //vl << HardKey_Datebook << HardKey_Contacts << HardKey_Mail << HardKey_Menu << HardKey_Home << HardKey_Suspend << HardKey_Backlight; |
956 | //return vl; | 956 | //return vl; |
957 | //} | 957 | //} |
958 | 958 | ||