OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename k_args_args field ChReq to pipe_req 

Eliminates references to obsolete "channel" terminology.

Change-Id: I0456bfd9a43bd94f83c58dd1f47be50bf393d492
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2015-07-07 13:12:08 -04:00 committed by Anas Nashif
parent a2b866ea74
commit 367d9e9e3f
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/microkernel/include/micro_private_types.h
View File

@ -441,7 +441,7 @@ union k_args_args {
struct _z4arg z4;
struct _pipe_xfer_req_arg ChProc;
struct _pipe_xfer_ack_arg ChMovedAck;
struct _pipe_req_arg ChReq;
struct _pipe_req_arg pipe_req;
struct _pipe_ack_arg ChAck;
};

20
kernel/microkernel/k_pipe.c
View File

@ -95,9 +95,9 @@ int _task_pipe_get(kpipe_t Id, void *pBuffer,
A.Comm = PIPE_GET_REQUEST;
A.Time.ticks = TimeOut;
A.Args.ChReq.ReqInfo.ChRef.Id = Id;
A.Args.ChReq.ReqType.Sync.iSizeTotal = iNbrBytesToRead;
A.Args.ChReq.ReqType.Sync.pData = pBuffer;
A.Args.pipe_req.ReqInfo.ChRef.Id = Id;
A.Args.pipe_req.ReqType.Sync.iSizeTotal = iNbrBytesToRead;
A.Args.pipe_req.ReqType.Sync.pData = pBuffer;
_k_pipe_option_set(&A.Args, Option);
_k_pipe_request_type_set(&A.Args, _SYNCREQ);
@ -147,9 +147,9 @@ int _task_pipe_put(kpipe_t Id, void *pBuffer,
A.Comm = PIPE_PUT_REQUEST;
A.Time.ticks = TimeOut;
A.Args.ChReq.ReqInfo.ChRef.Id = Id;
A.Args.ChReq.ReqType.Sync.iSizeTotal = iNbrBytesToWrite;
A.Args.ChReq.ReqType.Sync.pData = pBuffer;
A.Args.pipe_req.ReqInfo.ChRef.Id = Id;
A.Args.pipe_req.ReqType.Sync.iSizeTotal = iNbrBytesToWrite;
A.Args.pipe_req.ReqType.Sync.pData = pBuffer;
_k_pipe_option_set(&A.Args, Option);
_k_pipe_request_type_set(&A.Args, _SYNCREQ);
@ -193,10 +193,10 @@ int _task_pipe_put_async(kpipe_t Id, struct k_block Block,
A.Time.ticks = TICKS_UNLIMITED;
/* same behavior in flow as a blocking call w/o a timeout */
A.Args.ChReq.ReqInfo.ChRef.Id = Id;
A.Args.ChReq.ReqType.Async.block = Block;
A.Args.ChReq.ReqType.Async.iSizeTotal = iSize2Xfer;
A.Args.ChReq.ReqType.Async.sema = Sema;
A.Args.pipe_req.ReqInfo.ChRef.Id = Id;
A.Args.pipe_req.ReqType.Async.block = Block;
A.Args.pipe_req.ReqType.Async.iSizeTotal = iSize2Xfer;
A.Args.pipe_req.ReqType.Async.sema = Sema;
_k_pipe_request_type_set(&A.Args, _ASYNCREQ);
_k_pipe_option_set(&A.Args, _ALL_N); /* force ALL_N */

6
kernel/microkernel/k_pipe_get.c
View File

@ -48,7 +48,7 @@ void _k_pipe_get_request(struct k_args *RequestOrig)
struct k_args *Request;
struct k_args *RequestProc;
kpipe_t pipeId = RequestOrig->Args.ChReq.ReqInfo.ChRef.Id;
kpipe_t pipeId = RequestOrig->Args.pipe_req.ReqInfo.ChRef.Id;
/* If it's a poster, then don't deschedule the task */
@ -73,9 +73,9 @@ void _k_pipe_get_request(struct k_args *RequestOrig)
switch (_k_pipe_request_type_get(&RequestProc->Args)) {
case _SYNCREQ:
RequestProc->Args.ChProc.pData =
Request->Args.ChReq.ReqType.Sync.pData;
Request->Args.pipe_req.ReqType.Sync.pData;
RequestProc->Args.ChProc.iSizeTotal =
Request->Args.ChReq.ReqType.Sync.iSizeTotal;
Request->Args.pipe_req.ReqType.Sync.iSizeTotal;
break;
default:
break;

10
kernel/microkernel/k_pipe_put.c
View File

@ -49,7 +49,7 @@ void _k_pipe_put_request(struct k_args *RequestOrig)
struct k_args *Request;
struct k_args *RequestProc;
kpipe_t pipeId = RequestOrig->Args.ChReq.ReqInfo.ChRef.Id;
kpipe_t pipeId = RequestOrig->Args.pipe_req.ReqInfo.ChRef.Id;
bool bAsync;
@ -85,15 +85,15 @@ void _k_pipe_put_request(struct k_args *RequestOrig)
switch (_k_pipe_request_type_get(&RequestProc->Args)) {
case _SYNCREQ:
RequestProc->Args.ChProc.pData =
Request->Args.ChReq.ReqType.Sync.pData;
Request->Args.pipe_req.ReqType.Sync.pData;
RequestProc->Args.ChProc.iSizeTotal =
Request->Args.ChReq.ReqType.Sync.iSizeTotal;
Request->Args.pipe_req.ReqType.Sync.iSizeTotal;
break;
case _ASYNCREQ:
RequestProc->Args.ChProc.pData =
Request->Args.ChReq.ReqType.Async.block.pointer_to_data;
Request->Args.pipe_req.ReqType.Async.block.pointer_to_data;
RequestProc->Args.ChProc.iSizeTotal =
Request->Args.ChReq.ReqType.Async.iSizeTotal;
Request->Args.pipe_req.ReqType.Async.iSizeTotal;
break;
default:
break;