Module: xenomai-forge
Branch: next
Commit: eac5435aefad177eb0ecd59cb9e749ff9c6cdac2
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=eac5435aefad177eb0ecd59cb9e749ff9c6cdac2
Author: Philippe Gerum <r...@xenomai.org>
Date: Tue Aug 12 15:44:44 2014 +0200
rtdm/device: use built-in check for availability of core services
---
kernel/cobalt/rtdm/device.c | 7 ++-----
kernel/cobalt/rtdm/init.c | 2 --
kernel/cobalt/rtdm/internal.h | 2 --
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/kernel/cobalt/rtdm/device.c b/kernel/cobalt/rtdm/device.c
index a9819cd..8c2bf40 100644
--- a/kernel/cobalt/rtdm/device.c
+++ b/kernel/cobalt/rtdm/device.c
@@ -52,8 +52,6 @@ struct rb_root rtdm_protocol_devices;
struct semaphore nrt_dev_lock;
DEFINE_XNLOCK(rt_dev_lock);
-int rtdm_initialised = 0;
-
extern void __rt_dev_close(struct rtdm_fd *fd);
static int enosys(void)
@@ -191,8 +189,7 @@ int rtdm_dev_register(struct rtdm_device *device)
spl_t s;
int ret;
- /* Catch unsuccessful initialisation */
- if (!rtdm_initialised)
+ if (!realtime_core_enabled())
return -ENOSYS;
/* Sanity check: structure version */
@@ -344,7 +341,7 @@ int rtdm_dev_unregister(struct rtdm_device *device,
unsigned int poll_delay)
xnhandle_t handle = 0;
spl_t s;
- if (!rtdm_initialised)
+ if (!realtime_core_enabled())
return -ENOSYS;
rtdm_reference_device(device);
diff --git a/kernel/cobalt/rtdm/init.c b/kernel/cobalt/rtdm/init.c
index 1d35905..85464d8 100644
--- a/kernel/cobalt/rtdm/init.c
+++ b/kernel/cobalt/rtdm/init.c
@@ -62,8 +62,6 @@ int __init rtdm_init(void)
if (ret)
goto cleanup_proc;
- rtdm_initialised = 1;
-
return 0;
cleanup_proc:
diff --git a/kernel/cobalt/rtdm/internal.h b/kernel/cobalt/rtdm/internal.h
index 515f6ba..cac5f52 100644
--- a/kernel/cobalt/rtdm/internal.h
+++ b/kernel/cobalt/rtdm/internal.h
@@ -51,8 +51,6 @@ extern struct list_head rtdm_named_devices;
extern struct rb_root rtdm_protocol_devices;
extern struct xnpersonality rtdm_personality;
-extern int rtdm_initialised;
-
void cleanup_process_files(struct rtdm_process *owner);
int rtdm_no_support(void);
struct rtdm_device *__rtdm_get_named_device(const char *name, int *minor_r);
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
