summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_ramses.cpp170
-rw-r--r--libopie2/opiecore/device/odevice_ramses.h34
2 files changed, 50 insertions, 154 deletions
diff --git a/libopie2/opiecore/device/odevice_ramses.cpp b/libopie2/opiecore/device/odevice_ramses.cpp
index 7db2af1..0cddf85 100644
--- a/libopie2/opiecore/device/odevice_ramses.cpp
+++ b/libopie2/opiecore/device/odevice_ramses.cpp
@@ -58,14 +58,2 @@ using namespace Opie::Core::Internal;
-struct r_button ramses_buttons [] = {
- { Model_Ramses_MNCI,
- Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
- "devicebuttons/z_menu",
- "QPE/TaskBar", "toggleMenu()",
- "QPE/TaskBar", "toggleStartMenu()" },
- { Model_Ramses_MNCI,
- Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
- "devicebuttons/ipaq_home",
- "QPE/Launcher", "home()",
- "buttonsettings", "raise()" },
-};
@@ -76,17 +64,19 @@ void Ramses::init(const QString&)
- QFile f("/proc/sys/board/ramses");
+ // with old Prototype-LCD, /proc/sys/board/lcd_type = 1
+ //d->m_modelstr = "Ramses";
+ //d->m_model = Model_Ramses_MNCI;
+ //d->m_rotation = Rot0;
- d->m_modelstr = "Ramses";
- d->m_model = Model_Ramses_MNCI;
+ // all current Hardware, with /proc/sys/board/lcd_type = 2
+ d->m_modelstr = "MNCIRX";
+ d->m_model = Model_Ramses_MNCIRX;
+ d->m_rotation = Rot90;
- d->m_rotation = Rot0;
- d->m_holdtime = 1000;
+ d->m_holdtime = 500;
- // Distribution detection code now in the base class
- m_power_timer = 0;
+ // This table is true for a Intel XScale PXA 255
#ifdef QT_QWS_ALLOW_OVERCLOCK
-#warning *** Overclocking enabled - this may fry your hardware - you have been warned ***
-#define OC(x...) x
+#define OC(x...) x
#else
@@ -95,68 +85,23 @@ void Ramses::init(const QString&)
- // 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
+ 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
+ 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
+ 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
-
+ 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 *)
+void Ramses::playAlarmSound()
{
- killTimer(m_power_timer);
- m_power_timer = 0;
- QWSServer::sendKeyEvent(-1, HardKey_Backlight, 0, true, false);
- QWSServer::sendKeyEvent(-1, HardKey_Backlight, 0, false, false);
-}
-
-
-bool Ramses::setSoftSuspend(bool soft)
-{
- qDebug("Ramses::setSoftSuspend(%d)", soft);
-#if 0
- bool res = false;
- int fd;
-
- if (((fd = ::open("/dev/apm_bios", O_RDWR)) >= 0) ||
- ((fd = ::open("/dev/misc/apm_bios",O_RDWR)) >= 0)) {
-
- int sources = ::ioctl(fd, APM_IOCGEVTSRC, 0); // get current event sources
-
- if (sources >= 0) {
- if (soft)
- sources &= ~APM_EVT_POWER_BUTTON;
- else
- sources |= APM_EVT_POWER_BUTTON;
-
- if (::ioctl(fd, APM_IOCSEVTSRC, sources) >= 0) // set new event sources
- res = true;
- else
- perror("APM_IOCGEVTSRC");
- }
- else
- perror("APM_IOCGEVTSRC");
-
- ::close(fd);
- }
- else
- perror("/dev/apm_bios or /dev/misc/apm_bios");
+#ifndef QT_NO_SOUND
+ static Sound snd ( "alarm" );
- return res;
+ changeMixerForAlarm( 0, "/dev/sound/mixer" , &snd);
+ snd.play();
#else
- return true;
+#error QT_NO_SOUND defined
#endif
@@ -164,26 +109,20 @@ bool Ramses::setSoftSuspend(bool soft)
+
bool Ramses::suspend()
{
- qDebug("Ramses::suspend");
- return false;
-}
+ if ( !isQWS( ) ) // only qwsserver is allowed to suspend
+ return false;
-/**
-* This sets the display on or off
-*/
-bool Ramses::setDisplayStatus(bool on)
-{
- qDebug("Ramses::setDisplayStatus(%d)", on);
-#if 0
- bool res = false;
- int fd;
+ sendSuspendmsg();
+ ::sync();
- if ((fd = ::open ("/dev/fb/0", O_RDWR)) >= 0) {
- res = (::ioctl(fd, FBIOBLANK, on ? VESA_NO_BLANKING : VESA_POWERDOWN) == 0);
+ int fd;
+ if ((fd = ::open("/proc/sys/pm/suspend", O_WRONLY)) >= 0) {
+ char writeCommand[] = "1\n";
+ ::write(fd, writeCommand, sizeof(writeCommand) );
::close(fd);
}
- return res;
-#else
+
+ ::usleep ( 200 * 1000 );
return true;
-#endif
}
@@ -191,8 +130,5 @@ bool Ramses::setDisplayStatus(bool on)
-/*
-* We get something between 0..255 into us
-*/
bool Ramses::setDisplayBrightness(int bright)
{
- qDebug("Ramses::setDisplayBrightness(%d)", bright);
+ //qDebug("Ramses::setDisplayBrightness(%d)", bright);
bool res = false;
@@ -207,3 +143,3 @@ bool Ramses::setDisplayBrightness(int bright)
- // Turn backlight completely off
+ // Turn backlight completely off if brightness=0
if ((fd = ::open("/proc/sys/board/lcd_backlight", O_WRONLY)) >= 0) {
@@ -215,7 +151,4 @@ bool Ramses::setDisplayBrightness(int bright)
- // scale backlight brightness to hardware
- bright = 500-(bright * 500 / 255);
- if ((fd = ::open("/proc/sys/board/pwm1", O_WRONLY)) >= 0) {
- qDebug(" %d ->pwm1", bright);
- char writeCommand[100];
+ if ((fd = ::open("/proc/sys/board/lcd_brightness", O_WRONLY)) >= 0) {
+ char writeCommand[10];
const int count = sprintf(writeCommand, "%d\n", bright);
@@ -233,32 +166,3 @@ int Ramses::displayBrightnessResolution() const
-bool Ramses::setDisplayContrast(int contr)
-{
- qDebug("Ramses::setDisplayContrast(%d)", contr);
- bool res = false;
- int fd;
-
- // 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);
- }
- return res;
-}
-
-
-int Ramses::displayContrastResolution() const
-{
- return 20;
-}
+// TODO: add displayContrast for old MNCI
diff --git a/libopie2/opiecore/device/odevice_ramses.h b/libopie2/opiecore/device/odevice_ramses.h
index 3cf5e92..bbd3862 100644
--- a/libopie2/opiecore/device/odevice_ramses.h
+++ b/libopie2/opiecore/device/odevice_ramses.h
@@ -36,2 +36,13 @@
+
+#ifndef OD_IOC
+#define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
+#define OD_IO(type,number) OD_IOC(0,type,number,0)
+#define OD_IOW(type,number,size) OD_IOC(1,type,number,sizeof(size))
+#define OD_IOR(type,number,size) OD_IOC(2,type,number,sizeof(size))
+#define OD_IORW(type,number,size) OD_IOC(3,type,number,sizeof(size))
+#endif
+
+
+
namespace Opie {
@@ -40,3 +51,3 @@ namespace Internal {
-class Ramses : public ODevice, public QWSServer::KeyboardFilter
+class Ramses : public ODevice
{
@@ -46,28 +57,9 @@ class Ramses : public ODevice, public QWSServer::KeyboardFilter
public:
- virtual bool setSoftSuspend( bool soft );
virtual bool suspend();
- virtual bool setDisplayStatus( bool on );
virtual bool setDisplayBrightness( int b );
virtual int displayBrightnessResolution() const;
- virtual bool setDisplayContrast( int b );
- virtual int displayContrastResolution() const;
-
- protected:
- virtual bool filter ( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
- virtual void timerEvent ( QTimerEvent *te );
-
- int m_power_timer;
+ virtual void playAlarmSound();
};
-struct r_button {
- uint model;
- Qt::Key code;
- char *utext;
- char *pix;
- char *fpressedservice;
- char *fpressedaction;
- char *fheldservice;
- char *fheldaction;
-};
}