summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice.h1
-rw-r--r--libopie2/opiecore/device/odevice_jornada.cpp28
2 files changed, 22 insertions, 7 deletions
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h
index 96a41fc..c434216 100644
--- a/libopie2/opiecore/device/odevice.h
+++ b/libopie2/opiecore/device/odevice.h
@@ -50,48 +50,49 @@ namespace Opie{
namespace Core{
class ODeviceData;
/**
* The available devices
*/
enum OModel {
Model_Unknown, // = 0
Model_Series_Mask = 0xff000000,
Model_iPAQ = ( 1 << 24 ),
Model_iPAQ_All = ( Model_iPAQ | 0xffffff ),
Model_iPAQ_H31xx = ( Model_iPAQ | 0x000001 ),
Model_iPAQ_H36xx = ( Model_iPAQ | 0x000002 ),
Model_iPAQ_H37xx = ( Model_iPAQ | 0x000004 ),
Model_iPAQ_H38xx = ( Model_iPAQ | 0x000008 ),
Model_iPAQ_H39xx = ( Model_iPAQ | 0x000010 ),
Model_iPAQ_H5xxx = ( Model_iPAQ | 0x000020 ),
Model_iPAQ_H22xx = ( Model_iPAQ | 0x000040 ),
Model_Jornada = ( 6 << 24 ),
Model_Jornada_56x = ( Model_Jornada | 0x000001 ),
+ Model_Jornada_720 = ( Model_Jornada | 0x000002 ),
Model_Zaurus = ( 2 << 24 ),
Model_Zaurus_SL5000 = ( Model_Zaurus | 0x000001 ),
Model_Zaurus_SL5500 = ( Model_Zaurus | 0x000002 ),
Model_Zaurus_SLA300 = ( Model_Zaurus | 0x000003 ),
Model_Zaurus_SLB600 = ( Model_Zaurus | 0x000004 ),
Model_Zaurus_SLC7x0 = ( Model_Zaurus | 0x000005 ),
Model_Zaurus_SL6000 = ( Model_Zaurus | 0x000006 ),
Model_Zaurus_SLC3000 = ( Model_Zaurus | 0x000007 ),
Model_SIMpad = ( 3 << 24 ),
Model_SIMpad_All = ( Model_SIMpad | 0xffffff ),
Model_SIMpad_CL4 = ( Model_SIMpad | 0x000001 ),
Model_SIMpad_SL4 = ( Model_SIMpad | 0x000002 ),
Model_SIMpad_SLC = ( Model_SIMpad | 0x000004 ),
Model_SIMpad_TSinus = ( Model_SIMpad | 0x000008 ),
Model_Ramses = ( 4 << 24 ),
Model_Ramses_All = ( Model_Ramses | 0xffffff ),
Model_Ramses_MNCI = ( Model_Ramses | 0x000001 ),
Model_Ramses_MNCIRX = ( Model_Ramses | 0x000002 ),
diff --git a/libopie2/opiecore/device/odevice_jornada.cpp b/libopie2/opiecore/device/odevice_jornada.cpp
index 7d080ba..c7ed4bc 100644
--- a/libopie2/opiecore/device/odevice_jornada.cpp
+++ b/libopie2/opiecore/device/odevice_jornada.cpp
@@ -87,98 +87,112 @@ struct j_button jornada56x_buttons [] = {
"datebook", "nextView()",
"today", "raise()" },
{ Model_Jornada_56x,
Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
"devicebuttons/jornada56x_contact",
"addressbook", "raise()",
"addressbook", "beamBusinessCard()" },
{ Model_Jornada_56x,
Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Todo Button"),
"devicebuttons/jornada56x_todo",
"todolist", "raise()",
"todolist", "create()" },
{ Model_Jornada_56x,
Qt::Key_F8, QT_TRANSLATE_NOOP("Button", "Home Button"),
"devicebuttons/jornada56x_home",
"QPE/Launcher", "home()",
"buttonsettings", "raise()" },
{ Model_Jornada_56x,
Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Record Button"),
"devicebuttons/jornada56x_record",
"QPE/VMemo", "toggleRecord()",
"sound", "raise()" },
};
-void Jornada::init(const QString&)
+void Jornada::init(const QString& cpu_info)
{
d->m_vendorstr = "HP";
d->m_vendor = Vendor_HP;
- d->m_modelstr = "Jornada 56x";
- d->m_model = Model_Jornada_56x;
- d->m_rotation = Rot0;
+
+ QString model;
+ int loc = cpu_info.find( ":" );
+ if ( loc != -1 )
+ model = cpu_info.mid( loc+2 ).simplifyWhiteSpace();
+ else
+ model = cpu_info;
+
+ if ( model == "HP Jornada 56x" ) {
+ d->m_modelstr = "Jornada 56x";
+ d->m_model = Model_Jornada_56x;
+ } else if ( model == "HP Jornada 720" ) {
+ d->m_modelstr = "Jornada 720";
+ d->m_model = Model_Jornada_720;
+ }
+
+ d->m_rotation = Rot0; //all Jornadas need this rotation
//Distribution detecting code is now in base class
}
void Jornada::initButtons()
{
if ( d->m_buttons )
return;
d->m_buttons = new QValueList <ODeviceButton>;
for ( uint i = 0; i < ( sizeof( jornada56x_buttons ) / sizeof( j_button )); i++ ) {
j_button *ib = jornada56x_buttons + i;
ODeviceButton b;
if (( ib->model & d->m_model ) == d->m_model ) {
b. setKeycode ( ib->code );
b. setUserText ( QObject::tr ( "Button", ib->utext ));
b. setPixmap ( Resource::loadPixmap ( ib->pix ));
b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib->fpressedservice ), ib->fpressedaction ));
b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib->fheldservice ), ib->fheldaction ));
d->m_buttons->append ( b );
}
}
reloadButtonMapping();
}
int Jornada::displayBrightnessResolution() const
{
return 255;
}
bool Jornada::setDisplayBrightness( int bright )
{
bool res = false;
if ( bright > 255 )
bright = 255;
if ( bright < 0 )
bright = 0;
QString cmdline;
if ( !bright )
- cmdline = QString::fromLatin1( "echo 4 > /sys/class/backlight/sa1100fb/power");
+ cmdline = QString::fromLatin1( "echo 4 > /sys/class/backlight/*/power");
else
- cmdline = QString::fromLatin1( "echo 0 > /sys/class/backlight/sa1100fb/power; echo %1 > /sys/class/backlight/sa1100fb/brightness" ).arg( bright );
+ cmdline = QString::fromLatin1( "echo 0 > /sys/class/backlight/*/power; echo %1 > /sys/class/backlight/*/brightness" ).arg( bright );
// No Global::shellQuote as we gurantee it to be sane
res = ( ::system( QFile::encodeName(cmdline) ) == 0 );
return res;
}
bool Jornada::setDisplayStatus ( bool on )
{
bool res = false;
- QString cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/sa1100fb/power; echo %2 > /sys/class/backlight/sa1100fb/power").arg( on ? "0" : "4" ).arg( on ? "0" : "4" );
+ QString cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/*/power; echo %2 > /sys/class/backlight/*/power").arg( on ? "0" : "4" ).arg( on ? "0" : "4" );
res = ( ::system( QFile::encodeName(cmdline) ) == 0 );
return res;
}