summaryrefslogtreecommitdiff
authorsandman <sandman>2002-10-19 01:12:25 (UTC)
committer sandman <sandman>2002-10-19 01:12:25 (UTC)
commita0ea0e7ff2fad769a92136edc1a7381692e7739f (patch) (unidiff)
tree8c186385c133ca4ad06de66b93a91131a52cc06e
parente869be9990c0db11288bd196778cadd0ad6976a9 (diff)
downloadopie-a0ea0e7ff2fad769a92136edc1a7381692e7739f.zip
opie-a0ea0e7ff2fad769a92136edc1a7381692e7739f.tar.gz
opie-a0ea0e7ff2fad769a92136edc1a7381692e7739f.tar.bz2
don't probe for old device names on iPAQs anymore
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 80e9a91..58bd663 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -580,9 +580,7 @@ void iPAQ::alarmSound ( )
580 int vol; 580 int vol;
581 bool vol_reset = false; 581 bool vol_reset = false;
582 582
583 if ((( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) || 583 if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) {
584 (( fd = ::open ( "/dev/mixer", O_RDWR )) >= 0 )) {
585
586 if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) { 584 if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) {
587 Config cfg ( "qpe" ); 585 Config cfg ( "qpe" );
588 cfg. setGroup ( "Volume" ); 586 cfg. setGroup ( "Volume" );
@@ -651,8 +649,7 @@ bool iPAQ::setDisplayBrightness ( int bright )
651 bright = (int) ( 0.5 + ( ::pow ( 2, double( bright ) / 255.0 ) - 1 ) * 128.0 ); // logarithmic 649 bright = (int) ( 0.5 + ( ::pow ( 2, double( bright ) / 255.0 ) - 1 ) * 128.0 ); // logarithmic
652 //bright = ( bright + 1 ) / 2; 650 //bright = ( bright + 1 ) / 2;
653 651
654 if ((( fd = ::open ( "/dev/ts", O_WRONLY )) >= 0 ) || 652 if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) {
655 (( fd = ::open ( "/dev/h3600_ts", O_WRONLY )) >= 0 )) {
656 FLITE_IN bl; 653 FLITE_IN bl;
657 bl. mode = 1; 654 bl. mode = 1;
658 bl. pwr = bright ? 1 : 0; 655 bl. pwr = bright ? 1 : 0;