author | schurig <schurig> | 2003-06-06 14:32:51 (UTC) |
---|---|---|
committer | schurig <schurig> | 2003-06-06 14:32:51 (UTC) |
commit | 802e9457b1bc158c61849755215fe2a5bad6231d (patch) (unidiff) | |
tree | 81b8a5cdb9d4b5beaee2f18eec6ca995ec8e77d2 | |
parent | 225486a1c3714b4b0c0e60286df13d8ede029768 (diff) | |
download | opie-802e9457b1bc158c61849755215fe2a5bad6231d.zip opie-802e9457b1bc158c61849755215fe2a5bad6231d.tar.gz opie-802e9457b1bc158c61849755215fe2a5bad6231d.tar.bz2 |
frequency change works now
-rw-r--r-- | core/settings/light-and-power/light.cpp | 30 | ||||
-rw-r--r-- | core/settings/light-and-power/light.h | 3 | ||||
-rw-r--r-- | libopie/odevice.cpp | 49 | ||||
-rw-r--r-- | libopie/odevice.h | 2 |
4 files changed, 61 insertions, 23 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 @@ | |||
37 | 37 | ||
38 | #include <qcheckbox.h> | 38 | #include <qcheckbox.h> |
39 | #include <qtabwidget.h> | 39 | #include <qtabwidget.h> |
40 | #include <qslider.h> | 40 | #include <qslider.h> |
41 | #include <qtimer.h> | 41 | #include <qtimer.h> |
42 | #include <qspinbox.h> | 42 | #include <qspinbox.h> |
43 | #include <qpushbutton.h> | 43 | #include <qpushbutton.h> |
44 | #include <qgroupbox.h> | 44 | #include <qgroupbox.h> |
45 | #include <qcombobox.h> | ||
45 | 46 | ||
46 | #include <opie/odevice.h> | 47 | #include <opie/odevice.h> |
47 | 48 | ||
48 | #include "sensor.h" | 49 | #include "sensor.h" |
49 | 50 | ||
50 | using namespace Opie; | 51 | using namespace Opie; |
51 | 52 | ||
52 | LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | 53 | LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) |
@@ -57,32 +58,45 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
57 | 58 | ||
58 | if ( !ODevice::inst ( )-> hasLightSensor ( )) { | 59 | if ( !ODevice::inst ( )-> hasLightSensor ( )) { |
59 | auto_brightness-> hide ( ); | 60 | auto_brightness-> hide ( ); |
60 | CalibrateLightSensor-> hide ( ); | 61 | CalibrateLightSensor-> hide ( ); |
61 | auto_brightness_ac-> hide ( ); | 62 | auto_brightness_ac-> hide ( ); |
62 | CalibrateLightSensor_ac-> hide ( ); | 63 | CalibrateLightSensor_ac-> hide ( ); |
63 | } | 64 | } |
64 | if (m_cres) { | 65 | if (m_cres) { |
65 | GroupLight->setTitle(tr("Backlight & Contrast")); | 66 | GroupLight->setTitle(tr("Backlight && Contrast")); |
67 | GroupLight_ac->setTitle(GroupLight->title()); | ||
66 | } else { | 68 | } else { |
67 | contrast->hide(); | 69 | contrast->hide(); |
68 | contrast_ac->hide(); | 70 | contrast_ac->hide(); |
69 | } | 71 | } |
70 | 72 | ||
73 | QStrList freq = ODevice::inst()->cpuFrequencies(); | ||
74 | if ( freq.count() ) { | ||
75 | frequency->insertStrList( freq ); | ||
76 | frequency_ac->insertStrList( freq ); | ||
77 | } else { | ||
78 | frequency->hide(); | ||
79 | frequency_ac->hide(); | ||
80 | } | ||
81 | |||
71 | Config config ( "apm" ); | 82 | Config config ( "apm" ); |
72 | config. setGroup ( "Battery" ); | 83 | config. setGroup ( "Battery" ); |
73 | 84 | ||
74 | // battery spinboxes | 85 | // battery spinboxes |
75 | interval_dim-> setValue ( config. readNumEntry ( "Dim", 30 )); | 86 | interval_dim-> setValue ( config. readNumEntry ( "Dim", 30 )); |
76 | interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 20 )); | 87 | interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 20 )); |
77 | interval_suspend-> setValue ( config. readNumEntry ( "Suspend", 60 )); | 88 | interval_suspend-> setValue ( config. readNumEntry ( "Suspend", 60 )); |
78 | 89 | ||
79 | // battery check and slider | 90 | // battery check and slider |
80 | LcdOffOnly-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); | 91 | LcdOffOnly->setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); |
92 | |||
93 | // CPU frequency | ||
94 | frequency->setCurrentItem( config.readNumEntry("Freq", 0) ); | ||
81 | 95 | ||
82 | int bright = config. readNumEntry ( "Brightness", 127 ); | 96 | int bright = config. readNumEntry ( "Brightness", 127 ); |
83 | int contr = m_oldcontrast = config. readNumEntry ( "Contrast", 127 ); | 97 | int contr = m_oldcontrast = config. readNumEntry ( "Contrast", 127 ); |
84 | brightness-> setTickInterval ( QMAX( 16, 256 / m_bres )); | 98 | brightness-> setTickInterval ( QMAX( 16, 256 / m_bres )); |
85 | brightness-> setLineStep ( QMAX( 1, 256 / m_bres )); | 99 | brightness-> setLineStep ( QMAX( 1, 256 / m_bres )); |
86 | brightness-> setPageStep ( QMAX( 1, 256 / m_bres )); | 100 | brightness-> setPageStep ( QMAX( 1, 256 / m_bres )); |
87 | brightness-> setValue ( bright ); | 101 | brightness-> setValue ( bright ); |
88 | 102 | ||
@@ -102,16 +116,19 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
102 | // ac spinboxes | 116 | // ac spinboxes |
103 | interval_dim_ac-> setValue ( config. readNumEntry ( "Dim", 60 )); | 117 | interval_dim_ac-> setValue ( config. readNumEntry ( "Dim", 60 )); |
104 | interval_lightoff_ac-> setValue ( config. readNumEntry ( "LightOff", 120 )); | 118 | interval_lightoff_ac-> setValue ( config. readNumEntry ( "LightOff", 120 )); |
105 | interval_suspend_ac-> setValue ( config. readNumEntry ( "Suspend", 0 )); | 119 | interval_suspend_ac-> setValue ( config. readNumEntry ( "Suspend", 0 )); |
106 | 120 | ||
107 | // ac check and slider | 121 | // ac check and slider |
108 | LcdOffOnly_ac-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); | 122 | LcdOffOnly_ac-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); |
109 | 123 | ||
124 | // CPU frequency | ||
125 | frequency_ac->setCurrentItem( config.readNumEntry("Freq", 0) ); | ||
126 | |||
110 | bright = config. readNumEntry ( "Brightness", 255 ); | 127 | bright = config. readNumEntry ( "Brightness", 255 ); |
111 | brightness_ac-> setTickInterval ( QMAX( 16, 256 / m_bres )); | 128 | brightness_ac-> setTickInterval ( QMAX( 16, 256 / m_bres )); |
112 | brightness_ac-> setLineStep ( QMAX( 1, 256 / m_bres )); | 129 | brightness_ac-> setLineStep ( QMAX( 1, 256 / m_bres )); |
113 | brightness_ac-> setPageStep ( QMAX( 1, 256 / m_bres )); | 130 | brightness_ac-> setPageStep ( QMAX( 1, 256 / m_bres )); |
114 | brightness_ac-> setValue ( bright ); | 131 | brightness_ac-> setValue ( bright ); |
115 | 132 | ||
116 | if (m_cres) { | 133 | if (m_cres) { |
117 | contr = config. readNumEntry ( "Contrast", 127); | 134 | contr = config. readNumEntry ( "Contrast", 127); |
@@ -142,16 +159,17 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
142 | } | 159 | } |
143 | 160 | ||
144 | connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); | 161 | connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); |
145 | connect ( brightness_ac, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); | 162 | connect ( brightness_ac, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); |
146 | if (m_cres) { | 163 | if (m_cres) { |
147 | connect ( contrast, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); | 164 | connect ( contrast, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); |
148 | connect ( contrast_ac, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); | 165 | connect ( contrast_ac, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); |
149 | } | 166 | } |
167 | connect( frequency, SIGNAL( activated(int) ), this, SLOT( setFrequency(int) ) ); | ||
150 | } | 168 | } |
151 | 169 | ||
152 | LightSettings::~LightSettings ( ) | 170 | LightSettings::~LightSettings ( ) |
153 | { | 171 | { |
154 | } | 172 | } |
155 | 173 | ||
156 | void LightSettings::calibrateSensor ( ) | 174 | void LightSettings::calibrateSensor ( ) |
157 | { | 175 | { |
@@ -184,16 +202,22 @@ void LightSettings::setBacklight ( int bright ) | |||
184 | 202 | ||
185 | void LightSettings::setContrast ( int contr ) | 203 | void LightSettings::setContrast ( int contr ) |
186 | { | 204 | { |
187 | if (contr == -1) contr = m_oldcontrast; | 205 | if (contr == -1) contr = m_oldcontrast; |
188 | 206 | ||
189 | ODevice::inst ( )-> setDisplayContrast(contr); | 207 | ODevice::inst ( )-> setDisplayContrast(contr); |
190 | } | 208 | } |
191 | 209 | ||
210 | void LightSettings::setFrequency ( int index ) | ||
211 | { | ||
212 | qWarning("LightSettings::setFrequency(%d)", index); | ||
213 | ODevice::inst ( )-> setCpuFrequency(index); | ||
214 | } | ||
215 | |||
192 | void LightSettings::resetBacklight ( ) | 216 | void LightSettings::resetBacklight ( ) |
193 | { | 217 | { |
194 | setBacklight ( -1 ); | 218 | setBacklight ( -1 ); |
195 | setContrast ( -1 ); | 219 | setContrast ( -1 ); |
196 | } | 220 | } |
197 | 221 | ||
198 | void LightSettings::accept ( ) | 222 | void LightSettings::accept ( ) |
199 | { | 223 | { |
@@ -203,26 +227,28 @@ void LightSettings::accept ( ) | |||
203 | config. setGroup ( "Battery" ); | 227 | config. setGroup ( "Battery" ); |
204 | config. writeEntry ( "LcdOffOnly", LcdOffOnly-> isChecked ( )); | 228 | config. writeEntry ( "LcdOffOnly", LcdOffOnly-> isChecked ( )); |
205 | config. writeEntry ( "Dim", interval_dim-> value ( )); | 229 | config. writeEntry ( "Dim", interval_dim-> value ( )); |
206 | config. writeEntry ( "LightOff", interval_lightoff-> value ( )); | 230 | config. writeEntry ( "LightOff", interval_lightoff-> value ( )); |
207 | config. writeEntry ( "Suspend", interval_suspend-> value ( )); | 231 | config. writeEntry ( "Suspend", interval_suspend-> value ( )); |
208 | config. writeEntry ( "Brightness", brightness-> value () ); | 232 | config. writeEntry ( "Brightness", brightness-> value () ); |
209 | if (m_cres) | 233 | if (m_cres) |
210 | config. writeEntry ( "Contrast", contrast-> value () ); | 234 | config. writeEntry ( "Contrast", contrast-> value () ); |
235 | config. writeEntry ( "Freq", frequency->currentItem() ); | ||
211 | 236 | ||
212 | // ac | 237 | // ac |
213 | config. setGroup ( "AC" ); | 238 | config. setGroup ( "AC" ); |
214 | config. writeEntry ( "LcdOffOnly", LcdOffOnly_ac-> isChecked ( )); | 239 | config. writeEntry ( "LcdOffOnly", LcdOffOnly_ac-> isChecked ( )); |
215 | config. writeEntry ( "Dim", interval_dim_ac-> value ( )); | 240 | config. writeEntry ( "Dim", interval_dim_ac-> value ( )); |
216 | config. writeEntry ( "LightOff", interval_lightoff_ac-> value ( )); | 241 | config. writeEntry ( "LightOff", interval_lightoff_ac-> value ( )); |
217 | config. writeEntry ( "Suspend", interval_suspend_ac-> value ( )); | 242 | config. writeEntry ( "Suspend", interval_suspend_ac-> value ( )); |
218 | config. writeEntry ( "Brightness", brightness_ac-> value () ); | 243 | config. writeEntry ( "Brightness", brightness_ac-> value () ); |
219 | if (m_cres) | 244 | if (m_cres) |
220 | config. writeEntry ( "Contrast", contrast_ac-> value () ); | 245 | config. writeEntry ( "Contrast", contrast_ac-> value () ); |
246 | config. writeEntry ( "Freq", frequency_ac->currentItem() ); | ||
221 | 247 | ||
222 | // only make light sensor stuff appear if the unit has a sensor | 248 | // only make light sensor stuff appear if the unit has a sensor |
223 | if ( ODevice::inst ( )-> hasLightSensor ( )) { | 249 | if ( ODevice::inst ( )-> hasLightSensor ( )) { |
224 | config. setGroup ( "Battery" ); | 250 | config. setGroup ( "Battery" ); |
225 | config. writeEntry ( "LightSensor", auto_brightness->isChecked() ); | 251 | config. writeEntry ( "LightSensor", auto_brightness->isChecked() ); |
226 | config. writeEntry ( "LightSensorData", m_sensordata, ';' ); | 252 | config. writeEntry ( "LightSensorData", m_sensordata, ';' ); |
227 | config. setGroup ( "AC" ); | 253 | config. setGroup ( "AC" ); |
228 | config. writeEntry ( "LightSensor", auto_brightness_ac->isChecked() ); | 254 | 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 @@ | |||
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | #ifndef __LIGHT_H__ | 28 | #ifndef __LIGHT_H__ |
29 | #define __LIGHT_H__ | 29 | #define __LIGHT_H__ |
30 | 30 | ||
31 | 31 | ||
32 | #include <qstringlist.h> | 32 | #include <qstringlist.h> |
33 | #include <qlistbox.h> | ||
33 | #include "lightsettingsbase.h" | 34 | #include "lightsettingsbase.h" |
34 | 35 | ||
35 | class QTimer; | 36 | class QTimer; |
36 | 37 | ||
37 | class LightSettings : public LightSettingsBase | 38 | class LightSettings : public LightSettingsBase |
38 | { | 39 | { |
39 | Q_OBJECT | 40 | Q_OBJECT |
40 | 41 | ||
@@ -46,22 +47,24 @@ protected: | |||
46 | virtual void accept(); | 47 | virtual void accept(); |
47 | virtual void done ( int r ); | 48 | virtual void done ( int r ); |
48 | 49 | ||
49 | protected slots: | 50 | protected slots: |
50 | virtual void calibrateSensor ( ); | 51 | virtual void calibrateSensor ( ); |
51 | virtual void calibrateSensorAC ( ); | 52 | virtual void calibrateSensorAC ( ); |
52 | void setBacklight ( int ); | 53 | void setBacklight ( int ); |
53 | void setContrast ( int ); | 54 | void setContrast ( int ); |
55 | void setFrequency ( int ); | ||
54 | void resetBacklight ( ); | 56 | void resetBacklight ( ); |
55 | 57 | ||
56 | private: | 58 | private: |
57 | int m_bres; | 59 | int m_bres; |
58 | int m_cres; | 60 | int m_cres; |
59 | int m_oldcontrast; | 61 | int m_oldcontrast; |
62 | int m_oldfreq; | ||
60 | QTimer *m_resettimer; | 63 | QTimer *m_resettimer; |
61 | QStringList m_sensordata; | 64 | QStringList m_sensordata; |
62 | QStringList m_sensordata_ac; | 65 | QStringList m_sensordata_ac; |
63 | }; | 66 | }; |
64 | 67 | ||
65 | 68 | ||
66 | #endif | 69 | #endif |
67 | 70 | ||
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 | |||
774 | return 0; | 774 | return 0; |
775 | } | 775 | } |
776 | 776 | ||
777 | /** | 777 | /** |
778 | * @return a list with valid CPU frequency | 778 | * @return a list with valid CPU frequency |
779 | */ | 779 | */ |
780 | QStrList &ODevice::cpuFrequencies ( ) const | 780 | QStrList &ODevice::cpuFrequencies ( ) const |
781 | { | 781 | { |
782 | qWarning("ODevice::cpuFrequencies: m_cpu_frequencies is %d", (int) d->m_cpu_frequencies); | ||
783 | return *d->m_cpu_frequencies; | 782 | return *d->m_cpu_frequencies; |
784 | } | 783 | } |
785 | 784 | ||
786 | 785 | ||
787 | /** | 786 | /** |
788 | * Set desired cpu frequency | 787 | * Set desired cpu frequency |
789 | * | 788 | * |
790 | * @param index index into d->m_cpu_frequencies of the frequency to be set | 789 | * @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 | |||
792 | bool ODevice::setCpuFrequency(uint index) | 791 | bool ODevice::setCpuFrequency(uint index) |
793 | { | 792 | { |
794 | if (index >= d->m_cpu_frequencies->count()) | 793 | if (index >= d->m_cpu_frequencies->count()) |
795 | return false; | 794 | return false; |
796 | 795 | ||
797 | char *freq = d->m_cpu_frequencies->at(index); | 796 | char *freq = d->m_cpu_frequencies->at(index); |
798 | qWarning("set freq to %s", freq); | 797 | qWarning("set freq to %s", freq); |
799 | 798 | ||
800 | //TODO: do the change in /proc/sys/cpu/0/speed | 799 | int fd; |
801 | |||
802 | return false; | ||
803 | } | ||
804 | 800 | ||
805 | /** | 801 | if ((fd = ::open("/proc/sys/cpu/0/speed", O_WRONLY)) >= 0) { |
806 | * Returns current frequency index out of d->m_cpu_frequencies | 802 | char writeCommand[50]; |
807 | */ | 803 | const int count = sprintf(writeCommand, "%s\n", freq); |
808 | uint ODevice::cpuFrequency() const | 804 | int res = (::write(fd, writeCommand, count) != -1); |
809 | { | 805 | ::close(fd); |
810 | // TODO: get freq from /proc/sys/cpu/0/speed and return index | 806 | return res; |
807 | } | ||
811 | 808 | ||
812 | return 0; | 809 | return false; |
813 | } | 810 | } |
814 | 811 | ||
815 | 812 | ||
816 | |||
817 | /** | 813 | /** |
818 | * @return a list of hardware buttons | 814 | * @return a list of hardware buttons |
819 | */ | 815 | */ |
820 | const QValueList <ODeviceButton> &ODevice::buttons ( ) | 816 | const QValueList <ODeviceButton> &ODevice::buttons ( ) |
821 | { | 817 | { |
822 | initButtons ( ); | 818 | initButtons ( ); |
823 | 819 | ||
824 | return *d-> m_buttons; | 820 | return *d-> m_buttons; |
@@ -1987,21 +1983,36 @@ void Ramses::init() | |||
1987 | QTextStream ts(&f); | 1983 | QTextStream ts(&f); |
1988 | ts.setDevice(&f); | 1984 | ts.setDevice(&f); |
1989 | d->m_sysverstr = ts.readLine(); | 1985 | d->m_sysverstr = ts.readLine(); |
1990 | f.close(); | 1986 | f.close(); |
1991 | } | 1987 | } |
1992 | 1988 | ||
1993 | m_power_timer = 0; | 1989 | m_power_timer = 0; |
1994 | 1990 | ||
1995 | qWarning("adding freq"); | 1991 | #ifdef QT_QWS_ALLOW_OVERCLOCK |
1996 | d->m_cpu_frequencies->append("100"); | 1992 | #warning *** Overclocking enabled - this may fry your hardware - you have been warned *** |
1997 | d->m_cpu_frequencies->append("200"); | 1993 | #define OC(x...) x |
1998 | d->m_cpu_frequencies->append("300"); | 1994 | #else |
1999 | d->m_cpu_frequencies->append("400"); | 1995 | #define OC(x...) |
1996 | #endif | ||
1997 | |||
1998 | |||
1999 | // This table is true for a Intel XScale PXA 255 | ||
2000 | |||
2001 | d->m_cpu_frequencies->append("99000"); // mem= 99, run= 99, turbo= 99, PXbus= 50 | ||
2002 | OC(d->m_cpu_frequencies->append("118000"); ) // mem=118, run=118, turbo=118, PXbus= 59 OC'd mem | ||
2003 | d->m_cpu_frequencies->append("199100"); // mem= 99, run=199, turbo=199, PXbus= 99 | ||
2004 | OC(d->m_cpu_frequencies->append("236000"); ) // mem=118, run=236, turbo=236, PXbus=118 OC'd mem | ||
2005 | d->m_cpu_frequencies->append("298600"); // mem= 99, run=199, turbo=298, PXbus= 99 | ||
2006 | OC(d->m_cpu_frequencies->append("354000"); ) // mem=118, run=236, turbo=354, PXbus=118 OC'd mem | ||
2007 | d->m_cpu_frequencies->append("398099"); // mem= 99, run=199, turbo=398, PXbus= 99 | ||
2008 | d->m_cpu_frequencies->append("398100"); // mem= 99, run=398, turbo=398, PXbus=196 | ||
2009 | OC(d->m_cpu_frequencies->append("471000"); ) // mem=118, run=471, turbo=471, PXbus=236 OC'd mem/core/bus | ||
2010 | |||
2000 | } | 2011 | } |
2001 | 2012 | ||
2002 | bool Ramses::filter(int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat) | 2013 | bool Ramses::filter(int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat) |
2003 | { | 2014 | { |
2004 | Q_UNUSED( keycode ); | 2015 | Q_UNUSED( keycode ); |
2005 | Q_UNUSED( modifiers ); | 2016 | Q_UNUSED( modifiers ); |
2006 | Q_UNUSED( isPress ); | 2017 | Q_UNUSED( isPress ); |
2007 | Q_UNUSED( autoRepeat ); | 2018 | Q_UNUSED( autoRepeat ); |
@@ -2139,18 +2150,16 @@ bool Ramses::setDisplayContrast(int contr) | |||
2139 | 2150 | ||
2140 | if ((fd = ::open("/proc/sys/board/pwm0", O_WRONLY)) >= 0) { | 2151 | if ((fd = ::open("/proc/sys/board/pwm0", O_WRONLY)) >= 0) { |
2141 | qDebug(" %d -> pwm0", contr); | 2152 | qDebug(" %d -> pwm0", contr); |
2142 | char writeCommand[100]; | 2153 | char writeCommand[100]; |
2143 | const int count = sprintf(writeCommand, "%d\n", contr); | 2154 | const int count = sprintf(writeCommand, "%d\n", contr); |
2144 | res = (::write(fd, writeCommand, count) != -1); | 2155 | res = (::write(fd, writeCommand, count) != -1); |
2145 | res = true; | 2156 | res = true; |
2146 | ::close(fd); | 2157 | ::close(fd); |
2147 | } else { | ||
2148 | qWarning("no write"); | ||
2149 | } | 2158 | } |
2150 | return res; | 2159 | return res; |
2151 | } | 2160 | } |
2152 | 2161 | ||
2153 | 2162 | ||
2154 | int Ramses::displayContrastResolution() const | 2163 | int Ramses::displayContrastResolution() const |
2155 | { | 2164 | { |
2156 | return 20; | 2165 | 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: | |||
195 | virtual bool setLedState ( OLed led, OLedState st ); | 195 | virtual bool setLedState ( OLed led, OLedState st ); |
196 | 196 | ||
197 | virtual bool hasLightSensor ( ) const; | 197 | virtual bool hasLightSensor ( ) const; |
198 | virtual int readLightSensor ( ); | 198 | virtual int readLightSensor ( ); |
199 | virtual int lightSensorResolution ( ) const; | 199 | virtual int lightSensorResolution ( ) const; |
200 | 200 | ||
201 | QStrList &cpuFrequencies() const; | 201 | QStrList &cpuFrequencies() const; |
202 | bool setCpuFrequency(uint index); | 202 | bool setCpuFrequency(uint index); |
203 | uint cpuFrequency() const; | 203 | int cpuFrequency() const; |
204 | 204 | ||
205 | /** | 205 | /** |
206 | * Returns the available buttons on this device. The number and location | 206 | * Returns the available buttons on this device. The number and location |
207 | * of buttons will vary depending on the device. Button numbers will be assigned | 207 | * of buttons will vary depending on the device. Button numbers will be assigned |
208 | * by the device manufacturer and will be from most preferred button to least preffered | 208 | * by the device manufacturer and will be from most preferred button to least preffered |
209 | * button. Note that this list only contains "user mappable" buttons. | 209 | * button. Note that this list only contains "user mappable" buttons. |
210 | */ | 210 | */ |
211 | const QValueList<ODeviceButton> &buttons ( ); | 211 | const QValueList<ODeviceButton> &buttons ( ); |