summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie/odevice.cpp8
-rw-r--r--libopie/odevice.h2
2 files changed, 1 insertions, 9 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 6572fb6..1da8862 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -6,275 +6,269 @@
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <signal.h>
#include <sys/time.h>
#include <linux/soundcard.h>
#include <qapplication.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qpe/sound.h>
#include <qpe/resource.h>
#include <qpe/config.h>
#include "odevice.h"
class ODeviceData {
public:
QString m_vendorstr;
OVendor m_vendor;
QString m_modelstr;
OModel m_model;
QString m_systemstr;
OSystem m_system;
QString m_sysverstr;
OLedState m_leds [4]; // just for convenience ...
};
class ODeviceIPAQ : public ODevice {
protected:
virtual void init ( );
public:
virtual void alarmSound ( );
virtual uint hasLeds ( ) const;
virtual OLedState led ( uint which ) const;
virtual bool setLed ( uint which, OLedState st );
};
class ODeviceZaurus : public ODevice {
protected:
virtual void init ( );
public:
virtual void alarmSound ( );
virtual void keySound ( );
virtual void touchSound ( );
virtual uint hasLeds ( ) const;
virtual OLedState led ( uint which ) const;
virtual bool setLed ( uint which, OLedState st );
protected:
virtual void buzzer ( int snd );
};
ODevice *ODevice::inst ( )
{
static ODevice *dev = 0;
if ( !dev ) {
if ( QFile::exists ( "/proc/hal/model" ))
dev = new ODeviceIPAQ ( );
else if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
dev = new ODeviceZaurus ( );
else
dev = new ODevice ( );
dev-> init ( );
}
return dev;
}
ODevice::ODevice ( )
{
d = new ODeviceData;
d-> m_modelstr = "Unknown";
d-> m_model = OMODEL_Unknown;
d-> m_vendorstr = "Unkown";
d-> m_vendor = OVENDOR_Unknown;
d-> m_systemstr = "Unkown";
d-> m_system = OSYSTEM_Unknown;
d-> m_sysverstr = "0.0";
}
void ODevice::init ( )
{
}
ODevice::~ODevice ( )
{
delete d;
}
//#include <linux/apm_bios.h>
//#define APM_IOC_SUSPEND _IO('A',2)
#define APM_IOC_SUSPEND (( 0<<30 ) | ( 'A'<<8 ) | ( 2 ) | ( 0<<16 ))
-
-void ODevice::tstp_sighandler ( int )
-{
-}
-
-
bool ODevice::suspend ( )
{
if ( d-> m_model == OMODEL_Unknown ) // better don't suspend in qvfb / on unkown devices
return false;
int fd;
bool res = false;
if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) ||
(( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) {
struct timeval tvs, tvn;
- ::signal ( SIGTSTP, tstp_sighandler ); // we don't want to be stopped
+ ::signal ( SIGTSTP, SIG_IGN ); // we don't want to be stopped
::gettimeofday ( &tvs, 0 );
res = ( ::ioctl ( fd, APM_IOC_SUSPEND ) == 0 ); // tell the kernel to "start" suspending
::close ( fd );
if ( res ) {
::kill ( -::getpid ( ), SIGTSTP ); // stop everthing in out process group
do { // wait at most 1.5 sec: either suspend didn't work or the device resumed
::usleep ( 200 * 1000 );
::gettimeofday ( &tvn, 0 );
} while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 1500 );
::kill ( -::getpid ( ), SIGCONT ); // continue everything in our process group
}
::signal ( SIGTSTP, SIG_DFL );
}
return res;
}
QString ODevice::vendorString ( )
{
return d-> m_vendorstr;
}
OVendor ODevice::vendor ( )
{
return d-> m_vendor;
}
QString ODevice::modelString ( )
{
return d-> m_modelstr;
}
OModel ODevice::model ( )
{
return d-> m_model;
}
QString ODevice::systemString ( )
{
return d-> m_systemstr;
}
OSystem ODevice::system ( )
{
return d-> m_system;
}
QString ODevice::systemVersionString ( )
{
return d-> m_sysverstr;
}
void ODevice::alarmSound ( )
{
#ifndef QT_QWS_EBX
#ifndef QT_NO_SOUND
static Sound snd ( "alarm" );
if ( snd. isFinished ( ))
snd. play ( );
#endif
#endif
}
void ODevice::keySound ( )
{
#ifndef QT_QWS_EBX
#ifndef QT_NO_SOUND
static Sound snd ( "keysound" );
if ( snd. isFinished ( ))
snd. play ( );
#endif
#endif
}
void ODevice::touchSound ( )
{
#ifndef QT_QWS_EBX
#ifndef QT_NO_SOUND
static Sound snd ( "touchsound" );
//qDebug("touchSound");
if ( snd. isFinished ( )) {
snd. play ( );
// qDebug("sound should play");
}
#endif
#endif
}
uint ODevice::hasLeds ( ) const
{
return 0;
}
OLedState ODevice::led ( uint /*which*/ ) const
{
return OLED_Off;
}
bool ODevice::setLed ( uint /*which*/, OLedState /*st*/ )
{
return false;
}
//#if defined( QT_QWS_IPAQ ) // IPAQ
void ODeviceIPAQ::init ( )
{
d-> m_vendorstr = "HP";
d-> m_vendor = OVENDOR_HP;
QFile f ( "/proc/hal/model" );
if ( f. open ( IO_ReadOnly )) {
QTextStream ts ( &f );
diff --git a/libopie/odevice.h b/libopie/odevice.h
index cda504a..5009b91 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -1,111 +1,109 @@
/* This file is part of the OPIE libraries
Copyright (C) 2002 Robert Griebl (sandman@handhelds.org)
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef _LIBOPIE_ODEVICE_H_
#define _LIBOPIE_ODEVICE_H_
#include <qstring.h>
class ODeviceData;
enum OModel {
OMODEL_Unknown,
OMODEL_iPAQ_H31xx,
OMODEL_iPAQ_H36xx,
OMODEL_iPAQ_H37xx,
OMODEL_iPAQ_H38xx,
OMODEL_Zaurus_SL5000
};
enum OVendor {
OVENDOR_Unknown,
OVENDOR_HP,
OVENDOR_Sharp
};
enum OSystem {
OSYSTEM_Unknown,
OSYSTEM_Familiar,
OSYSTEM_Zaurus,
OSYSTEM_OpenZaurus
};
enum OLedState {
OLED_Off,
OLED_On,
OLED_BlinkSlow,
OLED_BlinkFast
};
class ODevice
{
public:
public:
static ODevice *inst ( );
// system
virtual bool suspend ( );
// information
QString modelString ( );
OModel model ( );
QString vendorString ( );
OVendor vendor ( );
QString systemString ( );
OSystem system ( );
QString systemVersionString ( );
// input / output
virtual void alarmSound ( );
virtual void keySound ( );
virtual void touchSound ( );
virtual uint hasLeds ( ) const;
virtual OLedState led ( uint which ) const;
virtual bool setLed ( uint which, OLedState st );
virtual ~ODevice ( );
protected:
ODevice ( );
virtual void init ( );
ODeviceData *d;
private:
ODevice ( const ODevice & );
-
- static void tstp_sighandler ( int );
};
#endif