michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Remove references to SyncLocal

Browse source 
The SyncLocal symbol is not used.

Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
Change-Id: I87c55b8869bbe447436f6e2ccf3d3652b50532ce
This commit is contained in:
Peter Mitsis 2015-04-20 15:25:03 -04:00 • committed by Anas Nashif
commit 4b19f3c661
5 changed files with 6 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/microkernel/k_struct.h
View file

@ -230,11 +230,6 @@ struct sync_req {
int iSizeTotal; int iSizeTotal;
}; };
struct sync_req_l {
int Data[5];
int iSizeTotal;
};
struct async_req { struct async_req {
struct k_block block; struct k_block block;
int iSizeTotal; int iSizeTotal;
@ -245,7 +240,6 @@ struct k_chreq {
struct req_info ReqInfo; struct req_info ReqInfo;
union { union {
struct sync_req Sync; struct sync_req Sync;
struct sync_req_l SyncLocal;
struct async_req Async; struct async_req Async;
} ReqType; } ReqType;
int Dummy; int Dummy;
@ -266,7 +260,6 @@ struct k_chack {
struct req_info ReqInfo; struct req_info ReqInfo;
union { union {
struct sync_req Dummy; struct sync_req Dummy;
struct sync_req_l SyncLocal;
struct async_req Async; struct async_req Async;
} ReqType; } ReqType;
int iSizeXferred; int iSizeXferred;

20
kernel/microkernel/channel/KS_ChGet.c
View file

@ -66,24 +66,10 @@ int _task_pipe_get(kpipe_t Id,
ChReq.ReqInfo.ChRef.Id = Id; ChReq.ReqInfo.ChRef.Id = Id;
ChxxxSetChOpt((K_ARGS_ARGS *)&ChReq, Option); ChxxxSetChOpt((K_ARGS_ARGS *)&ChReq, Option);
/* check what type of synchr. Xfer: ChxxxSetReqType((K_ARGS_ARGS *)&ChReq, _SYNCREQ);
Not yet implemented ChReq.ReqType.Sync.iSizeTotal = iNbrBytesToRead;
*/ ChReq.ReqType.Sync.pData = pBuffer;
/* special synchr. Xfer: Not yet implemented
{
ChxxxSetReqType( &ReqInfo, _SYNCREQL);
ChReq.ReqType.SyncLocal.Data ...;
ChReq.ReqType.SyncLocal.iSizeTotal =iNbrBytesToRead;
}
*/
/* normal synchr. Xfer: */
{
ChxxxSetReqType((K_ARGS_ARGS *)&ChReq, _SYNCREQ);
ChReq.ReqType.Sync.iSizeTotal = iNbrBytesToRead;
ChReq.ReqType.Sync.pData = pBuffer;
}
A.Args.ChReq = ChReq; A.Args.ChReq = ChReq;
} }

18
kernel/microkernel/channel/KS_ChPut.c
View file

@ -68,22 +68,10 @@ int _task_pipe_put(kpipe_t Id,
ChReq.ReqInfo.ChRef.Id = Id; ChReq.ReqInfo.ChRef.Id = Id;
ChxxxSetChOpt((K_ARGS_ARGS *)&ChReq, Option); ChxxxSetChOpt((K_ARGS_ARGS *)&ChReq, Option);
/* check what type of synchr. Xfer: Not yet implemented ChxxxSetReqType((K_ARGS_ARGS *)&ChReq, _SYNCREQ);
*/ ChReq.ReqType.Sync.iSizeTotal = iNbrBytesToWrite;
ChReq.ReqType.Sync.pData = pBuffer;
/* special synchr. Xfer: Not yet implemented
{
ChxxxSetReqType( &ReqInfo, _SYNCREQL);
ChReq.ReqType.SyncLocal.Data ...;
ChReq.ReqType.SyncLocal.iSizeTotal =iNbrBytesToWrite;
}
*/
/* normal synchr. Xfer: */
{
ChxxxSetReqType((K_ARGS_ARGS *)&ChReq, _SYNCREQ);
ChReq.ReqType.Sync.iSizeTotal = iNbrBytesToWrite;
ChReq.ReqType.Sync.pData = pBuffer;
}
A.Args.ChReq = ChReq; A.Args.ChReq = ChReq;
} }

13
kernel/microkernel/channel/K_ChGReq.c
View file

@ -80,19 +80,6 @@ void K_ChRecvReq(struct k_args *RequestOrig)
RequestProc->Args.ChProc.iSizeTotal = RequestProc->Args.ChProc.iSizeTotal =
Request->Args.ChReq.ReqType.Sync.iSizeTotal; Request->Args.ChReq.ReqType.Sync.iSizeTotal;
break; break;
#if 0
/*
* This code is presently unreachable and as such has been if-def'd out.
* It is unreachable because the "calling code" for this special
* synchronous transfer case has not been implemented in
* KS_ChGet.c :: _task_pipe_get().
*/
case _SYNCREQL:
RequestProc->Args.ChProc.pData = Request->Args.ChReq.ReqType.SyncLocal.Data;
RequestProc->Args.ChProc.iSizeTotal = Request->Args.ChReq.ReqType.SyncLocal.iSizeTotal;
break;
#endif
default: default:
break; break;
} }

15
kernel/microkernel/channel/K_ChPReq.c
View file

@ -92,21 +92,6 @@ void K_ChSendReq(struct k_args *RequestOrig)
Request->Args.ChReq.ReqType.Sync Request->Args.ChReq.ReqType.Sync
.iSizeTotal; .iSizeTotal;
break; break;
#if 0
case _SYNCREQL:
/*
* This code is presently unreachable and as such has been if-def'd out.
* It is unreachable because the "calling code" for this special
* synchronous transfer case has not been implemented in
* KS_ChPut.c :: _task_pipe_put().
*/
RequestProc->Args.ChProc.pData =
Request->Args.ChReq.ReqType.SyncLocal.Data;
RequestProc->Args.ChProc.iSizeTotal =
Request->Args.ChReq.ReqType.SyncLocal.iSizeTotal;
break;
#endif
case _ASYNCREQ: case _ASYNCREQ:
RequestProc->Args.ChProc.DataNode = RequestProc->Args.ChProc.DataNode =
OBJ_NODE(Request->Args.ChReq OBJ_NODE(Request->Args.ChReq