diff --git a/include/microkernel/k_struct.h b/include/microkernel/k_struct.h index b4803caabf5..ad859ceef2c 100644 --- a/include/microkernel/k_struct.h +++ b/include/microkernel/k_struct.h @@ -230,11 +230,6 @@ struct sync_req { int iSizeTotal; }; -struct sync_req_l { - int Data[5]; - int iSizeTotal; -}; - struct async_req { struct k_block block; int iSizeTotal; @@ -245,7 +240,6 @@ struct k_chreq { struct req_info ReqInfo; union { struct sync_req Sync; - struct sync_req_l SyncLocal; struct async_req Async; } ReqType; int Dummy; @@ -266,7 +260,6 @@ struct k_chack { struct req_info ReqInfo; union { struct sync_req Dummy; - struct sync_req_l SyncLocal; struct async_req Async; } ReqType; int iSizeXferred; diff --git a/kernel/microkernel/channel/KS_ChGet.c b/kernel/microkernel/channel/KS_ChGet.c index 1aee8137ad5..3f718ba543d 100644 --- a/kernel/microkernel/channel/KS_ChGet.c +++ b/kernel/microkernel/channel/KS_ChGet.c @@ -66,24 +66,10 @@ int _task_pipe_get(kpipe_t Id, ChReq.ReqInfo.ChRef.Id = Id; 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 = 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; } diff --git a/kernel/microkernel/channel/KS_ChPut.c b/kernel/microkernel/channel/KS_ChPut.c index 64aa4900eb2..3f5a08ef7eb 100644 --- a/kernel/microkernel/channel/KS_ChPut.c +++ b/kernel/microkernel/channel/KS_ChPut.c @@ -68,22 +68,10 @@ int _task_pipe_put(kpipe_t Id, ChReq.ReqInfo.ChRef.Id = Id; 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; } diff --git a/kernel/microkernel/channel/K_ChGReq.c b/kernel/microkernel/channel/K_ChGReq.c index 61a3ebe3346..75fdda628c8 100644 --- a/kernel/microkernel/channel/K_ChGReq.c +++ b/kernel/microkernel/channel/K_ChGReq.c @@ -80,19 +80,6 @@ void K_ChRecvReq(struct k_args *RequestOrig) RequestProc->Args.ChProc.iSizeTotal = Request->Args.ChReq.ReqType.Sync.iSizeTotal; 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: break; } diff --git a/kernel/microkernel/channel/K_ChPReq.c b/kernel/microkernel/channel/K_ChPReq.c index 3fc5a0b6598..b4f8ccda3be 100644 --- a/kernel/microkernel/channel/K_ChPReq.c +++ b/kernel/microkernel/channel/K_ChPReq.c @@ -92,21 +92,6 @@ void K_ChSendReq(struct k_args *RequestOrig) Request->Args.ChReq.ReqType.Sync .iSizeTotal; 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: RequestProc->Args.ChProc.DataNode = OBJ_NODE(Request->Args.ChReq