[Xenomai-git] Philippe Gerum : cobalt/kernel: unify naming of extern data - cobalt_machine

2015-03-24 Thread git repository hosting 
Module: xenomai-3
Branch: master
Commit: 04dbe2ac275a001e4870b714cbfdd66ddfe940f3
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=04dbe2ac275a001e4870b714cbfdd66ddfe940f3

Author: Philippe Gerum 
Date:   Sun Feb 15 19:16:13 2015 +0100

cobalt/kernel: unify naming of extern data - cobalt_machine

---

 kernel/cobalt/arch/arm/machine.c|2 +-
 kernel/cobalt/arch/blackfin/machine.c   |2 +-
 kernel/cobalt/arch/nios2/machine.c  |2 +-
 kernel/cobalt/arch/powerpc/machine.c|2 +-
 kernel/cobalt/arch/sh/machine.c |2 +-
 kernel/cobalt/arch/x86/machine.c|2 +-
 kernel/cobalt/include/asm-generic/xenomai/machine.h |6 +++---
 kernel/cobalt/init.c|8 
 kernel/cobalt/procfs.c  |6 +++---
 kernel/cobalt/rtdm/drvlib.c |4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/kernel/cobalt/arch/arm/machine.c b/kernel/cobalt/arch/arm/machine.c
index fed94c9..bb50d2b 100644
--- a/kernel/cobalt/arch/arm/machine.c
+++ b/kernel/cobalt/arch/arm/machine.c
@@ -108,7 +108,7 @@ static const char *const fault_labels[] = {
[IPIPE_NR_FAULTS] = NULL
 };
 
