Skip to content

Commit 36e2845

Browse files
dpgeorgedpgeorge
committed
cc3200: Replace physical tabs with spaces.
Preparing this to move to drivers/ directory, want to make it as similar to original code from TI as possible.
1 parent 4a23a01 commit 36e2845

5 files changed

Lines changed: 97 additions & 101 deletions

File tree

‎cc3200/simplelink/include/simplelink.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,7 @@ extern "C"
294294
#define SL_INC_NET_APP_PKG
295295
#define SL_INC_NET_CFG_PKG
296296
#define SL_INC_FS_PKG
297-
#if defined(DEBUG) && !defined(BOOTLOADER)
298297
#define SL_INC_ARG_CHECK
299-
#else
300-
#undef SL_INC_ARG_CHECK
301-
#endif
302298
#define SL_INC_WLAN_PKG
303299
#define SL_INC_SOCKET_PKG
304300
#define SL_INC_SOCK_CLIENT_SIDE_API
@@ -352,7 +348,7 @@ typedef void (*_SlSpawnEntryFunc_t)(void* pValue);
352348
#define _u32 unsigned long
353349
#define _i32 signed long
354350
#define _volatile volatile
355-
#define _const const
351+
#define _const const
356352
#endif
357353

358354
typedef _u16 _SlOpcode_t;

‎cc3200/simplelink/source/device.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ sl_EventMaskSet
269269
*****************************************************************************/
270270
typedef union
271271
{
272-
_DevMaskEventSetCommand_t Cmd;
273-
_BasicResponse_t Rsp;
272+
_DevMaskEventSetCommand_t Cmd;
273+
_BasicResponse_t Rsp;
274274
}_SlEventMaskSetMsg_u;
275275

276276
const _SlCmdCtrl_t _SlEventMaskSetCmdCtrl =
@@ -299,7 +299,7 @@ sl_EventMaskGet
299299
******************************************************************************/
300300
typedef union
301301
{
302-
_DevMaskEventGetCommand_t Cmd;
302+
_DevMaskEventGetCommand_t Cmd;
303303
_DevMaskEventGetResponse_t Rsp;
304304
}_SlEventMaskGetMsg_u;
305305

@@ -332,8 +332,8 @@ sl_DevGet
332332

333333
typedef union
334334
{
335-
_DeviceSetGet_t Cmd;
336-
_DeviceSetGet_t Rsp;
335+
_DeviceSetGet_t Cmd;
336+
_DeviceSetGet_t Rsp;
337337
}_SlDeviceMsgGet_u;
338338

339339
const _SlCmdCtrl_t _SlDeviceGetCmdCtrl =
@@ -471,7 +471,7 @@ sl_UartSetMode
471471
#ifdef SL_IF_TYPE_UART
472472
typedef union
473473
{
474-
_DevUartSetModeCommand_t Cmd;
474+
_DevUartSetModeCommand_t Cmd;
475475
_DevUartSetModeResponse_t Rsp;
476476
}_SlUartSetModeMsg_u;
477477

‎cc3200/simplelink/source/driver.c‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ support backward sync pattern */
6262
#define MATCH_WITH_SEQ_NUM(pBuf, TxSeqNum) ( BUF_SYNC_SPIM(pBuf) == (N2H_SYNC_SPIM_WITH_SEQ(TxSeqNum)) )
6363
#define N2H_SYNC_PATTERN_MATCH(pBuf, TxSeqNum) \
6464
( \
65-
( (*((_u32 *)pBuf) & N2H_SYNC_PATTERN_SEQ_NUM_EXISTS) && ( MATCH_WITH_SEQ_NUM(pBuf, TxSeqNum) ) ) || \
66-
( !(*((_u32 *)pBuf) & N2H_SYNC_PATTERN_SEQ_NUM_EXISTS) && ( MATCH_WOUT_SEQ_NUM(pBuf ) ) ) \
65+
( (*((_u32 *)pBuf) & N2H_SYNC_PATTERN_SEQ_NUM_EXISTS) && ( MATCH_WITH_SEQ_NUM(pBuf, TxSeqNum) ) ) || \
66+
( !(*((_u32 *)pBuf) & N2H_SYNC_PATTERN_SEQ_NUM_EXISTS) && ( MATCH_WOUT_SEQ_NUM(pBuf ) ) ) \
6767
)
6868

