author | mickeyl <mickeyl> | 2005-03-31 20:03:31 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-03-31 20:03:31 (UTC) |
commit | 629c1c9a366f56e9d98940f8dcd0778d039f1421 (patch) (unidiff) | |
tree | b54e1da270ada28f0127585d4d9dcf46e36c3de1 /libopie2 | |
parent | 44bfce59cd3cfb2fa6d75675dee5db5edb36e522 (diff) | |
download | opie-629c1c9a366f56e9d98940f8dcd0778d039f1421.zip opie-629c1c9a366f56e9d98940f8dcd0778d039f1421.tar.gz opie-629c1c9a366f56e9d98940f8dcd0778d039f1421.tar.bz2 |
check for '2.4' kernel rather than for an Embedix version, since we will
most likely neither see a unified 2.4 OZ kernel, nor a Embedix 2.6.
-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 26 |
2 files changed, 8 insertions, 20 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index cf2061b..af77ed1 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -97,50 +97,48 @@ struct default_button default_buttons [] = { | |||
97 | "devicebuttons/z_calendar", | 97 | "devicebuttons/z_calendar", |
98 | "datebook", "nextView()", | 98 | "datebook", "nextView()", |
99 | "today", "raise()" }, | 99 | "today", "raise()" }, |
100 | { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), | 100 | { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), |
101 | "devicebuttons/z_contact", | 101 | "devicebuttons/z_contact", |
102 | "addressbook", "raise()", | 102 | "addressbook", "raise()", |
103 | "addressbook", "beamBusinessCard()" }, | 103 | "addressbook", "beamBusinessCard()" }, |
104 | { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), | 104 | { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), |
105 | "devicebuttons/z_home", | 105 | "devicebuttons/z_home", |
106 | "QPE/Launcher", "home()", | 106 | "QPE/Launcher", "home()", |
107 | "buttonsettings", "raise()" }, | 107 | "buttonsettings", "raise()" }, |
108 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), | 108 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), |
109 | "devicebuttons/z_menu", | 109 | "devicebuttons/z_menu", |
110 | "QPE/TaskBar", "toggleMenu()", | 110 | "QPE/TaskBar", "toggleMenu()", |
111 | "QPE/TaskBar", "toggleStartMenu()" }, | 111 | "QPE/TaskBar", "toggleStartMenu()" }, |
112 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), | 112 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), |
113 | "devicebuttons/z_mail", | 113 | "devicebuttons/z_mail", |
114 | "opiemail", "raise()", | 114 | "opiemail", "raise()", |
115 | "opiemail", "newMail()" }, | 115 | "opiemail", "newMail()" }, |
116 | }; | 116 | }; |
117 | 117 | ||
118 | ODevice *ODevice::inst() | 118 | ODevice *ODevice::inst() |
119 | { | 119 | { |
120 | static ODevice *dev = 0; | 120 | static ODevice *dev = 0; |
121 | |||
122 | // rewrite this to only use /proc/cpuinfo or so | ||
123 | QString cpu_info; | 121 | QString cpu_info; |
124 | 122 | ||
125 | if ( !dev ) | 123 | if ( !dev ) |
126 | { | 124 | { |
127 | QFile f( PATH_PROC_CPUINFO ); | 125 | QFile f( PATH_PROC_CPUINFO ); |
128 | if ( f.open( IO_ReadOnly ) ) | 126 | if ( f.open( IO_ReadOnly ) ) |
129 | { | 127 | { |
130 | QTextStream s( &f ); | 128 | QTextStream s( &f ); |
131 | while ( !s.atEnd() ) | 129 | while ( !s.atEnd() ) |
132 | { | 130 | { |
133 | QString line; | 131 | QString line; |
134 | line = s.readLine(); | 132 | line = s.readLine(); |
135 | if ( line.startsWith( "Hardware" ) ) | 133 | if ( line.startsWith( "Hardware" ) ) |
136 | { | 134 | { |
137 | qDebug( "ODevice() - found '%s'", (const char*) line ); | 135 | qDebug( "ODevice() - found '%s'", (const char*) line ); |
138 | cpu_info = line; | 136 | cpu_info = line; |
139 | if ( line.contains( "sharp", false ) ) dev = new Internal::Zaurus(); | 137 | if ( line.contains( "sharp", false ) ) dev = new Internal::Zaurus(); |
140 | else if ( line.contains( "ipaq", false ) ) dev = new Internal::iPAQ(); | 138 | else if ( line.contains( "ipaq", false ) ) dev = new Internal::iPAQ(); |
141 | else if ( line.contains( "simpad", false ) ) dev = new Internal::SIMpad(); | 139 | else if ( line.contains( "simpad", false ) ) dev = new Internal::SIMpad(); |
142 | else if ( line.contains( "jornada", false ) ) dev = new Internal::Jornada(); | 140 | else if ( line.contains( "jornada", false ) ) dev = new Internal::Jornada(); |
143 | else if ( line.contains( "ramses", false ) ) dev = new Internal::Ramses(); | 141 | else if ( line.contains( "ramses", false ) ) dev = new Internal::Ramses(); |
144 | else if ( line.contains( "Tradesquare.NL", false ) ) dev = new Internal::Beagle(); | 142 | else if ( line.contains( "Tradesquare.NL", false ) ) dev = new Internal::Beagle(); |
145 | else qWarning( "ODevice() - unknown hardware - using default." ); | 143 | else qWarning( "ODevice() - unknown hardware - using default." ); |
146 | break; | 144 | break; |
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index 3bd7f6e..e9b163a 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp | |||
@@ -93,96 +93,86 @@ struct z_button z_buttons_c700 [] = { | |||
93 | "devicebuttons/z_home", | 93 | "devicebuttons/z_home", |
94 | "QPE/Launcher", "home()", | 94 | "QPE/Launcher", "home()", |
95 | "buttonsettings", "raise()" }, | 95 | "buttonsettings", "raise()" }, |
96 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), | 96 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), |
97 | "devicebuttons/z_menu", | 97 | "devicebuttons/z_menu", |
98 | "QPE/TaskBar", "toggleMenu()", | 98 | "QPE/TaskBar", "toggleMenu()", |
99 | "QPE/TaskBar", "toggleStartMenu()" }, | 99 | "QPE/TaskBar", "toggleStartMenu()" }, |
100 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), | 100 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), |
101 | "devicebuttons/z_mail", | 101 | "devicebuttons/z_mail", |
102 | "opiemail", "raise()", | 102 | "opiemail", "raise()", |
103 | "opiemail", "newMail()" }, | 103 | "opiemail", "newMail()" }, |
104 | 104 | ||
105 | { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Hinge1"), | 105 | { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Hinge1"), |
106 | "devicebuttons/z_hinge1", | 106 | "devicebuttons/z_hinge1", |
107 | "QPE/Rotation", "rotateDefault()",0}, | 107 | "QPE/Rotation", "rotateDefault()",0}, |
108 | { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Hinge2"), | 108 | { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Hinge2"), |
109 | "devicebuttons/z_hinge2", | 109 | "devicebuttons/z_hinge2", |
110 | "QPE/Rotation", "rotateDefault()",0}, | 110 | "QPE/Rotation", "rotateDefault()",0}, |
111 | { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), | 111 | { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), |
112 | "devicebuttons/z_hinge3", | 112 | "devicebuttons/z_hinge3", |
113 | "QPE/Rotation", "rotateDefault()",0}, | 113 | "QPE/Rotation", "rotateDefault()",0}, |
114 | }; | 114 | }; |
115 | 115 | ||
116 | // FIXME This gets unnecessary complicated. We should think about splitting the Zaurus | 116 | // FIXME This gets unnecessary complicated. We should think about splitting the Zaurus |
117 | // class up into individual classes. We need three classes | 117 | // class up into individual classes. We would need three classes |
118 | // | 118 | // |
119 | // Zaurus-Collie (SA-model w/ 320x240 lcd, for SL5500 and SL5000) | 119 | // Zaurus-Collie (SA-model w/ 320x240 lcd, for SL5500 and SL5000) |
120 | // Zaurus-Poodle (PXA-model w/ 320x240 lcd, for SL5600) | 120 | // Zaurus-Poodle (PXA-model w/ 320x240 lcd, for SL5600) |
121 | // Zaurus-Corgi (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000) | 121 | // Zaurus-Corgi (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000, C1000) |
122 | // Zaurus-Tosa (PXA-model w/ 480x640 lcd, for SL6000) | 122 | // Zaurus-Tosa (PXA-model w/ 480x640 lcd, for SL6000) |
123 | // | ||
124 | // Only question right now is: Do we really need to do it? Because as soon | ||
125 | // as the OpenZaurus kernel is ready, there will be a unified interface for all | ||
126 | // Zaurus models (concerning apm, backlight, buttons, etc.) | ||
127 | // | ||
128 | // Comments? - mickeyl. | ||
129 | 123 | ||
130 | void Zaurus::init(const QString& cpu_info) | 124 | void Zaurus::init(const QString& cpu_info) |
131 | { | 125 | { |
132 | // Set the time to wait until the system is realy suspended | 126 | // Set the time to wait until the system is really suspended |
133 | // the delta between apm --suspend and sleeping | 127 | // the delta between apm --suspend and sleeping |
134 | setAPMTimeOut( 15000 ); | 128 | setAPMTimeOut( 15000 ); |
135 | 129 | ||
136 | // generic distribution code already scanned /etc/issue at that point - | 130 | // generic distribution code already scanned /etc/issue at that point - |
137 | // embedix releases contain "Embedix <version> | Linux for Embedded Devices" | 131 | // embedix releases contain "Embedix <version> | Linux for Embedded Devices" |
138 | if ( d->m_sysverstr.contains( "embedix", false ) ) | 132 | if ( d->m_sysverstr.contains( "embedix", false ) ) |
139 | { | 133 | { |
140 | d->m_vendorstr = "Sharp"; | 134 | d->m_vendorstr = "Sharp"; |
141 | d->m_vendor = Vendor_Sharp; | 135 | d->m_vendor = Vendor_Sharp; |
142 | d->m_systemstr = "Zaurus"; | 136 | d->m_systemstr = "Zaurus"; |
143 | d->m_system = System_Zaurus; | 137 | d->m_system = System_Zaurus; |
144 | m_embedix = true; | 138 | m_embedix = true; |
145 | } | 139 | } |
146 | else | 140 | else |
147 | { | 141 | { |
148 | d->m_vendorstr = "OpenZaurus Team"; | 142 | d->m_vendorstr = "OpenZaurus Team"; |
149 | d->m_systemstr = "OpenZaurus"; | 143 | d->m_systemstr = "OpenZaurus"; |
150 | d->m_system = System_OpenZaurus; | 144 | d->m_system = System_OpenZaurus; |
151 | // sysver already gathered | 145 | // sysver already gathered |
152 | 146 | ||
153 | // OpenZaurus sometimes uses the embedix kernel, check if this is one | 147 | // OpenZaurus sometimes uses the 2.4 (embedix) kernel, check if this is one |
154 | FILE *uname = popen("uname -r", "r"); | 148 | FILE *uname = popen("uname -r", "r"); |
155 | QFile f; | 149 | QFile f; |
156 | QString line; | 150 | QString line; |
157 | if ( f.open(IO_ReadOnly, uname) ) { | 151 | if ( f.open(IO_ReadOnly, uname) ) { |
158 | QTextStream ts ( &f ); | 152 | QTextStream ts ( &f ); |
159 | line = ts. readLine(); | 153 | line = ts.readLine(); |
160 | int loc = line. find ( "embedix" ); | 154 | m_embedix = line.startsWith( "2.4." ); |
161 | if ( loc != -1 ) | ||
162 | m_embedix = true; | ||
163 | else | ||
164 | m_embedix = false; | ||
165 | f.close(); | 155 | f.close(); |
166 | } | 156 | } |
167 | pclose(uname); | 157 | pclose(uname); |
168 | } | 158 | } |
169 | 159 | ||
170 | // check the Zaurus model | 160 | // check the Zaurus model |
171 | QString model; | 161 | QString model; |
172 | int loc = cpu_info.find( ":" ); | 162 | int loc = cpu_info.find( ":" ); |
173 | if ( loc != -1 ) | 163 | if ( loc != -1 ) |
174 | model = cpu_info.mid( loc+2 ).simplifyWhiteSpace(); | 164 | model = cpu_info.mid( loc+2 ).simplifyWhiteSpace(); |
175 | else | 165 | else |
176 | model = cpu_info; | 166 | model = cpu_info; |
177 | 167 | ||
178 | if ( model == "SHARP Corgi" ) { | 168 | if ( model == "SHARP Corgi" ) { |
179 | d->m_model = Model_Zaurus_SLC7x0; | 169 | d->m_model = Model_Zaurus_SLC7x0; |
180 | d->m_modelstr = "Zaurus SL-C700"; | 170 | d->m_modelstr = "Zaurus SL-C700"; |
181 | } else if ( model == "SHARP Shepherd" ) { | 171 | } else if ( model == "SHARP Shepherd" ) { |
182 | d->m_model = Model_Zaurus_SLC7x0; | 172 | d->m_model = Model_Zaurus_SLC7x0; |
183 | d->m_modelstr = "Zaurus SL-C750"; | 173 | d->m_modelstr = "Zaurus SL-C750"; |
184 | } else if ( model == "SHARP Husky" ) { | 174 | } else if ( model == "SHARP Husky" ) { |
185 | d->m_model = Model_Zaurus_SLC7x0; | 175 | d->m_model = Model_Zaurus_SLC7x0; |
186 | d->m_modelstr = "Zaurus SL-C760 or SL-C860"; | 176 | d->m_modelstr = "Zaurus SL-C760 or SL-C860"; |
187 | } else if ( model == "SHARP Boxer" ) { | 177 | } else if ( model == "SHARP Boxer" ) { |
188 | d->m_model = Model_Zaurus_SLC7x0; | 178 | d->m_model = Model_Zaurus_SLC7x0; |
@@ -208,51 +198,51 @@ void Zaurus::init(const QString& cpu_info) | |||
208 | } | 198 | } |
209 | 199 | ||
210 | // set initial rotation | 200 | // set initial rotation |
211 | switch( d->m_model ) { | 201 | switch( d->m_model ) { |
212 | case Model_Zaurus_SL6000: // fallthrough | 202 | case Model_Zaurus_SL6000: // fallthrough |
213 | case Model_Zaurus_SLA300: | 203 | case Model_Zaurus_SLA300: |
214 | d->m_rotation = Rot0; | 204 | d->m_rotation = Rot0; |
215 | break; | 205 | break; |
216 | case Model_Zaurus_SLC3000: // fallthrough | 206 | case Model_Zaurus_SLC3000: // fallthrough |
217 | case Model_Zaurus_SLC1000: // fallthrough | 207 | case Model_Zaurus_SLC1000: // fallthrough |
218 | case Model_Zaurus_SLC7x0: | 208 | case Model_Zaurus_SLC7x0: |
219 | d->m_rotation = rotation(); | 209 | d->m_rotation = rotation(); |
220 | d->m_direction = direction(); | 210 | d->m_direction = direction(); |
221 | break; | 211 | break; |
222 | case Model_Zaurus_SLB600: // fallthrough | 212 | case Model_Zaurus_SLB600: // fallthrough |
223 | case Model_Zaurus_SL5000: // fallthrough | 213 | case Model_Zaurus_SL5000: // fallthrough |
224 | case Model_Zaurus_SL5500: // fallthrough | 214 | case Model_Zaurus_SL5500: // fallthrough |
225 | default: | 215 | default: |
226 | d->m_rotation = Rot270; | 216 | d->m_rotation = Rot270; |
227 | break; | 217 | break; |
228 | } | 218 | } |
229 | m_leds[0] = Led_Off; | 219 | m_leds[0] = Led_Off; |
230 | 220 | ||
231 | if ( m_embedix ) | 221 | if ( m_embedix ) |
232 | qDebug( "Zaurus::init() - Using the Embedix HAL on a %s", (const char*) d->m_modelstr ); | 222 | qDebug( "Zaurus::init() - Using the 2.4 Embedix HAL on a %s", (const char*) d->m_modelstr ); |
233 | else | 223 | else |
234 | qDebug( "Zaurus::init() - Using the OpenZaurus HAL on a %s", (const char*) d->m_modelstr ); | 224 | qDebug( "Zaurus::init() - Using the 2.6 OpenZaurus HAL on a %s", (const char*) d->m_modelstr ); |
235 | } | 225 | } |
236 | 226 | ||
237 | void Zaurus::initButtons() | 227 | void Zaurus::initButtons() |
238 | { | 228 | { |
239 | if ( d->m_buttons ) | 229 | if ( d->m_buttons ) |
240 | return; | 230 | return; |
241 | 231 | ||
242 | 232 | ||
243 | d->m_buttons = new QValueList <ODeviceButton>; | 233 | d->m_buttons = new QValueList <ODeviceButton>; |
244 | 234 | ||
245 | struct z_button * pz_buttons; | 235 | struct z_button * pz_buttons; |
246 | int buttoncount; | 236 | int buttoncount; |
247 | switch ( d->m_model ) { | 237 | switch ( d->m_model ) { |
248 | case Model_Zaurus_SLC3000: // fallthrough | 238 | case Model_Zaurus_SLC3000: // fallthrough |
249 | case Model_Zaurus_SLC1000: // fallthrough | 239 | case Model_Zaurus_SLC1000: // fallthrough |
250 | case Model_Zaurus_SLC7x0: | 240 | case Model_Zaurus_SLC7x0: |
251 | if ( isQWS( ) ) { | 241 | if ( isQWS( ) ) { |
252 | addPreHandler(this); // hinge-sensor-handler | 242 | addPreHandler(this); // hinge-sensor-handler |
253 | } | 243 | } |
254 | pz_buttons = z_buttons_c700; | 244 | pz_buttons = z_buttons_c700; |
255 | buttoncount = ARRAY_SIZE(z_buttons_c700); | 245 | buttoncount = ARRAY_SIZE(z_buttons_c700); |
256 | break; | 246 | break; |
257 | default: | 247 | default: |
258 | pz_buttons = z_buttons; | 248 | pz_buttons = z_buttons; |