[Xenomai-git] Philippe Gerum : ksrc, include: cope with introduction of user_msghdr
Module: xenomai-2.6
Branch: master
Commit: 54515995de2143734b16b16ba3419cdf016fc0dd
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=54515995de2143734b16b16ba3419cdf016fc0dd
Author: Philippe Gerum
Date: Wed May 25 14:32:05 2016 +0200
ksrc, include: cope with introduction of user_msghdr
---
include/rtdm/rtcan.h |2 +-
include/rtdm/rtdm.h | 15 +--
include/rtdm/rtdm_driver.h |4 ++--
include/rtdm/rtipc.h |4 ++--
ksrc/drivers/can/rtcan_raw.c |6 +++---
ksrc/drivers/ipc/bufp.c |4 ++--
ksrc/drivers/ipc/iddp.c |4 ++--
ksrc/drivers/ipc/internal.h |4 ++--
ksrc/drivers/ipc/rtipc.c |4 ++--
ksrc/drivers/ipc/xddp.c |4 ++--
ksrc/skins/rtdm/core.c | 12 ++--
ksrc/skins/rtdm/syscall.c|4 ++--
12 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/include/rtdm/rtcan.h b/include/rtdm/rtcan.h
index b8bd762..3ff7651 100644
--- a/include/rtdm/rtcan.h
+++ b/include/rtdm/rtcan.h
@@ -146,7 +146,7 @@
* It is possible to receive a high precision timestamp with every CAN
* message. The condition is a former instruction to the socket via
* @ref RTCAN_RTIOC_TAKE_TIMESTAMP. The timestamp will be copied to the
- * @c msg_control buffer of struct msghdr if it points to a valid
+ * @c msg_control buffer of struct user_msghdr if it points to a valid
* memory location with size of @ref nanosecs_abs_t. If this
* is a NULL pointer the timestamp will be discarded silently. @n
* @n
diff --git a/include/rtdm/rtdm.h b/include/rtdm/rtdm.h
index d907f08..64accfc 100644
--- a/include/rtdm/rtdm.h
+++ b/include/rtdm/rtdm.h
@@ -54,6 +54,7 @@
#include
#include
#include
+#include
typedef u32 socklen_t;
typedef struct task_struct rtdm_user_info_t;
@@ -247,9 +248,9 @@ ssize_t __rt_dev_read(rtdm_user_info_t *user_info, int fd,
void *buf,
ssize_t __rt_dev_write(rtdm_user_info_t *user_info, int fd, const void *buf,
size_t nbyte);
ssize_t __rt_dev_recvmsg(rtdm_user_info_t *user_info, int fd,
-struct msghdr *msg, int flags);
+struct user_msghdr *msg, int flags);
ssize_t __rt_dev_sendmsg(rtdm_user_info_t *user_info, int fd,
-const struct msghdr *msg, int flags);
+const struct user_msghdr *msg, int flags);
#endif /* __KERNEL__ */
/* Define RTDM_NO_DEFAULT_USER_API to switch off the default rt_dev_xxx
@@ -287,7 +288,7 @@ static inline ssize_t rt_dev_recvfrom(int fd, void *buf,
size_t len, int flags,
socklen_t *fromlen)
{
struct iovec iov;
- struct msghdr msg;
+ struct user_msghdr msg;
int ret;
iov.iov_base = buf;
@@ -308,6 +309,8 @@ static inline ssize_t rt_dev_recvfrom(int fd, void *buf,
size_t len, int flags,
#else /* !__KERNEL__ */
+#define user_msghdr msghdr
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -318,8 +321,8 @@ int rt_dev_close(int fd);
int rt_dev_ioctl(int fd, int request, ...);
ssize_t rt_dev_read(int fd, void *buf, size_t nbyte);
ssize_t rt_dev_write(int fd, const void *buf, size_t nbyte);
-ssize_t rt_dev_recvmsg(int fd, struct msghdr *msg, int flags);
-ssize_t rt_dev_sendmsg(int fd, const struct msghdr *msg, int flags);
+ssize_t rt_dev_recvmsg(int fd, struct user_msghdr *msg, int flags);
+ssize_t rt_dev_sendmsg(int fd, const struct user_msghdr *msg, int flags);
ssize_t rt_dev_recvfrom(int fd, void *buf, size_t len, int flags,
struct sockaddr *from, socklen_t *fromlen);
@@ -344,7 +347,7 @@ static inline ssize_t rt_dev_sendto(int fd, const void
*buf, size_t len,
socklen_t tolen)
{
struct iovec iov;
- struct msghdr msg;
+ struct user_msghdr msg;
iov.iov_base = (void *)buf;
iov.iov_len = len;
diff --git a/include/rtdm/rtdm_driver.h b/include/rtdm/rtdm_driver.h
index 15d61d3..f0f82b7 100644
--- a/include/rtdm/rtdm_driver.h
+++ b/include/rtdm/rtdm_driver.h
@@ -305,7 +305,7 @@ typedef ssize_t (*rtdm_write_handler_t)(struct
rtdm_dev_context *context,
* http://www.opengroup.org/onlinepubs/009695399 */
typedef ssize_t (*rtdm_recvmsg_handler_t)(struct rtdm_dev_context *context,
rtdm_user_info_t *user_info,
- struct msghdr *msg, int flags);
+ struct user_msghdr *msg, int flags);
/**
* Transmit message handler
@@ -325,7 +325,7 @@ typedef ssize_t (*rtdm_recvmsg_handler_t)(struct
rtdm_dev_context *context,
* http://www.opengroup.org/onlinepubs/009695399 */
typedef ssize_t (*rtdm_sendmsg_handler_t)(struct rtdm_dev_context *context,
rtdm_user_info_t *user_info,
- const struct msghdr *msg, int flags);
+ const struct user_
[Xenomai-git] Philippe Gerum : ksrc, include: cope with introduction of user_msghdr
Module: xenomai-2.6
Branch: wip/4.x-fixups
Commit: 54515995de2143734b16b16ba3419cdf016fc0dd
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=54515995de2143734b16b16ba3419cdf016fc0dd
Author: Philippe Gerum
Date: Wed May 25 14:32:05 2016 +0200
ksrc, include: cope with introduction of user_msghdr
---
include/rtdm/rtcan.h |2 +-
include/rtdm/rtdm.h | 15 +--
include/rtdm/rtdm_driver.h |4 ++--
include/rtdm/rtipc.h |4 ++--
ksrc/drivers/can/rtcan_raw.c |6 +++---
ksrc/drivers/ipc/bufp.c |4 ++--
ksrc/drivers/ipc/iddp.c |4 ++--
ksrc/drivers/ipc/internal.h |4 ++--
ksrc/drivers/ipc/rtipc.c |4 ++--
ksrc/drivers/ipc/xddp.c |4 ++--
ksrc/skins/rtdm/core.c | 12 ++--
ksrc/skins/rtdm/syscall.c|4 ++--
12 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/include/rtdm/rtcan.h b/include/rtdm/rtcan.h
index b8bd762..3ff7651 100644
--- a/include/rtdm/rtcan.h
+++ b/include/rtdm/rtcan.h
@@ -146,7 +146,7 @@
* It is possible to receive a high precision timestamp with every CAN
* message. The condition is a former instruction to the socket via
* @ref RTCAN_RTIOC_TAKE_TIMESTAMP. The timestamp will be copied to the
- * @c msg_control buffer of struct msghdr if it points to a valid
+ * @c msg_control buffer of struct user_msghdr if it points to a valid
* memory location with size of @ref nanosecs_abs_t. If this
* is a NULL pointer the timestamp will be discarded silently. @n
* @n
diff --git a/include/rtdm/rtdm.h b/include/rtdm/rtdm.h
index d907f08..64accfc 100644
--- a/include/rtdm/rtdm.h
+++ b/include/rtdm/rtdm.h
@@ -54,6 +54,7 @@
#include
#include
#include
+#include
typedef u32 socklen_t;
typedef struct task_struct rtdm_user_info_t;
@@ -247,9 +248,9 @@ ssize_t __rt_dev_read(rtdm_user_info_t *user_info, int fd,
void *buf,
ssize_t __rt_dev_write(rtdm_user_info_t *user_info, int fd, const void *buf,
size_t nbyte);
ssize_t __rt_dev_recvmsg(rtdm_user_info_t *user_info, int fd,
-struct msghdr *msg, int flags);
+struct user_msghdr *msg, int flags);
ssize_t __rt_dev_sendmsg(rtdm_user_info_t *user_info, int fd,
-const struct msghdr *msg, int flags);
+const struct user_msghdr *msg, int flags);
#endif /* __KERNEL__ */
/* Define RTDM_NO_DEFAULT_USER_API to switch off the default rt_dev_xxx
@@ -287,7 +288,7 @@ static inline ssize_t rt_dev_recvfrom(int fd, void *buf,
size_t len, int flags,
socklen_t *fromlen)
{
struct iovec iov;
- struct msghdr msg;
+ struct user_msghdr msg;
int ret;
iov.iov_base = buf;
@@ -308,6 +309,8 @@ static inline ssize_t rt_dev_recvfrom(int fd, void *buf,
size_t len, int flags,
#else /* !__KERNEL__ */
+#define user_msghdr msghdr
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -318,8 +321,8 @@ int rt_dev_close(int fd);
int rt_dev_ioctl(int fd, int request, ...);
ssize_t rt_dev_read(int fd, void *buf, size_t nbyte);
ssize_t rt_dev_write(int fd, const void *buf, size_t nbyte);
-ssize_t rt_dev_recvmsg(int fd, struct msghdr *msg, int flags);
-ssize_t rt_dev_sendmsg(int fd, const struct msghdr *msg, int flags);
+ssize_t rt_dev_recvmsg(int fd, struct user_msghdr *msg, int flags);
+ssize_t rt_dev_sendmsg(int fd, const struct user_msghdr *msg, int flags);
ssize_t rt_dev_recvfrom(int fd, void *buf, size_t len, int flags,
struct sockaddr *from, socklen_t *fromlen);
@@ -344,7 +347,7 @@ static inline ssize_t rt_dev_sendto(int fd, const void
*buf, size_t len,
socklen_t tolen)
{
struct iovec iov;
- struct msghdr msg;
+ struct user_msghdr msg;
iov.iov_base = (void *)buf;
iov.iov_len = len;
diff --git a/include/rtdm/rtdm_driver.h b/include/rtdm/rtdm_driver.h
index 15d61d3..f0f82b7 100644
--- a/include/rtdm/rtdm_driver.h
+++ b/include/rtdm/rtdm_driver.h
@@ -305,7 +305,7 @@ typedef ssize_t (*rtdm_write_handler_t)(struct
rtdm_dev_context *context,
* http://www.opengroup.org/onlinepubs/009695399 */
typedef ssize_t (*rtdm_recvmsg_handler_t)(struct rtdm_dev_context *context,
rtdm_user_info_t *user_info,
- struct msghdr *msg, int flags);
+ struct user_msghdr *msg, int flags);
/**
* Transmit message handler
@@ -325,7 +325,7 @@ typedef ssize_t (*rtdm_recvmsg_handler_t)(struct
rtdm_dev_context *context,
* http://www.opengroup.org/onlinepubs/009695399 */
typedef ssize_t (*rtdm_sendmsg_handler_t)(struct rtdm_dev_context *context,
rtdm_user_info_t *user_info,
- const struct msghdr *msg, int flags);
+ const stru
