-rw-r--r-- | libopie/odevice.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index bc09e92..82a0099 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp | |||
@@ -1555,11 +1555,11 @@ bool Zaurus::isZaurus() | |||
1555 | if ( loc != -1 ) | 1555 | if ( loc != -1 ) |
1556 | model = line. mid ( loc + 2 ). simplifyWhiteSpace( ); | 1556 | model = line. mid ( loc + 2 ). simplifyWhiteSpace( ); |
1557 | 1557 | ||
1558 | if ( model == "Sharp-Collie" | 1558 | if ( model == "Sharp-Collie" |
1559 | || model == "Collie" | 1559 | || model == "Collie" |
1560 | || model == "SHARP Corgi" | 1560 | || model == "SHARP Corgi" |
1561 | || model == "SHARP Shepherd" | 1561 | || model == "SHARP Shepherd" |
1562 | || model == "SHARP Poodle" | 1562 | || model == "SHARP Poodle" |
1563 | || model == "SHARP Husky" | 1563 | || model == "SHARP Husky" |
1564 | ) | 1564 | ) |
1565 | is_zaurus = true; | 1565 | is_zaurus = true; |
@@ -1578,10 +1578,10 @@ void Zaurus::init ( ) | |||
1578 | // QFile f ( "/proc/filesystems" ); | 1578 | // QFile f ( "/proc/filesystems" ); |
1579 | QString model; | 1579 | QString model; |
1580 | 1580 | ||
1581 | // It isn't a good idea to check the system configuration to | 1581 | // It isn't a good idea to check the system configuration to |
1582 | // detect the distribution ! | 1582 | // detect the distribution ! |
1583 | // Otherwise it may happen that any other distribution is detected as openzaurus, just | 1583 | // Otherwise it may happen that any other distribution is detected as openzaurus, just |
1584 | // because it uses a jffs2 filesystem.. | 1584 | // because it uses a jffs2 filesystem.. |
1585 | // (eilers) | 1585 | // (eilers) |
1586 | // if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) { | 1586 | // if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) { |
1587 | QFile f ("/etc/oz_version"); | 1587 | QFile f ("/etc/oz_version"); |
@@ -1696,9 +1696,9 @@ void Zaurus::initButtons ( ) | |||
1696 | b. setKeycode ( zb-> code ); | 1696 | b. setKeycode ( zb-> code ); |
1697 | b. setUserText ( QObject::tr ( "Button", zb-> utext )); | 1697 | b. setUserText ( QObject::tr ( "Button", zb-> utext )); |
1698 | b. setPixmap ( Resource::loadPixmap ( zb-> pix )); | 1698 | b. setPixmap ( Resource::loadPixmap ( zb-> pix )); |
1699 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( zb-> fpressedservice ), | 1699 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( zb-> fpressedservice ), |
1700 | zb-> fpressedaction )); | 1700 | zb-> fpressedaction )); |
1701 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( zb-> fheldservice ), | 1701 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( zb-> fheldservice ), |
1702 | zb-> fheldaction )); | 1702 | zb-> fheldaction )); |
1703 | 1703 | ||
1704 | d-> m_buttons-> append ( b ); | 1704 | d-> m_buttons-> append ( b ); |
@@ -1707,7 +1707,7 @@ void Zaurus::initButtons ( ) | |||
1707 | reloadButtonMapping ( ); | 1707 | reloadButtonMapping ( ); |
1708 | 1708 | ||
1709 | QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); | 1709 | QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); |
1710 | connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), | 1710 | connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), |
1711 | this, SLOT( systemMessage ( const QCString &, const QByteArray & ))); | 1711 | this, SLOT( systemMessage ( const QCString &, const QByteArray & ))); |
1712 | } | 1712 | } |
1713 | 1713 | ||
@@ -1964,6 +1964,7 @@ bool Zaurus::setSoftSuspend ( bool soft ) | |||
1964 | 1964 | ||
1965 | bool Zaurus::setDisplayBrightness ( int bright ) | 1965 | bool Zaurus::setDisplayBrightness ( int bright ) |
1966 | { | 1966 | { |
1967 | //qDebug( "Zaurus::setDisplayBrightness( %d )", bright ); | ||
1967 | bool res = false; | 1968 | bool res = false; |
1968 | int fd; | 1969 | int fd; |
1969 | 1970 | ||
@@ -1974,12 +1975,13 @@ bool Zaurus::setDisplayBrightness ( int bright ) | |||
1974 | { | 1975 | { |
1975 | if ( d->m_model == Model_Zaurus_SLC7x0 ) | 1976 | if ( d->m_model == Model_Zaurus_SLC7x0 ) |
1976 | { | 1977 | { |
1978 | //qDebug( "using special treatment for devices with the corgi backlight interface" ); | ||
1977 | // special treatment for devices with the corgi backlight interface | 1979 | // special treatment for devices with the corgi backlight interface |
1978 | if (( fd = ::open ( "/proc/driver/fl/corgi-bl", O_WRONLY )) >= 0 ) | 1980 | if (( fd = ::open ( "/proc/driver/fl/corgi-bl", O_WRONLY )) >= 0 ) |
1979 | { | 1981 | { |
1980 | if ( bright > 0x11 ) bright = 0x11; | 1982 | int value = ( bright == 1 ) ? 1 : bright * ( 17.0 / 255.0 ); |
1981 | char writeCommand[100]; | 1983 | char writeCommand[100]; |
1982 | const int count = sprintf( writeCommand, "0x%x\n", bright ); | 1984 | const int count = sprintf( writeCommand, "0x%x\n", value ); |
1983 | res = ( ::write ( fd, writeCommand, count ) != -1 ); | 1985 | res = ( ::write ( fd, writeCommand, count ) != -1 ); |
1984 | ::close ( fd ); | 1986 | ::close ( fd ); |
1985 | } | 1987 | } |