Module: xenomai-head Branch: master Commit: 5095bf53eec0ac390a8e6a345fc061c7cdd45dc4 URL: http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=5095bf53eec0ac390a8e6a345fc061c7cdd45dc4
Author: Philippe Gerum <[email protected]> Date: Mon Sep 6 15:45:10 2010 +0200 rtipc: fix build for non-pervasive mode --- ksrc/drivers/ipc/bufp.c | 10 ++++++++-- ksrc/drivers/ipc/iddp.c | 10 ++++++++-- ksrc/drivers/ipc/xddp.c | 15 ++++++++++++--- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/ksrc/drivers/ipc/bufp.c b/ksrc/drivers/ipc/bufp.c index 1300584..2394a5d 100644 --- a/ksrc/drivers/ipc/bufp.c +++ b/ksrc/drivers/ipc/bufp.c @@ -337,11 +337,14 @@ static ssize_t __bufp_recvmsg(struct rtipc_private *priv, if (iov[nvec].iov_len == 0) continue; vlen = wrlen >= iov[nvec].iov_len ? iov[nvec].iov_len : wrlen; +#ifdef CONFIG_XENO_OPT_PERVASIVE if (user_info) { xnbufd_map_uread(&bufd, iov[nvec].iov_base, vlen); ret = __bufp_readbuf(sk, &bufd, flags); xnbufd_unmap_uread(&bufd); - } else { + } else +#endif + { xnbufd_map_kread(&bufd, iov[nvec].iov_base, vlen); ret = __bufp_readbuf(sk, &bufd, flags); xnbufd_unmap_kread(&bufd); @@ -587,11 +590,14 @@ static ssize_t __bufp_sendmsg(struct rtipc_private *priv, if (iov[nvec].iov_len == 0) continue; vlen = rdlen >= iov[nvec].iov_len ? iov[nvec].iov_len : rdlen; +#ifdef CONFIG_XENO_OPT_PERVASIVE if (user_info) { xnbufd_map_uread(&bufd, iov[nvec].iov_base, vlen); ret = __bufp_writebuf(rsk, sk, &bufd, flags); xnbufd_unmap_uread(&bufd); - } else { + } else +#endif + { xnbufd_map_kread(&bufd, iov[nvec].iov_base, vlen); ret = __bufp_writebuf(rsk, sk, &bufd, flags); xnbufd_unmap_kread(&bufd); diff --git a/ksrc/drivers/ipc/iddp.c b/ksrc/drivers/ipc/iddp.c index 1d1cbb5..69dd9cf 100644 --- a/ksrc/drivers/ipc/iddp.c +++ b/ksrc/drivers/ipc/iddp.c @@ -301,11 +301,14 @@ static ssize_t __iddp_recvmsg(struct rtipc_private *priv, if (iov[nvec].iov_len == 0) continue; vlen = wrlen >= iov[nvec].iov_len ? iov[nvec].iov_len : wrlen; +#ifdef CONFIG_XENO_OPT_PERVASIVE if (user_info) { xnbufd_map_uread(&bufd, iov[nvec].iov_base, vlen); ret = xnbufd_copy_from_kmem(&bufd, mbuf->data + rdoff, vlen); xnbufd_unmap_uread(&bufd); - } else { + } else +#endif + { xnbufd_map_kread(&bufd, iov[nvec].iov_base, vlen); ret = xnbufd_copy_from_kmem(&bufd, mbuf->data + rdoff, vlen); xnbufd_unmap_kread(&bufd); @@ -421,11 +424,14 @@ static ssize_t __iddp_sendmsg(struct rtipc_private *priv, if (iov[nvec].iov_len == 0) continue; vlen = rdlen >= iov[nvec].iov_len ? iov[nvec].iov_len : rdlen; +#ifdef CONFIG_XENO_OPT_PERVASIVE if (user_info) { xnbufd_map_uread(&bufd, iov[nvec].iov_base, vlen); ret = xnbufd_copy_to_kmem(mbuf->data + wroff, &bufd, vlen); xnbufd_unmap_uread(&bufd); - } else { + } else +#endif + { xnbufd_map_kread(&bufd, iov[nvec].iov_base, vlen); ret = xnbufd_copy_to_kmem(mbuf->data + wroff, &bufd, vlen); xnbufd_unmap_kread(&bufd); diff --git a/ksrc/drivers/ipc/xddp.c b/ksrc/drivers/ipc/xddp.c index 7aa06aa..448744b 100644 --- a/ksrc/drivers/ipc/xddp.c +++ b/ksrc/drivers/ipc/xddp.c @@ -327,11 +327,14 @@ static ssize_t __xddp_recvmsg(struct rtipc_private *priv, if (iov[nvec].iov_len == 0) continue; vlen = wrlen >= iov[nvec].iov_len ? iov[nvec].iov_len : wrlen; +#ifdef CONFIG_XENO_OPT_PERVASIVE if (user_info) { xnbufd_map_uread(&bufd, iov[nvec].iov_base, vlen); ret = xnbufd_copy_from_kmem(&bufd, mbuf->data + rdoff, vlen); xnbufd_unmap_uread(&bufd); - } else { + } else +#endif + { xnbufd_map_kread(&bufd, iov[nvec].iov_base, vlen); ret = xnbufd_copy_from_kmem(&bufd, mbuf->data + rdoff, vlen); xnbufd_unmap_kread(&bufd); @@ -524,11 +527,14 @@ static ssize_t __xddp_sendmsg(struct rtipc_private *priv, if (iov[nvec].iov_len == 0) continue; vlen = rdlen >= iov[nvec].iov_len ? iov[nvec].iov_len : rdlen; +#ifdef CONFIG_XENO_OPT_PERVASIVE if (user_info) { xnbufd_map_uread(&bufd, iov[nvec].iov_base, vlen); ret = __xddp_stream(rsk, from, &bufd); xnbufd_unmap_uread(&bufd); - } else { + } else +#endif + { xnbufd_map_kread(&bufd, iov[nvec].iov_base, vlen); ret = __xddp_stream(rsk, from, &bufd); xnbufd_unmap_kread(&bufd); @@ -567,11 +573,14 @@ nostream: if (iov[nvec].iov_len == 0) continue; vlen = rdlen >= iov[nvec].iov_len ? iov[nvec].iov_len : rdlen; +#ifdef CONFIG_XENO_OPT_PERVASIVE if (user_info) { xnbufd_map_uread(&bufd, iov[nvec].iov_base, vlen); ret = xnbufd_copy_to_kmem(mbuf->data + wrlen, &bufd, vlen); xnbufd_unmap_uread(&bufd); - } else { + } else +#endif + { xnbufd_map_kread(&bufd, iov[nvec].iov_base, vlen); ret = xnbufd_copy_to_kmem(mbuf->data + wrlen, &bufd, vlen); xnbufd_unmap_kread(&bufd); _______________________________________________ Xenomai-git mailing list [email protected] https://mail.gna.org/listinfo/xenomai-git
