3 files changed, 211 insertions, 1 deletions

diff --git a/config.in b/config.in
index 6b63da1..57036a9 100644
--- a/config.in
+++ b/config.in
@@ -9,86 +9,93 @@ menu "Build Parameters"
 #    building the OpenZaurus buildroot on.
 #
 #  config BUILD_X86
 #    boolean "X86 Architecture"
 #
 #endchoice
 
 choice
   prompt "Target Machine"
   default TARGET_X86
   help
     Please select the architecture of the machine you will be
     building the OpenZaurus buildroot for.
 
   config TARGET_X86
     boolean "Intel X86"
 
   config TARGET_SHARP
     boolean "Sharp Zaurus SL-5x00 - stock"
 
 #  config TARGET_OZ
 #    boolean "Sharp Zaurus SL-5x00 - OpenZaurus"
 
   config TARGET_IPAQ
-    boolean "Ipaq"
+    boolean "iPAQ"
+
+  config TARGET_RAMSES
+    boolean "Ramses"
 
 endchoice
 
 config OPTIMIZE
   boolean "Use optimizations"
   default "y" if ! TARGET_X86
 
 config DEBUG
   boolean "Enable debug builds"
   default n
 
   config RELEASE
     bool
     default y
     depends ! DEBUG
 
 config SPECFILE
   string
   default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
   default "linux-g++" if TARGET_X86 && X11
   default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
   default "linux-g++" if TARGET_SHARP && X11
 #  default "linux-oz-g++" if TARGET_OZ
   default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
   default "linux-g++" if TARGET_IPAQ && X11
+  default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11)
+  default "linux-g++" if TARGET_RAMSES && X11
 
 config CUSTOMFILE
   string
   default "custom-ipaq.h" if TARGET_IPAQ
   default "custom-sharp.h" if TARGET_SHARP
+  default "custom-ramses.h" if TARGET_RAMSES
   
 
 config OPTIMIZATIONS
   string "Optimization flags"
   depends OPTIMIZE
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
   default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
+  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_RAMSES
 
 #config CROSS
 #  string "Crosscompilation prefix"
 #  default "arm-linux-"
 #  help
 #    Crosscompilation prefix is the prefix which will be prepended
 #    to all compilation commands. For example, a crosscompilation prefix
 #    of arm-linux-, results in the build calling arm-linux-gcc as its CC.
 
 config EXPERIMENTAL
   bool "Prompt for development and/or incomplete items"
   default y
 
 endmenu
 
 menu "Base"
   choice
     prompt "Qpe Library Selection"
     default LIBQPE
     
     source library/config.in
     source x11/config.in
   endchoice
   source libopie/config.in
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index f0429d4..d86654e 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -140,48 +140,67 @@ protected:
 public:
         virtual bool setSoftSuspend ( bool soft );
         virtual bool suspend();
 
         virtual bool setDisplayStatus( bool on );
         virtual bool setDisplayBrightness ( int b );
         virtual int displayBrightnessResolution ( ) const;
 
         virtual void alarmSound ( );
 
     virtual QValueList <OLed> ledList ( ) const;
         virtual QValueList <OLedState> ledStateList ( OLed led ) const;
         virtual OLedState ledState ( OLed led ) const;
         virtual bool setLedState ( OLed led, OLedState st );
 
 protected:
         virtual bool filter ( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
         virtual void timerEvent ( QTimerEvent *te );
 
         int m_power_timer;
 
         OLedState m_leds [1]; //FIXME check if really only one
 };
 
