Module: xenomai-forge
Branch: next
Commit: d8966401a46b9f05c00cc21fde876e12e7855d72
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=d8966401a46b9f05c00cc21fde876e12e7855d72

Author: Philippe Gerum <r...@xenomai.org>
Date:   Thu Jul  4 09:51:08 2013 +0200

include/asm-generic/features.h: drop useless indirection file

---

 include/cobalt/asm-arm/features.h           |    4 ++-
 include/cobalt/asm-arm/uapi/features.h      |    2 +
 include/cobalt/asm-blackfin/features.h      |    4 ++-
 include/cobalt/asm-blackfin/uapi/features.h |    4 ++-
 include/cobalt/asm-generic/Makefile.am      |    1 -
 include/cobalt/asm-generic/Makefile.in      |    1 -
 include/cobalt/asm-generic/features.h       |   28 ---------------------------
 include/cobalt/asm-generic/uapi/features.h  |    2 -
 include/cobalt/asm-nios2/features.h         |    5 +--
 include/cobalt/asm-nios2/uapi/features.h    |   10 +++-----
 include/cobalt/asm-powerpc/features.h       |    4 ++-
 include/cobalt/asm-powerpc/uapi/features.h  |    2 +
 include/cobalt/asm-sh/features.h            |    5 +--
 include/cobalt/asm-sh/uapi/features.h       |   10 +++-----
 include/cobalt/asm-x86/features.h           |    4 ++-
 include/cobalt/asm-x86/uapi/features.h      |    2 +
 16 files changed, 33 insertions(+), 55 deletions(-)

diff --git a/include/cobalt/asm-arm/features.h 
b/include/cobalt/asm-arm/features.h
index a95f293..127f927 100644
--- a/include/cobalt/asm-arm/features.h
+++ b/include/cobalt/asm-arm/features.h
@@ -26,7 +26,9 @@
 #define CONFIG_XENO_ARM_EABI 1
 #endif
 
+struct xnfeatinfo;
+static inline void collect_arch_features(struct xnfeatinfo *p) { }
+
 #include <asm/xenomai/uapi/features.h>
-#include <asm-generic/xenomai/features.h>
 
 #endif /* !_COBALT_ASM_ARM_FEATURES_H */
diff --git a/include/cobalt/asm-arm/uapi/features.h 
b/include/cobalt/asm-arm/uapi/features.h
index b1af2cd..686ee93 100644
--- a/include/cobalt/asm-arm/uapi/features.h
+++ b/include/cobalt/asm-arm/uapi/features.h
@@ -38,6 +38,8 @@
 #define XNARCH_HAVE_LLMULSHFT    1
 #define XNARCH_HAVE_NODIV_LLIMD  1
 
+struct xnfeatinfo_archdep { /* no arch-specific feature */ };
+
 #include <asm-generic/xenomai/uapi/features.h>
 
 static inline const char *get_feature_label(unsigned int feature)
diff --git a/include/cobalt/asm-blackfin/features.h 
b/include/cobalt/asm-blackfin/features.h
index 370005d..8bcdda1 100644
--- a/include/cobalt/asm-blackfin/features.h
+++ b/include/cobalt/asm-blackfin/features.h
@@ -19,7 +19,9 @@
 #ifndef _COBALT_ASM_BLACKFIN_FEATURES_H
 #define _COBALT_ASM_BLACKFIN_FEATURES_H
 
+struct xnfeatinfo;
+static inline void collect_arch_features(struct xnfeatinfo *p) { }
+
 #include <asm/xenomai/uapi/features.h>
-#include <asm-generic/xenomai/features.h>
 
 #endif /* !_COBALT_ASM_BLACKFIN_FEATURES_H */
diff --git a/include/cobalt/asm-blackfin/uapi/features.h 
b/include/cobalt/asm-blackfin/uapi/features.h
index 9436371..8f5e5d3 100644
--- a/include/cobalt/asm-blackfin/uapi/features.h
+++ b/include/cobalt/asm-blackfin/uapi/features.h
@@ -28,7 +28,9 @@
 #define XNARCH_HAVE_LLMULSHFT    1
 #define XNARCH_HAVE_NODIV_LLIMD  1
 
