2 files changed, 65 insertions, 6 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index f808960..4b5a54e 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -59,32 +59,33 @@ public:
         QString m_vendorstr;
         OVendor m_vendor;
 
         QString m_modelstr;
         OModel m_model;
 
         QString m_systemstr;
         OSystem m_system;
 
         QString m_sysverstr;
 
         Transformation m_rotation;
         ODirection m_direction;
 
         QValueList <ODeviceButton> *m_buttons;
         uint                        m_holdtime;
+        QStrList                   *m_cpu_frequencies;
 };
 
 
 class iPAQ : public ODevice, public QWSServer::KeyboardFilter {
 protected:
         virtual void init ( );
         virtual void initButtons ( );
 
 public:
         virtual bool setSoftSuspend ( bool soft );
 
         virtual bool setDisplayBrightness ( int b );
         virtual int displayBrightnessResolution ( ) const;
 
         virtual void alarmSound ( );
 
@@ -410,32 +411,33 @@ ODevice *ODevice::inst ( )
 ODevice::ODevice ( )
 {
         d = new ODeviceData;
 
         d-> m_modelstr = "Unknown";
         d-> m_model = Model_Unknown;
         d-> m_vendorstr = "Unknown";
         d-> m_vendor = Vendor_Unknown;
         d-> m_systemstr = "Unknown";
         d-> m_system = System_Unknown;
         d-> m_sysverstr = "0.0";
         d-> m_rotation = Rot0;
         d-> m_direction = CW;
 
         d-> m_holdtime = 1000; // 1000ms
         d-> m_buttons = 0;
+        d-> m_cpu_frequencies = new QStrList;
 }
 
 void ODevice::systemMessage ( const QCString &msg, const QByteArray & )
 {
         if ( msg == "deviceButtonMappingChanged()" ) {
                 reloadButtonMapping ( );
         }
 }
 
 void ODevice::init ( )
 {
 }
 
 /**
  * This method initialises the  button mapping
  */
@@ -760,32 +762,72 @@ bool ODevice::hasLightSensor ( ) const
  * @return a value from the light senso
  */
 int ODevice::readLightSensor ( )
 {
         return -1;
 }
 
 /**
  * @return the light sensor resolution whatever that is ;)
  */
 int ODevice::lightSensorResolution ( ) const
 {
         return 0;
 }
 
 /**
+ * @return a list with valid CPU frequency
+ */
+QStrList &ODevice::cpuFrequencies ( ) const
+{
+qWarning("ODevice::cpuFrequencies: m_cpu_frequencies is %d", (int) d->m_cpu_frequencies);
+        return *d->m_cpu_frequencies;
+}
+
+
+/**
+ * Set desired cpu frequency
+ * 
+ * @param index index into d->m_cpu_frequencies of the frequency to be set
+ */
+bool ODevice::setCpuFrequency(uint index)
+{
+        if (index >= d->m_cpu_frequencies->count())
+                return false;
+
+        char *freq = d->m_cpu_frequencies->at(index);
+        qWarning("set freq to %s", freq);
+
+        //TODO: do the change in /proc/sys/cpu/0/speed
+
+        return false;
+}
+
+/**
+ * Returns current frequency index out of d->m_cpu_frequencies
+ */
+uint ODevice::cpuFrequency() const
+{
+        // TODO: get freq from /proc/sys/cpu/0/speed and return index
+
+        return 0;
+}
+
+
+
+/**
  * @return a list of hardware buttons
  */
 const QValueList <ODeviceButton> &ODevice::buttons ( )
 {
         initButtons ( );
 
         return *d-> m_buttons;
 }
 
 /**
  * @return The amount of time that would count as a hold
  */
 uint ODevice::buttonHoldTime ( ) const
 {
         return d-> m_holdtime;
 }
@@ -1937,32 +1979,37 @@ void Ramses::init()
         d->m_holdtime = 1000;
 
         f.setName("/etc/oz_version");
 
         if (f.open(IO_ReadOnly)) {
                    d->m_systemstr = "OpenEmbedded/Ramses";
                     d->m_system = System_OpenZaurus;
 
                 QTextStream ts(&f);
                 ts.setDevice(&f);
                 d->m_sysverstr = ts.readLine();
                 f.close();
         }
 
         m_power_timer = 0;
 
+qWarning("adding freq");
+        d->m_cpu_frequencies->append("100");
+        d->m_cpu_frequencies->append("200");
+        d->m_cpu_frequencies->append("300");
+        d->m_cpu_frequencies->append("400");
 }
 
 bool Ramses::filter(int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat)
 {
         Q_UNUSED( keycode );
         Q_UNUSED( modifiers );
         Q_UNUSED( isPress );
         Q_UNUSED( autoRepeat );
         return false;
 }
 
 void Ramses::timerEvent(QTimerEvent *)
 {
         killTimer(m_power_timer);
         m_power_timer = 0;
         QWSServer::sendKeyEvent(-1, HardKey_Backlight, 0, true, false);
@@ -1997,32 +2044,33 @@ bool Ramses::setSoftSuspend(bool soft)
                         perror("APM_IOCGEVTSRC");
 
                 ::close(fd);
         }
         else
                 perror("/dev/apm_bios or /dev/misc/apm_bios");
 
     return res;
 #else
     return true;
 #endif
 }
 
 bool Ramses::suspend ( )
 {
         qDebug("Ramses::suspend");
+        return false;
 }
 
 /**
  * This sets the display on or off
  */
 bool Ramses::setDisplayStatus(bool on)
 {
         qDebug("Ramses::setDisplayStatus(%d)", on);
 #if 0
         bool res = false;
         int fd;
 
         if ((fd = ::open ("/dev/fb/0", O_RDWR)) >= 0) {
                 res = (::ioctl(fd, FBIOBLANK, on ? VESA_NO_BLANKING : VESA_POWERDOWN) == 0);
                 ::close(fd);
         }
@@ -2035,42 +2083,49 @@ bool Ramses::setDisplayStatus(bool on)
 
 /*
  * We get something between 0..255 into us
 */
 bool Ramses::setDisplayBrightness(int bright)
 {
         qDebug("Ramses::setDisplayBrightness(%d)", bright);
         bool res = false;
         int fd;
 
         // pwm1 brighness: 20 steps 500..0 (dunkel->hell)
 
         if (bright > 255 )
                 bright = 255;
         if (bright < 0)
                 bright = 0;
-        bright = 500-(bright * 500 / 255);
 
+        // Turn backlight completely off
+        if ((fd = ::open("/proc/sys/board/lcd_backlight", O_WRONLY)) >= 0) {
+                char writeCommand[10];
+                const int count = sprintf(writeCommand, "%d\n", bright ? 1 : 0);
+                res = (::write(fd, writeCommand, count) != -1);
+                ::close(fd);
+        }
+
+        // scale backlight brightness to hardware
+        bright = 500-(bright * 500 / 255);
         if ((fd = ::open("/proc/sys/board/pwm1", O_WRONLY)) >= 0) {
                 qDebug(" %d -> pwm1", bright);
                 char writeCommand[100];
                 const int count = sprintf(writeCommand, "%d\n", bright);
                 res = (::write(fd, writeCommand, count) != -1);
                 ::close(fd);
-        } else {
-                qWarning("no write");
         }
         return res;
 }
 
 
 int Ramses::displayBrightnessResolution() const
 {
         return 32;
 }
 
 bool Ramses::setDisplayContrast(int contr)
 {
         qDebug("Ramses::setDisplayContrast(%d)", contr);
         bool res = false;
         int fd;
 
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 0974e8d..7f6f856 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -10,32 +10,33 @@
     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 <qobject.h>
 #include <qstring.h>
 #include <qnamespace.h>
+#include <qstrlist.h>
 
 #include <opie/odevicebutton.h>
 
 #include <qpe/qpeapplication.h> /* for Transformation enum.. */
 
 class ODeviceData;
 
 namespace Opie {
 
 /**
  * The available devices
  */
 enum OModel {
         Model_Unknown, // = 0
 
         Model_Series_Mask   = 0xff000000,
@@ -136,39 +137,38 @@ enum ODirection {
  */
 class ODevice : public QObject {
         Q_OBJECT
 
 private:
         /* disable copy */
         ODevice ( const ODevice & );
 
 protected:
         ODevice ( );
         virtual void init ( );
         virtual void initButtons ( );
 
         ODeviceData *d;
 
 public:
-    // sandman do we want to allow destructions? -zecke?
+        // sandman do we want to allow destructions? -zecke?
         virtual ~ODevice ( );
 
-
         static ODevice *inst ( );
 
-// information
+        // information
 
         QString modelString ( ) const;
         OModel model ( ) const;
         inline OModel series ( ) const { return (OModel) ( model ( ) & Model_Series_Mask ); }
 
         QString vendorString ( ) const;
         OVendor vendor ( ) const;
 
         QString systemString ( ) const;
         OSystem system ( ) const;
 
         QString systemVersionString ( ) const;
 
         Transformation rotation ( ) const;
         ODirection direction ( ) const;
 
@@ -185,32 +185,36 @@ public:
 
 // input / output
         //FIXME playAlarmSound and al might be better -zecke
         virtual void alarmSound ( );
         virtual void keySound ( );
         virtual void touchSound ( );
 
         virtual QValueList <OLed> ledList ( ) const;
         virtual QValueList <OLedState> ledStateList ( OLed led ) const;
         virtual OLedState ledState ( OLed led ) const;
         virtual bool setLedState ( OLed led, OLedState st );
 
         virtual bool hasLightSensor ( ) const;
         virtual int readLightSensor ( );
         virtual int lightSensorResolution ( ) const;
 
+        QStrList &cpuFrequencies() const;
+        bool setCpuFrequency(uint index);
+        uint cpuFrequency() const;
+
         /**
          * Returns the available buttons on this device.  The number and location
          * of buttons will vary depending on the device.  Button numbers will be assigned
          * by the device manufacturer and will be from most preferred button to least preffered
          * button.  Note that this list only contains "user mappable" buttons.
          */
         const QValueList<ODeviceButton> &buttons ( );
 
         /**
          * Returns the DeviceButton for the \a keyCode.  If \a keyCode is not found, it
          * returns 0L
          */
         const ODeviceButton *buttonForKeycode ( ushort keyCode );
 
         /**
          * Reassigns the pressed action for \a button.  To return to the factory