+class Ramses : public ODevice, public QWSServer::KeyboardFilter {
+protected:
+        virtual void init ( );
+        virtual void initButtons ( );
+
+public:
+        virtual bool setSoftSuspend ( bool soft );
+
+        virtual bool setDisplayStatus( bool on );
+        virtual bool setDisplayBrightness ( int b );
+        virtual int displayBrightnessResolution ( ) const;
+
+protected:
+        virtual bool filter ( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
+        virtual void timerEvent ( QTimerEvent *te );
+
+        int m_power_timer;
+};
+
 struct i_button {
         uint model;
     Qt::Key code;
     char *utext;
     char *pix;
     char *fpressedservice;
     char *fpressedaction;
     char *fheldservice;
     char *fheldaction;
 } ipaq_buttons [] = {
     { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx,
     Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
         "devicebuttons/ipaq_calendar",
         "datebook", "nextView()",
         "today", "raise()" },
     { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx,
     Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
         "devicebuttons/ipaq_contact",
         "addressbook", "raise()",
         "addressbook", "beamBusinessCard()" },
     { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx,
     Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
         "devicebuttons/ipaq_menu",
          "QPE/TaskBar", "toggleMenu()",
@@ -301,72 +320,96 @@ struct s_button {
     { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
     Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Upper+Right"),
     "devicebuttons/simpad_upper_right",
     "QPE/TaskBar", "toggleMenu()",
     "QPE/TaskBar", "toggleStartMenu()" },
     { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
     Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Upper+Left"),
     "devicebuttons/simpad_upper_left",
     "QPE/Rotation", "flip()",
     "QPE/Rotation", "flip()" },
     /*
     { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
     Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Lower+Upper"),
     "devicebuttons/simpad_lower_upper",
     "QPE/Launcher", "home()",
     "buttonsettings", "raise()" },
     { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
     Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Lower+Upper"),
     "devicebuttons/simpad_upper_lower",
     "QPE/Launcher", "home()",
     "buttonsettings", "raise()" },
     */
 };
 
+struct r_button {
+        uint model;
+    Qt::Key code;
+    char *utext;
+    char *pix;
+    char *fpressedservice;
+    char *fpressedaction;
+    char *fheldservice;
+    char *fheldaction;
+} ramses_buttons [] = {
+    { Model_Ramses_MNCI,
+    Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
+        "devicebuttons/simpad_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()" },
+};
+
 static QCString makeChannel ( const char *str )
 {
         if ( str && !::strchr ( str, '/' ))
                 return QCString ( "QPE/Application/" ) + str;
         else
                 return str;
 }
 
 static inline bool isQWS()
 {
         return qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false;
 }
 
 ODevice *ODevice::inst ( )
 {
         static ODevice *dev = 0;
 
         if ( !dev ) {
                 if ( QFile::exists ( "/proc/hal/model" ))
                         dev = new iPAQ ( );
                 else if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
                         dev = new Zaurus ( );
                 else if ( QFile::exists ( "/proc/ucb1x00" ) && QFile::exists ( "/proc/cs3" ))
                         dev = new SIMpad ( );
+                else if ( QFile::exists ( "/proc/sys/board/name" ))
+                        dev = new Ramses ( );
                 else
                         dev = new ODevice ( );
 
                 dev-> init ( );
         }
         return dev;
 }
 
 
 /**************************************************
  *
  * common
  *
  **************************************************/
 
 
 ODevice::ODevice ( )
 {
         d = new ODeviceData;
 
         d-> m_modelstr = "Unknown";
         d-> m_model = Model_Unknown;
         d-> m_vendorstr = "Unknown";
         d-> m_vendor = Vendor_Unknown;
@@ -1823,24 +1866,178 @@ bool SIMpad::setDisplayBrightness ( int bright )
                 value += mask;
                 char writeCommand[100];
                 const int count = sprintf( writeCommand, "0x%x\n", value );
                 res = ( ::write ( fd, writeCommand, count ) != -1 );
                 ::close ( fd );
         }
         return res;
 }
 
 
 int SIMpad::displayBrightnessResolution ( ) const
 {
         switch ( model ( )) {
                 case Model_SIMpad_CL4:
                 case Model_SIMpad_SL4:
                 case Model_SIMpad_SLC:
                 case Model_SIMpad_TSinus:
                         return 255; //TODO find out if this is save
 
                 default:
                         return 2;
         }
 }
 
+/**************************************************
+ *
+ * Ramses
+ *
+ **************************************************/
+
+void Ramses::init ( )
+{
+        d->m_vendorstr = "M und N";
+        d->m_vendor = Vendor_MundN;
+
+        QFile f( "/proc/sys/board/ramses" );
+
+        d->m_modelstr = "Ramses";
+        d->m_model = Model_Ramses_MNCI;
+
+        d->m_rotation = Rot180;
+        d->m_direction = CCW;
+        d->m_holdtime = 1000;
+
+        f.setName( "/etc/oz_version" );
+
+        if ( f.open( IO_ReadOnly )) {
+                   d->m_systemstr = "OpenEmbedded/Ramses";
+                    d->m_system = System_OpenZaurus;
+
+                QTextStream ts ( &f );
+                ts.setDevice ( &f );
+                d->m_sysverstr = ts.readLine ( );
+                f.close ( );
+        }
+
+        m_power_timer = 0;
+
+}
+
+void Ramses::initButtons ( )
+{
+        if ( d->m_buttons )
+                return;
+
+        if ( isQWS( ) )
+                QWSServer::setKeyboardFilter ( this );
+
+        d->m_buttons = new QValueList <ODeviceButton>;
+
+        for ( uint i = 0; i < ( sizeof( ramses_buttons ) / sizeof( s_button )); i++ ) {
+                r_button *rb = ramses_buttons + i;
+                ODeviceButton b;
+
+                if (( rb->model & d->m_model ) == d->m_model ) {
+                        b.setKeycode( rb->code );
+                        b.setUserText( QObject::tr ( "Button", rb->utext ));
+                        b.setPixmap( Resource::loadPixmap ( rb->pix ));
+                        b.setFactoryPresetPressedAction( OQCopMessage ( makeChannel ( rb->fpressedservice ), rb->fpressedaction ));
+                        b.setFactoryPresetHeldAction( OQCopMessage ( makeChannel ( rb->fheldservice ), rb->fheldaction ));
+
+                        d->m_buttons->append( b );
+                }
+        }
+        reloadButtonMapping();
+
+        QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
+        connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
+}
+
+bool Ramses::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
+{
+        //TODO
+        return false;
+}
+
+void Ramses::timerEvent ( QTimerEvent * )
+{
+        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 )
+{
+        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" );
+
+    return res;
+}
+
+/**
+ * This sets the display on or off
+ */
+bool Ramses::setDisplayStatus ( bool on )
+{
+        bool res = false;
+        int fd;
+
+        if (( fd = ::open ( "/dev/fb/0", O_RDWR )) >= 0 ) {
+                res = ( ::ioctl ( fd, FBIOBLANK, on ? VESA_NO_BLANKING : VESA_POWERDOWN ) == 0 );
+                ::close ( fd );
+        }
+        return res;
+}
+
+
+bool Ramses::setDisplayBrightness ( int bright )
+{
+        qDebug( "ODevice for Ramses: setDisplayBrightness( %d )", bright );
+        bool res = false;
+        int fd;
+
+        if ( bright > 255 )
+                bright = 100;
+        if ( bright < 0 )
+                bright = 0;
+
+        if (( fd = ::open ( "/proc/sys/board/pwm0", O_WRONLY )) >= 0 ) {
+                char writeCommand[100];
+                const int count = sprintf( writeCommand, "%d\n", bright);
+                res = ( ::write ( fd, writeCommand, count ) != -1 );
+                ::close ( fd );
+        }
+        return res;
+}
+
+
+int Ramses::displayBrightnessResolution ( ) const
+{
+        return 100;
+}
diff --git a/libopie/odevice.h b/libopie/odevice.h
index dcdd4a8..5829440 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -43,59 +43,65 @@ enum OModel {
         Model_iPAQ          = ( 1 << 24 ),
 
         Model_iPAQ_All      = ( Model_iPAQ | 0xffffff ),
         Model_iPAQ_H31xx    = ( Model_iPAQ | 0x000001 ),
         Model_iPAQ_H36xx    = ( Model_iPAQ | 0x000002 ),
         Model_iPAQ_H37xx    = ( Model_iPAQ | 0x000004 ),
         Model_iPAQ_H38xx    = ( Model_iPAQ | 0x000008 ),
         Model_iPAQ_H39xx    = ( Model_iPAQ | 0x000010 ),
 
         Model_Zaurus        = ( 2 << 24 ),
 
         Model_Zaurus_SL5000 = ( Model_Zaurus | 0x000001 ),
         Model_Zaurus_SL5500 = ( Model_Zaurus | 0x000002 ),
         Model_Zaurus_SLA300 = ( Model_Zaurus | 0x000003 ),
         Model_Zaurus_SLB600 = ( Model_Zaurus | 0x000004 ),
         Model_Zaurus_SLC700 = ( Model_Zaurus | 0x000005 ),
 
         Model_SIMpad        = ( 3 << 24 ),
 
         Model_SIMpad_All    = ( Model_SIMpad | 0xffffff ),
         Model_SIMpad_CL4    = ( Model_SIMpad | 0x000001 ),
         Model_SIMpad_SL4    = ( Model_SIMpad | 0x000002 ),
         Model_SIMpad_SLC    = ( Model_SIMpad | 0x000004 ),
         Model_SIMpad_TSinus = ( Model_SIMpad | 0x000008 ),
+
+        Model_Ramses        = ( 4 << 24 ),
+
+        Model_Ramses_All    = ( Model_Ramses | 0xffffff ),
+        Model_Ramses_MNCI   = ( Model_Ramses | 0x000001 ),
 };
 
 /**
  * The vendor of the device
  */
 enum OVendor {
         Vendor_Unknown,
 
         Vendor_HP,
         Vendor_Sharp,
         Vendor_SIEMENS,
+        Vendor_MundN,
 };
 
 /**
  * The System used
  */
 enum OSystem {
         System_Unknown,
 
         System_Familiar,
         System_Zaurus,
         System_OpenZaurus
 };
 
 enum OLedState {
         Led_Off,
         Led_On,
         Led_BlinkSlow,
         Led_BlinkFast
 };
 
 enum OLed {
         Led_Mail,
         Led_Power,
         Led_BlueTooth