-#include <asm-generic/xenomai/features.h>
+struct xnfeatinfo_archdep { /* no arch-specific feature */ };
+
+#include <asm-generic/xenomai/uapi/features.h>
 
 static inline const char *get_feature_label(unsigned int feature)
 {
diff --git a/include/cobalt/asm-generic/Makefile.am 
b/include/cobalt/asm-generic/Makefile.am
index ab80c4f..913c7a7 100644
--- a/include/cobalt/asm-generic/Makefile.am
+++ b/include/cobalt/asm-generic/Makefile.am
@@ -1,7 +1,6 @@
 includesubdir = $(includedir)/asm-generic
 
 includesub_HEADERS =   \
-       features.h      \
        machine.h       \
        mayday.h        \
        pci_ids.h       \
diff --git a/include/cobalt/asm-generic/Makefile.in 
b/include/cobalt/asm-generic/Makefile.in
index 0f3aed5..5ec533d 100644
--- a/include/cobalt/asm-generic/Makefile.in
+++ b/include/cobalt/asm-generic/Makefile.in
@@ -312,7 +312,6 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 includesubdir = $(includedir)/asm-generic
 includesub_HEADERS = \
-       features.h      \
        machine.h       \
        mayday.h        \
        pci_ids.h       \
diff --git a/include/cobalt/asm-generic/features.h 
b/include/cobalt/asm-generic/features.h
deleted file mode 100644
index 983c735..0000000
--- a/include/cobalt/asm-generic/features.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2005 Philippe Gerum <r...@xenomai.org>.
- *
- *   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, Inc., 675 Mass Ave, Cambridge MA 02139,
- *   USA; 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 _COBALT_ASM_GENERIC_FEATURES_H
-#define _COBALT_ASM_GENERIC_FEATURES_H
-
-#include <asm-generic/xenomai/uapi/features.h>
-
-#ifndef xnfeatinfo_archdep
-static inline void collect_arch_features(struct xnfeatinfo *p) { }
-#endif /* !xnfeatinfo_archdep */
-
-#endif /* !_COBALT_ASM_GENERIC_FEATURES_H */
diff --git a/include/cobalt/asm-generic/uapi/features.h 
b/include/cobalt/asm-generic/uapi/features.h
index c20f76e..58eb5c3 100644
--- a/include/cobalt/asm-generic/uapi/features.h
+++ b/include/cobalt/asm-generic/uapi/features.h
@@ -29,9 +29,7 @@ struct xnfeatinfo {
        char feat_req_s[XNFEAT_STRING_LEN];
        unsigned long feat_mis; /* Missing features. */
        char feat_mis_s[XNFEAT_STRING_LEN];
-#ifdef xnfeatinfo_archdep
        struct xnfeatinfo_archdep feat_arch; /* Arch-dep extension. */
-#endif
        unsigned long feat_abirev; /* ABI revision level. */
 };
 
diff --git a/include/cobalt/asm-nios2/features.h 
b/include/cobalt/asm-nios2/features.h
index cafcb2c..5d7a69d 100644
--- a/include/cobalt/asm-nios2/features.h
+++ b/include/cobalt/asm-nios2/features.h
@@ -21,11 +21,10 @@
 
 #include <linux/ipipe.h>
 #include <asm/xenomai/uapi/features.h>
-#include <asm-generic/xenomai/features.h>
 
-static inline void collect_arch_features(struct xnfeatinfo *finfo)
+static inline void collect_arch_features(struct xnfeatinfo *p)
 {
-       finfo->feat_arch.hrclock_membase = __ipipe_hrclock_membase;
+       p->feat_arch.hrclock_membase = __ipipe_hrclock_membase;
 }
 
 #endif /* !_COBALT_ASM_NIOS2_FEATURES_H */
diff --git a/include/cobalt/asm-nios2/uapi/features.h 
b/include/cobalt/asm-nios2/uapi/features.h
index 634c9e6..1874d3a 100644
--- a/include/cobalt/asm-nios2/uapi/features.h
+++ b/include/cobalt/asm-nios2/uapi/features.h
@@ -18,12 +18,6 @@
 #ifndef _COBALT_ASM_NIOS2_UAPI_FEATURES_H
 #define _COBALT_ASM_NIOS2_UAPI_FEATURES_H
 
-struct xnfeatinfo_nios2 {
-       unsigned long hrclock_membase;
-};
-
-#define xnfeatinfo_archdep  xnfeatinfo_nios2
-
 /* The ABI revision level we use on this arch. */
 #define XENOMAI_ABI_REV   3UL
 
@@ -34,6 +28,10 @@ struct xnfeatinfo_nios2 {
 #define XNARCH_HAVE_LLMULSHFT    1
 #define XNARCH_HAVE_NODIV_LLIMD  1
 
+struct xnfeatinfo_archdep {
+       unsigned long hrclock_membase;
+};
+
 #include <asm-generic/xenomai/uapi/features.h>
 
 static inline const char *get_feature_label(unsigned int feature)
diff --git a/include/cobalt/asm-powerpc/features.h 
b/include/cobalt/asm-powerpc/features.h
index 31bd159..042149f 100644
--- a/include/cobalt/asm-powerpc/features.h
+++ b/include/cobalt/asm-powerpc/features.h
@@ -19,7 +19,9 @@
 #ifndef _COBALT_ASM_POWERPC_FEATURES_H
 #define _COBALT_ASM_POWERPC_FEATURES_H
 
+struct xnfeatinfo;
+static inline void collect_arch_features(struct xnfeatinfo *p) { }
+
 #include <asm/xenomai/uapi/features.h>
-#include <asm-generic/xenomai/features.h>
 
 #endif /* !_COBALT_ASM_POWERPC_FEATURES_H */
diff --git a/include/cobalt/asm-powerpc/uapi/features.h 
b/include/cobalt/asm-powerpc/uapi/features.h
index 200ed71..266bd25 100644
--- a/include/cobalt/asm-powerpc/uapi/features.h
+++ b/include/cobalt/asm-powerpc/uapi/features.h
@@ -29,6 +29,8 @@
 #define XNARCH_HAVE_LLMULSHFT    1
 #define XNARCH_HAVE_NODIV_LLIMD  1
 
+struct xnfeatinfo_archdep { /* no arch-specific feature */ };
+
 #include <asm-generic/xenomai/uapi/features.h>
 
 static inline const char *get_feature_label(unsigned feature)
diff --git a/include/cobalt/asm-sh/features.h b/include/cobalt/asm-sh/features.h
index 5b6c8e0..7395279 100644
--- a/include/cobalt/asm-sh/features.h
+++ b/include/cobalt/asm-sh/features.h
@@ -21,11 +21,10 @@
 
 #include <linux/ipipe.h>
 #include <asm/xenomai/uapi/features.h>
-#include <asm-generic/xenomai/features.h>
 
-static inline void collect_arch_features(struct xnfeatinfo *finfo)
+static inline void collect_arch_features(struct xnfeatinfo *p)
 {
-       finfo->feat_arch.hrclock_membase = __pa(__ipipe_tsc);
+       p->feat_arch.hrclock_membase = __pa(__ipipe_tsc);
 }
 
 #endif /* !_COBALT_ASM_SH_FEATURES_H */
diff --git a/include/cobalt/asm-sh/uapi/features.h 
b/include/cobalt/asm-sh/uapi/features.h
index d509631..d8d0fac 100644
--- a/include/cobalt/asm-sh/uapi/features.h
+++ b/include/cobalt/asm-sh/uapi/features.h
@@ -19,12 +19,6 @@
 #ifndef _COBALT_ASM_SH_FEATURES_H
 #define _COBALT_ASM_SH_FEATURES_H
 
-struct xnfeatinfo_sh {
-       unsigned long hrclock_membase;
-};
-
-#define xnfeatinfo_archdep  xnfeatinfo_sh
-
 /* The ABI revision level we use on this arch. */
 #define XENOMAI_ABI_REV   1UL
 
@@ -35,6 +29,10 @@ struct xnfeatinfo_sh {
 #define XNARCH_HAVE_LLMULSHFT    1
 #define XNARCH_HAVE_NODIV_LLIMD  1
 
+struct xnfeatinfo_archdep {
+       unsigned long hrclock_membase;
+};
+
 #include <asm-generic/xenomai/uapi/features.h>
 
 static inline const char *get_feature_label(unsigned int feature)
diff --git a/include/cobalt/asm-x86/features.h 
b/include/cobalt/asm-x86/features.h
index 813489e..fa0f33a 100644
--- a/include/cobalt/asm-x86/features.h
+++ b/include/cobalt/asm-x86/features.h
@@ -19,7 +19,9 @@
 #ifndef _COBALT_ASM_X86_FEATURES_H
 #define _COBALT_ASM_X86_FEATURES_H
 
+struct xnfeatinfo;
+static inline void collect_arch_features(struct xnfeatinfo *p) { }
+
 #include <asm/xenomai/uapi/features.h>
-#include <asm-generic/xenomai/features.h>
 
 #endif /* !_COBALT_ASM_X86_FEATURES_H */
diff --git a/include/cobalt/asm-x86/uapi/features.h 
b/include/cobalt/asm-x86/uapi/features.h
index e4d4fff..d676f70 100644
--- a/include/cobalt/asm-x86/uapi/features.h
+++ b/include/cobalt/asm-x86/uapi/features.h
@@ -28,6 +28,8 @@
 #define XNARCH_HAVE_LLMULSHFT    1
 #define XNARCH_HAVE_NODIV_LLIMD  1
 
+struct xnfeatinfo_archdep { /* no arch-specific feature */ };
+
 #include <asm-generic/xenomai/uapi/features.h>
 
 static inline const char *get_feature_label(unsigned int feature)


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to