From 0d376ab2c8be5051e2b7a44983cabd4caa666c59 Mon Sep 17 00:00:00 2001
From: Peter Mitsis <peter.mitsis@windriver.com>
Date: Mon, 20 Apr 2015 23:34:59 -0400
Subject: [PATCH] Remove 'srcnode' from moved_req structure

The 'srcnode' field in the moved_req structure is only relevant to multi-node
systems.  Furthermore, with the absence of the 'srcnode' field, the routine
setup_movedata() requires one less parameter.

Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
Change-Id: I00bbee2d78ef345a00399708215bd9e1ef5298d2
---
 include/microkernel/k_struct.h        | 1 -
 kernel/microkernel/channel/K_Ch_Mvd.c | 2 --
 kernel/microkernel/channel/K_Ch_RO.c  | 1 -
 kernel/microkernel/channel/K_Ch_WO.c  | 1 -
 kernel/microkernel/channel/K_Ch_WR.c  | 1 -
 kernel/microkernel/include/kchan.h    | 1 -
 6 files changed, 7 deletions(-)

diff --git a/include/microkernel/k_struct.h b/include/microkernel/k_struct.h
index ec99f513e1..69a8264c4d 100644
--- a/include/microkernel/k_struct.h
+++ b/include/microkernel/k_struct.h
@@ -353,7 +353,6 @@ typedef uint32_t MovedAction;
 
 struct moved_req {
 	MovedAction Action;
-	knode_t srcnode;
 	void *source;
 	void *destination;
 	uint32_t iTotalSize;
diff --git a/kernel/microkernel/channel/K_Ch_Mvd.c b/kernel/microkernel/channel/K_Ch_Mvd.c
index e2ce060ca7..240670c684 100644
--- a/kernel/microkernel/channel/K_Ch_Mvd.c
+++ b/kernel/microkernel/channel/K_Ch_Mvd.c
@@ -54,7 +54,6 @@ void setup_movedata(struct k_args *A,
 					  struct k_args *pWriter,
 					  struct k_args *pReader,
 					  void *destination,
-					  knode_t srcnode,
 					  void *source,
 					  uint32_t size,
 					  int XferID)
@@ -65,7 +64,6 @@ void setup_movedata(struct k_args *A,
 				set/reset of state bits */
 
 	A->Args.MovedReq.Action = (MovedAction)(MVDACT_SNDACK | MVDACT_RCVACK);
-	A->Args.MovedReq.srcnode = srcnode;
 	A->Args.MovedReq.source = source;
 	A->Args.MovedReq.destination = destination;
 	A->Args.MovedReq.iTotalSize = size;
diff --git a/kernel/microkernel/channel/K_Ch_RO.c b/kernel/microkernel/channel/K_Ch_RO.c
index 7f61dbe6cf..a7098a3dcf 100644
--- a/kernel/microkernel/channel/K_Ch_RO.c
+++ b/kernel/microkernel/channel/K_Ch_RO.c
@@ -95,7 +95,6 @@ void K_ChProcRO(struct pipe_struct *pPipe, struct k_args *pNewReader)
 			pReader,
 			(char *)(pReaderArgs->pData) +
 				OCTET_TO_SIZEOFUNIT(pReaderArgs->iSizeXferred),
-			K_ThisNode,
 			pRead,
 			ret,
 			id);
diff --git a/kernel/microkernel/channel/K_Ch_WO.c b/kernel/microkernel/channel/K_Ch_WO.c
index 9faacc4f14..2316ebf637 100644
--- a/kernel/microkernel/channel/K_Ch_WO.c
+++ b/kernel/microkernel/channel/K_Ch_WO.c
@@ -95,7 +95,6 @@ void K_ChProcWO(struct pipe_struct *pPipe, struct k_args *pNewWriter)
 			pWriter,
 			NULL,
 			pWrite,
-			pWriterArgs->DataNode,
 			(char *)(pWriterArgs->pData) +
 				OCTET_TO_SIZEOFUNIT(pWriterArgs->iSizeXferred),
 			ret,
diff --git a/kernel/microkernel/channel/K_Ch_WR.c b/kernel/microkernel/channel/K_Ch_WR.c
index 9e3d15e856..c9e0ea53de 100644
--- a/kernel/microkernel/channel/K_Ch_WR.c
+++ b/kernel/microkernel/channel/K_Ch_WR.c
@@ -162,7 +162,6 @@ void K_ChProcWR(
 			pReader,
 			(char *)(pReaderArgs->pData) +
 				OCTET_TO_SIZEOFUNIT(pReaderArgs->iSizeXferred),
-			pWriterArgs->DataNode,
 			(char *)(pWriterArgs->pData) +
 				OCTET_TO_SIZEOFUNIT(pWriterArgs->iSizeXferred),
 			iT2,
diff --git a/kernel/microkernel/include/kchan.h b/kernel/microkernel/include/kchan.h
index 24319ea47c..f6f1a52ae1 100644
--- a/kernel/microkernel/include/kchan.h
+++ b/kernel/microkernel/include/kchan.h
@@ -74,7 +74,6 @@ void setup_movedata(struct k_args *A,
 		    struct k_args *pWriter,
 		    struct k_args *pReader,
 		    void *destination,
-		    knode_t srcnode,
 		    void *source,
 		    uint32_t size,
 		    int XferID);