1 files changed, 4 insertions, 4 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 4c33a0e..d6e6892 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -714,142 +714,142 @@ void ODevice::touchSound ( )
 /**
 * This method will return a list of leds
 * available on this device
 * @return a list of LEDs.
 */
 QValueList <OLed> ODevice::ledList ( ) const
 {
        return QValueList <OLed> ( );
 }
 /**
 * This does return the state of the LEDs
 */
 QValueList <OLedState> ODevice::ledStateList ( OLed /*which*/ ) const
 {
        return QValueList <OLedState> ( );
 }
 /**
 * @return the state for a given OLed
 */
 OLedState ODevice::ledState ( OLed /*which*/ ) const
 {
        return Led_Off;
 }
 /**
 * Set the state for a LED
 * @param which Which OLed to use
 * @param st The state to set
 * @return success or failure
 */
 bool ODevice::setLedState ( OLed which, OLedState st )
 {
        Q_UNUSED( which )
        Q_UNUSED( st    )
        return false;
 }
 /**
 * @return if the device has a light sensor
 */
 bool ODevice::hasLightSensor ( ) const
 {
        return false;
 }
 /**
 * @return a value from the light senso
 */
 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
+ * @return a list with CPU frequencies supported by the hardware
 */
-QStrList &ODevice::cpuFrequencies ( ) const
+const QStrList &ODevice::allowedCpuFrequencies ( ) const
 {
        return *d->m_cpu_frequencies;
 }
 /**
- * Set desired cpu frequency
+ * Set desired CPU frequency
 * 
 * @param index index into d->m_cpu_frequencies of the frequency to be set
 */
