From f59c0244eb0d4a601d074d4141b05b76476bd725 Mon Sep 17 00:00:00 2001 From: Peter Mitsis Date: Mon, 20 Apr 2015 14:04:18 -0400 Subject: [PATCH] Move REQ_TYPE bits to private header file The REQ_TYPE bits are only used internally. Change-Id: I80df7c8a6498ab5624f234df190ffe61267076fd Signed-off-by: Peter Mitsis Signed-off-by: Benjamin Walsh --- include/microkernel/k_struct.h | 6 ------ kernel/microkernel/channel/ch_addit.c | 1 + kernel/microkernel/include/kchan.h | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/microkernel/k_struct.h b/include/microkernel/k_struct.h index 7000b6d6e0e..886fafa5dbd 100644 --- a/include/microkernel/k_struct.h +++ b/include/microkernel/k_struct.h @@ -180,12 +180,6 @@ struct k_mrec { /* target channels types: */ -typedef uint32_t REQ_TYPE; -#define _ALLREQ ((REQ_TYPE)0x0000FF00) -#define _SYNCREQ ((REQ_TYPE)0x00000100) -#define _SYNCREQL ((REQ_TYPE)0x00000200) -#define _ASYNCREQ ((REQ_TYPE)0x00000400) - typedef uint32_t TIME_TYPE; #define _ALLTIME ((TIME_TYPE)0x00FF0000) #define _TIME_NB ((TIME_TYPE)0x00010000) diff --git a/kernel/microkernel/channel/ch_addit.c b/kernel/microkernel/channel/ch_addit.c index 221f9a91774..51717110d59 100644 --- a/kernel/microkernel/channel/ch_addit.c +++ b/kernel/microkernel/channel/ch_addit.c @@ -33,6 +33,7 @@ #include "microkernel/k_struct.h" #include "kmemcpy.h" #include "minik.h" +#include "kchan.h" #include "kticks.h" #include #include diff --git a/kernel/microkernel/include/kchan.h b/kernel/microkernel/include/kchan.h index f6f1a52ae1d..1ef48c61701 100644 --- a/kernel/microkernel/include/kchan.h +++ b/kernel/microkernel/include/kchan.h @@ -39,6 +39,11 @@ #include "ch_cfg.h" /* defines the high-level behavior of the channel service \ */ +typedef uint32_t REQ_TYPE; +#define _ALLREQ ((REQ_TYPE)0x0000FF00) +#define _SYNCREQ ((REQ_TYPE)0x00000100) +#define _SYNCREQL ((REQ_TYPE)0x00000200) +#define _ASYNCREQ ((REQ_TYPE)0x00000400) /* K functions: */