From 802e9457b1bc158c61849755215fe2a5bad6231d Mon Sep 17 00:00:00 2001 From: schurig Date: Fri, 06 Jun 2003 14:32:51 +0000 Subject: frequency change works now --- 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 @@ -42,6 +42,7 @@ #include #include #include +#include #include @@ -62,12 +63,22 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) 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" ); @@ -77,7 +88,10 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) interval_suspend-> setValue ( config. readNumEntry ( "Suspend", 60 )); // battery check and slider - LcdOffOnly-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); + 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 ); @@ -107,6 +121,9 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) // 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 )); @@ -147,6 +164,7 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) 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 ( ) @@ -189,6 +207,12 @@ void LightSettings::setContrast ( int contr ) ODevice::inst ( )-> setDisplayContrast(contr); } +void LightSettings::setFrequency ( int index ) +{ +qWarning("LightSettings::setFrequency(%d)", index); + ODevice::inst ( )-> setCpuFrequency(index); +} + void LightSettings::resetBacklight ( ) { setBacklight ( -1 ); @@ -208,6 +232,7 @@ void LightSettings::accept ( ) config. writeEntry ( "Brightness", brightness-> value () ); if (m_cres) config. writeEntry ( "Contrast", contrast-> value () ); + config. writeEntry ( "Freq", frequency->currentItem() ); // ac config. setGroup ( "AC" ); @@ -218,6 +243,7 @@ void LightSettings::accept ( ) 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 ( )) { 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 @@ -30,6 +30,7 @@ #include +#include #include "lightsettingsbase.h" class QTimer; @@ -51,12 +52,14 @@ protected slots: 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; diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 4b5a54e..4c33a0e 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp @@ -779,7 +779,6 @@ int ODevice::lightSensorResolution ( ) const */ QStrList &ODevice::cpuFrequencies ( ) const { -qWarning("ODevice::cpuFrequencies: m_cpu_frequencies is %d", (int) d->m_cpu_frequencies); return *d->m_cpu_frequencies; } @@ -797,23 +796,20 @@ bool ODevice::setCpuFrequency(uint index) 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 */ @@ -1992,11 +1988,26 @@ void Ramses::init() 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) @@ -2144,8 +2155,6 @@ bool Ramses::setDisplayContrast(int contr) res = (::write(fd, writeCommand, count) != -1); res = true; ::close(fd); - } else { - qWarning("no write"); } return res; } diff --git a/libopie/odevice.h b/libopie/odevice.h index 7f6f856..18ff5f1 100644 --- a/libopie/odevice.h +++ b/libopie/odevice.h @@ -200,7 +200,7 @@ public: QStrList &cpuFrequencies() const; bool setCpuFrequency(uint index); - uint cpuFrequency() const; + int cpuFrequency() const; /** * Returns the available buttons on this device. The number and location -- cgit v0.9.0.2