frequency change works now

4 files changed, 59 insertions, 21 deletions

diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index 8b98672..68c2929 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -37,16 +37,17 @@
 
 #include <qcheckbox.h>
 #include <qtabwidget.h>
 #include <qslider.h>
 #include <qtimer.h>
 #include <qspinbox.h>
 #include <qpushbutton.h>
 #include <qgroupbox.h>
+#include <qcombobox.h>
 
 #include <opie/odevice.h>
 
 #include "sensor.h"
 
 using namespace Opie;
 
 LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
@@ -57,33 +58,46 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
 
 	if ( !ODevice::inst ( )-> hasLightSensor ( )) {
 		auto_brightness-> hide ( );
 		CalibrateLightSensor-> hide ( );
 		auto_brightness_ac-> hide ( );
 		CalibrateLightSensor_ac-> hide ( );
 	}
 	if (m_cres) {
-		GroupLight->setTitle(tr("Backlight & Contrast"));
+		GroupLight->setTitle(tr("Backlight && Contrast"));
+		GroupLight_ac->setTitle(GroupLight->title());
 	} else {
 		contrast->hide();
 		contrast_ac->hide();
 	}
 
+	QStrList freq = ODevice::inst()->cpuFrequencies();
+	if ( freq.count() ) {
+		frequency->insertStrList( freq );
+		frequency_ac->insertStrList( freq );
+	} else {
+		frequency->hide();
+		frequency_ac->hide();
+	}
+
 	Config config ( "apm" );
 	config. setGroup ( "Battery" );
 
 	// battery spinboxes
 	interval_dim->      setValue ( config. readNumEntry ( "Dim", 30 ));
 	interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 20 ));
 	interval_suspend->  setValue ( config. readNumEntry ( "Suspend", 60 ));
 
 	// battery check and slider
 	LcdOffOnly-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false ));
 
+	// CPU frequency
+	frequency->setCurrentItem( config.readNumEntry("Freq", 0) );
+
 	int bright = config. readNumEntry ( "Brightness", 127 );
 	int contr  = m_oldcontrast = config. readNumEntry ( "Contrast", 127 );
 	brightness-> setTickInterval ( QMAX( 16, 256 / m_bres ));
 	brightness-> setLineStep ( QMAX( 1, 256 / m_bres ));
 	brightness-> setPageStep ( QMAX( 1, 256 / m_bres ));
 	brightness-> setValue ( bright );
 
 	if (m_cres) {
@@ -102,16 +116,19 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
 	// ac spinboxes
 	interval_dim_ac->      setValue ( config. readNumEntry ( "Dim", 60 ));
 	interval_lightoff_ac-> setValue ( config. readNumEntry ( "LightOff", 120 ));
 	interval_suspend_ac->  setValue ( config. readNumEntry ( "Suspend", 0 ));
 
 	// ac check and slider
 	LcdOffOnly_ac-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false ));
 
+	// CPU frequency
+	frequency_ac->setCurrentItem( config.readNumEntry("Freq", 0) );
+
 	bright = config. readNumEntry ( "Brightness", 255 );
 	brightness_ac-> setTickInterval ( QMAX( 16, 256 / m_bres ));
 	brightness_ac-> setLineStep ( QMAX( 1, 256 / m_bres ));
 	brightness_ac-> setPageStep ( QMAX( 1, 256 / m_bres ));
 	brightness_ac-> setValue ( bright );
 
 	if (m_cres) {
 		contr = config. readNumEntry ( "Contrast", 127);
@@ -142,16 +159,17 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
 	}
 	
 	connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
 	connect ( brightness_ac, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
 	if (m_cres) {
 		connect ( contrast,    SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int )));
 		connect ( contrast_ac, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int )));
 	}