-struct xnarch_machdesc xnarch_machdesc = {
+struct cobalt_machine cobalt_machine = {
.name = "arm",
.init = NULL,
.cleanup = NULL,
diff --git a/kernel/cobalt/arch/blackfin/machine.c 
b/kernel/cobalt/arch/blackfin/machine.c
index 098d921..8175d9d 100644
--- a/kernel/cobalt/arch/blackfin/machine.c
+++ b/kernel/cobalt/arch/blackfin/machine.c
@@ -81,7 +81,7 @@ static const char *const fault_labels[] = {
[47] = NULL
 };
 
-struct xnarch_machdesc xnarch_machdesc = {
+struct cobalt_machine cobalt_machine = {
.name = "blackfin",
.init = mach_blackfin_init,
.cleanup = mach_blackfin_cleanup,
diff --git a/kernel/cobalt/arch/nios2/machine.c 
b/kernel/cobalt/arch/nios2/machine.c
index ebd8ab6..39f5cc1 100644
--- a/kernel/cobalt/arch/nios2/machine.c
+++ b/kernel/cobalt/arch/nios2/machine.c
@@ -50,7 +50,7 @@ static const char *const fault_labels[] = {
[6] = NULL
 };
 
-struct xnarch_machdesc xnarch_machdesc = {
+struct cobalt_machine cobalt_machine = {
.name = "nios2",
.init = NULL,
.cleanup = NULL,
diff --git a/kernel/cobalt/arch/powerpc/machine.c 
b/kernel/cobalt/arch/powerpc/machine.c
index 2e35b4d..62c339c 100644
--- a/kernel/cobalt/arch/powerpc/machine.c
+++ b/kernel/cobalt/arch/powerpc/machine.c
@@ -62,7 +62,7 @@ static const char *const fault_labels[] = {
[16] = NULL
 };
 
-struct xnarch_machdesc xnarch_machdesc = {
+struct cobalt_machine cobalt_machine = {
.name = "powerpc",
.init = mach_powerpc_init,
.cleanup = NULL,
diff --git a/kernel/cobalt/arch/sh/machine.c b/kernel/cobalt/arch/sh/machine.c
index 9603407..327632c 100644
--- a/kernel/cobalt/arch/sh/machine.c
+++ b/kernel/cobalt/arch/sh/machine.c
@@ -49,7 +49,7 @@ static const char *const fault_labels[] = {
[5] = NULL
 };
 
-struct xnarch_machdesc xnarch_machdesc = {
+struct cobalt_machine cobalt_machine = {
.name = "sh",
.init = NULL,
.cleanup = NULL,
diff --git a/kernel/cobalt/arch/x86/machine.c b/kernel/cobalt/arch/x86/machine.c
index 3ce34ae..630f308 100644
--- a/kernel/cobalt/arch/x86/machine.c
+++ b/kernel/cobalt/arch/x86/machine.c
@@ -181,7 +181,7 @@ static const char *const fault_labels[] = {
 [20] = NULL,
 };
 
-struct xnarch_machdesc xnarch_machdesc = {
+struct cobalt_machine cobalt_machine = {
.name = "x86",
.init = mach_x86_init,
.cleanup = mach_x86_cleanup,
diff --git a/kernel/cobalt/include/asm-generic/xenomai/machine.h 
b/kernel/cobalt/include/asm-generic/xenomai/machine.h
index 32f5ae0..48b96ed 100644
--- a/kernel/cobalt/include/asm-generic/xenomai/machine.h
+++ b/kernel/cobalt/include/asm-generic/xenomai/machine.h
@@ -26,7 +26,7 @@
 
 struct vm_area_struct;
 
-struct xnarch_machdesc {
+struct cobalt_machine {
const char *name;
int (*init)(void);
void (*cleanup)(void);
@@ -35,7 +35,7 @@ struct xnarch_machdesc {
const char *const *fault_labels;
 };
 
-extern struct xnarch_machdesc xnarch_machdesc;
+extern struct cobalt_machine cobalt_machine;
 
 struct xnarch_percpu_machdata {
unsigned long apc_pending;
@@ -66,7 +66,7 @@ extern struct xnarch_machdata xnarch_machdata;
 
 static inline unsigned long xnarch_timer_calibrate(void)
 {
-   return xnarch_machdesc.calibrate();
+   return cobalt_machine.calibrate();
 }
 
 #ifndef xnarch_cache_aliasing
diff --git a/kernel/cobalt/init.c b/kernel/cobalt/init.c
index 65dc042..a51c28a 100644
--- a/kernel/cobalt/init.c
+++ b/kernel/cobalt/init.c
@@ -182,8 +182,8 @@ static int __init mach_setup(void)
xnarch_machdata.timer_freq = timerfreq_arg;
xnarch_machdata.clock_freq = clockfreq_arg;
 
-

[Xenomai-git] Philippe Gerum : cobalt/kernel: unify naming of extern data - cobalt_machine

2015-02-17 Thread git repository hosting 
Module: xenomai-3
Branch: next
Commit: 04dbe2ac275a001e4870b714cbfdd66ddfe940f3
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=04dbe2ac275a001e4870b714cbfdd66ddfe940f3

Author: Philippe Gerum 
Date:   Sun Feb 15 19:16:13 2015 +0100

cobalt/kernel: unify naming of extern data - cobalt_machine

---

 kernel/cobalt/arch/arm/machine.c|2 +-
 kernel/cobalt/arch/blackfin/machine.c   |2 +-
 kernel/cobalt/arch/nios2/machine.c  |2 +-
 kernel/cobalt/arch/powerpc/machine.c|2 +-
 kernel/cobalt/arch/sh/machine.c |2 +-
 kernel/cobalt/arch/x86/machine.c|2 +-
 kernel/cobalt/include/asm-generic/xenomai/machine.h |6 +++---
 kernel/cobalt/init.c|8 
 kernel/cobalt/procfs.c  |6 +++---
 kernel/cobalt/rtdm/drvlib.c |4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/kernel/cobalt/arch/arm/machine.c b/kernel/cobalt/arch/arm/machine.c
index fed94c9..bb50d2b 100644
--- a/kernel/cobalt/arch/arm/machine.c
+++ b/kernel/cobalt/arch/arm/machine.c
@@ -108,7 +108,7 @@ static const char *const fault_labels[] = {
[IPIPE_NR_FAULTS] = NULL
 };
 
-struct xnarch_machdesc xnarch_machdesc = {
+struct cobalt_machine cobalt_machine = {
.name = "arm",
.init = NULL,
.cleanup = NULL,
diff --git a/kernel/cobalt/arch/blackfin/machine.c 
b/kernel/cobalt/arch/blackfin/machine.c
index 098d921..8175d9d 100644
--- a/kernel/cobalt/arch/blackfin/machine.c
+++ b/kernel/cobalt/arch/blackfin/machine.c
@@ -81,7 +81,7 @@ static const char *const fault_labels[] = {
[47] = NULL
 };
 
-struct xnarch_machdesc xnarch_machdesc = {
+struct cobalt_machine cobalt_machine = {
.name = "blackfin",
.init = mach_blackfin_init,
.cleanup = mach_blackfin_cleanup,
diff --git a/kernel/cobalt/arch/nios2/machine.c 
b/kernel/cobalt/arch/nios2/machine.c
index ebd8ab6..39f5cc1 100644
--- a/kernel/cobalt/arch/nios2/machine.c
+++ b/kernel/cobalt/arch/nios2/machine.c
@@ -50,7 +50,7 @@ static const char *const fault_labels[] = {
[6] = NULL
 };
 
-struct xnarch_machdesc xnarch_machdesc = {
+struct cobalt_machine cobalt_machine = {
.name = "nios2",
.init = NULL,
.cleanup = NULL,
diff --git a/kernel/cobalt/arch/powerpc/machine.c 
b/kernel/cobalt/arch/powerpc/machine.c
index 2e35b4d..62c339c 100644
--- a/kernel/cobalt/arch/powerpc/machine.c
+++ b/kernel/cobalt/arch/powerpc/machine.c
@@ -62,7 +62,7 @@ static const char *const fault_labels[] = {
[16] = NULL
 };
 
-struct xnarch_machdesc xnarch_machdesc = {
+struct cobalt_machine cobalt_machine = {
.name = "powerpc",
.init = mach_powerpc_init,
.cleanup = NULL,
diff --git a/kernel/cobalt/arch/sh/machine.c b/kernel/cobalt/arch/sh/machine.c
index 9603407..327632c 100644
--- a/kernel/cobalt/arch/sh/machine.c
+++ b/kernel/cobalt/arch/sh/machine.c
@@ -49,7 +49,7 @@ static const char *const fault_labels[] = {
[5] = NULL
 };
 
-struct xnarch_machdesc xnarch_machdesc = {
+struct cobalt_machine cobalt_machine = {
.name = "sh",
.init = NULL,
.cleanup = NULL,
diff --git a/kernel/cobalt/arch/x86/machine.c b/kernel/cobalt/arch/x86/machine.c
index 3ce34ae..630f308 100644
--- a/kernel/cobalt/arch/x86/machine.c
+++ b/kernel/cobalt/arch/x86/machine.c
@@ -181,7 +181,7 @@ static const char *const fault_labels[] = {
 [20] = NULL,
 };
 
-struct xnarch_machdesc xnarch_machdesc = {
+struct cobalt_machine cobalt_machine = {
.name = "x86",
.init = mach_x86_init,
.cleanup = mach_x86_cleanup,
diff --git a/kernel/cobalt/include/asm-generic/xenomai/machine.h 
b/kernel/cobalt/include/asm-generic/xenomai/machine.h
index 32f5ae0..48b96ed 100644
--- a/kernel/cobalt/include/asm-generic/xenomai/machine.h
+++ b/kernel/cobalt/include/asm-generic/xenomai/machine.h
@@ -26,7 +26,7 @@
 
 struct vm_area_struct;
 
-struct xnarch_machdesc {
+struct cobalt_machine {
const char *name;
int (*init)(void);
void (*cleanup)(void);
@@ -35,7 +35,7 @@ struct xnarch_machdesc {
const char *const *fault_labels;
 };
 
-extern struct xnarch_machdesc xnarch_machdesc;
+extern struct cobalt_machine cobalt_machine;
 
 struct xnarch_percpu_machdata {
unsigned long apc_pending;
@@ -66,7 +66,7 @@ extern struct xnarch_machdata xnarch_machdata;
 
 static inline unsigned long xnarch_timer_calibrate(void)
 {
-   return xnarch_machdesc.calibrate();
+   return cobalt_machine.calibrate();
 }
 
 #ifndef xnarch_cache_aliasing
diff --git a/kernel/cobalt/init.c b/kernel/cobalt/init.c
index 65dc042..a51c28a 100644
--- a/kernel/cobalt/init.c
+++ b/kernel/cobalt/init.c
@@ -182,8 +182,8 @@ static int __init mach_setup(void)
xnarch_machdata.timer_freq = timerfreq_arg;
xnarch_machdata.clock_freq = clockfreq_arg;
 
-