remove EC_RTDM_OPS_HAS_MMAP again
This commit is contained in:
parent
1c9f9bfe7d
commit
656526f03c
|
|
@ -758,7 +758,7 @@ else
|
|||
xeno_rtdm_ldflags=`$xenomaiconfig --skin rtdm --auto-init-solib --ldflags`
|
||||
xeno_v3=1
|
||||
xeno=0
|
||||
AC_DEFINE([EC_RTDM_OPS_HAS_MMAP], [1], [RTDM device operations has mmap handler])
|
||||
AC_DEFINE([EC_RTDM_XENOMAI_V3], [1], [Use Xenomai3 RTDM flavour])
|
||||
else
|
||||
xeno_native_cflags=`$xenomaiconfig --skin native --cflags`
|
||||
xeno_native_ldflags=`$xenomaiconfig --skin native --ldflags`
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ endif
|
|||
if ENABLE_XENOMAI_V3
|
||||
libethercat_rtdm_la_CFLAGS += $(XENOMAI_RTDM_CFLAGS)
|
||||
libethercat_rtdm_la_LDFLAGS += $(XENOMAI_RTDM_LDFLAGS)
|
||||
libethercat_rtdm_la_CFLAGS += -DUSE_RTDM_XENOMAI_V3 -DEC_RTDM_OPS_HAS_MMAP
|
||||
libethercat_rtdm_la_CFLAGS += -DUSE_RTDM_XENOMAI_V3
|
||||
else
|
||||
libethercat_rtdm_la_CFLAGS += -DUSE_RTDM
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -564,7 +564,7 @@ int ecrt_master_activate(ec_master_t *master)
|
|||
master->process_data_size = io.process_data_size;
|
||||
|
||||
if (master->process_data_size) {
|
||||
#if defined(USE_RTDM) || !defined(EC_RTDM_OPS_HAS_MMAP)
|
||||
#ifdef USE_RTDM
|
||||
/* memory-mapping was already done in kernel. The user-space addess is
|
||||
* provided in the ioctl data.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1893,7 +1893,7 @@ static ATTRIBUTES int ec_ioctl_activate(
|
|||
offset += ecrt_domain_size(domain);
|
||||
}
|
||||
|
||||
#if defined(EC_IOCTL_RTDM) && !defined(EC_RTDM_OPS_HAS_MMAP)
|
||||
#if defined(EC_IOCTL_RTDM) && !defined(EC_RTDM_XENOMAI_V3)
|
||||
/* RTDM uses a different approach for memory-mapping, which has to be
|
||||
* initiated by the kernel.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -846,7 +846,7 @@ long ec_ioctl(ec_master_t *, ec_ioctl_context_t *, unsigned int,
|
|||
long ec_ioctl_rtdm(ec_master_t *, ec_ioctl_context_t *, unsigned int,
|
||||
void __user *);
|
||||
|
||||
#ifndef EC_RTDM_OPS_HAS_MMAP
|
||||
#ifndef EC_RTDM_XENOMAI_V3
|
||||
int ec_rtdm_mmap(ec_ioctl_context_t *, void **);
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue