author | sandman <sandman> | 2002-10-27 15:56:07 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-27 15:56:07 (UTC) |
commit | 5f09fc992af19fc208315217eb46635a762f1e55 (patch) (unidiff) | |
tree | ca5fae3182096453fd4db323a748bac038ae4ba3 /libopie/odevice.cpp | |
parent | bf21c882b82bfcdbcdce6b2dc5d863a2a2fb37c7 (diff) | |
download | opie-5f09fc992af19fc208315217eb46635a762f1e55.zip opie-5f09fc992af19fc208315217eb46635a762f1e55.tar.gz opie-5f09fc992af19fc208315217eb46635a762f1e55.tar.bz2 |
fixed a typo in the light sensor code
-rw-r--r-- | libopie/odevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 44fe35f..6ea4d45 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp | |||
@@ -595,193 +595,193 @@ void iPAQ::alarmSound ( ) | |||
595 | if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) { | 595 | if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) { |
596 | if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) { | 596 | if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) { |
597 | Config cfg ( "qpe" ); | 597 | Config cfg ( "qpe" ); |
598 | cfg. setGroup ( "Volume" ); | 598 | cfg. setGroup ( "Volume" ); |
599 | 599 | ||
600 | int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 ); | 600 | int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 ); |
601 | if ( volalarm < 0 ) | 601 | if ( volalarm < 0 ) |
602 | volalarm = 0; | 602 | volalarm = 0; |
603 | else if ( volalarm > 100 ) | 603 | else if ( volalarm > 100 ) |
604 | volalarm = 100; | 604 | volalarm = 100; |
605 | volalarm |= ( volalarm << 8 ); | 605 | volalarm |= ( volalarm << 8 ); |
606 | 606 | ||
607 | if (( volalarm & 0xff ) > ( vol & 0xff )) { | 607 | if (( volalarm & 0xff ) > ( vol & 0xff )) { |
608 | if ( ::ioctl ( fd, MIXER_WRITE( 0 ), &volalarm ) >= 0 ) | 608 | if ( ::ioctl ( fd, MIXER_WRITE( 0 ), &volalarm ) >= 0 ) |
609 | vol_reset = true; | 609 | vol_reset = true; |
610 | } | 610 | } |
611 | } | 611 | } |
612 | } | 612 | } |
613 | 613 | ||
614 | snd. play ( ); | 614 | snd. play ( ); |
615 | while ( !snd. isFinished ( )) | 615 | while ( !snd. isFinished ( )) |
616 | qApp-> processEvents ( ); | 616 | qApp-> processEvents ( ); |
617 | 617 | ||
618 | if ( fd >= 0 ) { | 618 | if ( fd >= 0 ) { |
619 | if ( vol_reset ) | 619 | if ( vol_reset ) |
620 | ::ioctl ( fd, MIXER_WRITE( 0 ), &vol ); | 620 | ::ioctl ( fd, MIXER_WRITE( 0 ), &vol ); |
621 | ::close ( fd ); | 621 | ::close ( fd ); |
622 | } | 622 | } |
623 | #endif | 623 | #endif |
624 | #endif | 624 | #endif |
625 | } | 625 | } |
626 | 626 | ||
627 | 627 | ||
628 | bool iPAQ::setSoftSuspend ( bool soft ) | 628 | bool iPAQ::setSoftSuspend ( bool soft ) |
629 | { | 629 | { |
630 | bool res = false; | 630 | bool res = false; |
631 | int fd; | 631 | int fd; |
632 | 632 | ||
633 | if (( fd = ::open ( "/proc/sys/ts/suspend_button_mode", O_WRONLY )) >= 0 ) { | 633 | if (( fd = ::open ( "/proc/sys/ts/suspend_button_mode", O_WRONLY )) >= 0 ) { |
634 | if ( ::write ( fd, soft ? "1" : "0", 1 ) == 1 ) | 634 | if ( ::write ( fd, soft ? "1" : "0", 1 ) == 1 ) |
635 | res = true; | 635 | res = true; |
636 | else | 636 | else |
637 | ::perror ( "write to /proc/sys/ts/suspend_button_mode" ); | 637 | ::perror ( "write to /proc/sys/ts/suspend_button_mode" ); |
638 | 638 | ||
639 | ::close ( fd ); | 639 | ::close ( fd ); |
640 | } | 640 | } |
641 | else | 641 | else |
642 | ::perror ( "/proc/sys/ts/suspend_button_mode" ); | 642 | ::perror ( "/proc/sys/ts/suspend_button_mode" ); |
643 | 643 | ||
644 | return res; | 644 | return res; |
645 | } | 645 | } |
646 | 646 | ||
647 | 647 | ||
648 | bool iPAQ::setDisplayBrightness ( int bright ) | 648 | bool iPAQ::setDisplayBrightness ( int bright ) |
649 | { | 649 | { |
650 | bool res = false; | 650 | bool res = false; |
651 | int fd; | 651 | int fd; |
652 | 652 | ||
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 255; // 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 | ||
686 | int iPAQ::readLightSensor ( ) | 686 | int iPAQ::readLightSensor ( ) |
687 | { | 687 | { |
688 | int fd; | 688 | int fd; |
689 | int val = -1; | 689 | int val = -1; |
690 | 690 | ||
691 | if (( fd = ::open ( "/proc/hal/lightsensor", O_RDONLY )) >= 0 ) { | 691 | if (( fd = ::open ( "/proc/hal/light_sensor", O_RDONLY )) >= 0 ) { |
692 | char buffer [5]; | 692 | char buffer [5]; |
693 | 693 | ||
694 | if ( ::read ( fd, buffer, 4 ) == 4 ) { | 694 | if ( ::read ( fd, buffer, 4 ) == 4 ) { |
695 | char *endptr; | 695 | char *endptr; |
696 | 696 | ||
697 | buffer [4] = 0; | 697 | buffer [4] = 0; |
698 | val = ::strtol ( buffer + 2, &endptr, 16 ); | 698 | val = ::strtol ( buffer + 2, &endptr, 16 ); |
699 | 699 | ||
700 | if ( *endptr != 0 ) | 700 | if ( *endptr != 0 ) |
701 | val = -1; | 701 | val = -1; |
702 | } | 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 | ||
728 | if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) { | 728 | if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) { |
729 | d-> m_systemstr = "OpenZaurus"; | 729 | d-> m_systemstr = "OpenZaurus"; |
730 | d-> m_system = System_OpenZaurus; | 730 | d-> m_system = System_OpenZaurus; |
731 | 731 | ||
732 | f. close ( ); | 732 | f. close ( ); |
733 | 733 | ||
734 | f. setName ( "/etc/oz_version" ); | 734 | f. setName ( "/etc/oz_version" ); |
735 | if ( f. open ( IO_ReadOnly )) { | 735 | if ( f. open ( IO_ReadOnly )) { |
736 | QTextStream ts ( &f ); | 736 | QTextStream ts ( &f ); |
737 | d-> m_sysverstr = ts. readLine ( ). mid ( 10 ); | 737 | d-> m_sysverstr = ts. readLine ( ). mid ( 10 ); |
738 | f. close ( ); | 738 | f. close ( ); |
739 | } | 739 | } |
740 | } | 740 | } |
741 | else { | 741 | else { |
742 | d-> m_systemstr = "Zaurus"; | 742 | d-> m_systemstr = "Zaurus"; |
743 | d-> m_system = System_Zaurus; | 743 | d-> m_system = System_Zaurus; |
744 | } | 744 | } |
745 | 745 | ||
746 | 746 | ||
747 | m_leds [0] = Led_Off; | 747 | m_leds [0] = Led_Off; |
748 | } | 748 | } |
749 | 749 | ||
750 | #include <unistd.h> | 750 | #include <unistd.h> |
751 | #include <fcntl.h> | 751 | #include <fcntl.h> |
752 | #include <sys/ioctl.h> | 752 | #include <sys/ioctl.h> |
753 | 753 | ||
754 | //#include <asm/sharp_char.h> // including kernel headers is evil ... | 754 | //#include <asm/sharp_char.h> // including kernel headers is evil ... |
755 | 755 | ||
756 | #define SHARP_DEV_IOCTL_COMMAND_START 0x5680 | 756 | #define SHARP_DEV_IOCTL_COMMAND_START 0x5680 |
757 | 757 | ||
758 | #defineSHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) | 758 | #defineSHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) |
759 | #define SHARP_BUZZER_MAKESOUND (SHARP_BUZZER_IOCTL_START) | 759 | #define SHARP_BUZZER_MAKESOUND (SHARP_BUZZER_IOCTL_START) |
760 | 760 | ||
761 | #define SHARP_BUZ_TOUCHSOUND 1 /* touch panel sound */ | 761 | #define SHARP_BUZ_TOUCHSOUND 1 /* touch panel sound */ |
762 | #define SHARP_BUZ_KEYSOUND 2 /* key sound */ | 762 | #define SHARP_BUZ_KEYSOUND 2 /* key sound */ |
763 | #define SHARP_BUZ_SCHEDULE_ALARM 11 /* schedule alarm */ | 763 | #define SHARP_BUZ_SCHEDULE_ALARM 11 /* schedule alarm */ |
764 | 764 | ||
765 | /* --- for SHARP_BUZZER device --- */ | 765 | /* --- for SHARP_BUZZER device --- */ |
766 | 766 | ||
767 | //#defineSHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) | 767 | //#defineSHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) |
768 | //#define SHARP_BUZZER_MAKESOUND (SHARP_BUZZER_IOCTL_START) | 768 | //#define SHARP_BUZZER_MAKESOUND (SHARP_BUZZER_IOCTL_START) |
769 | 769 | ||
770 | #define SHARP_BUZZER_SETVOLUME (SHARP_BUZZER_IOCTL_START+1) | 770 | #define SHARP_BUZZER_SETVOLUME (SHARP_BUZZER_IOCTL_START+1) |
771 | #define SHARP_BUZZER_GETVOLUME (SHARP_BUZZER_IOCTL_START+2) | 771 | #define SHARP_BUZZER_GETVOLUME (SHARP_BUZZER_IOCTL_START+2) |
772 | #define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3) | 772 | #define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3) |
773 | #define SHARP_BUZZER_SETMUTE (SHARP_BUZZER_IOCTL_START+4) | 773 | #define SHARP_BUZZER_SETMUTE (SHARP_BUZZER_IOCTL_START+4) |
774 | #define SHARP_BUZZER_STOPSOUND (SHARP_BUZZER_IOCTL_START+5) | 774 | #define SHARP_BUZZER_STOPSOUND (SHARP_BUZZER_IOCTL_START+5) |
775 | 775 | ||
776 | //#define SHARP_BUZ_TOUCHSOUND 1 /* touch panel sound */ | 776 | //#define SHARP_BUZ_TOUCHSOUND 1 /* touch panel sound */ |
777 | //#define SHARP_BUZ_KEYSOUND 2 /* key sound */ | 777 | //#define SHARP_BUZ_KEYSOUND 2 /* key sound */ |
778 | 778 | ||
779 | //#define SHARP_PDA_ILLCLICKSOUND 3 /* illegal click */ | 779 | //#define SHARP_PDA_ILLCLICKSOUND 3 /* illegal click */ |
780 | //#define SHARP_PDA_WARNSOUND 4 /* warning occurred */ | 780 | //#define SHARP_PDA_WARNSOUND 4 /* warning occurred */ |
781 | //#define SHARP_PDA_ERRORSOUND 5 /* error occurred */ | 781 | //#define SHARP_PDA_ERRORSOUND 5 /* error occurred */ |
782 | //#define SHARP_PDA_CRITICALSOUND 6 /* critical error occurred */ | 782 | //#define SHARP_PDA_CRITICALSOUND 6 /* critical error occurred */ |
783 | //#define SHARP_PDA_SYSSTARTSOUND 7 /* system start */ | 783 | //#define SHARP_PDA_SYSSTARTSOUND 7 /* system start */ |
784 | //#define SHARP_PDA_SYSTEMENDSOUND 8 /* system shutdown */ | 784 | //#define SHARP_PDA_SYSTEMENDSOUND 8 /* system shutdown */ |
785 | //#define SHARP_PDA_APPSTART 9 /* application start */ | 785 | //#define SHARP_PDA_APPSTART 9 /* application start */ |
786 | //#define SHARP_PDA_APPQUIT 10 /* application ends */ | 786 | //#define SHARP_PDA_APPQUIT 10 /* application ends */ |
787 | 787 | ||