summaryrefslogtreecommitdiff
authorsandman <sandman>2002-10-19 01:12:25 (UTC)
committer sandman <sandman>2002-10-19 01:12:25 (UTC)
commita0ea0e7ff2fad769a92136edc1a7381692e7739f (patch) (side-by-side diff)
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
@@ -575,19 +575,17 @@ void iPAQ::alarmSound ( )
{
#if defined( QT_QWS_IPAQ ) // IPAQ
#ifndef QT_NO_SOUND
static Sound snd ( "alarm" );
int fd;
int vol;
bool vol_reset = false;
- if ((( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) ||
- (( fd = ::open ( "/dev/mixer", O_RDWR )) >= 0 )) {
-
+ if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) {
if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) {
Config cfg ( "qpe" );
cfg. setGroup ( "Volume" );
int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 );
if ( volalarm < 0 )
volalarm = 0;
else if ( volalarm > 100 )
@@ -646,18 +644,17 @@ bool iPAQ::setDisplayBrightness ( int bright )
bright = 0;
// 128 is the maximum if you want a decent lifetime for the LCD
if ( bright > 1 )
bright = (int) ( 0.5 + ( ::pow ( 2, double( bright ) / 255.0 ) - 1 ) * 128.0 ); // logarithmic
// bright = ( bright + 1 ) / 2;
- if ((( fd = ::open ( "/dev/ts", O_WRONLY )) >= 0 ) ||
- (( fd = ::open ( "/dev/h3600_ts", O_WRONLY )) >= 0 )) {
+ if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) {
FLITE_IN bl;
bl. mode = 1;
bl. pwr = bright ? 1 : 0;
bl. brightness = bright;
res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 );
::close ( fd );
}
return res;