6969
#define OPCODE(_ptr) (((_SlResponseHeader_t *)(_ptr))->GenHeader.Opcode)
@@ -116,12 +116,12 @@ _SlReturnVal_t _SlDrvRxHdrRead(_u8 *pBuf, _u8 *pAlignSize);
116116
void _SlDrvShiftDWord(_u8 *pBuf);
117117
void _SlDrvDriverCBInit(void);
118118
void _SlAsyncEventGenericHandler(void);
119-
_i16 _SlDrvWaitForPoolObj(_u32 ActionID, _u8 SocketID);
120-
void _SlDrvReleasePoolObj(_u8 pObj);
121-
void _SlDrvObjInit(void);
122-
void _SlDrvObjDeInit(void);
123-
void _SlRemoveFromList(_u8* ListIndex, _u8 ItemIndex);
124-
_SlReturnVal_t _SlFindAndSetActiveObj(_SlOpcode_t Opcode, _u8 Sd);
119+
_i16 _SlDrvWaitForPoolObj(_u32 ActionID, _u8 SocketID);
120+
void _SlDrvReleasePoolObj(_u8 pObj);
121+
void _SlDrvObjInit(void);
122+
void _SlDrvObjDeInit(void);
123+
void _SlRemoveFromList(_u8* ListIndex, _u8 ItemIndex);
124+
_SlReturnVal_t _SlFindAndSetActiveObj(_SlOpcode_t Opcode, _u8 Sd);
125125

126126

