1 files changed, 29 insertions, 78 deletions

diff --git a/libopie2/opiecore/device/odevice_yopy.cpp b/libopie2/opiecore/device/odevice_yopy.cpp
index 9d0cdeb..a76f90b 100644
--- a/libopie2/opiecore/device/odevice_yopy.cpp
+++ b/libopie2/opiecore/device/odevice_yopy.cpp
@@ -1,33 +1,33 @@
 /*
                              This file is part of the Opie Project
-                             Copyright (C) The Opie Team <opie-devel@handhelds.org>
+                            Copyright (C) The Opie Team <opie-devel@handhelds.org>
               =.
             .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
+          .>+-=
+_;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program is distributed in the hope that
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+- .   .-<_>     .<>         Foundation; either version 2 of the License,
+    ._= =}       :          or (at your option) any later version.
+   .%`+i>       _;_.
+   .i_,=:_.      -<s.       This program is distributed in the hope that
+    +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+   : ..    .:,     . . .    without even the implied warranty of
+   =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+ _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
- :     =  ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+:     =  ...= . :.=-
+-.   .:....=;==+<;          You should have received a copy of the GNU
+ -_. . .   )=.  =           Library General Public License along with
+   --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
-#include "odevice.h"
+#include "odevice_yopy.h"
 
 /* QT */
 #include <qapplication.h>
@@ -53,46 +53,9 @@
 #include <linux/soundcard.h>
 #endif
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#endif
-
-// _IO and friends are only defined in kernel headers ...
-
-#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))
-
 using namespace Opie;
 
-class Yopy : public ODevice
-{
-  protected:
-
-    virtual void init();
-    virtual void initButtons();
-
-  public:
-    virtual bool suspend();
-
-    virtual bool setDisplayBrightness ( int b );
-    virtual int displayBrightnessResolution() const;
-
-    static bool isYopy();
-};
-
-struct yopy_button {
-    Qt::Key code;
-    char *utext;
-    char *pix;
-    char *fpressedservice;
-    char *fpressedaction;
-    char *fheldservice;
-    char *fheldaction;
-} yopy_buttons [] = {
+struct yopy_button yopy_buttons [] = {
 { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Action Button"),
     "devicebuttons/yopy_action",
     "datebook", "nextView()",
@@ -107,26 +70,6 @@ struct yopy_button {
     "buttonsettings", "raise()" },
 };
 
-bool Yopy::isYopy()
-{
-QFile f( "/proc/cpuinfo" );
-if ( f. open ( IO_ReadOnly ) ) {
-    QTextStream ts ( &f );
-    QString line;
-    while( line = ts. readLine() ) {
-    if ( line. left ( 8 ) == "Hardware" ) {
-    int loc = line. find ( ":" );
-    if ( loc != -1 ) {
-    QString model =
-        line. mid ( loc + 2 ). simplifyWhiteSpace( );
-    return ( model == "Yopy" );
-    }
-    }
-    }
-}
-return false;
-}
-
 void Yopy::init()
 {
 d->m_vendorstr = "G.Mate";
@@ -139,7 +82,8 @@ d->m_systemstr = "Linupy";
 d->m_system = System_Linupy;
 
 QFile f ( "/etc/issue" );
-if ( f. open ( IO_ReadOnly )) {
+    if ( f. open ( IO_ReadOnly ) )
+    {
     QTextStream ts ( &f );
     ts.readLine();
     d->m_sysverstr = ts. readLine();
@@ -147,6 +91,7 @@ if ( f. open ( IO_ReadOnly )) {
 }
 }
 
+
 void Yopy::initButtons()
 {
 if ( d->m_buttons )
@@ -154,7 +99,8 @@ if ( d->m_buttons )
 
 d->m_buttons = new QValueList <ODeviceButton>;
 
-for (uint i = 0; i < ( sizeof( yopy_buttons ) / sizeof(yopy_button)); i++) {
+    for ( uint i = 0; i < ( sizeof( yopy_buttons ) / sizeof( yopy_button ) ); i++ )
+    {
 
     yopy_button *ib = yopy_buttons + i;
 
@@ -177,6 +123,7 @@ connect(sysch, SIGNAL(received(const QCString &, const QByteArray & )),
     this, SLOT(systemMessage(const QCString &, const QByteArray & )));
 }
 
+
 bool Yopy::suspend()
 {
 /* Opie for Yopy does not implement its own power management at the 
@@ -185,14 +132,17 @@ bool Yopy::suspend()
 return false;
 }
 
+
 bool Yopy::setDisplayBrightness(int bright)
 {
 /* The code here works, but is disabled as the current version runs
     parallel to X, and relies on the existing backlight demon. */
 #if 0
-if ( QFile::exists("/proc/sys/pm/light") ) {
+    if ( QFile::exists( "/proc/sys/pm/light" ) )
+    {
     int fd = ::open("/proc/sys/pm/light", O_WRONLY);
-    if (fd >= 0 ) {
+        if ( fd >= 0 )
+        {
     if (bright)
     ::write(fd, "1\n", 2);
     else
@@ -205,6 +155,7 @@ if ( QFile::exists("/proc/sys/pm/light") ) {
 return false;
 }
 
+
 int Yopy::displayBrightnessResolution() const
 {
     return 2;