| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Vars.make | 3 | ||||
| -rw-r--r-- | config.in | 6 | ||||
| -rw-r--r-- | libopie2/opiecore/device/device.pro | 6 | ||||
| -rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 3 | ||||
| -rw-r--r-- | libopie2/opiecore/device/odevice.h | 9 | ||||
| -rw-r--r-- | libopie2/opiecore/device/odevice_htc.h | 154 | ||||
| -rw-r--r-- | mkspecs/qws/linux-htc-g++/qmake.conf | 81 |
8 files changed, 260 insertions, 5 deletions
@@ -8,3 +8,4 @@ * OPIE-PackageManager: Added two configuration options: "Force recursive", "Verbose fetch" (hrw) - + * Added hardware support for HTC Universal (ljp) + Fixed Bugs @@ -52,2 +52,5 @@ ifdef CONFIG_TARGET_MACOSX endif +ifdef CONFIG_TARGET_HTC + PLATFORM=htc-linux +endif @@ -38,2 +38,5 @@ choice + config TARGET_HTC + boolean "HTC" + config TARGET_64BIT @@ -104,2 +107,4 @@ config SPECFILE default "qws/linux-oe-g++" if TARGET_OE && (!X11) + default "qws/linux-htc-g++" if TARGET_HTC && (! X11) + default "linux-g++" if TARGET_HTC && X11 @@ -122,2 +127,3 @@ config OPTIMIZATIONS default "-march=armv5te -mtune=xscale -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_C700 + default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_HTC diff --git a/libopie2/opiecore/device/device.pro b/libopie2/opiecore/device/device.pro index 8469398..0954733 100644 --- a/libopie2/opiecore/device/device.pro +++ b/libopie2/opiecore/device/device.pro @@ -11,3 +11,4 @@ HEADERS += device/odevice.h \ device/odevice_yopy.h \ - device/odevice_mypal.h + device/odevice_mypal.h \ + device/odevice_htc.h @@ -24,3 +25,4 @@ SOURCES += device/odevice.cpp \ device/odevice_yopy.cpp \ - device/odevice_mypal.cpp + device/odevice_mypal.cpp \ + device/odevice_htc.cpp diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index 7b99eb4..c6e031f 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp @@ -39,2 +39,3 @@ #include "odevice_genuineintel.h" +#include "odevice_htc.h" @@ -146,2 +147,4 @@ ODevice *ODevice::inst() else if ( line.contains( "Tradesquare.NL", false ) ) dev = new Internal::Beagle(); + else if ( line.contains( "HTC", false ) ) dev = new Internal::HTC(); + else qWarning( "ODevice() - unknown hardware - using default." ); diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h index c70d2af..0c78277 100644 --- a/libopie2/opiecore/device/odevice.h +++ b/libopie2/opiecore/device/odevice.h @@ -122,3 +122,7 @@ enum OModel { Model_MyPal_716 = ( Model_MyPal | 0x0002 ), - Model_MyPal_730 = ( Model_MyPal | 0x0003 ) + Model_MyPal_730 = ( Model_MyPal | 0x0003 ), + + Model_HTC = ( 9 << 16 ), + Model_HTC_All = ( Model_HTC | 0xffff ), + Model_HTC_Universal = ( Model_HTC | 0x0001 ) }; @@ -138,3 +142,4 @@ enum OVendor { Vendor_GenuineIntel, - Vendor_Asus + Vendor_Asus, + Vendor_HTC }; diff --git a/libopie2/opiecore/device/odevice_htc.h b/libopie2/opiecore/device/odevice_htc.h new file mode 100644 index 0000000..5b707c8 --- a/dev/null +++ b/libopie2/opiecore/device/odevice_htc.h @@ -0,0 +1,154 @@ +/* + This file is part of the Opie Project + Copyright (C) 2002-2005 The Opie Team <opie-devel@handhelds.org> + =. Copyright (C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de> + .=l. + .>+-= + _;:, .> :=|. 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; version 2 of the License. + ._= =} : + .%`+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. + If not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ + +#ifndef ODEVICE_HTC +#define ODEVICE_HTC + +#include "odevice_abstractmobiledevice.h" + +/* QT */ +#include <qfile.h> +#include <qwindowsystem_qws.h> + +#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)) + +// Audio +#define SHARP_DEV_IOCTL_COMMAND_START 0x5680 + +#define SHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) +#define SHARP_BUZZER_MAKESOUND (SHARP_BUZZER_IOCTL_START) + +#define SHARP_BUZ_TOUCHSOUND 1 /* touch panel sound */ +#define SHARP_BUZ_KEYSOUND 2 /* key sound */ +#define SHARP_BUZ_SCHEDULE_ALARM 11 /* schedule alarm */ + +#define SHARP_BUZZER_SETVOLUME (SHARP_BUZZER_IOCTL_START+1) +#define SHARP_BUZZER_GETVOLUME (SHARP_BUZZER_IOCTL_START+2) +#define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3) +#define SHARP_BUZZER_SETMUTE (SHARP_BUZZER_IOCTL_START+4) +#define SHARP_BUZZER_STOPSOUND (SHARP_BUZZER_IOCTL_START+5) + +// LED +#define SHARP_LED_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) +#define SHARP_LED_SETSTATUS (SHARP_LED_IOCTL_START+1) +#define SHARP_LED_MAIL_EXISTS 9 /* mail status (exists or not) */ + +#define LED_MAIL_NO_UNREAD_MAIL 0 /* for SHARP_LED_MAIL_EXISTS */ +#define LED_MAIL_NEWMAIL_EXISTS 1 /* for SHARP_LED_MAIL_EXISTS */ +#define LED_MAIL_UNREAD_MAIL_EX 2 /* for SHARP_LED_MAIL_EXISTS */ + +// Rotation and Power Management +#define SHARP_IOCTL_GET_ROTATION 0x413c + +#define APM_IOCGEVTSRC OD_IOR( 'A', 203, int ) +#define APM_IOCSEVTSRC OD_IORW( 'A', 204, int ) +#define APM_EVT_POWER_BUTTON (1 << 0) + +// Brightness Embedix +#define SHARP_FL_IOCTL_DEVICE "/dev/sharp_fl" +#define SHARP_FL_IOCTL_ON 1 +#define SHARP_FL_IOCTL_OFF 2 +#define SHARP_FL_IOCTL_STEP_CONTRAST 100 +#define SHARP_FL_IOCTL_GET_STEP_CONTRAST 101 +#define SHARP_FL_IOCTL_GET_STEP 102 + +// Vesa Standard +#define FB_BLANK_UNBLANK 0 +#define FB_BLANK_POWERDOWN 4 + +namespace Opie { +namespace Core { +namespace Internal { + +class HTC : public OAbstractMobileDevice, public QWSServer::KeyboardFilter +{ + Q_OBJECT + + protected: + virtual void init(const QString&); + virtual void initButtons(); + void initHingeSensor(); + + protected slots: + void hingeSensorTriggered(); + void systemMessage( const QCString &msg, const QByteArray & ); + + public: + virtual bool setDisplayBrightness( int b ); + virtual bool setDisplayStatus( bool on ); + virtual int displayBrightnessResolution() const; + + virtual void playAlarmSound(); + virtual void playKeySound(); + virtual void playTouchSound(); + + 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 ); + + virtual bool hasHingeSensor() const; + virtual OHingeStatus readHingeSensor() const; + + virtual Transformation rotation() const; + virtual ODirection direction() const; + virtual bool suspend(); + + protected: + virtual void buzzer( int snd ); + virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat ); + + QString m_backlightdev; + OLedState m_leds[1]; + bool m_embedix; + QFile m_hinge; +}; + +struct htc_button { + Qt::Key code; + char *utext; + char *pix; + char *fpressedservice; + char *fpressedaction; + char *fheldservice; + char *fheldaction; +}; +} +} +} +#endif diff --git a/mkspecs/qws/linux-htc-g++/qmake.conf b/mkspecs/qws/linux-htc-g++/qmake.conf new file mode 100644 index 0000000..76a0ad5 --- a/dev/null +++ b/mkspecs/qws/linux-htc-g++/qmake.conf @@ -0,0 +1,81 @@ +# +# $Id$ +# +# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler +# + +MAKEFILE_GENERATOR = UNIX +TEMPLATE = app +CONFIG += qt link_prl + +QMAKE_CC = $(CCACHE) $(DISTCC) $(shell which arm-linux-gcc) +QMAKE_LEX = flex +QMAKE_LEXFLAGS = +QMAKE_YACC = yacc +QMAKE_YACCFLAGS = -d +QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) +QMAKE_CFLAGS_WARN_ON = -Wall -W +QMAKE_CFLAGS_WARN_OFF = +QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) +QMAKE_CFLAGS_DEBUG = -g +QMAKE_CFLAGS_SHLIB = -fPIC +QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses +QMAKE_CFLAGS_THREAD = -D_REENTRANT + +QMAKE_CXX = $(CCACHE) $(DISTCC) $(shell which arm-linux-g++) -DQT_QWS_IPAQ +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) +QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF +QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG +QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB +QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD + +QMAKE_INCDIR = +QMAKE_LIBDIR = +QMAKE_INCDIR_X11 = +QMAKE_LIBDIR_X11 = +QMAKE_INCDIR_QT = $(QTDIR)/include +QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_OPENGL = /usr/X11R6/include +QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include +QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib + +QMAKE_LINK = arm-linux-g++ +QMAKE_LINK_SHLIB = arm-linux-g++ +QMAKE_LFLAGS = $(LFLAGS_EXTRA) +QMAKE_LFLAGS_RELEASE = +QMAKE_LFLAGS_DEBUG = +QMAKE_LFLAGS_SHLIB = -shared +QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB +QMAKE_LFLAGS_SONAME = -Wl,-soname, +QMAKE_LFLAGS_THREAD = +QMAKE_RPATH = -Wl,-rpath-link, + +QMAKE_LIBS = $(LIBS_EXTRA) +QMAKE_LIBS_DYNLOAD = -ldl +QMAKE_LIBS_X11 = +QMAKE_LIBS_X11SM = +QMAKE_LIBS_QT = -lqte +QMAKE_LIBS_QT_THREAD = -lqte-mt +QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_QTOPIA = -lqtopia -lqpe +QMAKE_LIBS_THREAD = -lpthread + +QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_UIC = $(QTDIR)/bin/uic + +QMAKE_AR = ar cqs +QMAKE_RANLIB = + +QMAKE_TAR = tar -cf +QMAKE_GZIP = gzip -9f + +QMAKE_COPY = cp -f +QMAKE_MOVE = mv -f +QMAKE_DEL_FILE = rm -f +QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p |