2 files changed, 63 insertions, 4 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index f808960..4b5a54e 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -69,12 +69,13 @@ public:
 
         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 ( );
@@ -420,12 +421,13 @@ ODevice::ODevice ( )
         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 ( );
@@ -770,12 +772,52 @@ int ODevice::readLightSensor ( )
 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 ( );
 
@@ -1947,12 +1989,17 @@ void Ramses::init()
                 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 );
@@ -2007,12 +2054,13 @@ bool Ramses::setSoftSuspend(bool soft)
 #endif
 }
 
 bool Ramses::suspend ( )
 {
         qDebug("Ramses::suspend");
+        return false;
 }
 
 /**
  * This sets the display on or off
  */
 bool Ramses::setDisplayStatus(bool on)
@@ -2045,22 +2093,29 @@ bool Ramses::setDisplayBrightness(int bright)
         // 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
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 0974e8d..7f6f856 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -20,12 +20,13 @@
 #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;
@@ -149,13 +150,12 @@ protected:
         ODeviceData *d;
 
 public:
     // sandman do we want to allow destructions? -zecke?
         virtual ~ODevice ( );
 
-
         static ODevice *inst ( );
 
 // information
 
         QString modelString ( ) const;
         OModel model ( ) const;
@@ -195,12 +195,16 @@ public:
         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.
          */