1.1 --- a/epoc32/include/c32comm.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/c32comm.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,9 +1,9 @@
1.4 // Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
1.5 // All rights reserved.
1.6 // This component and the accompanying materials are made available
1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
1.8 +// under the terms of "Eclipse Public License v1.0"
1.9 // which accompanies this distribution, and is available
1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
1.12 //
1.13 // Initial Contributors:
1.14 // Nokia Corporation - initial contribution.
1.15 @@ -13,13 +13,6 @@
1.16 // Description:
1.17 //
1.18
1.19 -#ifndef SYMBIAN_C32_SERCOMMS_V2
1.20 -// PLEASE NOTE: This file is part of Version 2 of C32 - that is, the multi-threaded version.
1.21 -// The single-threaded C32 version of this file is in c32\Version1\SCOMM
1.22 -// All defect fixes should be applied to both versions where appropriate.
1.23 -// PLEASE NOTE: This comment is applicable to SercommsV2 but is surrounded by an "#ifndef"
1.24 -// to enable the automatic removal of this comment once non-C32 V2 code is removed.
1.25 -#endif
1.26
1.27
1.28 #ifndef C32COMM_H
1.29 @@ -41,26 +34,6 @@
1.30 IMPORT_C TInt StartC32();
1.31 IMPORT_C TInt StartC32WithCMISuppressions(const TDesC& aCMISuppressionList);
1.32
1.33 -/**
1.34 -C32 major version number.
1.35 -@internalAll
1.36 -*/
1.37 -const TUint KEC32MajorVersionNumber = 1;
1.38 -/**
1.39 -C32 minor version number.
1.40 -@internalAll
1.41 -*/
1.42 -const TUint KEC32MinorVersionNumber = 0;
1.43 -/**
1.44 -C32 build version number.
1.45 -@internalAll
1.46 -*/
1.47 -const TUint KEC32BuildVersionNumber = 605;
1.48 -
1.49 -/**
1.50 -@internalComponent
1.51 -*/
1.52 -const TDesC& KCommServerName(void);
1.53
1.54 /** Specifies the mode in which a port is opened.
1.55
1.56 @@ -109,7 +82,7 @@
1.57
1.58 /**
1.59 trace flags for debugging purposes
1.60 -@internalComponent
1.61 +@publishedAll
1.62 */
1.63 enum TC32Trace
1.64 {
1.65 @@ -139,9 +112,9 @@
1.66 struct TCommServerConfigV01
1.67 {
1.68 /** Buffering option: either KCommBufferFull or KCommBufferPartial */
1.69 - TUint iBufFlags; ///< contains buffer flags e.g for partial read/write
1.70 + TUint iBufFlags; //< contains buffer flags e.g for partial read/write
1.71 /** Size of server buffer if partial buffering is being used */
1.72 - TUint iBufSize; ///< size of the Tx/Rx buffer
1.73 + TUint iBufSize; //< size of the Tx/Rx buffer
1.74 };
1.75
1.76 /** Package buffer for a server configuration object. TCommServerConfig is used
1.77 @@ -170,13 +143,13 @@
1.78 @publishedAll
1.79 @released
1.80 */
1.81 -const TUint KCommResetRx = 0x00000001; ///< to by used as flag by RComm::ResetBuffers
1.82 +const TUint KCommResetRx = 0x00000001; //< to by used as flag by RComm::ResetBuffers
1.83 /** Reset the transmit buffer
1.84
1.85 @publishedAll
1.86 @released
1.87 */
1.88 -const TUint KCommResetTx = 0x00000002; ///< to by used as flag by RComm::ResetBuffers
1.89 +const TUint KCommResetTx = 0x00000002; //< to by used as flag by RComm::ResetBuffers
1.90 /** Port name. Used by TSerialInfo::iName.
1.91
1.92 @publishedAll
1.93 @@ -214,12 +187,12 @@
1.94 public:
1.95 /** Description of the CSY meant only for human reading. It
1.96 can be up to KMaxPortDescription (48) characters long. */
1.97 - TPortDescription iDescription; ///< description of the port (CSY)
1.98 + TPortDescription iDescription; //< description of the port (CSY)
1.99 /** The short name of the port (Port Prefix). This is used in calls to RComm::Open(). It can be up to
1.100 KMaxPortName (i.e. 16) characters long. */
1.101 - TPortName iName; ///< name of the port
1.102 - TUint iLowUnit; ///< The lowest port number supported by the serial module
1.103 - TUint iHighUnit; ///< the highest port number supported by the serial module
1.104 + TPortName iName; //< name of the port
1.105 + TUint iLowUnit; //< The lowest port number supported by the serial module
1.106 + TUint iHighUnit; //< the highest port number supported by the serial module
1.107 };
1.108
1.109 /**
1.110 @@ -357,10 +330,15 @@
1.111 IMPORT_C TInt RComm::DebugInfo(TDes8& aDes);
1.112 #endif
1.113 private:
1.114 - TPtr8 iSignalsNotification; ///< pointer to the signals to be changed during notification
1.115 - TPtr8 iFlowNotification; ///< pointer to the flow control to be changed during notification
1.116 + TPtr8 iSignalsNotification; //< pointer to the signals to be changed during notification
1.117 + TPtr8 iFlowNotification; //< pointer to the flow control to be changed during notification
1.118 };
1.119
1.120 +
1.121 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
1.122 +#include <c32comm_internal.h>
1.123 +#endif
1.124 +
1.125 #include <c32comm.inl>
1.126
1.127 #endif // C32COMM_H