127127
/*****************************************************************************/
@@ -352,8 +352,8 @@ _SlReturnVal_t _SlDrvDataReadOp(
352352
OSI_RET_OK_CHECK( sl_LockObjUnlock(&g_pCB->FlowContCB.TxLockObj) );
353353

354354
/* send the message */
355-
g_pCB->TempProtocolHeader.Opcode = pCmdCtrl->Opcode;
356-
g_pCB->TempProtocolHeader.Len = _SL_PROTOCOL_CALC_LEN(pCmdCtrl,pCmdExt);
355+
g_pCB->TempProtocolHeader.Opcode = pCmdCtrl->Opcode;
356+
g_pCB->TempProtocolHeader.Len = _SL_PROTOCOL_CALC_LEN(pCmdCtrl,pCmdExt);
357357
g_pCB->FunctionParams.pCmdCtrl = pCmdCtrl;
358358
g_pCB->FunctionParams.pTxRxDescBuff = (_u8 *)pTxRxDescBuff;
359359
g_pCB->FunctionParams.pCmdExt = pCmdExt;
@@ -427,8 +427,8 @@ _SlReturnVal_t _SlDrvDataWriteOp(
427427
OSI_RET_OK_CHECK( sl_LockObjUnlock(&g_pCB->FlowContCB.TxLockObj) );
428428

429429
/* send the message */
430-
g_pCB->TempProtocolHeader.Opcode = pCmdCtrl->Opcode;
431-
g_pCB->TempProtocolHeader.Len = _SL_PROTOCOL_CALC_LEN(pCmdCtrl,pCmdExt);
430+
g_pCB->TempProtocolHeader.Opcode = pCmdCtrl->Opcode;
431+
g_pCB->TempProtocolHeader.Len = _SL_PROTOCOL_CALC_LEN(pCmdCtrl,pCmdExt);
432432

433433
g_pCB->FunctionParams.pCmdCtrl = pCmdCtrl;
434434
g_pCB->FunctionParams.pTxRxDescBuff = pTxRxDescBuff;
@@ -447,8 +447,8 @@ _SlReturnVal_t _SlDrvMsgWrite(void)
447447
{
448448
VERIFY_PROTOCOL(NULL != g_pCB->FunctionParams.pCmdCtrl);
449449

450-
g_pCB->TempProtocolHeader.Opcode = g_pCB->FunctionParams.pCmdCtrl->Opcode;
451-
g_pCB->TempProtocolHeader.Len = _SL_PROTOCOL_CALC_LEN(g_pCB->FunctionParams.pCmdCtrl,
450+
g_pCB->TempProtocolHeader.Opcode = g_pCB->FunctionParams.pCmdCtrl->Opcode;
451+
g_pCB->TempProtocolHeader.Len = _SL_PROTOCOL_CALC_LEN(g_pCB->FunctionParams.pCmdCtrl,
452452
g_pCB->FunctionParams.pCmdExt);
453453
/* */
454454
if (g_pCB->RelayFlagsViaRxPayload == TRUE)
@@ -628,7 +628,7 @@ _SlReturnVal_t _SlDrvMsgRead(void)
628628
VERIFY_RET_OK(_SlFindAndSetActiveObj(OPCODE(uBuf.TempBuf),SD(&uBuf.TempBuf[4]) & BSD_SOCKET_ID_MASK));
629629

630630
/* Verify data is waited on this socket. The pArgs should have been set by _SlDrvDataReadOp(). */
631-
VERIFY_SOCKET_CB(NULL != ((_SlArgsData_t *)(g_pCB->ObjPool[g_pCB->FunctionParams.AsyncExt.ActionIndex].pData))->pArgs);
631+
VERIFY_SOCKET_CB(NULL != ((_SlArgsData_t *)(g_pCB->ObjPool[g_pCB->FunctionParams.AsyncExt.ActionIndex].pData))->pArgs);
632632

633633
sl_Memcpy( ((_SlArgsData_t *)(g_pCB->ObjPool[g_pCB->FunctionParams.AsyncExt.ActionIndex].pRespArgs))->pArgs, &uBuf.TempBuf[4], RECV_ARGS_SIZE);
634634

@@ -800,7 +800,7 @@ void _SlAsyncEventGenericHandler(void)
800800
}
801801
case SL_OPCODE_WLAN_CONNECTION_FAILED:
802802
{
803-
slWlanConnFailureAsyncResponse_t * pResp = (slWlanConnFailureAsyncResponse_t*)_SL_RESP_ARGS_START(g_pCB->FunctionParams.AsyncExt.pAsyncBuf);
803+
slWlanConnFailureAsyncResponse_t * pResp = (slWlanConnFailureAsyncResponse_t*)_SL_RESP_ARGS_START(g_pCB->FunctionParams.AsyncExt.pAsyncBuf);
804804

805805
wlanEvent.Event = SL_WLAN_CONNECTION_FAILED_EVENT;
806806
wlanEvent.EventData.P2PModewlanConnectionFailure.status = pResp->status;
@@ -817,7 +817,7 @@ void _SlAsyncEventGenericHandler(void)
817817
wlanEvent.EventData.STAandP2PModeWlanConnected.connection_type = pWlanResp->connection_type;
818818
sl_Memcpy(wlanEvent.EventData.STAandP2PModeWlanConnected.bssid, pWlanResp->bssid, 6);
819819
sl_Memcpy(wlanEvent.EventData.STAandP2PModeWlanConnected.go_peer_device_name,pWlanResp->go_peer_device_name,pWlanResp->go_peer_device_name_len);
820-
sl_Memcpy(wlanEvent.EventData.STAandP2PModeWlanConnected.ssid_name, pWlanResp->ssid_name, pWlanResp->ssid_len);
820+
sl_Memcpy(wlanEvent.EventData.STAandP2PModeWlanConnected.ssid_name, pWlanResp->ssid_name, pWlanResp->ssid_len);
821821
wlanEvent.EventData.STAandP2PModeWlanConnected.ssid_len = pWlanResp->ssid_len;
822822
wlanEvent.EventData.STAandP2PModeWlanConnected.go_peer_device_name_len = pWlanResp->go_peer_device_name_len;
823823

@@ -832,7 +832,7 @@ void _SlAsyncEventGenericHandler(void)
832832
wlanEvent.EventData.STAandP2PModeDisconnected.connection_type = pWlanResp->connection_type;
833833
sl_Memcpy(wlanEvent.EventData.STAandP2PModeDisconnected.bssid, pWlanResp->bssid, 6);
834834
sl_Memcpy(wlanEvent.EventData.STAandP2PModeDisconnected.go_peer_device_name,pWlanResp->go_peer_device_name,pWlanResp->go_peer_device_name_len);
835-
sl_Memcpy(wlanEvent.EventData.STAandP2PModeDisconnected.ssid_name, pWlanResp->ssid_name, pWlanResp->ssid_len);
835+
sl_Memcpy(wlanEvent.EventData.STAandP2PModeDisconnected.ssid_name, pWlanResp->ssid_name, pWlanResp->ssid_len);
836836
wlanEvent.EventData.STAandP2PModeDisconnected.ssid_len = pWlanResp->ssid_len;
837837
wlanEvent.EventData.STAandP2PModeDisconnected.reason_code = pWlanResp->reason_code;
838838
wlanEvent.EventData.STAandP2PModeDisconnected.go_peer_device_name_len = pWlanResp->go_peer_device_name_len;
@@ -884,7 +884,7 @@ void _SlAsyncEventGenericHandler(void)
884884

885885
case SL_OPCODE_SOCKET_TXFAILEDASYNCRESPONSE:
886886
{
887-
SlSockEventData_t *txfailparams = (SlSockEventData_t*)_SL_RESP_ARGS_START(g_pCB->FunctionParams.AsyncExt.pAsyncBuf);
887+
SlSockEventData_t *txfailparams = (SlSockEventData_t*)_SL_RESP_ARGS_START(g_pCB->FunctionParams.AsyncExt.pAsyncBuf);
888888
sockAppEvent.Event = SL_SOCKET_TX_FAILED_EVENT;
889889
sl_Memcpy((void *)&sockAppEvent.EventData,(void *)txfailparams,sizeof(SlSockEventData_t));
890890
g_pCB->FunctionParams.AsyncExt.AsyncEvtHandler(&sockAppEvent);
@@ -893,7 +893,7 @@ void _SlAsyncEventGenericHandler(void)
893893

894894
case SL_OPCODE_SOCKET_SOCKETASYNCEVENT:
895895
{
896-
SlSockEventData_t *socketAsyncEvent = (SlSockEventData_t*)_SL_RESP_ARGS_START(g_pCB->FunctionParams.AsyncExt.pAsyncBuf);
896+
SlSockEventData_t *socketAsyncEvent = (SlSockEventData_t*)_SL_RESP_ARGS_START(g_pCB->FunctionParams.AsyncExt.pAsyncBuf);
897897
sockAppEvent.Event = SL_SOCKET_ASYNC_EVENT;
898898
sockAppEvent.EventData.socketAsyncEvent.sd = socketAsyncEvent->socketAsyncEvent.sd;
899899
sockAppEvent.EventData.socketAsyncEvent.type = socketAsyncEvent->socketAsyncEvent.type; /* one of the possible types of socket */
@@ -1176,12 +1176,12 @@ void _SlDrvClassifyRxMsg(
11761176
}
11771177
#endif
11781178
}
1179-
/* else if (SL_OPCODE_SILO_NVMEM == (Opcode & SL_OPCODE_SILO_MASK)) */
1180-
/* { */
1181-
/* } */
1182-
/* else if (SL_OPCODE_SILO_NETCFG == (Opcode & SL_OPCODE_SILO_MASK)) */
1183-
/* { */
1184-
/* } */
1179+
/* else if (SL_OPCODE_SILO_NVMEM == (Opcode & SL_OPCODE_SILO_MASK)) */
1180+
/* { */
1181+
/* } */
1182+
/* else if (SL_OPCODE_SILO_NETCFG == (Opcode & SL_OPCODE_SILO_MASK)) */
1183+
/* { */
1184+
/* } */
11851185
else
11861186
{
11871187
SL_ERROR_TRACE1(MSG_311, "ASSERT: _SlDrvClassifyRxMsg : invalid opcode = 0x%x", Opcode);
@@ -1191,8 +1191,8 @@ void _SlDrvClassifyRxMsg(
11911191
else
11921192
{
11931193
/* These may be Command responses only */
1194-
g_pCB->FunctionParams.AsyncExt.RxMsgClass = CMD_RESP_CLASS;
1195-
}
1194+
g_pCB->FunctionParams.AsyncExt.RxMsgClass = CMD_RESP_CLASS;
1195+
}
11961196

11971197
}
11981198

@@ -1280,7 +1280,7 @@ _SlReturnVal_t _SlDrvRxHdrRead(_u8 *pBuf, _u8 *pAlignSize)
12801280
/* ***************************************************************************** */
12811281
typedef union
12821282
{
1283-
_BasicResponse_t Rsp;
1283+
_BasicResponse_t Rsp;
12841284
}_SlBasicCmdMsg_u;
12851285

12861286
_i16 _SlDrvBasicCmd(_SlOpcode_t Opcode)
@@ -1357,7 +1357,7 @@ _i16 _SlDrvWaitForPoolObj(_u32 ActionID, _u8 SocketID)
13571357
}
13581358
/* move to active list */
13591359
g_pCB->ObjPool[CurrObjIndex].NextIndex = g_pCB->ActivePoolIdx;
1360-
g_pCB->ActivePoolIdx = CurrObjIndex;
1360+
g_pCB->ActivePoolIdx = CurrObjIndex;
13611361
/* unlock */
13621362
OSI_RET_OK_CHECK(sl_LockObjUnlock(&g_pCB->ProtectionLockObj));
13631363
return CurrObjIndex;
@@ -1398,7 +1398,7 @@ void _SlDrvReleasePoolObj(_u8 ObjIdx)
13981398
{
13991399
/* unset actionID */
14001400
g_pCB->ActiveActionsBitmap &= ~(1<<g_pCB->ObjPool[ObjIdx].ActionID);
1401-
}
1401+
}
14021402

14031403
/* delete old data */
14041404
g_pCB->ObjPool[ObjIdx].pRespArgs = NULL;
@@ -1475,7 +1475,7 @@ void _SlRemoveFromList(_u8 *ListIndex, _u8 ItemIndex)
14751475
g_pCB->ObjPool[Idx].NextIndex = g_pCB->ObjPool[ItemIndex].NextIndex;
14761476
break;
14771477
}
1478-
Idx = g_pCB->ObjPool[Idx].NextIndex;
1478+
Idx = g_pCB->ObjPool[Idx].NextIndex;
14791479
}
14801480
}
14811481
}

