2 files changed, 30 insertions, 21 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 4b5a54e..4c33a0e 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -766,67 +766,63 @@ 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;
-}
+        int fd;
 
-/**
- * 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
+        if ((fd = ::open("/proc/sys/cpu/0/speed", O_WRONLY)) >= 0) {
+                char writeCommand[50];
+                const int count = sprintf(writeCommand, "%s\n", freq);
+                int res = (::write(fd, writeCommand, count) != -1);
+                ::close(fd);
+                return res;
+        }
 
-        return 0;
+        return false;
 }
 
 
-
 /**
  * @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;
@@ -1979,37 +1975,52 @@ 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");
+#ifdef QT_QWS_ALLOW_OVERCLOCK
+#warning *** Overclocking enabled - this may fry your hardware - you have been warned ***
+#define OC(x...)        x
+#else
+#define OC(x...)
+#endif
+
+
+        // This table is true for a Intel XScale PXA 255
+
+        d->m_cpu_frequencies->append("99000");      // mem= 99, run= 99, turbo= 99, PXbus= 50
+        OC(d->m_cpu_frequencies->append("118000"); )   // mem=118, run=118, turbo=118, PXbus= 59 OC'd mem
+        d->m_cpu_frequencies->append("199100");     // mem= 99, run=199, turbo=199, PXbus= 99
+        OC(d->m_cpu_frequencies->append("236000"); )   // mem=118, run=236, turbo=236, PXbus=118 OC'd mem
+        d->m_cpu_frequencies->append("298600");     // mem= 99, run=199, turbo=298, PXbus= 99
+        OC(d->m_cpu_frequencies->append("354000"); )   // mem=118, run=236, turbo=354, PXbus=118 OC'd mem
+        d->m_cpu_frequencies->append("398099");     // mem= 99, run=199, turbo=398, PXbus= 99
+        d->m_cpu_frequencies->append("398100");     // mem= 99, run=398, turbo=398, PXbus=196
+        OC(d->m_cpu_frequencies->append("471000"); )   // mem=118, run=471, turbo=471, PXbus=236 OC'd mem/core/bus
+
 }
 
 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);
@@ -2131,27 +2142,25 @@ bool Ramses::setDisplayContrast(int contr)
 
         // pwm0 contrast: 20 steps 79..90 (dunkel->hell)
 
         if (contr > 255 )
                 contr = 255;
         if (contr < 0)
                 contr = 0;
         contr = 90 - (contr * 20 / 255);
 
         if ((fd = ::open("/proc/sys/board/pwm0", O_WRONLY)) >= 0) {
                 qDebug(" %d -> pwm0", contr);
                 char writeCommand[100];
                 const int count = sprintf(writeCommand, "%d\n", contr);
                 res = (::write(fd, writeCommand, count) != -1);
                 res = true;
                 ::close(fd);
-        } else {
-                qWarning("no write");
         }
         return res;
 }
 
 
 int Ramses::displayContrastResolution() const
 {
         return 20;
 }
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 7f6f856..18ff5f1 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -187,33 +187,33 @@ public:
         //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;
+        int 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 );
 
         /**