-bool ODevice::setCpuFrequency(uint index)
+bool ODevice::setCurrentCpuFrequency(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);
        int fd;
        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 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;
 }
 /**
 * This method return a ODeviceButton for a key code
 * or 0 if no special hardware button is available for the device
 *
 * @return The devicebutton or 0l
 * @see ODeviceButton
 */
 const ODeviceButton *ODevice::buttonForKeycode ( ushort code )
 {
        initButtons ( );
        for ( QValueListConstIterator<ODeviceButton> it = d-> m_buttons-> begin ( ); it != d-> m_buttons-> end ( ); ++it ) {
                if ( (*it). keycode ( ) == code )
                        return &(*it);
        }
        return 0;
 }
 void ODevice::reloadButtonMapping ( )
 {
        initButtons ( );
        Config cfg ( "ButtonSettings" );
        for ( uint i = 0; i < d-> m_buttons-> count ( ); i++ ) {

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index 4c33a0e..d6e6892 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp
@@ -714,142 +714,142 @@ void ODevice::touchSound ( )
714	/**	714	/**
715	* This method will return a list of leds	715	* This method will return a list of leds
716	* available on this device	716	* available on this device
717	* @return a list of LEDs.	717	* @return a list of LEDs.
718	*/	718	*/
719	QValueList <OLed> ODevice::ledList ( ) const	719	QValueList <OLed> ODevice::ledList ( ) const
720	{	720	{
721	return QValueList <OLed> ( );	721	return QValueList <OLed> ( );
722	}	722	}
723		723
724	/**	724	/**
725	* This does return the state of the LEDs	725	* This does return the state of the LEDs
726	*/	726	*/
727	QValueList <OLedState> ODevice::ledStateList ( OLed /which/ ) const	727	QValueList <OLedState> ODevice::ledStateList ( OLed /which/ ) const
728	{	728	{
729	return QValueList <OLedState> ( );	729	return QValueList <OLedState> ( );
730	}	730	}
731		731
732	/**	732	/**
733	* @return the state for a given OLed	733	* @return the state for a given OLed
734	*/	734	*/
735	OLedState ODevice::ledState ( OLed /which/ ) const	735	OLedState ODevice::ledState ( OLed /which/ ) const
736	{	736	{
737	return Led_Off;	737	return Led_Off;
738	}	738	}
739		739
740	/**	740	/**
741	* Set the state for a LED	741	* Set the state for a LED
742	* @param which Which OLed to use	742	* @param which Which OLed to use
743	* @param st The state to set	743	* @param st The state to set
744	* @return success or failure	744	* @return success or failure
745	*/	745	*/
746	bool ODevice::setLedState ( OLed which, OLedState st )	746	bool ODevice::setLedState ( OLed which, OLedState st )
747	{	747	{
748	Q_UNUSED( which )	748	Q_UNUSED( which )
749	Q_UNUSED( st )	749	Q_UNUSED( st )
750	return false;	750	return false;
751	}	751	}
752		752
753	/**	753	/**
754	* @return if the device has a light sensor	754	* @return if the device has a light sensor
755	*/	755	*/
756	bool ODevice::hasLightSensor ( ) const	756	bool ODevice::hasLightSensor ( ) const
757	{	757	{
758	return false;	758	return false;
759	}	759	}
760		760
761	/**	761	/**
762	* @return a value from the light senso	762	* @return a value from the light senso
763	*/	763	*/
764	int ODevice::readLightSensor ( )	764	int ODevice::readLightSensor ( )
765	{	765	{
766	return -1;	766	return -1;
767	}	767	}
768		768
769	/**	769	/**
770	* @return the light sensor resolution whatever that is ;)	770	* @return the light sensor resolution whatever that is ;)
771	*/	771	*/
772	int ODevice::lightSensorResolution ( ) const	772	int ODevice::lightSensorResolution ( ) const
773	{	773	{
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 CPU frequencies supported by the hardware
779	*/	779	*/
780	QStrList &ODevice::cpuFrequencies ( ) const	780	const QStrList &ODevice::allowedCpuFrequencies ( ) const
781	{	781	{
782	return *d->m_cpu_frequencies;	782	return *d->m_cpu_frequencies;
783	}	783	}
784		784
785		785
786	/**	786	/**
787	* Set desired cpu frequency	787	* Set desired CPU frequency
788	*	788	*
789	* @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
790	*/	790	*/
791	bool ODevice::setCpuFrequency(uint index)	791	bool ODevice::setCurrentCpuFrequency(uint index)
792	{	792	{
793	if (index >= d->m_cpu_frequencies->count())	793	if (index >= d->m_cpu_frequencies->count())
794	return false;	794	return false;
795		795
796	char *freq = d->m_cpu_frequencies->at(index);	796	char *freq = d->m_cpu_frequencies->at(index);
797	qWarning("set freq to %s", freq);	797	qWarning("set freq to %s", freq);
798		798
799	int fd;	799	int fd;
800		800
801	if ((fd = ::open("/proc/sys/cpu/0/speed", O_WRONLY)) >= 0) {	801	if ((fd = ::open("/proc/sys/cpu/0/speed", O_WRONLY)) >= 0) {
802	char writeCommand[50];	802	char writeCommand[50];
803	const int count = sprintf(writeCommand, "%s\n", freq);	803	const int count = sprintf(writeCommand, "%s\n", freq);
804	int res = (::write(fd, writeCommand, count) != -1);	804	int res = (::write(fd, writeCommand, count) != -1);
805	::close(fd);	805	::close(fd);
806	return res;	806	return res;
807	}	807	}
808		808
809	return false;	809	return false;
810	}	810	}
811		811
812		812
813	/**	813	/**
814	* @return a list of hardware buttons	814	* @return a list of hardware buttons
815	*/	815	*/
816	const QValueList <ODeviceButton> &ODevice::buttons ( )	816	const QValueList <ODeviceButton> &ODevice::buttons ( )
817	{	817	{
818	initButtons ( );	818	initButtons ( );
819		819
820	return *d-> m_buttons;	820	return *d-> m_buttons;
821	}	821	}
822		822
823	/**	823	/**
824	* @return The amount of time that would count as a hold	824	* @return The amount of time that would count as a hold
825	*/	825	*/
826	uint ODevice::buttonHoldTime ( ) const	826	uint ODevice::buttonHoldTime ( ) const
827	{	827	{
828	return d-> m_holdtime;	828	return d-> m_holdtime;
829	}	829	}
830		830
831	/**	831	/**
832	* This method return a ODeviceButton for a key code	832	* This method return a ODeviceButton for a key code
833	* or 0 if no special hardware button is available for the device	833	* or 0 if no special hardware button is available for the device
834	*	834	*
835	* @return The devicebutton or 0l	835	* @return The devicebutton or 0l
836	* @see ODeviceButton	836	* @see ODeviceButton
837	*/	837	*/
838	const ODeviceButton *ODevice::buttonForKeycode ( ushort code )	838	const ODeviceButton *ODevice::buttonForKeycode ( ushort code )
839	{	839	{
840	initButtons ( );	840	initButtons ( );
841		841
842	for ( QValueListConstIterator<ODeviceButton> it = d-> m_buttons-> begin ( ); it != d-> m_buttons-> end ( ); ++it ) {	842	for ( QValueListConstIterator<ODeviceButton> it = d-> m_buttons-> begin ( ); it != d-> m_buttons-> end ( ); ++it ) {
843	if ( (*it). keycode ( ) == code )	843	if ( (*it). keycode ( ) == code )
844	return &(*it);	844	return &(*it);
845	}	845	}
846	return 0;	846	return 0;
847	}	847	}
848		848
849	void ODevice::reloadButtonMapping ( )	849	void ODevice::reloadButtonMapping ( )
850	{	850	{
851	initButtons ( );	851	initButtons ( );
852		852
853	Config cfg ( "ButtonSettings" );	853	Config cfg ( "ButtonSettings" );
854		854
855	for ( uint i = 0; i < d-> m_buttons-> count ( ); i++ ) {	855	for ( uint i = 0; i < d-> m_buttons-> count ( ); i++ ) {