--- a/omap3530/shared/serialkeyb/serialkeyboard.cpp Sun Nov 21 00:40:16 2010 +0000
+++ b/omap3530/shared/serialkeyb/serialkeyboard.cpp Sun Nov 21 00:50:10 2010 +0000
@@ -323,7 +323,7 @@
static void UartIsr( TAny* aParam );
static void AddKeyDfc( TAny* aParam );
void AddKey( TUint aKey );
-
+
private:
enum TState
@@ -360,7 +360,7 @@
// Register with the power resource manager
_LIT( KName, "serkey" );
r = PowerResourceManager::RegisterClient( iPrmClientId, KName );
- __KTRACE_OPT(KBOOT,Kern::Printf("+TSerialKeyboardl::Create:PRM client ID=%x, err=%d", iPrmClientId, r));
+ __KTRACE_OPT(KEXTENSION,Kern::Printf("+TSerialKeyboardl::Create:PRM client ID=%x, err=%d", iPrmClientId, r));
if( r != KErrNone )
{
return r;
@@ -373,11 +373,11 @@
r = Interrupt::Bind( iUart.InterruptId(), UartIsr, this );
if ( r < 0 )
{
- Kern::Printf("TSerialKeyboard Bind r=%d", r);
+ __KTRACE_OPT(KBOOT,Kern::Printf("TSerialKeyboard Bind r=%d", r));
return r;
}
- Kern::Printf("+TSerialKeyboard::Create bound to interrupt" );
+ __KTRACE_OPT(KEXTENSION,Kern::Printf("+TSerialKeyboard::Create bound to interrupt" ));
#ifdef USE_SYMBIAN_PRM
// Ask power resource manager to turn on clocks to the UART
@@ -407,7 +407,7 @@
void TSerialKeyboard::UartIsr( TAny* aParam )
{
TSerialKeyboard* self = reinterpret_cast<TSerialKeyboard*>( aParam );
-
+
const TUint iir = Omap3530Uart::IIR::iMem.Read( self->iUart );
if ( 0 == (iir bitand Omap3530Uart::IIR::IT_PENDING::KMask) )
@@ -419,7 +419,7 @@
if ( (pending bitand Omap3530Uart::IIR::IT_TYPE::ERHR) || (pending bitand Omap3530Uart::IIR::IT_TYPE::ERxLineStatus) )
{
TUint byte = self->iUart.Read();
-
+
if( KMagicCrashValue == byte )
{
Kern::Fault( "SERKEY-FORCED", 0 );
@@ -467,7 +467,7 @@
case EEscaping2:
{
TInt index = self->iKey - KEscapeBase;
-
+
if ( (index >= 0) && (index < KEscapeCount) )
{
self->AddKey( KEscapedScanCode[ index ] );
@@ -498,13 +498,13 @@
TRawEvent e;
-
+
if ( func )
{
e.Set( TRawEvent::EKeyDown, EStdKeyRightFunc, 0 );
Kern::AddEvent( e );
}
-
+
if ( ctrl )
{
e.Set( TRawEvent::EKeyDown, EStdKeyRightCtrl, 0 );