Module: xenomai-rpm Branch: queue/vfile Commit: f7ea93bf3a4de5e5cccf25bec48af0fe2ca38d39 URL: http://git.xenomai.org/?p=xenomai-rpm.git;a=commit;h=f7ea93bf3a4de5e5cccf25bec48af0fe2ca38d39
Author: Philippe Gerum <[email protected]> Date: Sat Jun 19 00:13:34 2010 +0200 ksrc, include: remove most direct dependencies on PROC_FS Now that we moved to vfiles, replace explicit dependencies on PROC_FS by XENO_OPT_VFILE. Since vfiles are still based on procfs under the hood, XENO_OPT_VFILE is automatically selected whenever PROC_FS is available. --- include/asm-generic/wrappers.h | 4 +- include/nucleus/pod.h | 8 ++-- include/nucleus/registry.h | 10 ++-- include/nucleus/sched.h | 2 +- include/nucleus/shadow.h | 4 +- include/nucleus/vfile.h | 4 +- include/rtai/rtai_proc_fs.h | 84 ---------------------------------------- include/rtdm/rtdm_driver.h | 2 +- ksrc/arch/arm/hal.c | 3 - ksrc/arch/generic/hal.c | 3 + ksrc/arch/powerpc/hal.c | 3 - ksrc/drivers/ipc/bufp.c | 6 +- ksrc/drivers/ipc/iddp.c | 6 +- ksrc/drivers/ipc/xddp.c | 6 +- ksrc/nucleus/Kconfig | 5 ++ ksrc/nucleus/heap.c | 4 +- ksrc/nucleus/intr.c | 4 +- ksrc/nucleus/pipe.c | 1 - ksrc/nucleus/pod.c | 7 +-- ksrc/nucleus/registry.c | 32 ++++++++-------- ksrc/nucleus/sched-rt.c | 6 +- ksrc/nucleus/sched-sporadic.c | 6 +- ksrc/nucleus/sched-tp.c | 6 +- ksrc/nucleus/sched.c | 4 +- ksrc/nucleus/shadow.c | 10 ++-- ksrc/nucleus/timebase.c | 4 +- ksrc/nucleus/timer.c | 4 +- ksrc/skins/native/alarm.c | 6 +- ksrc/skins/native/buffer.c | 6 +- ksrc/skins/native/cond.c | 6 +- ksrc/skins/native/event.c | 6 +- ksrc/skins/native/heap.c | 6 +- ksrc/skins/native/intr.c | 6 +- ksrc/skins/native/mutex.c | 6 +- ksrc/skins/native/pipe.c | 6 +- ksrc/skins/native/queue.c | 6 +- ksrc/skins/native/sem.c | 6 +- ksrc/skins/psos+/queue.c | 6 +- ksrc/skins/psos+/rn.c | 6 +- ksrc/skins/psos+/sem.c | 6 +- ksrc/skins/rtai/fifo.c | 6 +- ksrc/skins/rtai/shm.c | 6 +- ksrc/skins/rtdm/internal.h | 7 +-- ksrc/skins/rtdm/syscall.c | 4 +- ksrc/skins/uitron/flag.c | 6 +- ksrc/skins/uitron/mbx.c | 6 +- ksrc/skins/uitron/sem.c | 6 +- ksrc/skins/vrtx/event.c | 6 +- ksrc/skins/vrtx/heap.c | 6 +- ksrc/skins/vrtx/mb.c | 6 +- ksrc/skins/vrtx/mx.c | 6 +- ksrc/skins/vrtx/pt.c | 6 +- ksrc/skins/vrtx/queue.c | 6 +- ksrc/skins/vrtx/sem.c | 6 +- ksrc/skins/vxworks/msgQLib.c | 6 +- ksrc/skins/vxworks/semLib.c | 6 +- ksrc/skins/vxworks/wdLib.c | 6 +- 57 files changed, 165 insertions(+), 252 deletions(-) diff --git a/include/asm-generic/wrappers.h b/include/asm-generic/wrappers.h index 56fafbc..e706f68 100644 --- a/include/asm-generic/wrappers.h +++ b/include/asm-generic/wrappers.h @@ -579,7 +579,7 @@ static inline int wrap_raise_cap(int cap) } #endif /* LINUX_VERSION_CODE >= 2.6.29 */ -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) #include <linux/module.h> #include <linux/proc_fs.h> @@ -590,7 +590,7 @@ static inline void wrap_proc_dir_entry_owner(struct proc_dir_entry *entry) #else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) */ #define wrap_proc_dir_entry_owner(entry) do { (void)entry; } while(0) #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) */ -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ #ifndef list_first_entry #define list_first_entry(ptr, type, member) \ diff --git a/include/nucleus/pod.h b/include/nucleus/pod.h index 1ad6014..01ff0a7 100644 --- a/include/nucleus/pod.h +++ b/include/nucleus/pod.h @@ -71,7 +71,7 @@ struct xnpod { xnsched_t sched[XNARCH_NR_CPUS]; /*!< Per-cpu scheduler slots. */ xnqueue_t threadq; /*!< All existing threads. */ -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct xnvfile_rev_tag threadlist_tag; #endif xnqueue_t tstartq, /*!< Thread start hook queue. */ @@ -104,13 +104,13 @@ extern xnarch_cpumask_t nkaffinity; extern xnpod_t nkpod_struct; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE int xnpod_init_proc(void); void xnpod_cleanup_proc(void); -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static inline int xnpod_init_proc(void) { return 0; } static inline void xnpod_cleanup_proc(void) {} -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ static inline int xnpod_mount(void) { diff --git a/include/nucleus/registry.h b/include/nucleus/registry.h index 7578d36..a1e9abe 100644 --- a/include/nucleus/registry.h +++ b/include/nucleus/registry.h @@ -41,7 +41,7 @@ typedef struct xnobject { struct xnsynch safesynch; /* !< Safe synchronization object. */ u_long safelock; /* !< Safe lock count. */ u_long cstamp; /* !< Creation stamp. */ -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct xnpnode *pnode; /* !< v-file information class. */ union { struct { @@ -52,7 +52,7 @@ typedef struct xnobject { struct xnvfile_link link; /* !< virtual link. */ } vfile_u; struct xnvfile *vfilp; -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ struct xnobject *hnext; /* !< Next in h-table */ struct xnholder link; } xnobject_t; @@ -67,7 +67,7 @@ int xnregistry_init(void); void xnregistry_cleanup(void); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE #define XNOBJECT_PNODE_RESERVED1 ((struct xnvfile *)1) #define XNOBJECT_PNODE_RESERVED2 ((struct xnvfile *)2) @@ -116,7 +116,7 @@ struct xnpnode_link { char *(*target)(void *obj); }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ #define DEFINE_XNPTREE(__var, __name); @@ -138,7 +138,7 @@ struct xnpnode_link { struct xnpnode node; }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ extern struct xnobject *registry_obj_slots; diff --git a/include/nucleus/sched.h b/include/nucleus/sched.h index f8cc059..c46ba4b 100644 --- a/include/nucleus/sched.h +++ b/include/nucleus/sched.h @@ -141,7 +141,7 @@ struct xnsched_class { void (*sched_suspend_rpi)(struct xnthread *thread); void (*sched_resume_rpi)(struct xnthread *thread); #endif -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE int (*sched_init_vfile)(struct xnsched_class *schedclass, struct xnvfile_directory *vfroot); void (*sched_cleanup_vfile)(struct xnsched_class *schedclass); diff --git a/include/nucleus/shadow.h b/include/nucleus/shadow.h index 1615ec8..19ab7fb 100644 --- a/include/nucleus/shadow.h +++ b/include/nucleus/shadow.h @@ -118,12 +118,12 @@ static inline void xnshadow_call_mayday(struct xnthread *thread) #endif /* CONFIG_XENO_OPT_PERVASIVE */ -#if defined(CONFIG_XENO_OPT_PERVASIVE) && defined(CONFIG_PROC_FS) +#if defined(CONFIG_XENO_OPT_PERVASIVE) && defined(CONFIG_XENO_OPT_VFILE) void xnshadow_init_proc(void); void xnshadow_cleanup_proc(void); #else static inline void xnshadow_init_proc(void) { } static inline void xnshadow_cleanup_proc(void) { } -#endif /* CONFIG_XENO_OPT_PERVASIVE && CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_PERVASIVE && CONFIG_XENO_OPT_VFILE */ #endif /* !_XENO_NUCLEUS_SHADOW_H */ diff --git a/include/nucleus/vfile.h b/include/nucleus/vfile.h index bda3542..601b4f5 100644 --- a/include/nucleus/vfile.h +++ b/include/nucleus/vfile.h @@ -669,13 +669,13 @@ void xnvfile_destroy_link(struct xnvfile_link *vlink) .sem = __SEMAPHORE_INITIALIZER(name.sem, 1), \ } -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ #define xnvfile_touch_tag(tag) do { } while (0) #define xnvfile_touch(vfile) do { } while (0) -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ /*...@}*/ diff --git a/include/rtai/rtai_proc_fs.h b/include/rtai/rtai_proc_fs.h deleted file mode 100644 index 1a62f3b..0000000 --- a/include/rtai/rtai_proc_fs.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (C) 1999-2003 Paolo Mantegazza <[email protected]> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef _RTAI_XENO_PROC_FS_H -#define _RTAI_XENO_PROC_FS_H - -#include <linux/proc_fs.h> - -#define LIMIT (PAGE_SIZE - 80) - -extern struct proc_dir_entry *rtai_proc_root; - -// proc print macros - Contributed by: Erwin Rol ([email protected]) - -// macro that holds the local variables that -// we use in the PROC_PRINT_* macros. We have -// this macro so we can add variables with out -// changing the users of this macro, of course -// only when the names don't colide! -#define PROC_PRINT_VARS \ - off_t pos = 0; \ - off_t begin = 0; \ - int len = 0 /* no ";" */ - -// macro that prints in the procfs read buffer. -// this macro expects the function arguments to be -// named as follows. -// static int FOO(char *page, char **start, -// off_t off, int count, int *eof, void *data) - -#define PROC_PRINT(fmt,args...) \ -do { \ - len += sprintf(page + len , fmt, ##args); \ - pos += len; \ - if(pos < off) { \ - len = 0; \ - begin = pos; \ - } \ - if(pos > off + count) \ - goto done; \ -} while(0) - -// macro to leave the read function for a other -// place than at the end. -#define PROC_PRINT_RETURN \ -do { \ - *eof = 1; \ - goto done; \ -} while(0) - -// macro that should only used ones at the end of the -// read function, to return from a other place in the -// read function use the PROC_PRINT_RETURN macro. -#define PROC_PRINT_DONE \ -do { \ - *eof = 1; \ - done: \ - *start = page + (off - begin); \ - len -= (off - begin); \ - if(len > count) \ - len = count; \ - if(len < 0) \ - len = 0; \ - return len; \ -} while(0) - -// End of proc print macros - -#endif /* !_RTAI_XENO_PROC_FS_H */ diff --git a/include/rtdm/rtdm_driver.h b/include/rtdm/rtdm_driver.h index 4b1d054..53beba4 100644 --- a/include/rtdm/rtdm_driver.h +++ b/include/rtdm/rtdm_driver.h @@ -518,7 +518,7 @@ struct rtdm_device { /** Name of /proc entry for the device, must not be NULL */ const char *proc_name; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE /** Set to device's vfile data after registration, do not modify */ struct xnvfile_directory vfroot; struct xnvfile_regular info_vfile; diff --git a/ksrc/arch/arm/hal.c b/ksrc/arch/arm/hal.c index 2c0dcfe..d5fb8b1 100644 --- a/ksrc/arch/arm/hal.c +++ b/ksrc/arch/arm/hal.c @@ -43,9 +43,6 @@ #include <asm/uaccess.h> #include <asm/unistd.h> #include <asm/xenomai/hal.h> -#ifdef CONFIG_PROC_FS -#include <linux/proc_fs.h> -#endif /* CONFIG_PROC_FS */ #include <stdarg.h> static struct { diff --git a/ksrc/arch/generic/hal.c b/ksrc/arch/generic/hal.c index 6239b0f..304962b 100644 --- a/ksrc/arch/generic/hal.c +++ b/ksrc/arch/generic/hal.c @@ -81,10 +81,13 @@ struct rthal_calibration_data rthal_tunables; rthal_trap_handler_t rthal_trap_handler; unsigned rthal_realtime_faults[RTHAL_NR_CPUS][RTHAL_NR_FAULTS]; +EXPORT_SYMBOL_GPL(rthal_realtime_faults); unsigned long rthal_apc_map; +EXPORT_SYMBOL_GPL(rthal_apc_map); struct rthal_apc_desc rthal_apc_table[RTHAL_NR_APCS]; +EXPORT_SYMBOL_GPL(rthal_apc_table); volatile int rthal_sync_op; diff --git a/ksrc/arch/powerpc/hal.c b/ksrc/arch/powerpc/hal.c index 70e55ff..c7a01df 100644 --- a/ksrc/arch/powerpc/hal.c +++ b/ksrc/arch/powerpc/hal.c @@ -47,9 +47,6 @@ #include <asm/uaccess.h> #include <asm/unistd.h> #include <asm/xenomai/hal.h> -#ifdef CONFIG_PROC_FS -#include <linux/proc_fs.h> -#endif /* CONFIG_PROC_FS */ #include <stdarg.h> #ifdef DEBUG diff --git a/ksrc/drivers/ipc/bufp.c b/ksrc/drivers/ipc/bufp.c index 714849f..7f9b1fc 100644 --- a/ksrc/drivers/ipc/bufp.c +++ b/ksrc/drivers/ipc/bufp.c @@ -74,7 +74,7 @@ static struct xnmap *portmap; #define _BUFP_BINDING 0 #define _BUFP_BOUND 1 -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE static char *__bufp_link_target(void *obj) { @@ -102,7 +102,7 @@ static struct xnpnode_link __bufp_pnode = { .target = __bufp_link_target, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_link __bufp_pnode = { .node = { @@ -110,7 +110,7 @@ static struct xnpnode_link __bufp_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ static void __bufp_cleanup_handler(struct rtipc_wait_context *wc) { diff --git a/ksrc/drivers/ipc/iddp.c b/ksrc/drivers/ipc/iddp.c index 706c119..9131b0d 100644 --- a/ksrc/drivers/ipc/iddp.c +++ b/ksrc/drivers/ipc/iddp.c @@ -79,7 +79,7 @@ static int poolwait; #define _IDDP_BINDING 0 #define _IDDP_BOUND 1 -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE static char *__iddp_link_target(void *obj) { @@ -107,7 +107,7 @@ static struct xnpnode_link __iddp_pnode = { .target = __iddp_link_target, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_link __iddp_pnode = { .node = { @@ -115,7 +115,7 @@ static struct xnpnode_link __iddp_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ static inline void __iddp_init_mbuf(struct iddp_message *mbuf, size_t len) { diff --git a/ksrc/drivers/ipc/xddp.c b/ksrc/drivers/ipc/xddp.c index bcf272f..f32c192 100644 --- a/ksrc/drivers/ipc/xddp.c +++ b/ksrc/drivers/ipc/xddp.c @@ -71,7 +71,7 @@ static int portmap[CONFIG_XENO_OPT_PIPE_NRDEV]; /* indexes RTDM fildes */ #define _XDDP_BINDING 2 #define _XDDP_BOUND 3 -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE static char *__xddp_link_target(void *obj) { @@ -99,7 +99,7 @@ static struct xnpnode_link __xddp_pnode = { .target = __xddp_link_target, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_link __xddp_pnode = { .node = { @@ -107,7 +107,7 @@ static struct xnpnode_link __xddp_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ static void __xddp_flush_pool(xnheap_t *heap, void *poolmem, u_long poolsz, void *cookie) diff --git a/ksrc/nucleus/Kconfig b/ksrc/nucleus/Kconfig index 211a4ad..391f0a8 100644 --- a/ksrc/nucleus/Kconfig +++ b/ksrc/nucleus/Kconfig @@ -139,6 +139,11 @@ config XENO_OPT_PIPE config XENO_OPT_MAP bool +config XENO_OPT_VFILE + bool + depends on PROC_FS + default y + config XENO_OPT_PIPE_NRDEV int "Number of pipe devices" depends on XENO_OPT_PIPE diff --git a/ksrc/nucleus/heap.c b/ksrc/nucleus/heap.c index 83b1440..c6cb581 100644 --- a/ksrc/nucleus/heap.c +++ b/ksrc/nucleus/heap.c @@ -79,7 +79,7 @@ struct xnheap kstacks; /* Private stack pool */ static DEFINE_XNQUEUE(heapq); /* Heap list for v-file dump */ -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE static struct xnvfile_rev_tag vfile_tag; @@ -165,7 +165,7 @@ void xnheap_cleanup_proc(void) xnvfile_destroy_snapshot(&vfile); } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ static void init_extent(xnheap_t *heap, xnextent_t *extent) { diff --git a/ksrc/nucleus/intr.c b/ksrc/nucleus/intr.c index d18a26a..d7a772f 100644 --- a/ksrc/nucleus/intr.c +++ b/ksrc/nucleus/intr.c @@ -981,7 +981,7 @@ int xnintr_query_next(int irq, xnintr_iterator_t *iterator, char *name_buf) } #endif /* CONFIG_XENO_OPT_STATS */ -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE #include <nucleus/vfile.h> @@ -1131,6 +1131,6 @@ void xnintr_cleanup_proc(void) xnvfile_destroy_regular(&irq_vfile); } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ /*...@}*/ diff --git a/ksrc/nucleus/pipe.c b/ksrc/nucleus/pipe.c index b0fd80c..303dce9 100644 --- a/ksrc/nucleus/pipe.c +++ b/ksrc/nucleus/pipe.c @@ -25,7 +25,6 @@ #include <linux/fcntl.h> #include <linux/poll.h> #include <linux/termios.h> -#include <linux/proc_fs.h> #include <linux/spinlock.h> #include <linux/device.h> #include <asm/io.h> diff --git a/ksrc/nucleus/pod.c b/ksrc/nucleus/pod.c index 46075fd..72f1568 100644 --- a/ksrc/nucleus/pod.c +++ b/ksrc/nucleus/pod.c @@ -3087,10 +3087,7 @@ int xnpod_set_thread_tslice(struct xnthread *thread, xnticks_t quantum) } EXPORT_SYMBOL_GPL(xnpod_set_thread_tslice); -#ifdef CONFIG_PROC_FS - -#include <linux/proc_fs.h> -#include <linux/ctype.h> +#ifdef CONFIG_XENO_OPT_VFILE #if XENO_DEBUG(XNLOCK) @@ -3348,6 +3345,6 @@ void xnpod_cleanup_proc(void) xnvfile_destroy_root(); } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ /*...@}*/ diff --git a/ksrc/nucleus/registry.c b/ksrc/nucleus/registry.c index db36238..9896c37 100644 --- a/ksrc/nucleus/registry.c +++ b/ksrc/nucleus/registry.c @@ -61,7 +61,7 @@ static int registry_hash_entries; static struct xnsynch registry_hash_synch; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE #include <linux/workqueue.h> @@ -102,7 +102,7 @@ static struct xnvfile_regular usage_vfile = { .ops = &usage_vfile_ops, }; -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ int xnregistry_init(void) { @@ -143,7 +143,7 @@ int xnregistry_init(void) } initq(®istry_obj_procq); -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ initq(®istry_obj_freeq); initq(®istry_obj_busyq); @@ -163,11 +163,11 @@ int xnregistry_init(void) registry_hash_entries); if (registry_hash_table == NULL) { -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE xnvfile_destroy_regular(&usage_vfile); xnvfile_destroy_dir(®istry_vfroot); rthal_apc_free(registry_proc_apc); -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ return -ENOMEM; } @@ -181,7 +181,7 @@ int xnregistry_init(void) void xnregistry_cleanup(void) { -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct xnobject *ecurr, *enext; struct xnpnode *pnode; int n; @@ -205,25 +205,25 @@ void xnregistry_cleanup(void) if (--pnode->root->entries == 0) xnvfile_destroy_dir(&pnode->root->vdir); } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ xnarch_free_host_mem(registry_hash_table, sizeof(struct xnobject *) * registry_hash_entries); xnsynch_destroy(®istry_hash_synch); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE rthal_apc_free(registry_proc_apc); flush_scheduled_work(); xnvfile_destroy_regular(&usage_vfile); xnvfile_destroy_dir(®istry_vfroot); -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ xnarch_free_host_mem(registry_obj_slots, CONFIG_XENO_OPT_REGISTRY_NRSLOTS * sizeof(struct xnobject)); } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE static DECLARE_MUTEX(export_mutex); @@ -515,7 +515,7 @@ static inline void registry_unexport_pnode(struct xnobject *object) } } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ static unsigned registry_hash_crunch(const char *key) { @@ -684,7 +684,7 @@ int xnregistry_enter(const char *key, void *objaddr, object->objaddr = objaddr; object->cstamp = ++registry_obj_stamp; object->safelock = 0; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE object->pnode = NULL; #endif if (*key == '\0') { @@ -708,10 +708,10 @@ int xnregistry_enter(const char *key, void *objaddr, */ *phandle = object - registry_obj_slots; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE if (pnode) registry_export_pnode(object, pnode); -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ if (registry_wakeup_sleepers(key)) xnpod_schedule(); @@ -914,7 +914,7 @@ int xnregistry_remove(xnhandle_t handle) if (object->key) { registry_hash_remove(object); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE if (object->pnode) { registry_unexport_pnode(object); @@ -924,7 +924,7 @@ int xnregistry_remove(xnhandle_t handle) if (object->pnode) goto unlock_and_exit; } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ removeq(®istry_obj_busyq, &object->link); } diff --git a/ksrc/nucleus/sched-rt.c b/ksrc/nucleus/sched-rt.c index 628018a..a182822 100644 --- a/ksrc/nucleus/sched-rt.c +++ b/ksrc/nucleus/sched-rt.c @@ -155,7 +155,7 @@ static struct xnthread *xnsched_rt_peek_rpi(struct xnsched *sched) #endif /* CONFIG_XENO_OPT_PRIOCPL */ -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct xnvfile_directory sched_rt_vfroot; @@ -276,7 +276,7 @@ static void xnsched_rt_cleanup_vfile(struct xnsched_class *schedclass) xnvfile_destroy_dir(&sched_rt_vfroot); } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ struct xnsched_class xnsched_class_rt = { .sched_init = xnsched_rt_init, @@ -298,7 +298,7 @@ struct xnsched_class xnsched_class_rt = { .sched_suspend_rpi = NULL, .sched_resume_rpi = NULL, #endif -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE .sched_init_vfile = xnsched_rt_init_vfile, .sched_cleanup_vfile = xnsched_rt_cleanup_vfile, #endif diff --git a/ksrc/nucleus/sched-sporadic.c b/ksrc/nucleus/sched-sporadic.c index 3261a8d..fe12400 100644 --- a/ksrc/nucleus/sched-sporadic.c +++ b/ksrc/nucleus/sched-sporadic.c @@ -413,7 +413,7 @@ static void xnsched_sporadic_resume_rpi(struct xnthread *thread) #endif /* CONFIG_XENO_OPT_PRIOCPL */ -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct xnvfile_directory sched_sporadic_vfroot; @@ -547,7 +547,7 @@ static void xnsched_sporadic_cleanup_vfile(struct xnsched_class *schedclass) xnvfile_destroy_dir(&sched_sporadic_vfroot); } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ struct xnsched_class xnsched_class_sporadic = { .sched_init = xnsched_sporadic_init, @@ -570,7 +570,7 @@ struct xnsched_class xnsched_class_sporadic = { .sched_suspend_rpi = xnsched_sporadic_suspend_rpi, .sched_resume_rpi = xnsched_sporadic_resume_rpi, #endif -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE .sched_init_vfile = xnsched_sporadic_init_vfile, .sched_cleanup_vfile = xnsched_sporadic_cleanup_vfile, #endif diff --git a/ksrc/nucleus/sched-tp.c b/ksrc/nucleus/sched-tp.c index 752d094..43a548e 100644 --- a/ksrc/nucleus/sched-tp.c +++ b/ksrc/nucleus/sched-tp.c @@ -277,7 +277,7 @@ int xnsched_tp_get_partition(struct xnsched *sched) } EXPORT_SYMBOL_GPL(xnsched_tp_get_partition); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct xnvfile_directory sched_tp_vfroot; @@ -382,7 +382,7 @@ static void xnsched_tp_cleanup_vfile(struct xnsched_class *schedclass) xnvfile_destroy_dir(&sched_tp_vfroot); } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ struct xnsched_class xnsched_class_tp = { .sched_init = xnsched_tp_init, @@ -398,7 +398,7 @@ struct xnsched_class xnsched_class_tp = { .sched_trackprio = xnsched_tp_trackprio, .sched_declare = xnsched_tp_declare, .sched_forget = xnsched_tp_forget, -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE .sched_init_vfile = xnsched_tp_init_vfile, .sched_cleanup_vfile = xnsched_tp_cleanup_vfile, #endif diff --git a/ksrc/nucleus/sched.c b/ksrc/nucleus/sched.c index 2647fa1..955380c 100644 --- a/ksrc/nucleus/sched.c +++ b/ksrc/nucleus/sched.c @@ -685,7 +685,7 @@ struct xnpholder *nextmlq(struct xnsched_mlq *q, struct xnpholder *h) #endif /* CONFIG_XENO_OPT_SCALABLE_SCHED */ -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE static struct xnvfile_directory schedclass_vfroot; @@ -1052,4 +1052,4 @@ void xnsched_cleanup_proc(void) xnvfile_destroy_snapshot(&sched_vfile); } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ diff --git a/ksrc/nucleus/shadow.c b/ksrc/nucleus/shadow.c index c128762..e75b499 100644 --- a/ksrc/nucleus/shadow.c +++ b/ksrc/nucleus/shadow.c @@ -69,7 +69,7 @@ EXPORT_SYMBOL_GPL(nkerrptd); struct xnskin_slot { struct xnskin_props *props; atomic_counter_t refcnt; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct xnvfile_regular vfile; #endif } muxtable[XENOMAI_MUX_NR]; @@ -2788,7 +2788,7 @@ static inline void do_cleanup_event(struct mm_struct *mm) RTHAL_DECLARE_CLEANUP_EVENT(cleanup_event); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE static struct xnvfile_directory iface_vfroot; @@ -2824,7 +2824,7 @@ void xnshadow_cleanup_proc(void) xnvfile_destroy_dir(&iface_vfroot); } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ /* * xnshadow_register_interface() -- Register a new skin/interface. @@ -2881,7 +2881,7 @@ int xnshadow_register_interface(struct xnskin_props *props) return -ENOBUFS; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE memset(&iface->vfile, 0, sizeof(iface->vfile)); iface->vfile.ops = &iface_vfile_ops; xnvfile_init_regular(props->name, &iface->vfile, @@ -2920,7 +2920,7 @@ int xnshadow_unregister_interface(int muxid) iface->props = NULL; xnlock_put_irqrestore(&nklock, s); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE xnvfile_destroy_regular(&iface->vfile); #endif diff --git a/ksrc/nucleus/timebase.c b/ksrc/nucleus/timebase.c index 87cde0b..5395a91 100644 --- a/ksrc/nucleus/timebase.c +++ b/ksrc/nucleus/timebase.c @@ -620,7 +620,7 @@ void xntbase_adjust_time(xntbase_t *base, xnsticks_t delta) } EXPORT_SYMBOL_GPL(xntbase_adjust_time); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct xnvfile_rev_tag tbaselist_tag; @@ -844,7 +844,7 @@ void xntbase_cleanup_proc(void) #endif /* CONFIG_XENO_OPT_STATS */ } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ /* The master time base - the most precise one, aperiodic, always valid. */ diff --git a/ksrc/nucleus/timer.c b/ksrc/nucleus/timer.c index d267ce4..bb9416c 100644 --- a/ksrc/nucleus/timer.c +++ b/ksrc/nucleus/timer.c @@ -1109,7 +1109,7 @@ xntbops_t nktimer_ops_aperiodic = { .move_timer = &xntimer_move_aperiodic, }; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE #include <nucleus/vfile.h> @@ -1151,6 +1151,6 @@ void xntimer_cleanup_proc(void) xnvfile_destroy_regular(&timer_vfile); } -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ /*...@}*/ diff --git a/ksrc/skins/native/alarm.c b/ksrc/skins/native/alarm.c index 4e21c21..912262c 100644 --- a/ksrc/skins/native/alarm.c +++ b/ksrc/skins/native/alarm.c @@ -43,7 +43,7 @@ #include <native/alarm.h> #include <native/timer.h> -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -131,7 +131,7 @@ static struct xnpnode_snapshot __alarm_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __alarm_pnode = { .node = { @@ -139,7 +139,7 @@ static struct xnpnode_snapshot __alarm_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ int __native_alarm_pkg_init(void) { diff --git a/ksrc/skins/native/buffer.c b/ksrc/skins/native/buffer.c index 6f7505a..d6e5d31 100644 --- a/ksrc/skins/native/buffer.c +++ b/ksrc/skins/native/buffer.c @@ -48,7 +48,7 @@ #include <native/buffer.h> #include <native/timer.h> -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -157,7 +157,7 @@ static struct xnpnode_snapshot __buffer_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __buffer_pnode = { .node = { @@ -165,7 +165,7 @@ static struct xnpnode_snapshot __buffer_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ /** * @fn int rt_buffer_create(RT_BUFFER *bf, const char *name, size_t bufsz, int mode) diff --git a/ksrc/skins/native/cond.c b/ksrc/skins/native/cond.c index b7b98fd..faca0ee 100644 --- a/ksrc/skins/native/cond.c +++ b/ksrc/skins/native/cond.c @@ -48,7 +48,7 @@ #include <native/mutex.h> #include <native/cond.h> -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -124,7 +124,7 @@ static struct xnpnode_snapshot __cond_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __cond_pnode = { .node = { @@ -132,7 +132,7 @@ static struct xnpnode_snapshot __cond_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ /** * @fn int rt_cond_create(RT_COND *cond, const char *name) diff --git a/ksrc/skins/native/event.c b/ksrc/skins/native/event.c index f20a04b..02d0a93 100644 --- a/ksrc/skins/native/event.c +++ b/ksrc/skins/native/event.c @@ -45,7 +45,7 @@ #include <native/task.h> #include <native/event.h> -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -141,7 +141,7 @@ static struct xnpnode_snapshot __event_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __event_pnode = { .node = { @@ -149,7 +149,7 @@ static struct xnpnode_snapshot __event_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ /** * @fn int rt_event_create(RT_EVENT *event,const char *name,unsigned long ivalue,int mode) diff --git a/ksrc/skins/native/heap.c b/ksrc/skins/native/heap.c index be3f029..3eb7bfc 100644 --- a/ksrc/skins/native/heap.c +++ b/ksrc/skins/native/heap.c @@ -49,7 +49,7 @@ #include <native/task.h> #include <native/heap.h> -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -148,7 +148,7 @@ static struct xnpnode_snapshot __heap_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __heap_pnode = { .node = { @@ -156,7 +156,7 @@ static struct xnpnode_snapshot __heap_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ static void __heap_flush_private(xnheap_t *heap, void *heapmem, u_long heapsize, void *cookie) diff --git a/ksrc/skins/native/intr.c b/ksrc/skins/native/intr.c index ef0d9c0..fa5d69c 100644 --- a/ksrc/skins/native/intr.c +++ b/ksrc/skins/native/intr.c @@ -56,7 +56,7 @@ static unsigned long __intr_get_hits(RT_INTR *intr) return sum; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -147,7 +147,7 @@ static struct xnpnode_snapshot __intr_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __intr_pnode = { .node = { @@ -155,7 +155,7 @@ static struct xnpnode_snapshot __intr_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ /*! * \fn int rt_intr_create (RT_INTR *intr,const char *name,unsigned irq,rt_isr_t isr,rt_iack_t iack,int mode) diff --git a/ksrc/skins/native/mutex.c b/ksrc/skins/native/mutex.c index 3cf7a42..12f5be8 100644 --- a/ksrc/skins/native/mutex.c +++ b/ksrc/skins/native/mutex.c @@ -51,7 +51,7 @@ #include <native/task.h> #include <native/mutex.h> -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -161,7 +161,7 @@ static struct xnpnode_snapshot __mutex_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __mutex_pnode = { .node = { @@ -169,7 +169,7 @@ static struct xnpnode_snapshot __mutex_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ int rt_mutex_create_inner(RT_MUTEX *mutex, const char *name, xnarch_atomic_t *fastlock) diff --git a/ksrc/skins/native/pipe.c b/ksrc/skins/native/pipe.c index d8a1d91..ee6cb11 100644 --- a/ksrc/skins/native/pipe.c +++ b/ksrc/skins/native/pipe.c @@ -52,7 +52,7 @@ #include <nucleus/registry.h> #include <native/pipe.h> -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE static char *__pipe_link_target(void *obj) { @@ -80,7 +80,7 @@ static struct xnpnode_link __pipe_pnode = { .target = __pipe_link_target, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_link __pipe_pnode = { .node = { @@ -88,7 +88,7 @@ static struct xnpnode_link __pipe_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ static void __pipe_flush_pool(xnheap_t *heap, void *poolmem, u_long poolsize, void *cookie) diff --git a/ksrc/skins/native/queue.c b/ksrc/skins/native/queue.c index 7b0a781..124d575 100644 --- a/ksrc/skins/native/queue.c +++ b/ksrc/skins/native/queue.c @@ -47,7 +47,7 @@ #include <native/task.h> #include <native/queue.h> -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -147,7 +147,7 @@ static struct xnpnode_snapshot __q_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __q_pnode = { .node = { @@ -155,7 +155,7 @@ static struct xnpnode_snapshot __q_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ static void __queue_flush_private(xnheap_t *heap, void *poolmem, u_long poolsize, void *cookie) diff --git a/ksrc/skins/native/sem.c b/ksrc/skins/native/sem.c index 1d88fd7..b493cee 100644 --- a/ksrc/skins/native/sem.c +++ b/ksrc/skins/native/sem.c @@ -48,7 +48,7 @@ #include <native/task.h> #include <native/sem.h> -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -139,7 +139,7 @@ static struct xnpnode_snapshot __sem_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __sem_pnode = { .node = { @@ -147,7 +147,7 @@ static struct xnpnode_snapshot __sem_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ /** * @fn int rt_sem_create(RT_SEM *sem,const char *name,unsigned long icount,int mode) diff --git a/ksrc/skins/psos+/queue.c b/ksrc/skins/psos+/queue.c index becbd19..7ea9141 100644 --- a/ksrc/skins/psos+/queue.c +++ b/ksrc/skins/psos+/queue.c @@ -29,7 +29,7 @@ static xnqueue_t psosmbufq; /* Shared msg buffers (in chunks) */ static u_long q_destroy_internal(psosqueue_t *queue); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -121,7 +121,7 @@ static struct xnpnode_snapshot __msgq_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __msgq_pnode = { .node = { @@ -129,7 +129,7 @@ static struct xnpnode_snapshot __msgq_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ void psosqueue_init(void) { diff --git a/ksrc/skins/psos+/rn.c b/ksrc/skins/psos+/rn.c index a870278..7043fcc 100644 --- a/ksrc/skins/psos+/rn.c +++ b/ksrc/skins/psos+/rn.c @@ -29,7 +29,7 @@ static void *rn0addr; static int rn_destroy_internal(psosrn_t *rn); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -119,7 +119,7 @@ static struct xnpnode_snapshot __rn_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __rn_pnode = { .node = { @@ -127,7 +127,7 @@ static struct xnpnode_snapshot __rn_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ int psosrn_init(u_long rn0size) { diff --git a/ksrc/skins/psos+/sem.c b/ksrc/skins/psos+/sem.c index db202c6..5621aa9 100644 --- a/ksrc/skins/psos+/sem.c +++ b/ksrc/skins/psos+/sem.c @@ -25,7 +25,7 @@ static xnqueue_t psossemq; static int sm_destroy_internal(psossem_t *sem); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -111,7 +111,7 @@ static struct xnpnode_snapshot __sem_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __sem_pnode = { .node = { @@ -119,7 +119,7 @@ static struct xnpnode_snapshot __sem_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ void psossem_init(void) { diff --git a/ksrc/skins/rtai/fifo.c b/ksrc/skins/rtai/fifo.c index 7ce79a7..47b7b76 100644 --- a/ksrc/skins/rtai/fifo.c +++ b/ksrc/skins/rtai/fifo.c @@ -25,7 +25,7 @@ static RT_FIFO __fifo_table[CONFIG_XENO_OPT_PIPE_NRDEV]; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { size_t bufsz; @@ -78,7 +78,7 @@ static struct xnpnode_snapshot __fifo_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __fifo_pnode = { .node = { @@ -86,7 +86,7 @@ static struct xnpnode_snapshot __fifo_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ #define CALL_FIFO_HANDLER(fifo, type) \ ((int (*)(int, ...))((fifo)->handler))((fifo) - __fifo_table, (type)) diff --git a/ksrc/skins/rtai/shm.c b/ksrc/skins/rtai/shm.c index 72f16d9..e3bbd79 100644 --- a/ksrc/skins/rtai/shm.c +++ b/ksrc/skins/rtai/shm.c @@ -53,7 +53,7 @@ static inline xnshm_a_t *link2shma(xnholder_t *ln) xnqueue_t xnshm_allocq; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { int size; @@ -105,7 +105,7 @@ static struct xnpnode_snapshot __shm_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __shm_pnode = { .node = { @@ -113,7 +113,7 @@ static struct xnpnode_snapshot __shm_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ static xnshm_a_t *kalloc_new_shm(unsigned long name, int size) { diff --git a/ksrc/skins/rtdm/internal.h b/ksrc/skins/rtdm/internal.h index 74abed2..ef43c25 100644 --- a/ksrc/skins/rtdm/internal.h +++ b/ksrc/skins/rtdm/internal.h @@ -21,7 +21,6 @@ #define _RTDM_INTERNAL_H #include <linux/list.h> -#include <linux/proc_fs.h> #include <linux/sem.h> #include <nucleus/pod.h> @@ -42,10 +41,10 @@ struct rtdm_fildes { }; struct rtdm_process { -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE char name[32]; pid_t pid; -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ xnshadow_ppd_t ppd; }; @@ -81,7 +80,7 @@ static inline void rtdm_dereference_device(struct rtdm_device *device) int __init rtdm_dev_init(void); void rtdm_dev_cleanup(void); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE int rtdm_proc_init(void); void rtdm_proc_cleanup(void); int rtdm_proc_register_device(struct rtdm_device *device); diff --git a/ksrc/skins/rtdm/syscall.c b/ksrc/skins/rtdm/syscall.c index 80785ab..21b771f 100644 --- a/ksrc/skins/rtdm/syscall.c +++ b/ksrc/skins/rtdm/syscall.c @@ -126,10 +126,10 @@ static void *rtdm_skin_callback(int event, void *data) if (!process) return ERR_PTR(-ENOSPC); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE memcpy(process->name, current->comm, sizeof(process->name)); process->pid = current->pid; -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_XENO_OPT_VFILE */ return &process->ppd; diff --git a/ksrc/skins/uitron/flag.c b/ksrc/skins/uitron/flag.c index ae362e3..4058961 100644 --- a/ksrc/skins/uitron/flag.c +++ b/ksrc/skins/uitron/flag.c @@ -23,7 +23,7 @@ static xnmap_t *ui_flag_idmap; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -115,7 +115,7 @@ static struct xnpnode_snapshot __flag_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __flag_pnode = { .node = { @@ -123,7 +123,7 @@ static struct xnpnode_snapshot __flag_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ int uiflag_init(void) { diff --git a/ksrc/skins/uitron/mbx.c b/ksrc/skins/uitron/mbx.c index a6eeabf..f2d3bd8 100644 --- a/ksrc/skins/uitron/mbx.c +++ b/ksrc/skins/uitron/mbx.c @@ -23,7 +23,7 @@ static xnmap_t *ui_mbx_idmap; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -110,7 +110,7 @@ static struct xnpnode_snapshot __mbx_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __mbx_pnode = { .node = { @@ -118,7 +118,7 @@ static struct xnpnode_snapshot __mbx_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ int uimbx_init(void) { diff --git a/ksrc/skins/uitron/sem.c b/ksrc/skins/uitron/sem.c index 55b6562..66df45d 100644 --- a/ksrc/skins/uitron/sem.c +++ b/ksrc/skins/uitron/sem.c @@ -23,7 +23,7 @@ static xnmap_t *ui_sem_idmap; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -110,7 +110,7 @@ static struct xnpnode_snapshot __sem_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __sem_pnode = { .node = { @@ -118,7 +118,7 @@ static struct xnpnode_snapshot __sem_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ int uisem_init(void) { diff --git a/ksrc/skins/vrtx/event.c b/ksrc/skins/vrtx/event.c index 3b84d1c..51a5f64 100644 --- a/ksrc/skins/vrtx/event.c +++ b/ksrc/skins/vrtx/event.c @@ -25,7 +25,7 @@ static xnmap_t *vrtx_event_idmap; static xnqueue_t vrtx_event_q; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -117,7 +117,7 @@ static struct xnpnode_snapshot __event_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __vrtx_pnode = { .node = { @@ -125,7 +125,7 @@ static struct xnpnode_snapshot __vrtx_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ static int event_destroy_internal(vrtxevent_t *evgroup) { diff --git a/ksrc/skins/vrtx/heap.c b/ksrc/skins/vrtx/heap.c index 90e92a1..2fcb66f 100644 --- a/ksrc/skins/vrtx/heap.c +++ b/ksrc/skins/vrtx/heap.c @@ -25,7 +25,7 @@ xnmap_t *vrtx_heap_idmap; static xnqueue_t vrtx_heap_q; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { size_t heapsz; @@ -72,7 +72,7 @@ static struct xnpnode_snapshot __heap_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __heap_pnode = { .node = { @@ -80,7 +80,7 @@ static struct xnpnode_snapshot __heap_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ static void heap_destroy_internal(vrtxheap_t *heap) { diff --git a/ksrc/skins/vrtx/mb.c b/ksrc/skins/vrtx/mb.c index 70e5643..bd6039b 100644 --- a/ksrc/skins/vrtx/mb.c +++ b/ksrc/skins/vrtx/mb.c @@ -28,7 +28,7 @@ static xnqueue_t vrtx_mbox_q; * the VRTX services are never dereferenced, but only used as hash * keys. */ -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -107,7 +107,7 @@ static struct xnpnode_snapshot __mb_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __mb_pnode = { .node = { @@ -115,7 +115,7 @@ static struct xnpnode_snapshot __mb_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ #define MB_HASHBITS 8 diff --git a/ksrc/skins/vrtx/mx.c b/ksrc/skins/vrtx/mx.c index 9d91fd6..e4c6b72 100644 --- a/ksrc/skins/vrtx/mx.c +++ b/ksrc/skins/vrtx/mx.c @@ -25,7 +25,7 @@ static xnmap_t *vrtx_mx_idmap; static xnqueue_t vrtx_mx_q; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -115,7 +115,7 @@ static struct xnpnode_snapshot __mutex_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __mutex_pnode = { .node = { @@ -123,7 +123,7 @@ static struct xnpnode_snapshot __mutex_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ int mx_destroy_internal(vrtxmx_t *mx) { diff --git a/ksrc/skins/vrtx/pt.c b/ksrc/skins/vrtx/pt.c index 43823e9..394669d 100644 --- a/ksrc/skins/vrtx/pt.c +++ b/ksrc/skins/vrtx/pt.c @@ -24,7 +24,7 @@ xnmap_t *vrtx_pt_idmap; static xnqueue_t vrtx_pt_q; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { u_long bsize; @@ -73,7 +73,7 @@ static struct xnpnode_snapshot __pt_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __pt_pnode = { .node = { @@ -81,7 +81,7 @@ static struct xnpnode_snapshot __pt_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ static void vrtxpt_delete_internal(vrtxpt_t *pt) { diff --git a/ksrc/skins/vrtx/queue.c b/ksrc/skins/vrtx/queue.c index 72fd72f..d4d5cf3 100644 --- a/ksrc/skins/vrtx/queue.c +++ b/ksrc/skins/vrtx/queue.c @@ -25,7 +25,7 @@ static xnmap_t *vrtx_queue_idmap; static xnqueue_t vrtx_queue_q; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -109,7 +109,7 @@ static struct xnpnode_snapshot __queue_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __queue_pnode = { .node = { @@ -117,7 +117,7 @@ static struct xnpnode_snapshot __queue_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ int queue_destroy_internal(vrtxqueue_t * queue) { diff --git a/ksrc/skins/vrtx/sem.c b/ksrc/skins/vrtx/sem.c index a0849fb..13cf2d9 100644 --- a/ksrc/skins/vrtx/sem.c +++ b/ksrc/skins/vrtx/sem.c @@ -25,7 +25,7 @@ static xnmap_t *vrtx_sem_idmap; static xnqueue_t vrtx_sem_q; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -106,7 +106,7 @@ static struct xnpnode_snapshot __sem_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __sem_pnode = { .node = { @@ -114,7 +114,7 @@ static struct xnpnode_snapshot __sem_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ static int sem_destroy_internal(vrtxsem_t *sem) { diff --git a/ksrc/skins/vxworks/msgQLib.c b/ksrc/skins/vxworks/msgQLib.c index b88e9a0..62be27f 100644 --- a/ksrc/skins/vxworks/msgQLib.c +++ b/ksrc/skins/vxworks/msgQLib.c @@ -22,7 +22,7 @@ static int msgq_destroy_internal(wind_msgq_t *queue); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -114,7 +114,7 @@ static struct xnpnode_snapshot __msgq_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __msgq_pnode = { .node = { @@ -122,7 +122,7 @@ static struct xnpnode_snapshot __msgq_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ void wind_msgq_init(void) { diff --git a/ksrc/skins/vxworks/semLib.c b/ksrc/skins/vxworks/semLib.c index 9a62d13..aa4db57 100644 --- a/ksrc/skins/vxworks/semLib.c +++ b/ksrc/skins/vxworks/semLib.c @@ -33,7 +33,7 @@ static const sem_vtbl_t semm_vtbl; static void sem_destroy_internal(wind_sem_t *sem); static SEM_ID sem_create_internal(int flags, const sem_vtbl_t *vtbl, int count); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -140,7 +140,7 @@ static struct xnpnode_snapshot __sem_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __sem_pnode = { .node = { @@ -148,7 +148,7 @@ static struct xnpnode_snapshot __sem_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ void wind_sem_init(void) { diff --git a/ksrc/skins/vxworks/wdLib.c b/ksrc/skins/vxworks/wdLib.c index 113e1c8..ca2a97d 100644 --- a/ksrc/skins/vxworks/wdLib.c +++ b/ksrc/skins/vxworks/wdLib.c @@ -24,7 +24,7 @@ static void wd_destroy_internal(wind_wd_t *wd); -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_XENO_OPT_VFILE struct vfile_priv { struct xnpholder *curr; @@ -111,7 +111,7 @@ static struct xnpnode_snapshot __wd_pnode = { }, }; -#else /* !CONFIG_PROC_FS */ +#else /* !CONFIG_XENO_OPT_VFILE */ static struct xnpnode_snapshot __wd_pnode = { .node = { @@ -119,7 +119,7 @@ static struct xnpnode_snapshot __wd_pnode = { }, }; -#endif /* !CONFIG_PROC_FS */ +#endif /* !CONFIG_XENO_OPT_VFILE */ static void wind_wd_trampoline(xntimer_t *timer) { _______________________________________________ Xenomai-git mailing list [email protected] https://mail.gna.org/listinfo/xenomai-git
