author | sandman <sandman> | 2002-07-27 22:45:04 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-07-27 22:45:04 (UTC) |
commit | 9cc89b6a54ee267953b0422c4607097d075ecab9 (patch) (side-by-side diff) | |
tree | 4bde48d162a97ef74cf9e276c0194b8138fb4e0c /libopie | |
parent | dac5c073c3e04ceb6900aeb72e53cf6d7350c3c9 (diff) | |
download | opie-9cc89b6a54ee267953b0422c4607097d075ecab9.zip opie-9cc89b6a54ee267953b0422c4607097d075ecab9.tar.gz opie-9cc89b6a54ee267953b0422c4607097d075ecab9.tar.bz2 |
Small extension to read the system version
(currently only functional for familiar)
-rw-r--r-- | libopie/odevice.cpp | 16 | ||||
-rw-r--r-- | libopie/odevice.h | 1 |
2 files changed, 16 insertions, 1 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 9931684..bc8014a 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp @@ -16,48 +16,50 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <qfile.h> #include <qtextstream.h> #include <qpe/sound.h> #include <qpe/resource.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 ( ); @@ -78,89 +80,95 @@ ODevice *ODevice::inst ( ) 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; } 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 } @@ -205,51 +213,57 @@ 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 ); d-> m_modelstr = "H" + ts. readLine ( ); if ( d-> m_modelstr == "H3100" ) d-> m_model = OMODEL_iPAQ_H31xx; else if ( d-> m_modelstr == "H3600" ) d-> m_model = OMODEL_iPAQ_H36xx; else if ( d-> m_modelstr == "H3700" ) d-> m_model = OMODEL_iPAQ_H37xx; else if ( d-> m_modelstr == "H3800" ) d-> m_model = OMODEL_iPAQ_H38xx; else d-> m_model = OMODEL_Unknown; f. close ( ); } - if ( QFile::exists ( "/etc/familiar-version" )) { + f. setName ( "/etc/familiar-version" ); + if ( f. open ( IO_ReadOnly )) { d-> m_systemstr = "Familiar"; d-> m_system = OSYSTEM_Familiar; + + QTextStream ts ( &f ); + d-> m_sysverstr = ts. readLine ( ). mid ( 10 ); + + f. close ( ); } d-> m_leds [0] = OLED_Off; } #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> #include <linux/soundcard.h> #include <qapplication.h> #include <qpe/config.h> //#include <linux/h3600_ts.h> // including kernel headers is evil ... typedef struct h3600_ts_led { unsigned char OffOnBlink; /* 0=off 1=on 2=Blink */ unsigned char TotalTime; /* Units of 5 seconds */ unsigned char OnTime; /* units of 100m/s */ unsigned char OffTime; /* units of 100m/s */ } LED_IN; // #define IOC_H3600_TS_MAGIC 'f' // #define LED_ON _IOW(IOC_H3600_TS_MAGIC, 5, struct h3600_ts_led) diff --git a/libopie/odevice.h b/libopie/odevice.h index b40abe7..b54e576 100644 --- a/libopie/odevice.h +++ b/libopie/odevice.h @@ -57,48 +57,49 @@ enum OLedState { OLED_BlinkSlow, OLED_BlinkFast }; class ODevice { public: public: static ODevice *inst ( ); // 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 & ); }; |