--- a/cbsatplugin/atmisccmdplugin/src/atmisccmdplugin.cpp Wed Sep 01 12:20:04 2010 +0100
+++ b/cbsatplugin/atmisccmdplugin/src/atmisccmdplugin.cpp Tue Sep 14 21:37:10 2010 +0300
@@ -24,7 +24,6 @@
#include "cnumcommandhandler.h"
#include "cfuncommandhandler.h"
#include "cbccommandhandler.h"
-#ifdef PROTOCOL_TDSCDMA
#include "hvercommandhandler.h"
#include "cgsncommandhandler.h"
#include "cgmrcommandhandler.h"
@@ -35,8 +34,6 @@
#include "cgmmcommandhandler.h"
#include "scpbrcommandhandler.h"
#include "scpbwcommandhandler.h"
-#endif
-
#include "atmisccmdpluginconsts.h"
#include "cmserror.h"
@@ -86,7 +83,6 @@
delete iCNUMHandler;
delete iCFUNHandler;
delete iCBCHandler;
-#ifdef PROTOCOL_TDSCDMA
delete iHVERHandler;
delete iCGSNHandler;
delete iCGMRHandler;
@@ -95,8 +91,7 @@
delete iCMGDHandler;
delete iCGMMHandler;
delete iSCPBRHandler;
- delete iSCPBWHandler;
-#endif
+ delete iSCPBWHandler;
iPhone.Close();
iTelServer.Close();
@@ -119,8 +114,6 @@
iCNUMHandler = CCNUMCommandHandler::NewL(this, iCommandParser, iPhone, iTelServer);
iCFUNHandler = CCFUNCommandHandler::NewL(this, iCommandParser, iPhone);
iCBCHandler = CCBCCommandHandler::NewL(this, iCommandParser, iPhone);
-
-#ifdef PROTOCOL_TDSCDMA
iHVERHandler = CHVERCommandHandler::NewL(this, iCommandParser, iPhone);
iCGSNHandler = CCGSNCommandHandler::NewL(this, iCommandParser, iPhone);
iCGMRHandler = CCGMRCommandHandler::NewL(this, iCommandParser, iPhone);
@@ -152,7 +145,6 @@
static_cast<CCGMMCommandHandler*>(iCGMMHandler)->SetTelephonyError(result);
}
delete telephonyWrapper;
-#endif
TRACE_FUNC_EXIT
}
@@ -226,7 +218,6 @@
iCurrentHandler = NULL;
break;
}
-#ifdef PROTOCOL_TDSCDMA
case (TAtCommandParser::ECmdAtHver):
{
iCurrentHandler = iHVERHandler;
@@ -287,7 +278,6 @@
iCurrentHandler = iSCPBWHandler;
break;
}
-#endif
case (TAtCommandParser::EUnknown):
default:
{
@@ -314,13 +304,11 @@
HandleCMEECommand();
HandleCommandCompleted( KErrNone, EReplyTypeOk);
}
-#ifdef PROTOCOL_TDSCDMA
else if (iCommandParser.Command() == TAtCommandParser::ECmdAtCmgf)
{
HandleCMGFCommand();
HandleCommandCompleted( KErrNone, EReplyTypeOk);
}
-#endif
else if (iCurrentHandler != NULL)
{
iHcCmd = &aCmd;
@@ -489,11 +477,9 @@
{
case EReplyTypeOther:
break;
-#ifdef PROTOCOL_TDSCDMA
case EReplyTypeEditor:
CreateEditModeBuffer( iReplyBuffer );
break;
-#endif
case EReplyTypeOk:
CreateOkOrErrorReply( iReplyBuffer, ETrue );
break;
@@ -877,7 +863,6 @@
{
TRACE_FUNC_ENTRY
-#ifdef PROTOCOL_TDSCDMA
TAtCommandParser::TCommandHandlerType cmdHandlerType = iCommandParser.CommandHandlerType();
if (cmdHandlerType == TAtCommandParser::ECmdHandlerTypeSet)
@@ -889,7 +874,6 @@
static_cast<CCMGWCommandHandler*> (iCMGWHandler)->SetMessageFormat(msgFormat);
}
}
-#endif
TRACE_FUNC_EXIT
}