summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice.h1
-rw-r--r--libopie2/opiecore/device/odevice_jornada.cpp24
2 files changed, 20 insertions, 5 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
@@ -72,4 +72,5 @@ enum OModel {
72 Model_Jornada = ( 6 << 24 ), 72 Model_Jornada = ( 6 << 24 ),
73 Model_Jornada_56x = ( Model_Jornada | 0x000001 ), 73 Model_Jornada_56x = ( Model_Jornada | 0x000001 ),
74 Model_Jornada_720 = ( Model_Jornada | 0x000002 ),
74 75
75 Model_Zaurus = ( 2 << 24 ), 76 Model_Zaurus = ( 2 << 24 ),
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
@@ -109,11 +109,25 @@ struct j_button jornada56x_buttons [] = {
109}; 109};
110 110
111void Jornada::init(const QString&) 111void Jornada::init(const QString& cpu_info)
112{ 112{
113 d->m_vendorstr = "HP"; 113 d->m_vendorstr = "HP";
114 d->m_vendor = Vendor_HP; 114 d->m_vendor = Vendor_HP;
115
116 QString model;
117 int loc = cpu_info.find( ":" );
118 if ( loc != -1 )
119 model = cpu_info.mid( loc+2 ).simplifyWhiteSpace();
120 else
121 model = cpu_info;
122
123 if ( model == "HP Jornada 56x" ) {
115 d->m_modelstr = "Jornada 56x"; 124 d->m_modelstr = "Jornada 56x";
116 d->m_model = Model_Jornada_56x; 125 d->m_model = Model_Jornada_56x;
117 d->m_rotation = Rot0; 126 } else if ( model == "HP Jornada 720" ) {
127 d->m_modelstr = "Jornada 720";
128 d->m_model = Model_Jornada_720;
129 }
130
131 d->m_rotation = Rot0; //all Jornadas need this rotation
118 //Distribution detecting code is now in base class 132 //Distribution detecting code is now in base class
119} 133}
@@ -161,7 +175,7 @@ bool Jornada::setDisplayBrightness( int bright )
161 175
162 if ( !bright ) 176 if ( !bright )
163 cmdline = QString::fromLatin1( "echo 4 > /sys/class/backlight/sa1100fb/power"); 177 cmdline = QString::fromLatin1( "echo 4 > /sys/class/backlight/*/power");
164 else 178 else
165 cmdline = QString::fromLatin1( "echo 0 > /sys/class/backlight/sa1100fb/power; echo %1 > /sys/class/backlight/sa1100fb/brightness" ).arg( bright ); 179 cmdline = QString::fromLatin1( "echo 0 > /sys/class/backlight/*/power; echo %1 > /sys/class/backlight/*/brightness" ).arg( bright );
166 180
167 // No Global::shellQuote as we gurantee it to be sane 181 // No Global::shellQuote as we gurantee it to be sane
@@ -176,5 +190,5 @@ bool Jornada::setDisplayStatus ( bool on )
176 bool res = false; 190 bool res = false;
177 191
178 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" ); 192 QString cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/*/power; echo %2 > /sys/class/backlight/*/power").arg( on ? "0" : "4" ).arg( on ? "0" : "4" );
179 193
180 res = ( ::system( QFile::encodeName(cmdline) ) == 0 ); 194 res = ( ::system( QFile::encodeName(cmdline) ) == 0 );