bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prepare uniting ec_rtdm_context

This commit is contained in:
Bjarne von Horn 2024-01-31 10:12:24 +01:00
parent 656526f03c
commit 0a41222ee6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
master/rtdm.c
View File

@ -43,7 +43,7 @@
/** Context structure for an open RTDM file handle. /** Context structure for an open RTDM file handle.
*/ */
typedef struct { typedef struct {
rtdm_user_info_t *user_info; /**< RTDM user data. */ rtdm_user_info_t *user_fd; /**< RTDM user data. */
ec_ioctl_context_t ioctl_ctx; /**< Context structure. */ ec_ioctl_context_t ioctl_ctx; /**< Context structure. */
} ec_rtdm_context_t; } ec_rtdm_context_t;
@ -143,7 +143,7 @@ int ec_rtdm_open(
ec_rtdm_dev_t *rtdm_dev = (ec_rtdm_dev_t *) context->device->device_data; ec_rtdm_dev_t *rtdm_dev = (ec_rtdm_dev_t *) context->device->device_data;
#endif #endif
ctx->user_info = user_info; ctx->user_fd = user_info;
ctx->ioctl_ctx.writable = oflags & O_WRONLY || oflags & O_RDWR; ctx->ioctl_ctx.writable = oflags & O_WRONLY || oflags & O_RDWR;
ctx->ioctl_ctx.requested = 0; ctx->ioctl_ctx.requested = 0;
ctx->ioctl_ctx.process_data = NULL; ctx->ioctl_ctx.process_data = NULL;
@ -220,7 +220,7 @@ int ec_rtdm_mmap(
container_of(ioctl_ctx, ec_rtdm_context_t, ioctl_ctx); container_of(ioctl_ctx, ec_rtdm_context_t, ioctl_ctx);
int ret; int ret;
ret = rtdm_mmap_to_user(ctx->user_info, ret = rtdm_mmap_to_user(ctx->user_fd,
ioctl_ctx->process_data, ioctl_ctx->process_data_size, ioctl_ctx->process_data, ioctl_ctx->process_data_size,
PROT_READ | PROT_WRITE, PROT_READ | PROT_WRITE,
user_address, user_address,

4
master/rtdm_xenomai_v3.c
View File

@ -43,7 +43,7 @@
#define DEBUG_RTDM 0 #define DEBUG_RTDM 0
struct ec_rtdm_context { struct ec_rtdm_context {
struct rtdm_fd *fd; struct rtdm_fd *user_fd;
ec_ioctl_context_t ioctl_ctx; /**< Context structure. */ ec_ioctl_context_t ioctl_ctx; /**< Context structure. */
}; };
@ -55,7 +55,7 @@ static int ec_rtdm_open(struct rtdm_fd *fd, int oflags)
ec_rtdm_dev_t *rtdm_dev = dev->device_data; ec_rtdm_dev_t *rtdm_dev = dev->device_data;
#endif #endif
ctx->fd = fd; ctx->user_fd = fd;
ctx->ioctl_ctx.writable = oflags & O_WRONLY || oflags & O_RDWR; ctx->ioctl_ctx.writable = oflags & O_WRONLY || oflags & O_RDWR;
ctx->ioctl_ctx.requested = 0; ctx->ioctl_ctx.requested = 0;