summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_htc.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libopie2/opiecore/device/odevice_htc.cpp b/libopie2/opiecore/device/odevice_htc.cpp
index 4e5200b..a6ade11 100644
--- a/libopie2/opiecore/device/odevice_htc.cpp
+++ b/libopie2/opiecore/device/odevice_htc.cpp
@@ -165,56 +165,56 @@ void HTC::init(const QString& cpu_info)
165 d->m_modelstr = "HTC Beetles"; 165 d->m_modelstr = "HTC Beetles";
166 } 166 }
167 if ( model == "HTC Blueangel" ) { 167 if ( model == "HTC Blueangel" ) {
168 d->m_model = Model_HTC_Blueangel; 168 d->m_model = Model_HTC_Blueangel;
169 d->m_modelstr = "HTC Blueangel"; 169 d->m_modelstr = "HTC Blueangel";
170 } 170 }
171 if ( model == "HTC Himalaya" ) { 171 if ( model == "HTC Himalaya" ) {
172 d->m_model = Model_HTC_Himalaya; 172 d->m_model = Model_HTC_Himalaya;
173 d->m_modelstr = "HTC Himalaya"; 173 d->m_modelstr = "HTC Himalaya";
174 } 174 }
175 if ( model == "HTC Magician" ) { 175 if ( model == "HTC Magician" ) {
176 d->m_model = Model_HTC_Magician; 176 d->m_model = Model_HTC_Magician;
177 d->m_modelstr = "HTC Magician"; 177 d->m_modelstr = "HTC Magician";
178 } 178 }
179 179
180 180
181 // set path to backlight device 181 // set path to backlight device
182 switch ( d->m_model ) 182 switch ( d->m_model )
183 { 183 {
184 case Model_HTC_Universal: 184 case Model_HTC_Universal:
185 case Model_HTC_Magician: 185 case Model_HTC_Magician:
186 case Model_HTC_Alpine: 186 case Model_HTC_Alpine:
187 case Model_HTC_Beetles: 187 case Model_HTC_Beetles:
188 case Model_HTC_Apache: 188 case Model_HTC_Apache:
189 m_backlightdev = "/sys/class/backlight/pxa2xx-fb/"; 189 m_backlightdev = "/sys/class/backlight/corgi-bl/";
190 break; 190 break;
191 case Model_HTC_Blueangel: 191 case Model_HTC_Blueangel:
192 case Model_HTC_Himalaya: 192 case Model_HTC_Himalaya:
193 m_backlightdev = "/sys/class/backlight/w100fb/"; 193 m_backlightdev = "/sys/class/backlight/w100fb/";
194 break; 194 break;
195 default: 195 default:
196 m_backlightdev = "/sys/class/backlight/pxafb/"; 196 m_backlightdev = "/sys/class/backlight/corgi-bl/";
197 } 197 }
198 198
199 // set initial rotation 199 // set initial rotation
200 switch( d->m_model ) 200 switch( d->m_model )
201 { 201 {
202 case Model_HTC_Universal: 202 case Model_HTC_Universal:
203 initHingeSensor(); 203 initHingeSensor();
204 d->m_rotation = rotation(); 204 d->m_rotation = rotation();
205 d->m_direction = direction(); 205 d->m_direction = direction();
206 break; 206 break;
207 default: 207 default:
208 d->m_rotation = Rot270; 208 d->m_rotation = Rot270;
209 } 209 }
210 210
211 // set default qte driver 211 // set default qte driver
212 switch( d->m_model ) 212 switch( d->m_model )
213 { 213 {
214 default: 214 default:
215 d->m_qteDriver = "Transformed"; 215 d->m_qteDriver = "Transformed";
216 } 216 }
217 217
218 m_leds[0] = Led_Off; 218 m_leds[0] = Led_Off;
219 219
220 qDebug( "HTC::init() - Using the 2.6 Xanadux on a %s", (const char*) d->m_modelstr ); 220 qDebug( "HTC::init() - Using the 2.6 Xanadux on a %s", (const char*) d->m_modelstr );
@@ -279,49 +279,49 @@ void HTC::buzzer( int sound )
279 switch ( sound ){ 279 switch ( sound ){
280 case SHARP_BUZ_TOUCHSOUND: { 280 case SHARP_BUZ_TOUCHSOUND: {
281 static Sound touch_sound("touchsound"); 281 static Sound touch_sound("touchsound");
282 snd = &touch_sound; 282 snd = &touch_sound;
283 } 283 }
284 break; 284 break;
285 case SHARP_BUZ_KEYSOUND: { 285 case SHARP_BUZ_KEYSOUND: {
286 static Sound key_sound( "keysound" ); 286 static Sound key_sound( "keysound" );
287 snd = &key_sound; 287 snd = &key_sound;
288 } 288 }
289 break; 289 break;
290 case SHARP_BUZ_SCHEDULE_ALARM: 290 case SHARP_BUZ_SCHEDULE_ALARM:
291 default: { 291 default: {
292 static Sound alarm_sound("alarm"); 292 static Sound alarm_sound("alarm");
293 snd = &alarm_sound; 293 snd = &alarm_sound;
294 } 294 }
295 break; 295 break;
296 } 296 }
297 } 297 }
298 298
299 // If a soundname is defined, we expect that this device has 299 // If a soundname is defined, we expect that this device has
300 // sound capabilities.. Otherwise we expect to have the buzzer 300 // sound capabilities.. Otherwise we expect to have the buzzer
301 // device.. 301 // device..
302 if ( snd && snd->isFinished() ){ 302 if ( snd && snd->isFinished() ){
303 changeMixerForAlarm( 0, "/dev/sound/mixer", snd ); 303 changeMixerForAlarm( 0, "/dev/mixer", snd );
304 snd->play(); 304 snd->play();
305 } else if( !snd ) { 305 } else if( !snd ) {
306 int fd = ::open ( "/dev/sharp_buz", O_WRONLY|O_NONBLOCK ); 306 int fd = ::open ( "/dev/sharp_buz", O_WRONLY|O_NONBLOCK );
307 307
308 if ( fd >= 0 ) { 308 if ( fd >= 0 ) {
309 ::ioctl ( fd, SHARP_BUZZER_MAKESOUND, sound ); 309 ::ioctl ( fd, SHARP_BUZZER_MAKESOUND, sound );
310 ::close ( fd ); 310 ::close ( fd );
311 } 311 }
312 312
313 } 313 }
314#endif 314#endif
315} 315}
316 316
317 317
318void HTC::playAlarmSound() 318void HTC::playAlarmSound()
319{ 319{
320 buzzer( SHARP_BUZ_SCHEDULE_ALARM ); 320 buzzer( SHARP_BUZ_SCHEDULE_ALARM );
321} 321}
322 322
323void HTC::playTouchSound() 323void HTC::playTouchSound()
324{ 324{
325 buzzer( SHARP_BUZ_TOUCHSOUND ); 325 buzzer( SHARP_BUZ_TOUCHSOUND );
326} 326}
327 327