# HG changeset patch # User Dario Sestito # Date 1279296978 -3600 # Node ID 4508ea692a4d0be75618d9ead72575c387ddaeab # Parent d1a826faf80bc61995f2753f03e5f9b96f8af1f6# Parent 7bf4e70b6d9ea7da95873b6bd064794e553f7321 Merge diff -r d1a826faf80b -r 4508ea692a4d omap3530/beagleboard/rom/base_beagle.iby --- a/omap3530/beagleboard/rom/base_beagle.iby Fri Jul 16 17:10:10 2010 +0100 +++ b/omap3530/beagleboard/rom/base_beagle.iby Fri Jul 16 17:16:18 2010 +0100 @@ -86,7 +86,10 @@ primary[VARID] =\epoc32\release\ARMV5\BUILD_DIR\_omap3530_ekern.exe \sys\bin\ekern.exe extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_kaomap3530.dll \sys\bin\kaomap3530.dll + #include <..\omapshared\mstick.iby> + +// Removing BTRACEX //extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_BTRACEX.LDD \sys\bin\btracex.ldd extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_prcm.dll \sys\bin\prcm.dll @@ -106,23 +109,26 @@ #include <../omapshared/tps65950.iby> #ifdef SYMBIAN_BASE_USE_GCE -extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_lcd_gce.dll \sys\bin\lcd.dll -device[VARID]=KERNEL_DIR\DEBUG_DIR\display.ldd \sys\bin\display0.ldd -#file=ABI_DIR\DEBUG_DIR\_beagle_ekdata.dll \sys\bin\ekdata.dll + // Use the new GCE compliant display driver + extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_lcd_gce.dll \sys\bin\lcd.dll + device[VARID]=KERNEL_DIR\DEBUG_DIR\display.ldd \sys\bin\display0.ldd + #file=ABI_DIR\DEBUG_DIR\_beagle_ekdata.dll \sys\bin\ekdata.dll + extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard_uisoftkeys.dll \sys\bin\ekeyb.dll #else -#ifdef TSHELL_SERIAL - //Use VT100 Over Serial -# define EDISP_DRV \EDISP_VT100.DLL - device[VARID]=KERNEL_DIR\BUILD_DIR\_omap3530_EUART.PDD \sys\bin\euart.pdd - device[VARID]=KERNEL_DIR\BUILD_DIR\ECOMM.LDD \sys\bin\ecomm.ldd -#else - extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_lcd.dll \sys\bin\lcd.dll -# ifdef TSHELL_SERIALMOUSE - extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_serialmouse.DLL \sys\bin\eserialmouse.dll -# else -// extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard.DLL \sys\bin\ekeyb.dll -# endif -#endif + #ifdef TSHELL_SERIAL + //Use VT100 Over Serial + #define EDISP_DRV \EDISP_VT100.DLL + device[VARID]=KERNEL_DIR\BUILD_DIR\_omap3530_EUART.PDD \sys\bin\euart.pdd + device[VARID]=KERNEL_DIR\BUILD_DIR\ECOMM.LDD \sys\bin\ecomm.ldd + #else + extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_lcd.dll \sys\bin\lcd.dll + #ifdef TSHELL_SERIALMOUSE + extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_serialmouse.DLL \sys\bin\eserialmouse.dll + #else + extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard.DLL \sys\bin\ekeyb.dll + #endif + #endif + extension[VARID]=KERNEL_DIR\BUILD_DIR\elocd.ldd \sys\bin\elocd.ldd extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_medint.pdd \sys\bin\medint.pdd device[VARID] =KERNEL_DIR\BUILD_DIR\pipelib.ldd \sys\bin\pipelib.ldd @@ -137,4 +143,4 @@ #endif //SYMBIAN_BASE_USE_GCE //extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_ekeyb.dll \sys\bin\ekeyb.dll -extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard.DLL \sys\bin\ekeyb.dll \ No newline at end of file +//extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard.DLL \sys\bin\ekeyb.dll \ No newline at end of file diff -r d1a826faf80b -r 4508ea692a4d omap3530/shared/serialkeyb/bld.inf --- a/omap3530/shared/serialkeyb/bld.inf Fri Jul 16 17:10:10 2010 +0100 +++ b/omap3530/shared/serialkeyb/bld.inf Fri Jul 16 17:16:18 2010 +0100 @@ -19,3 +19,4 @@ PRJ_MMPFILES serialkeyboard +serialkeyboard_UI_Softkeys diff -r d1a826faf80b -r 4508ea692a4d omap3530/shared/serialkeyb/serialkeyboard.cpp --- a/omap3530/shared/serialkeyb/serialkeyboard.cpp Fri Jul 16 17:10:10 2010 +0100 +++ b/omap3530/shared/serialkeyb/serialkeyboard.cpp Fri Jul 16 17:16:18 2010 +0100 @@ -32,6 +32,7 @@ #define ISFUNC(x) (0x4000&(x)) #define STDKEY(x) (0x1FFF&(x)) +#if _UI_SOFTKEYS_ENABLED_ static const TUint16 KScanCode[] = { /*00*/ EStdKeyNull, @@ -164,6 +165,141 @@ /*7f*/ EKeyDelete }; +#else +static const TUint16 KScanCode[] = + { + /*00*/ EStdKeyNull, + /*01*/ EStdKeyHome, // ^A + /*02*/ EStdKeyLeftArrow, // ^B + /*03*/ EStdKeyEscape, // ^C + /*04*/ SHIFTED(EStdKeyDownArrow), // ^D - move window down + /*05*/ EStdKeyEnd, // ^E + /*06*/ EStdKeyRightArrow, // ^F + /*07*/ EStdKeyNull, + /*08*/ EStdKeyBackspace, // ^H - Reserved! + /*09*/ EStdKeyTab, // ^I - Reserved! + /*0a*/ EStdKeyNull, + /*0b*/ EStdKeyIncContrast, // ^K + /*0c*/ EStdKeyDecContrast, // ^L + /*0d*/ EStdKeyEnter, // ^M - Reserved! + /*0e*/ EStdKeyDownArrow, // ^N + /*0f*/ EStdKeyNull, // ^O = instant death + /*10*/ EStdKeyUpArrow, // ^P + /*11*/ CTRLED(EStdKeyLeftArrow), // ^Q - make window narrower + /*12*/ CTRLED(FUNCED('5')), // ^R - rotate windows in text window server + /*13*/ EStdKeyNull, + /*14*/ CTRLED(EStdKeyDownArrow), // ^T - make window taller + /*15*/ SHIFTED(EStdKeyUpArrow), // ^U - move window up + /*16*/ EStdKeyNull, + /*17*/ CTRLED(EStdKeyRightArrow), // ^W - make window wider + /*18*/ SHIFTED(EStdKeyRightArrow), // ^X - move window right + /*19*/ CTRLED(EStdKeyUpArrow), // ^Y - make window shorter + /*1a*/ SHIFTED(EStdKeyLeftArrow), // ^Z - move window left + /*1b*/ EStdKeyEscape, // ^[ - Reserved! + /*1c*/ EStdKeyNull, + /*1d*/ EStdKeyNull, + /*1e*/ EStdKeyNull, + /*1f*/ EStdKeyNull, + /*20*/ EStdKeySpace, + /*21*/ SHIFTED('1'), // ! + /*22*/ SHIFTED('2'), // " + /*23*/ EStdKeyHash, // # + /*24*/ SHIFTED('4'), // $ + /*25*/ SHIFTED('5'), // % + /*26*/ SHIFTED('7'), // & + /*27*/ EStdKeySingleQuote, + /*28*/ SHIFTED('9'), // ( + /*29*/ SHIFTED('0'), // ) + /*2a*/ SHIFTED('8'), // * + /*2b*/ SHIFTED(EStdKeyEquals), // + + /*2c*/ EStdKeyComma, + /*2d*/ EStdKeyMinus, + /*2e*/ EStdKeyFullStop, + /*2f*/ EStdKeyForwardSlash, + /*30*/ '0', + /*31*/ '1', + /*32*/ '2', + /*33*/ '3', + /*34*/ '4', + /*35*/ '5', + /*36*/ '6', + /*37*/ '7', + /*38*/ '8', + /*39*/ '9', + /*3a*/ SHIFTED(EStdKeySemiColon), // : + /*3b*/ EStdKeySemiColon, + /*3c*/ SHIFTED(EStdKeyComma), // < + /*3d*/ EStdKeyEquals, + /*3e*/ SHIFTED(EStdKeyFullStop), // > + /*3f*/ SHIFTED(EStdKeyForwardSlash), // ? + /*40*/ SHIFTED(EStdKeySingleQuote), // @ + /*41*/ SHIFTED('A'), + /*42*/ SHIFTED('B'), + /*43*/ SHIFTED('C'), + /*44*/ SHIFTED('D'), + /*45*/ SHIFTED('E'), + /*46*/ SHIFTED('F'), + /*47*/ SHIFTED('G'), + /*48*/ SHIFTED('H'), + /*49*/ SHIFTED('I'), + /*4a*/ SHIFTED('J'), + /*4b*/ SHIFTED('K'), + /*4c*/ SHIFTED('L'), + /*4d*/ SHIFTED('M'), + /*4e*/ SHIFTED('N'), + /*4f*/ SHIFTED('O'), + /*50*/ SHIFTED('P'), + /*51*/ SHIFTED('Q'), + /*52*/ SHIFTED('R'), + /*53*/ SHIFTED('S'), + /*54*/ SHIFTED('T'), + /*55*/ SHIFTED('U'), + /*56*/ SHIFTED('V'), + /*57*/ SHIFTED('W'), + /*58*/ SHIFTED('X'), + /*59*/ SHIFTED('Y'), + /*5a*/ SHIFTED('Z'), + /*5b*/ EStdKeySquareBracketLeft, + /*5c*/ EStdKeyBackSlash, + /*5d*/ EStdKeySquareBracketRight, + /*5e*/ SHIFTED('6'), // ^ + /*5f*/ SHIFTED(EStdKeyMinus), // _ + /*60*/ EStdKeyBacklightToggle, // Actually ` + /*61*/ 'A', + /*62*/ 'B', + /*63*/ 'C', + /*64*/ 'D', + /*65*/ 'E', + /*66*/ 'F', + /*67*/ 'G', + /*68*/ 'H', + /*69*/ 'I', + /*6a*/ 'J', + /*6b*/ 'K', + /*6c*/ 'L', + /*6d*/ 'M', + /*6e*/ 'N', + /*6f*/ 'O', + /*70*/ 'P', + /*71*/ 'Q', + /*72*/ 'R', + /*73*/ 'S', + /*74*/ 'T', + /*75*/ 'U', + /*76*/ 'V', + /*77*/ 'W', + /*78*/ 'X', + /*79*/ 'Y', + /*7a*/ 'Z', + /*7b*/ SHIFTED(EStdKeySquareBracketLeft), + /*7c*/ SHIFTED(EStdKeyBackSlash), + /*7d*/ SHIFTED(EStdKeySquareBracketRight), + /*7e*/ SHIFTED(EStdKeyHash), + /*7f*/ EKeyDelete + }; + +#endif + static const TUint16 KEscapedScanCode[] = { EStdKeyUpArrow, @@ -310,7 +446,6 @@ } else { - Kern::Printf("Key received: %d %d", self->iKey, KScanCode[self->iKey]); self->AddKey( KScanCode[ self->iKey ] ); } break; @@ -362,7 +497,6 @@ TRawEvent e; - Kern::Printf("AddKey %d %d %d %d", shifted, ctrl, func, stdKey); if ( func ) { diff -r d1a826faf80b -r 4508ea692a4d omap3530/shared/serialkeyb/serialkeyboard_UI_Softkeys.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omap3530/shared/serialkeyb/serialkeyboard_UI_Softkeys.mmp Fri Jul 16 17:16:18 2010 +0100 @@ -0,0 +1,52 @@ +// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of the License "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// omap3530/shared/serialkeyb/serialkeyboard.mmp +// omap3530/shared/serialkeyb.serialkeyboard.mmp +// Simple serial keyboard implementation for Beagle baseport +// + + + +/** + @file +*/ +macro _UI_SOFTKEYS_ENABLED_ + +#define __USING_ASSP_REGISTER_API__ +#define __USING_ASSP_INTERRUPT_API__ + +#include "beagle/variant.mmh" +#include "kernel/kern_ext.mmh" + +target AsspTarget(serialkeyboard_uisoftkeys,dll) +targettype kext +romtarget ekeyb.dll + +systeminclude +/include/drivers + +SYMBIAN_BASE_SYSTEMINCLUDE(drivers) +sourcepath . +source serialkeyboard.cpp + +library AsspTarget(uart,lib) +library AsspTarget(prcm,lib) +//library resman.lib + +noexportlibrary + +uid 0x100039cf 0x100000db + +VENDORID 0x70000001 + +capability all