summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_beagle.h1
-rw-r--r--libopie2/opiecore/device/odevice_simpad.cpp3
2 files changed, 0 insertions, 4 deletions
diff --git a/libopie2/opiecore/device/odevice_beagle.h b/libopie2/opiecore/device/odevice_beagle.h
index 1626330..17b040c 100644
--- a/libopie2/opiecore/device/odevice_beagle.h
+++ b/libopie2/opiecore/device/odevice_beagle.h
@@ -27,25 +27,24 @@
27 Boston, MA 02111-1307, USA. 27 Boston, MA 02111-1307, USA.
28*/ 28*/
29 29
30#ifndef OPIE_CORE_DEVICE_BEAGLE_H 30#ifndef OPIE_CORE_DEVICE_BEAGLE_H
31#define OPIE_CORE_DEVICE_BEAGLE_H 31#define OPIE_CORE_DEVICE_BEAGLE_H
32 32
33#include "odevice.h" 33#include "odevice.h"
34 34
35namespace Opie { 35namespace Opie {
36namespace Core { 36namespace Core {
37namespace Internal { 37namespace Internal {
38class Beagle : public ODevice { 38class Beagle : public ODevice {
39 Q_OBJECT
40public: 39public:
41 Beagle(); 40 Beagle();
42 ~Beagle(); 41 ~Beagle();
43 42
44//@{ 43//@{
45 void init( const QString& init ); 44 void init( const QString& init );
46 void initButtons(); 45 void initButtons();
47//@} 46//@}
48 47
49 48
50//@{ 49//@{
51 bool setDisplayStatus( bool on ); 50 bool setDisplayStatus( bool on );
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp
index 335e0db..4ae3c4f 100644
--- a/libopie2/opiecore/device/odevice_simpad.cpp
+++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -154,27 +154,24 @@ void SIMpad::initButtons()
154 154
155 if (( sb->model & d->m_model ) == d->m_model ) { 155 if (( sb->model & d->m_model ) == d->m_model ) {
156 b. setKeycode ( sb->code ); 156 b. setKeycode ( sb->code );
157 b. setUserText ( QObject::tr ( "Button", sb->utext )); 157 b. setUserText ( QObject::tr ( "Button", sb->utext ));
158 b. setPixmap ( Resource::loadPixmap ( sb->pix )); 158 b. setPixmap ( Resource::loadPixmap ( sb->pix ));
159 b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( sb->fpressedservice ), sb->fpressedaction )); 159 b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( sb->fpressedservice ), sb->fpressedaction ));
160 b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( sb->fheldservice ), sb->fheldaction )); 160 b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( sb->fheldservice ), sb->fheldaction ));
161 161
162 d->m_buttons->append ( b ); 162 d->m_buttons->append ( b );
163 } 163 }
164 } 164 }
165 reloadButtonMapping(); 165 reloadButtonMapping();
166
167 QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
168 connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
169} 166}
170 167
171// SIMpad boardcontrol register CS3 168// SIMpad boardcontrol register CS3
172#define SIMPAD_BOARDCONTROL "/proc/cs3" 169#define SIMPAD_BOARDCONTROL "/proc/cs3"
173#define SIMPAD_VCC_5V_EN 0x0001 // For 5V PCMCIA 170#define SIMPAD_VCC_5V_EN 0x0001 // For 5V PCMCIA
174#define SIMPAD_VCC_3V_EN 0x0002 // FOR 3.3V PCMCIA 171#define SIMPAD_VCC_3V_EN 0x0002 // FOR 3.3V PCMCIA
175#define SIMPAD_EN1 0x0004 // This is only for EPROM's 172#define SIMPAD_EN1 0x0004 // This is only for EPROM's
176#define SIMPAD_EN0 0x0008 // Both should be enable for 3.3V or 5V 173#define SIMPAD_EN0 0x0008 // Both should be enable for 3.3V or 5V
177#define SIMPAD_DISPLAY_ON 0x0010 174#define SIMPAD_DISPLAY_ON 0x0010
178#define SIMPAD_PCMCIA_BUFF_DIS 0x0020 175#define SIMPAD_PCMCIA_BUFF_DIS 0x0020
179#define SIMPAD_MQ_RESET 0x0040 176#define SIMPAD_MQ_RESET 0x0040
180#define SIMPAD_PCMCIA_RESET 0x0080 177#define SIMPAD_PCMCIA_RESET 0x0080