+        connect( frequency, SIGNAL( activated(int) ),          this, SLOT( setFrequency(int) ) );
 }
 
 LightSettings::~LightSettings ( ) 
 {
 }
 
 void LightSettings::calibrateSensor ( )
 {
@@ -184,16 +202,22 @@ void LightSettings::setBacklight ( int bright )
 
 void LightSettings::setContrast ( int contr )
 {
 	if (contr == -1) contr = m_oldcontrast;
 	
 	ODevice::inst ( )-> setDisplayContrast(contr);
 }
 
+void LightSettings::setFrequency ( int index )
+{
+qWarning("LightSettings::setFrequency(%d)", index);
+	ODevice::inst ( )-> setCpuFrequency(index);
+}
+
 void LightSettings::resetBacklight ( )
 {
 	setBacklight ( -1 );
 	setContrast ( -1 );
 }
 
 void LightSettings::accept ( )
 {
@@ -203,26 +227,28 @@ void LightSettings::accept ( )
 	config. setGroup ( "Battery" );
 	config. writeEntry ( "LcdOffOnly", LcdOffOnly-> isChecked ( ));
 	config. writeEntry ( "Dim",        interval_dim-> value ( ));
 	config. writeEntry ( "LightOff",   interval_lightoff-> value ( ));
 	config. writeEntry ( "Suspend",    interval_suspend-> value ( ));
 	config. writeEntry ( "Brightness", brightness-> value () );
 	if (m_cres)
 	config. writeEntry ( "Contrast",   contrast-> value () );
+	config. writeEntry ( "Freq",       frequency->currentItem() );
 
 	// ac
 	config. setGroup ( "AC" );
 	config. writeEntry ( "LcdOffOnly", LcdOffOnly_ac-> isChecked ( ));
 	config. writeEntry ( "Dim",        interval_dim_ac-> value ( ));
 	config. writeEntry ( "LightOff",   interval_lightoff_ac-> value ( ));
 	config. writeEntry ( "Suspend",    interval_suspend_ac-> value ( ));
 	config. writeEntry ( "Brightness", brightness_ac-> value () );
 	if (m_cres)
 	config. writeEntry ( "Contrast",   contrast_ac-> value () );
+	config. writeEntry ( "Freq",       frequency_ac->currentItem() );
 
 	// only make light sensor stuff appear if the unit has a sensor	
 	if ( ODevice::inst ( )-> hasLightSensor ( )) {
 		config. setGroup ( "Battery" );
 		config. writeEntry ( "LightSensor", auto_brightness->isChecked() );
 		config. writeEntry ( "LightSensorData", m_sensordata, ';' );
 		config. setGroup ( "AC" );
 		config. writeEntry ( "LightSensor", auto_brightness_ac->isChecked() );
diff --git a/core/settings/light-and-power/light.h b/core/settings/light-and-power/light.h
index 4a8bf6b..c48e5f6 100644
--- a/core/settings/light-and-power/light.h
+++ b/core/settings/light-and-power/light.h
@@ -25,16 +25,17 @@
                              Boston, MA 02111-1307, USA.
 
 */
 #ifndef __LIGHT_H__
 #define __LIGHT_H__
 
 
 #include <qstringlist.h>
+#include <qlistbox.h>
 #include "lightsettingsbase.h"
 
 class QTimer;
 
 class LightSettings : public LightSettingsBase
 {
     Q_OBJECT
 
@@ -46,22 +47,24 @@ protected:
     virtual void accept();
     virtual void done ( int r );
 
 protected slots:
     virtual void calibrateSensor ( );
     virtual void calibrateSensorAC ( );
     void setBacklight ( int );
     void setContrast ( int );
+    void setFrequency ( int );
     void resetBacklight ( );
 
 private:
     int m_bres;
     int m_cres;
     int m_oldcontrast;
+    int m_oldfreq;
     QTimer *m_resettimer;
     QStringList m_sensordata;
     QStringList m_sensordata_ac;
 };
 
 
 #endif
 
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 4b5a54e..4c33a0e 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -774,17 +774,16 @@ 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
@@ -792,33 +791,30 @@ qWarning("ODevice::cpuFrequencies: m_cpu_frequencies is %d", (int) d->m_cpu_freq
 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
+	int fd;
 
-	return false;
+	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;
 }
 
-/**
- * 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 false;
 }
 
 
-
 /**
  * @return a list of hardware buttons
  */
 const QValueList <ODeviceButton> &ODevice::buttons ( )
 {
 	initButtons ( );
 
 	return *d-> m_buttons;
@@ -1987,21 +1983,36 @@ void Ramses::init()
 		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 );
@@ -2139,18 +2150,16 @@ bool Ramses::setDisplayContrast(int contr)
 
 	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
@@ -195,17 +195,17 @@ 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;
+	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 ( );