author | eilers <eilers> | 2003-11-17 17:32:06 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-11-17 17:32:06 (UTC) |
commit | d46685864bb18ffa82d5dac4fcfb1ae96471e89a (patch) (unidiff) | |
tree | ab5e53d5d777aea2b8baf62eeca8cd9d5605bbcf /libopie | |
parent | e8bba52dc9443d3aadcc2c221fa62ba37ea5c712 (diff) | |
download | opie-d46685864bb18ffa82d5dac4fcfb1ae96471e89a.zip opie-d46685864bb18ffa82d5dac4fcfb1ae96471e89a.tar.gz opie-d46685864bb18ffa82d5dac4fcfb1ae96471e89a.tar.bz2 |
Shit .. missed a wrong ")".. Odevice compiles now.. !
-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 58254a7..71ed9e4 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp | |||
@@ -1430,193 +1430,193 @@ bool iPAQ::setDisplayBrightness ( int bright ) | |||
1430 | res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 ); | 1430 | res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 ); |
1431 | ::close ( fd ); | 1431 | ::close ( fd ); |
1432 | } | 1432 | } |
1433 | return res; | 1433 | return res; |
1434 | } | 1434 | } |
1435 | 1435 | ||
1436 | int iPAQ::displayBrightnessResolution ( ) const | 1436 | int iPAQ::displayBrightnessResolution ( ) const |
1437 | { | 1437 | { |
1438 | switch ( model ( )) { | 1438 | switch ( model ( )) { |
1439 | case Model_iPAQ_H31xx: | 1439 | case Model_iPAQ_H31xx: |
1440 | case Model_iPAQ_H36xx: | 1440 | case Model_iPAQ_H36xx: |
1441 | case Model_iPAQ_H37xx: | 1441 | case Model_iPAQ_H37xx: |
1442 | return 128; // really 256, but >128 could damage the LCD | 1442 | return 128; // really 256, but >128 could damage the LCD |
1443 | 1443 | ||
1444 | case Model_iPAQ_H38xx: | 1444 | case Model_iPAQ_H38xx: |
1445 | case Model_iPAQ_H39xx: | 1445 | case Model_iPAQ_H39xx: |
1446 | return 64; | 1446 | return 64; |
1447 | case Model_iPAQ_H5xxx: | 1447 | case Model_iPAQ_H5xxx: |
1448 | return 255; | 1448 | return 255; |
1449 | 1449 | ||
1450 | default: | 1450 | default: |
1451 | return 2; | 1451 | return 2; |
1452 | } | 1452 | } |
1453 | } | 1453 | } |
1454 | 1454 | ||
1455 | 1455 | ||
1456 | bool iPAQ::hasLightSensor ( ) const | 1456 | bool iPAQ::hasLightSensor ( ) const |
1457 | { | 1457 | { |
1458 | return true; | 1458 | return true; |
1459 | } | 1459 | } |
1460 | 1460 | ||
1461 | int iPAQ::readLightSensor ( ) | 1461 | int iPAQ::readLightSensor ( ) |
1462 | { | 1462 | { |
1463 | int fd; | 1463 | int fd; |
1464 | int val = -1; | 1464 | int val = -1; |
1465 | 1465 | ||
1466 | if (( fd = ::open ( "/proc/hal/light_sensor", O_RDONLY )) >= 0 ) { | 1466 | if (( fd = ::open ( "/proc/hal/light_sensor", O_RDONLY )) >= 0 ) { |
1467 | char buffer [8]; | 1467 | char buffer [8]; |
1468 | 1468 | ||
1469 | if ( ::read ( fd, buffer, 5 ) == 5 ) { | 1469 | if ( ::read ( fd, buffer, 5 ) == 5 ) { |
1470 | char *endptr; | 1470 | char *endptr; |
1471 | 1471 | ||
1472 | buffer [4] = 0; | 1472 | buffer [4] = 0; |
1473 | val = ::strtol ( buffer + 2, &endptr, 16 ); | 1473 | val = ::strtol ( buffer + 2, &endptr, 16 ); |
1474 | 1474 | ||
1475 | if ( *endptr != 0 ) | 1475 | if ( *endptr != 0 ) |
1476 | val = -1; | 1476 | val = -1; |
1477 | } | 1477 | } |
1478 | ::close ( fd ); | 1478 | ::close ( fd ); |
1479 | } | 1479 | } |
1480 | 1480 | ||
1481 | return val; | 1481 | return val; |
1482 | } | 1482 | } |
1483 | 1483 | ||
1484 | int iPAQ::lightSensorResolution ( ) const | 1484 | int iPAQ::lightSensorResolution ( ) const |
1485 | { | 1485 | { |
1486 | return 256; | 1486 | return 256; |
1487 | } | 1487 | } |
1488 | 1488 | ||
1489 | /************************************************** | 1489 | /************************************************** |
1490 | * | 1490 | * |
1491 | * Zaurus | 1491 | * Zaurus |
1492 | * | 1492 | * |
1493 | **************************************************/ | 1493 | **************************************************/ |
1494 | 1494 | ||
1495 | // Check whether this device is the sharp zaurus.. | 1495 | // Check whether this device is the sharp zaurus.. |
1496 | bool Zaurus::isZaurus() | 1496 | bool Zaurus::isZaurus() |
1497 | { | 1497 | { |
1498 | 1498 | ||
1499 | // If the special devices by embedix exist, it is quite simple: it is a Zaurus ! | 1499 | // If the special devices by embedix exist, it is quite simple: it is a Zaurus ! |
1500 | if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ) ){ | 1500 | if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ) ){ |
1501 | return true; | 1501 | return true; |
1502 | } | 1502 | } |
1503 | 1503 | ||
1504 | // On non-embedix kernels, we have to look closer. | 1504 | // On non-embedix kernels, we have to look closer. |
1505 | bool is_zaurus = false; | 1505 | bool is_zaurus = false; |
1506 | QFile f ( "/proc/cpuinfo" ); | 1506 | QFile f ( "/proc/cpuinfo" ); |
1507 | if ( f. open ( IO_ReadOnly ) ) { | 1507 | if ( f. open ( IO_ReadOnly ) ) { |
1508 | QString model; | 1508 | QString model; |
1509 | QFile f ( "/proc/cpuinfo" ); | 1509 | QFile f ( "/proc/cpuinfo" ); |
1510 | 1510 | ||
1511 | QTextStream ts ( &f ); | 1511 | QTextStream ts ( &f ); |
1512 | QString line; | 1512 | QString line; |
1513 | while( line = ts. readLine ( ) ) { | 1513 | while( line = ts. readLine ( ) ) { |
1514 | if ( line. left ( 8 ) == "Hardware" ) | 1514 | if ( line. left ( 8 ) == "Hardware" ) |
1515 | break; | 1515 | break; |
1516 | } | 1516 | } |
1517 | int loc = line. find ( ":" ); | 1517 | int loc = line. find ( ":" ); |
1518 | if ( loc != -1 ) | 1518 | if ( loc != -1 ) |
1519 | model = line. mid ( loc + 2 ). simplifyWhiteSpace( ); | 1519 | model = line. mid ( loc + 2 ). simplifyWhiteSpace( ); |
1520 | 1520 | ||
1521 | if ( model == "Sharp-Collie" | 1521 | if ( model == "Sharp-Collie" |
1522 | || model == "Collie" | 1522 | || model == "Collie" |
1523 | || model == "SHARP Corgi" | 1523 | || model == "SHARP Corgi" |
1524 | || model == "SHARP Shepherd" | 1524 | || model == "SHARP Shepherd" |
1525 | || model == "SHARP Poodle" | 1525 | || model == "SHARP Poodle" |
1526 | || model == "SHARP Husky" ) | 1526 | || model == "SHARP Husky" |
1527 | ) | 1527 | ) |
1528 | is_zaurus = true; | 1528 | is_zaurus = true; |
1529 | 1529 | ||
1530 | } | 1530 | } |
1531 | return is_zaurus; | 1531 | return is_zaurus; |
1532 | } | 1532 | } |
1533 | 1533 | ||
1534 | 1534 | ||
1535 | void Zaurus::init ( ) | 1535 | void Zaurus::init ( ) |
1536 | { | 1536 | { |
1537 | d-> m_vendorstr = "Sharp"; | 1537 | d-> m_vendorstr = "Sharp"; |
1538 | d-> m_vendor = Vendor_Sharp; | 1538 | d-> m_vendor = Vendor_Sharp; |
1539 | m_embedix = true; // Not openzaurus means: It has an embedix kernel ! | 1539 | m_embedix = true; // Not openzaurus means: It has an embedix kernel ! |
1540 | 1540 | ||
1541 | // QFile f ( "/proc/filesystems" ); | 1541 | // QFile f ( "/proc/filesystems" ); |
1542 | QString model; | 1542 | QString model; |
1543 | 1543 | ||
1544 | // It isn't a good idea to check the system configuration to | 1544 | // It isn't a good idea to check the system configuration to |
1545 | // detect the distribution ! | 1545 | // detect the distribution ! |
1546 | // Otherwise it may happen that any other distribution is detected as openzaurus, just | 1546 | // Otherwise it may happen that any other distribution is detected as openzaurus, just |
1547 | // because it uses a jffs2 filesystem.. | 1547 | // because it uses a jffs2 filesystem.. |
1548 | // (eilers) | 1548 | // (eilers) |
1549 | // if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) { | 1549 | // if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) { |
1550 | QFile f ("/etc/oz_version"); | 1550 | QFile f ("/etc/oz_version"); |
1551 | if ( f.exists() ){ | 1551 | if ( f.exists() ){ |
1552 | d-> m_vendorstr = "OpenZaurus Team"; | 1552 | d-> m_vendorstr = "OpenZaurus Team"; |
1553 | d-> m_systemstr = "OpenZaurus"; | 1553 | d-> m_systemstr = "OpenZaurus"; |
1554 | d-> m_system = System_OpenZaurus; | 1554 | d-> m_system = System_OpenZaurus; |
1555 | 1555 | ||
1556 | if ( f. open ( IO_ReadOnly )) { | 1556 | if ( f. open ( IO_ReadOnly )) { |
1557 | QTextStream ts ( &f ); | 1557 | QTextStream ts ( &f ); |
1558 | d-> m_sysverstr = ts. readLine ( );//. mid ( 10 ); | 1558 | d-> m_sysverstr = ts. readLine ( );//. mid ( 10 ); |
1559 | f. close ( ); | 1559 | f. close ( ); |
1560 | } | 1560 | } |
1561 | 1561 | ||
1562 | // Openzaurus sometimes uses the embedix kernel! | 1562 | // Openzaurus sometimes uses the embedix kernel! |
1563 | // => Check whether this is an embedix kernel | 1563 | // => Check whether this is an embedix kernel |
1564 | FILE *uname = popen("uname -r", "r"); | 1564 | FILE *uname = popen("uname -r", "r"); |
1565 | QString line; | 1565 | QString line; |
1566 | if ( f.open(IO_ReadOnly, uname) ) { | 1566 | if ( f.open(IO_ReadOnly, uname) ) { |
1567 | QTextStream ts ( &f ); | 1567 | QTextStream ts ( &f ); |
1568 | line = ts. readLine ( ); | 1568 | line = ts. readLine ( ); |
1569 | int loc = line. find ( "embedix" ); | 1569 | int loc = line. find ( "embedix" ); |
1570 | if ( loc != -1 ) | 1570 | if ( loc != -1 ) |
1571 | m_embedix = true; | 1571 | m_embedix = true; |
1572 | else | 1572 | else |
1573 | m_embedix = false; | 1573 | m_embedix = false; |
1574 | f. close ( ); | 1574 | f. close ( ); |
1575 | } | 1575 | } |
1576 | pclose(uname); | 1576 | pclose(uname); |
1577 | } | 1577 | } |
1578 | else { | 1578 | else { |
1579 | d-> m_systemstr = "Zaurus"; | 1579 | d-> m_systemstr = "Zaurus"; |
1580 | d-> m_system = System_Zaurus; | 1580 | d-> m_system = System_Zaurus; |
1581 | } | 1581 | } |
1582 | 1582 | ||
1583 | f. setName ( "/proc/cpuinfo" ); | 1583 | f. setName ( "/proc/cpuinfo" ); |
1584 | if ( f. open ( IO_ReadOnly ) ) { | 1584 | if ( f. open ( IO_ReadOnly ) ) { |
1585 | QTextStream ts ( &f ); | 1585 | QTextStream ts ( &f ); |
1586 | QString line; | 1586 | QString line; |
1587 | while( line = ts. readLine ( ) ) { | 1587 | while( line = ts. readLine ( ) ) { |
1588 | if ( line. left ( 8 ) == "Hardware" ) | 1588 | if ( line. left ( 8 ) == "Hardware" ) |
1589 | break; | 1589 | break; |
1590 | } | 1590 | } |
1591 | int loc = line. find ( ":" ); | 1591 | int loc = line. find ( ":" ); |
1592 | if ( loc != -1 ) | 1592 | if ( loc != -1 ) |
1593 | model = line. mid ( loc + 2 ). simplifyWhiteSpace( ); | 1593 | model = line. mid ( loc + 2 ). simplifyWhiteSpace( ); |
1594 | } | 1594 | } |
1595 | 1595 | ||
1596 | if ( model == "SHARP Corgi" ) { | 1596 | if ( model == "SHARP Corgi" ) { |
1597 | d-> m_model = Model_Zaurus_SLC7x0; | 1597 | d-> m_model = Model_Zaurus_SLC7x0; |
1598 | d-> m_modelstr = "Zaurus SL-C700"; | 1598 | d-> m_modelstr = "Zaurus SL-C700"; |
1599 | } else if ( model == "SHARP Shepherd" ) { | 1599 | } else if ( model == "SHARP Shepherd" ) { |
1600 | d-> m_model = Model_Zaurus_SLC7x0; | 1600 | d-> m_model = Model_Zaurus_SLC7x0; |
1601 | d-> m_modelstr = "Zaurus SL-C750"; | 1601 | d-> m_modelstr = "Zaurus SL-C750"; |
1602 | } else if ( model == "SHARP Husky" ) { | 1602 | } else if ( model == "SHARP Husky" ) { |
1603 | d-> m_model = Model_Zaurus_SLC7x0; | 1603 | d-> m_model = Model_Zaurus_SLC7x0; |
1604 | d-> m_modelstr = "Zaurus SL-C760"; | 1604 | d-> m_modelstr = "Zaurus SL-C760"; |
1605 | } else if ( model == "SHARP Poodle" ) { | 1605 | } else if ( model == "SHARP Poodle" ) { |
1606 | d-> m_model = Model_Zaurus_SLB600; | 1606 | d-> m_model = Model_Zaurus_SLB600; |
1607 | d-> m_modelstr = "Zaurus SL-B500 or SL-5600"; | 1607 | d-> m_modelstr = "Zaurus SL-B500 or SL-5600"; |
1608 | } else if ( model == "Sharp-Collie" || model == "Collie" ) { | 1608 | } else if ( model == "Sharp-Collie" || model == "Collie" ) { |
1609 | d-> m_model = Model_Zaurus_SL5500; | 1609 | d-> m_model = Model_Zaurus_SL5500; |
1610 | d-> m_modelstr = "Zaurus SL-5500 or SL-5000d"; | 1610 | d-> m_modelstr = "Zaurus SL-5500 or SL-5000d"; |
1611 | } else { | 1611 | } else { |
1612 | d-> m_model = Model_Zaurus_SL5500; | 1612 | d-> m_model = Model_Zaurus_SL5500; |
1613 | d-> m_modelstr = "Zaurus (Model unknown)"; | 1613 | d-> m_modelstr = "Zaurus (Model unknown)"; |
1614 | } | 1614 | } |
1615 | 1615 | ||
1616 | bool flipstate = false; | 1616 | bool flipstate = false; |
1617 | switch ( d-> m_model ) { | 1617 | switch ( d-> m_model ) { |
1618 | case Model_Zaurus_SLA300: | 1618 | case Model_Zaurus_SLA300: |
1619 | d-> m_rotation = Rot0; | 1619 | d-> m_rotation = Rot0; |
1620 | break; | 1620 | break; |
1621 | case Model_Zaurus_SLC7x0: | 1621 | case Model_Zaurus_SLC7x0: |
1622 | // Note: need to 1) set flipstate based on physical screen orientation | 1622 | // Note: need to 1) set flipstate based on physical screen orientation |