From 3f95d62b351b390fdc1ad6f0473fd81b4b2de6bc Mon Sep 17 00:00:00 2001
From: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Date: Tue, 18 Sep 2007 09:01:29 +0200
Subject: [PATCH] Introduce EIBC_RETURN_UINT*

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
---
 eibd/client/eibclient-int.h    | 6 ++++++
 eibd/client/loadimage.c        | 2 +-
 eibd/client/mcauthorize.c      | 2 +-
 eibd/client/mcgetmaskversion.c | 2 +-
 eibd/client/mcgetpeitype.c     | 2 +-
 eibd/client/mcprogmodestatus.c | 2 +-
 eibd/client/mgetmaskversion.c  | 2 +-
 eibd/client/mprogmodestatus.c  | 2 +-
 8 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/eibd/client/eibclient-int.h b/eibd/client/eibclient-int.h
index 324c6a6..7aa0264 100644
--- a/eibd/client/eibclient-int.h
+++ b/eibd/client/eibclient-int.h
@@ -109,6 +109,12 @@ int _EIB_GetRequest (EIBConnection * con);
 #define EIBC_RETURN_LEN \
 	return con->req.len;
 
+#define EIBC_RETURN_UINT8(offset) \
+	return con->buf[offset];
+
+#define EIBC_RETURN_UINT16(offset) \
+	return (con->buf[offset] << 8) | (con->buf[offset+1]);
+
 #define EIBC_RETURN_PTR1(offset) \
 	if (con->req.ptr1) \
 	  *con->req.ptr1 = (con->buf[offset] << 8) | (con->buf[offset+1]);
diff --git a/eibd/client/loadimage.c b/eibd/client/loadimage.c
index a0b5b5c..88c7888 100644
--- a/eibd/client/loadimage.c
+++ b/eibd/client/loadimage.c
@@ -33,7 +33,7 @@ LoadImage_complete (EIBConnection * con)
 {
   EIBC_GETREQUEST
   EIBC_CHECKRESULT (EIB_LOAD_IMAGE, 4)
-  return (con->buf[2] << 8) | con->buf[3];
+  EIBC_RETURN_UINT16 (2)
 }
 
 int
diff --git a/eibd/client/mcauthorize.c b/eibd/client/mcauthorize.c
index 8bb9142..c23cde3 100644
--- a/eibd/client/mcauthorize.c
+++ b/eibd/client/mcauthorize.c
@@ -33,7 +33,7 @@ MC_Authorize_complete (EIBConnection * con)
 {
   EIBC_GETREQUEST
   EIBC_CHECKRESULT (EIB_MC_AUTHORIZE, 3)
-  return con->buf[2];
+  EIBC_RETURN_UINT8 (2)
 }
 
 int
diff --git a/eibd/client/mcgetmaskversion.c b/eibd/client/mcgetmaskversion.c
index 8bfac0c..f7b586f 100644
--- a/eibd/client/mcgetmaskversion.c
+++ b/eibd/client/mcgetmaskversion.c
@@ -33,7 +33,7 @@ MC_GetMaskVersion_complete (EIBConnection * con)
 {
   EIBC_GETREQUEST
   EIBC_CHECKRESULT (EIB_MC_MASK_VERSION, 4)
-  return (con->buf[2] << 8) | (con->buf[3]);
+  EIBC_RETURN_UINT16 (2)
 }
 
 int
diff --git a/eibd/client/mcgetpeitype.c b/eibd/client/mcgetpeitype.c
index f1ce555..cba8473 100644
--- a/eibd/client/mcgetpeitype.c
+++ b/eibd/client/mcgetpeitype.c
@@ -33,7 +33,7 @@ MC_GetPEIType_complete (EIBConnection * con)
 {
   EIBC_GETREQUEST
   EIBC_CHECKRESULT (EIB_MC_PEI_TYPE, 4)
-  return (con->buf[2] << 8) | (con->buf[3]);
+  EIBC_RETURN_UINT16 (2)
 }
 
 int
diff --git a/eibd/client/mcprogmodestatus.c b/eibd/client/mcprogmodestatus.c
index b5bd72a..672622e 100644
--- a/eibd/client/mcprogmodestatus.c
+++ b/eibd/client/mcprogmodestatus.c
@@ -33,7 +33,7 @@ MC_Progmode_Status_complete (EIBConnection * con)
 {
   EIBC_GETREQUEST
   EIBC_CHECKRESULT (EIB_MC_PROG_MODE, 3)
-  return con->buf[2];
+  EIBC_RETURN_UINT8 (2)
 }
 
 int
diff --git a/eibd/client/mgetmaskversion.c b/eibd/client/mgetmaskversion.c
index a77fddc..e0a1d38 100644
--- a/eibd/client/mgetmaskversion.c
+++ b/eibd/client/mgetmaskversion.c
@@ -33,7 +33,7 @@ M_GetMaskVersion_complete (EIBConnection * con)
 {
   EIBC_GETREQUEST
   EIBC_CHECKRESULT (EIB_MASK_VERSION, 4)
-  return (con->buf[2] << 8) | (con->buf[3]);
+  EIBC_RETURN_UINT16 (2)
 }
 
 int
diff --git a/eibd/client/mprogmodestatus.c b/eibd/client/mprogmodestatus.c
index f6fda34..f85b530 100644
--- a/eibd/client/mprogmodestatus.c
+++ b/eibd/client/mprogmodestatus.c
@@ -33,7 +33,7 @@ M_Progmode_Status_complete (EIBConnection * con)
 {
   EIBC_GETREQUEST
   EIBC_CHECKRESULT (EIB_PROG_MODE, 3)
-  return con->buf[2];
+  EIBC_RETURN_UINT8 (2)
 }
 
 int
-- 
2.11.4.GIT