‎cc3200/simplelink/source/fs.c‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ _u32 _sl_GetCreateFsMode(_u32 maxSizeInBytes,_u32 accessFlags)
9797
/*****************************************************************************/
9898
typedef union
9999
{
100-
_FsOpenCommand_t Cmd;
101-
_FsOpenResponse_t Rsp;
100+
_FsOpenCommand_t Cmd;
101+
_FsOpenResponse_t Rsp;
102102
}_SlFsOpenMsg_u;
103103

104104
const _SlCmdCtrl_t _SlFsOpenCmdCtrl =
@@ -122,27 +122,27 @@ _i32 sl_FsOpen(_u8 *pFileName,_u32 AccessModeAndMaxSize, _u32 *pToken,_i32 *pFil
122122

123123
Msg.Cmd.Mode = AccessModeAndMaxSize;
124124

125-
if(pToken != NULL)
126-
{
125+
if(pToken != NULL)
126+
{
127127
Msg.Cmd.Token = *pToken;
128-
}
128+
}
129129
else
130-
{
130+
{
131131
Msg.Cmd.Token = 0;
132-
}
132+
}
133133

134134
RetVal = _SlDrvCmdOp((_SlCmdCtrl_t *)&_SlFsOpenCmdCtrl, &Msg, &CmdExt);
135135
*pFileHandle = Msg.Rsp.FileHandle;
136-
if (pToken != NULL)
137-
{
136+
if (pToken != NULL)
137+
{
138138
*pToken = Msg.Rsp.Token;
139-
}
139+
}
140140

141-
/* in case of an error, return the erros file handler as an error code */
142-
if( *pFileHandle < 0 )
143-
{
144-
return *pFileHandle;
145-
}
141+
/* in case of an error, return the erros file handler as an error code */
142+
if( *pFileHandle < 0 )
143+
{
144+
return *pFileHandle;
145+
}
146146
return (_i32)RetVal;
147147
}
148148
#endif
@@ -152,8 +152,8 @@ _i32 sl_FsOpen(_u8 *pFileName,_u32 AccessModeAndMaxSize, _u32 *pToken,_i32 *pFil
152152
/*****************************************************************************/
153153
typedef union
154154
{
155-
_FsCloseCommand_t Cmd;
156-
_BasicResponse_t Rsp;
155+
_FsCloseCommand_t Cmd;
156+
_BasicResponse_t Rsp;
157157
}_SlFsCloseMsg_u;
158158

159159
const _SlCmdCtrl_t _SlFsCloseCmdCtrl =
@@ -198,8 +198,8 @@ _i16 sl_FsClose(_i32 FileHdl, _u8* pCeritificateFileName,_u8* pSignature ,_u32
198198
/*****************************************************************************/
199199
typedef union
200200
{
201-
_FsReadCommand_t Cmd;
202-
_FsReadResponse_t Rsp;
201+
_FsReadCommand_t Cmd;
202+
_FsReadResponse_t Rsp;
203203
}_SlFsReadMsg_u;
204204

205205
const _SlCmdCtrl_t _SlFsReadCmdCtrl =
@@ -269,8 +269,8 @@ _i32 sl_FsRead(_i32 FileHdl, _u32 Offset, _u8* pData, _u32 Len)
269269
/*****************************************************************************/
270270
typedef union
271271
{
272-
_FsWriteCommand_t Cmd;
273-
_FsWriteResponse_t Rsp;
272+
_FsWriteCommand_t Cmd;
273+
_FsWriteResponse_t Rsp;
274274
}_SlFsWriteMsg_u;
275275

276276
const _SlCmdCtrl_t _SlFsWriteCmdCtrl =
@@ -343,8 +343,8 @@ _i32 sl_FsWrite(_i32 FileHdl, _u32 Offset, _u8* pData, _u32 Len)
343343
/*****************************************************************************/
344344
typedef union
345345
{
346-
_FsGetInfoCommand_t Cmd;
347-
_FsGetInfoResponse_t Rsp;
346+
_FsGetInfoCommand_t Cmd;
347+
_FsGetInfoResponse_t Rsp;
348348
}_SlFsGetInfoMsg_u;
349349

350350
const _SlCmdCtrl_t _SlFsGetInfoCmdCtrl =
@@ -384,8 +384,8 @@ _i16 sl_FsGetInfo(_u8 *pFileName,_u32 Token,SlFsFileInfo_t* pFsFileInfo)
384384
/*****************************************************************************/
385385
typedef union
386386
{
387-
_FsDeleteCommand_t Cmd;
388-
_FsDeleteResponse_t Rsp;
387+
_FsDeleteCommand_t Cmd;
388+
_FsDeleteResponse_t Rsp;
389389
}_SlFsDeleteMsg_u;
390390

391391
const _SlCmdCtrl_t _SlFsDeleteCmdCtrl =

0 commit comments

Comments
 (0)