tee: use types/ directory for the type definitions header

Also, switch ioctl_tee test to system header usage, to double-check
things.

* tee.h: Rename to...
* types/tee.h: ...this.  Remove "xlat/tee_ioctl_cmds.h",
"xlat/tee_ioctl_gen_caps.h", "xlat/tee_ioctl_impl_ids.h",
"xlat/tee_ioctl_login_types.h", "xlat/tee_ioctl_max_arg_size.h",
"xlat/tee_ioctl_origins.h", "xlat/tee_ioctl_optee_caps.h",
"xlat/tee_ioctl_param_attr_types.h", "xlat/tee_ioctl_shm_flags.h"
includes.  Add header guard.
[!HAVE_STRUCT_TEE_IOCTL_BUF_DATA, !HAVE_STRUCT_TEE_IOCTL_CANCEL_ARG,
!HAVE_STRUCT_TEE_IOCTL_CLOSE_SESSION_ARG,
!HAVE_STRUCT_TEE_IOCTL_SHM_ALLOC_DATA,
!HAVE_STRUCT_TEE_IOCTL_SHM_REGISTER_FD_DATA,
!HAVE_STRUCT_TEE_IOCTL_SHM_REGISTER_DATA,
!HAVE_STRUCT_TEE_IOCTL_VERSION_DATA, !HAVE_STRUCT_TEE_IOCTL_PARAM,
!HAVE_STRUCT_TEE_IOCTL_INVOKE_ARG, !HAVE_STRUCT_TEE_IOCL_SUPP_RECV_ARG,
!HAVE_STRUCT_TEE_IOCL_SUPP_SEND_ARG,
!HAVE_STRUCT_TEE_IOCTL_OPEN_SESSION_ARG]: Remove ifdefs.
(struct tee_ioctl_buf_data): Change to...
(typedef struct_tee_ioctl_buf_data): ...this.
(struct tee_ioctl_cancel_arg): Change to...
(typedef struct_tee_ioctl_cancel_arg): ...this.
(struct tee_ioctl_close_session_arg): Change to...
(typedef struct_tee_ioctl_close_session_arg): ...this.
(struct tee_ioctl_shm_alloc_data): Change to...
(typedef struct_tee_ioctl_shm_alloc_data): ...this.
(struct tee_ioctl_shm_register_fd_data): Change to...
(typedef struct_tee_ioctl_shm_register_fd_data): ...this.
(struct tee_ioctl_shm_register_data): Change to...
(typedef struct_tee_ioctl_shm_register_data): ...this.
(struct tee_ioctl_version_data): Change to...
(typedef struct_tee_ioctl_version_data): ...this.
(struct tee_ioctl_param): Change to...
(typedef struct_tee_ioctl_param): ...this.
(struct tee_ioctl_invoke_arg): Change to...
(typedef struct_tee_ioctl_invoke_arg): ...this.  Change params field
type from struct tee_ioctl_param to struct_tee_ioctl_param.
(struct tee_iocl_supp_recv_arg): Change to...
(typedef struct_tee_iocl_supp_recv_arg): ...this.  Change params field
type from struct tee_ioctl_param to struct_tee_ioctl_param.
(struct tee_iocl_supp_send_arg): Change to...
(typedef struct_tee_iocl_supp_send_arg): ...this.  Change params field
type from struct tee_ioctl_param to struct_tee_ioctl_param.
(struct tee_ioctl_open_session_arg): Change to...
(typedef struct_tee_ioctl_open_session_arg): ...this.  Change params
field type from struct tee_ioctl_param to struct_tee_ioctl_param.
[TEE_IOCTL_PARAM_SIZE]: Move to tee.c.
* Makefile.am (libstrace_a_SOURCES): Remove tee.h.
* configure.ac (AC_CHECK_HEADERS([linux/tee.h])): Remove in favour of
auto-generated checks courtesy of types/tee.h.
* tee.c: Remove "tee.h" include.  Add "types/tee.h",
"xlat/tee_ioctl_cmds.h" (under XLAT_MACROS_ONLY definition),
"xlat/tee_ioctl_gen_caps.h", "xlat/tee_ioctl_impl_ids.h",
"xlat/tee_ioctl_login_types.h", "xlat/tee_ioctl_max_arg_size.h",
"xlat/tee_ioctl_origins.h", "xlat/tee_ioctl_optee_caps.h",
"xlat/tee_ioctl_param_attr_types.h", "xlat/tee_ioctl_shm_flags.h"
includes.
[TEE_IOCTL_PARAM_SIZE]: Move from tee.h.
(tee_print_buf, tee_fetch_buf_data): Change the buf argument type
from struct tee_ioctl_buf_data to struct_tee_ioctl_buf_data.
(tee_print_param_fn): Change the param variable type from
struct tee_ioctl_param to struct_tee_ioctl_param.
(tee_print_params): Change the param_buffer variable type from
struct tee_ioctl_param to struct_tee_ioctl_param.
(tee_version): Change the version variable type from
struct tee_ioctl_version_data to struct_tee_ioctl_version_data.
(tee_open_session): Change the buf_data variable type from
struct_tee ioctl_buf_data to struct_tee_ioctl_buf_data.  Change
the open_session variable type from struct tee_ioctl_open_session_arg
to struct_tee_ioctl_open_session_arg.
(tee_invoke): Change the buf_data variable type from
struct_tee ioctl_buf_data to struct_tee_ioctl_buf_data.  Change
the invoke variable type from struct tee_ioctl_invoke_arg to
struct_tee_ioctl_invoke_arg.
(tee_cancel): Change the cancel variable type from
struct tee_ioctl_cancel_arg to struct_tee_ioctl_cancel_arg.
(tee_close_session): Change the close_session variable type from
struct tee_ioctl_close_session_arg to
struct_tee_ioctl_close_session_arg.
(tee_suppl_recv): Change the buf_data variable type from
struct_tee ioctl_buf_data to struct_tee_ioctl_buf_data.  Change
the supp_recv variable type from struct tee_iocl_supp_recv_arg
to struct_tee_iocl_supp_recv_arg.
(tee_suppl_send): Change the buf_data variable type from
struct_tee ioctl_buf_data to struct_tee_ioctl_buf_data.  Change
the supp_send variable type from struct tee_iocl_supp_send_arg
to struct_tee_iocl_supp_send_arg.
(tee_shm_alloc): Change the shm_alloc variable type from
struct tee_ioctl_shm_alloc_data to struct_tee_ioctl_shm_alloc_data.
(tee_shm_register_fd): Change the shm_register_fd variable type from
struct tee_ioctl_shm_register_fd_data to
struct_tee_ioctl_shm_register_fd_data.
(tee_shm_register): Change the shm_register variable type from
struct tee_ioctl_shm_register_data to
struct_tee_ioctl_shm_register_data.
* tests/ioctl_tee.c: Put the contents under HAVE_LINUX_TEE_H ifdef.
Remove "tee.h" include.  Add <linux/tee.h> include.
[!TEE_IOCTL_PARAM_ATTR_META] (TEE_IOCTL_PARAM_ATTR_META): New
definition.
[!HAVE_STRUCT_TEE_IOCTL_SHM_REGISTER_FD_DATA] (struct
tee_ioctl_shm_register_fd_data): New type definition.
[!HAVE_STRUCT_TEE_IOCTL_SHM_REGISTER_DATA] (struct
tee_ioctl_shm_register_data): Likewise.
[!TEE_IOC_SHM_REGISTER_FD] (TEE_IOC_SHM_REGISTER_FD): New definition.
[!TEE_IOC_SHM_REGISTER] (TEE_IOC_SHM_REGISTER): Likewise.
* xlat/tee_ioctl_cmds.in (TEE_IOC_VERSION): Change type in the _IOR
macro argument from struct tee_ioctl_version_data to
struct_tee_ioctl_version_data.
(TEE_IOC_SHM_ALLOC): Change the type in the _IOWR macro argument from
struct tee_ioctl_shm_alloc_data to struct_tee_ioctl_shm_alloc_data.
(TEE_IOC_OPEN_SESSION): Change the type in the _IOR macro argument from
struct tee_ioctl_buf_data to struct_tee_ioctl_buf_data.
(TEE_IOC_INVOKE): Change the type in the _IOR macro argument from
struct tee_ioctl_buf_data to struct_tee_ioctl_buf_data.
(TEE_IOC_CANCEL): Change the type in the _IOR macro argument from
struct tee_ioctl_cancel_arg to struct_tee_ioctl_cancel_arg.
(TEE_IOC_CLOSE_SESSION): Change the type in the _IOR macro argument
from struct tee_ioctl_close_session_arg
to struct_tee_ioctl_close_session_arg.
(TEE_IOC_SUPPL_RECV): Change the type in the _IOR macro argument
from struct tee_ioctl_buf_data to struct_tee_ioctl_buf_data.
(TEE_IOC_SUPPL_SEND): Change the type in the _IOR macro argument
from struct tee_ioctl_buf_data to struct_tee_ioctl_buf_data.
(TEE_IOC_SHM_REGISTER_FD): Change the type in the _IOWR macro argument
from struct tee_ioctl_shm_register_fd_data
to struct_tee_ioctl_shm_register_fd_data.
(TEE_IOC_SHM_REGISTER): Change the type in the _IOWR macro argument
from struct tee_ioctl_shm_register_data
to struct_tee_ioctl_shm_register_data.

1 files changed, 0 insertions, 1 deletions

diff --git a/Makefile.am b/Makefile.am
index 8e64a0478..723460f2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -346,7 +346,6 @@ libstrace_a_SOURCES =	\
 	syslog.c	\
 	sysmips.c	\
 	tee.c		\
-	tee.h		\
 	term.c		\
 	time.c		\
 	times.c		\