commit 1e00d852398a479e5a3d74ded9913b2a605f2d44 parent 770a751fb300449727b1a658664d5ae9638158c7 Author: Roberto Vargas <roberto.vargas@arm.com> Date: Thu, 11 Oct 2018 08:56:38 +0100 Remove inclusion of arch/machine in pack/unpack functions This header was not needed and created problems in non arm targets. At the same time gendep.sh was fixed to work in any case using as delimiter the next variable (RMSA). Diffstat:
19 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/scripts/gencode.sh b/scripts/gencode.sh @@ -75,8 +75,7 @@ function gen(fun, tag, file) printf("#include <assert.h>\n"\ "#include <stdint.h>\n\n"\ - "#include <types.h>\n"\ - "#include <arch/machine.h>\n\n"\ + "#include <types.h>\n\n"\ "int\n"\ "%s_%s(uint64_t buf[], struct %s *sp)\n"\ "{\n"\ diff --git a/src/libtypes/Makefile b/src/libtypes/Makefile @@ -17,7 +17,7 @@ OBJS = pack.o unpack.o \ pack_rscb_ctrl.o \ unpack_rscb_ctrl.o \ -RMSA = $(JSONDIR)/RMSA.json +RMSA = $(JSONDIR)/RMSA.json # gendep.sh expects this var after OBJS TARGET = $(LIBDIR)/libtypes.a $(TARGET): $(OBJS) diff --git a/src/libtypes/gendep.sh b/src/libtypes/gendep.sh @@ -38,7 +38,7 @@ EOF cat "$@") > $tmp && mv $tmp ${inc}types.h (echo H -echo '/^OBJS/;/^$/c' +echo '/^OBJS/;/^RMSA/-c' printf 'OBJS = pack.o unpack.o \\\n' for i do diff --git a/src/libtypes/pack_rscb.c b/src/libtypes/pack_rscb.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int pack_rscb(uint64_t buf[], struct rscb *sp) diff --git a/src/libtypes/pack_rscb_ctrl.c b/src/libtypes/pack_rscb_ctrl.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int pack_rscb_ctrl(uint64_t buf[], struct rscb_ctrl *sp) diff --git a/src/libtypes/pack_rscb_event_ctx.c b/src/libtypes/pack_rscb_event_ctx.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int pack_rscb_event_ctx(uint64_t buf[], struct rscb_event_ctx *sp) diff --git a/src/libtypes/pack_rscb_event_vec.c b/src/libtypes/pack_rscb_event_vec.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int pack_rscb_event_vec(uint64_t buf[], struct rscb_event_vec *sp) diff --git a/src/libtypes/pack_rscb_l0rgt_hdr.c b/src/libtypes/pack_rscb_l0rgt_hdr.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int pack_rscb_l0rgt_hdr(uint64_t buf[], struct rscb_l0rgt_hdr *sp) diff --git a/src/libtypes/pack_rscb_rpu_cfg.c b/src/libtypes/pack_rscb_rpu_cfg.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int pack_rscb_rpu_cfg(uint64_t buf[], struct rscb_rpu_cfg *sp) diff --git a/src/libtypes/pack_rscb_state.c b/src/libtypes/pack_rscb_state.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int pack_rscb_state(uint64_t buf[], struct rscb_state *sp) diff --git a/src/libtypes/pack_rscb_sys_props.c b/src/libtypes/pack_rscb_sys_props.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int pack_rscb_sys_props(uint64_t buf[], struct rscb_sys_props *sp) diff --git a/src/libtypes/unpack_rscb.c b/src/libtypes/unpack_rscb.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int unpack_rscb(uint64_t buf[], struct rscb *sp) diff --git a/src/libtypes/unpack_rscb_ctrl.c b/src/libtypes/unpack_rscb_ctrl.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int unpack_rscb_ctrl(uint64_t buf[], struct rscb_ctrl *sp) diff --git a/src/libtypes/unpack_rscb_event_ctx.c b/src/libtypes/unpack_rscb_event_ctx.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int unpack_rscb_event_ctx(uint64_t buf[], struct rscb_event_ctx *sp) diff --git a/src/libtypes/unpack_rscb_event_vec.c b/src/libtypes/unpack_rscb_event_vec.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int unpack_rscb_event_vec(uint64_t buf[], struct rscb_event_vec *sp) diff --git a/src/libtypes/unpack_rscb_l0rgt_hdr.c b/src/libtypes/unpack_rscb_l0rgt_hdr.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int unpack_rscb_l0rgt_hdr(uint64_t buf[], struct rscb_l0rgt_hdr *sp) diff --git a/src/libtypes/unpack_rscb_rpu_cfg.c b/src/libtypes/unpack_rscb_rpu_cfg.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int unpack_rscb_rpu_cfg(uint64_t buf[], struct rscb_rpu_cfg *sp) diff --git a/src/libtypes/unpack_rscb_state.c b/src/libtypes/unpack_rscb_state.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int unpack_rscb_state(uint64_t buf[], struct rscb_state *sp) diff --git a/src/libtypes/unpack_rscb_sys_props.c b/src/libtypes/unpack_rscb_sys_props.c @@ -2,7 +2,6 @@ #include <stdint.h> #include <types.h> -#include <arch/machine.h> int unpack_rscb_sys_props(uint64_t buf[], struct rscb_sys_props *sp)