[Xenomai-git] Alexis Berlemont : Fix testing drivers' renaming issues
Module: xenomai-abe
Branch: analogy
Commit: 4d7c2434d54d25fe3d996005ea05b1a0bcc868fd
URL:
http://git.xenomai.org/?p=xenomai-abe.git;a=commit;h=4d7c2434d54d25fe3d996005ea05b1a0bcc868fd
Author: Alexis Berlemont
Date: Tue Oct 27 00:55:00 2009 +0100
Fix testing drivers' renaming issues
---
ksrc/drivers/analogy/testing/Kconfig |8 +-
ksrc/drivers/analogy/testing/Makefile | 26 +++---
ksrc/drivers/analogy/testing/fake.c | 116 ++--
ksrc/drivers/analogy/testing/loop.c | 136
4 files changed, 143 insertions(+), 143 deletions(-)
diff --git a/ksrc/drivers/analogy/testing/Kconfig
b/ksrc/drivers/analogy/testing/Kconfig
index 9169c03..fd1e73a 100644
--- a/ksrc/drivers/analogy/testing/Kconfig
+++ b/ksrc/drivers/analogy/testing/Kconfig
@@ -1,10 +1,10 @@
-config XENO_DRIVERS_COMEDI_FAKE
- depends on XENO_DRIVERS_COMEDI
+config XENO_DRIVERS_ANALOGY_FAKE
+ depends on XENO_DRIVERS_ANALOGY
tristate "Fake driver"
default n
-config XENO_DRIVERS_COMEDI_LOOP
- depends on XENO_DRIVERS_COMEDI
+config XENO_DRIVERS_ANALOGY_LOOP
+ depends on XENO_DRIVERS_ANALOGY
tristate "Loop driver"
default n
diff --git a/ksrc/drivers/analogy/testing/Makefile
b/ksrc/drivers/analogy/testing/Makefile
index 6326422..cb38daa 100644
--- a/ksrc/drivers/analogy/testing/Makefile
+++ b/ksrc/drivers/analogy/testing/Makefile
@@ -4,12 +4,12 @@ ifeq ($(PATCHLEVEL),6)
EXTRA_CFLAGS += -D__IN_XENOMAI__ -Iinclude/xenomai
-obj-$(CONFIG_XENO_DRIVERS_COMEDI_FAKE) += comedi_fake.o
-obj-$(CONFIG_XENO_DRIVERS_COMEDI_LOOP) += comedi_loop.o
+obj-$(CONFIG_XENO_DRIVERS_ANALOGY_FAKE) += analogy_fake.o
+obj-$(CONFIG_XENO_DRIVERS_ANALOGY_LOOP) += analogy_loop.o
-comedi_fake-y := fake.o
+analogy_fake-y := fake.o
-comedi_loop-y := loop.o
+analogy_loop-y := loop.o
else
@@ -17,23 +17,23 @@ else
O_TARGET := built-in.o
-obj-$(CONFIG_XENO_DRIVERS_COMEDI_FAKE) += comedi_fake.o
-obj-$(CONFIG_XENO_DRIVERS_COMEDI_LOOP) += comedi_loop.o
+obj-$(CONFIG_XENO_DRIVERS_ANALOGY_FAKE) += analogy_fake.o
+obj-$(CONFIG_XENO_DRIVERS_ANALOGY_LOOP) += analogy_loop.o
-comedi_fake-objs := fake.o
+analogy_fake-objs := fake.o
-comedi_loop-objs := loop.o
+analogy_loop-objs := loop.o
-export-objs := $(comedi_fake-objs) $(comedi_loop-objs)
+export-objs := $(analogy_fake-objs) $(analogy_loop-objs)
EXTRA_CFLAGS += -D__IN_XENOMAI__ -I$(TOPDIR)/include/xenomai
-I$(TOPDIR)/include/xenomai/compat
include $(TOPDIR)/Rules.make
-comedi_fake.o: $(comedi_fake-objs)
- $(LD) -r -o $@ $(comedi_fake-objs)
+analogy_fake.o: $(analogy_fake-objs)
+ $(LD) -r -o $@ $(analogy_fake-objs)
-comedi_loop.o: $(comedi_loop-objs)
- $(LD) -r -o $@ $(comedi_loop-objs)
+analogy_loop.o: $(analogy_loop-objs)
+ $(LD) -r -o $@ $(analogy_loop-objs)
endif
diff --git a/ksrc/drivers/analogy/testing/fake.c
b/ksrc/drivers/analogy/testing/fake.c
index 8ac48a6..bf3bacf 100644
--- a/ksrc/drivers/analogy/testing/fake.c
+++ b/ksrc/drivers/analogy/testing/fake.c
@@ -1,5 +1,5 @@
#include
-#include
+#include
#define TEST_TASK_PERIOD 100
#define TEST_NB_BITS 16
@@ -12,7 +12,7 @@
struct test_priv {
/* Task descriptor */
- comedi_task_t timer_task;
+ a4l_task_t timer_task;
/* Specific timing fields */
unsigned long scan_period_ns;
@@ -39,16 +39,16 @@ typedef struct test_attach_arg tstattr_t;
/* --- Channels / ranges part --- */
/* Channels descriptor */
-static comedi_chdesc_t test_chandesc = {
- .mode = COMEDI_CHAN_GLOBAL_CHANDESC,
+static a4l_chdesc_t test_chandesc = {
+ .mode = A4L_CHAN_GLOBAL_CHANDESC,
.length = 8,
.chans = {
- {COMEDI_CHAN_AREF_GROUND, TEST_NB_BITS},
+ {A4L_CHAN_AREF_GROUND, TEST_NB_BITS},
},
};
/* Ranges tab */
-static comedi_rngtab_t test_rngtab = {
+static a4l_rngtab_t test_rngtab = {
.length = 2,
.rngs = {
RANGE_V(-5,5),
@@ -56,10 +56,10 @@ static comedi_rngtab_t test_rngtab = {
},
};
/* Ranges descriptor */
-comedi_rngdesc_t test_rngdesc = RNG_GLOBAL(test_rngtab);
+a4l_rngdesc_t test_rngdesc = RNG_GLOBAL(test_rngtab);
/* Command options mask */
-static comedi_cmd_t test_cmd_mask = {
+static a4l_cmd_t test_cmd_mask = {
.idx_subd = 0,
.start_src = TRIG_NOW,
.scan_begin_src = TRIG_TIMER,
@@ -75,21 +75,21 @@ static sampl_t output_tab[8] = {
0x8000, 0xa000, 0xc000, 0x
};
static unsigned int output_idx;
-static comedi_lock_t output_lock = COMEDI_LOCK_UNLOCKED;
+static a4l_lock_t output_lock = A4L_LOCK_UNLOCKED;
static sampl_t test_output(tstprv_t *priv)
{
unsigned long flags;
unsigned int idx;
- comedi_lock_irqsave(&output_lock, flags);
+ a4l_lock_irqsave(&output_lock, flags);
output_idx += priv->quanta_cnt;
if(output_idx == 8)
output_idx = 0;
idx = o
[Xenomai-git] Alexis Berlemont : Fix testing drivers' renaming issues
Module: xenomai-abe
Branch: analogy
Commit: 262b5339ba7bd704ed40506b543766d18d4e2117
URL:
http://git.xenomai.org/?p=xenomai-abe.git;a=commit;h=262b5339ba7bd704ed40506b543766d18d4e2117
Author: Alexis Berlemont
Date: Tue Oct 27 00:55:00 2009 +0100
Fix testing drivers' renaming issues
---
ksrc/drivers/analogy/testing/Kconfig |8 +-
ksrc/drivers/analogy/testing/Makefile | 26 +++---
ksrc/drivers/analogy/testing/fake.c | 116 ++--
ksrc/drivers/analogy/testing/loop.c | 136
4 files changed, 143 insertions(+), 143 deletions(-)
diff --git a/ksrc/drivers/analogy/testing/Kconfig
b/ksrc/drivers/analogy/testing/Kconfig
index 9169c03..fd1e73a 100644
--- a/ksrc/drivers/analogy/testing/Kconfig
+++ b/ksrc/drivers/analogy/testing/Kconfig
@@ -1,10 +1,10 @@
-config XENO_DRIVERS_COMEDI_FAKE
- depends on XENO_DRIVERS_COMEDI
+config XENO_DRIVERS_ANALOGY_FAKE
+ depends on XENO_DRIVERS_ANALOGY
tristate "Fake driver"
default n
-config XENO_DRIVERS_COMEDI_LOOP
- depends on XENO_DRIVERS_COMEDI
+config XENO_DRIVERS_ANALOGY_LOOP
+ depends on XENO_DRIVERS_ANALOGY
tristate "Loop driver"
default n
diff --git a/ksrc/drivers/analogy/testing/Makefile
b/ksrc/drivers/analogy/testing/Makefile
index 6326422..cb38daa 100644
--- a/ksrc/drivers/analogy/testing/Makefile
+++ b/ksrc/drivers/analogy/testing/Makefile
@@ -4,12 +4,12 @@ ifeq ($(PATCHLEVEL),6)
EXTRA_CFLAGS += -D__IN_XENOMAI__ -Iinclude/xenomai
-obj-$(CONFIG_XENO_DRIVERS_COMEDI_FAKE) += comedi_fake.o
-obj-$(CONFIG_XENO_DRIVERS_COMEDI_LOOP) += comedi_loop.o
+obj-$(CONFIG_XENO_DRIVERS_ANALOGY_FAKE) += analogy_fake.o
+obj-$(CONFIG_XENO_DRIVERS_ANALOGY_LOOP) += analogy_loop.o
-comedi_fake-y := fake.o
+analogy_fake-y := fake.o
-comedi_loop-y := loop.o
+analogy_loop-y := loop.o
else
@@ -17,23 +17,23 @@ else
O_TARGET := built-in.o
-obj-$(CONFIG_XENO_DRIVERS_COMEDI_FAKE) += comedi_fake.o
-obj-$(CONFIG_XENO_DRIVERS_COMEDI_LOOP) += comedi_loop.o
+obj-$(CONFIG_XENO_DRIVERS_ANALOGY_FAKE) += analogy_fake.o
+obj-$(CONFIG_XENO_DRIVERS_ANALOGY_LOOP) += analogy_loop.o
-comedi_fake-objs := fake.o
+analogy_fake-objs := fake.o
-comedi_loop-objs := loop.o
+analogy_loop-objs := loop.o
-export-objs := $(comedi_fake-objs) $(comedi_loop-objs)
+export-objs := $(analogy_fake-objs) $(analogy_loop-objs)
EXTRA_CFLAGS += -D__IN_XENOMAI__ -I$(TOPDIR)/include/xenomai
-I$(TOPDIR)/include/xenomai/compat
include $(TOPDIR)/Rules.make
-comedi_fake.o: $(comedi_fake-objs)
- $(LD) -r -o $@ $(comedi_fake-objs)
+analogy_fake.o: $(analogy_fake-objs)
+ $(LD) -r -o $@ $(analogy_fake-objs)
-comedi_loop.o: $(comedi_loop-objs)
- $(LD) -r -o $@ $(comedi_loop-objs)
+analogy_loop.o: $(analogy_loop-objs)
+ $(LD) -r -o $@ $(analogy_loop-objs)
endif
diff --git a/ksrc/drivers/analogy/testing/fake.c
b/ksrc/drivers/analogy/testing/fake.c
index 8ac48a6..bf3bacf 100644
--- a/ksrc/drivers/analogy/testing/fake.c
+++ b/ksrc/drivers/analogy/testing/fake.c
@@ -1,5 +1,5 @@
#include
-#include
+#include
#define TEST_TASK_PERIOD 100
#define TEST_NB_BITS 16
@@ -12,7 +12,7 @@
struct test_priv {
/* Task descriptor */
- comedi_task_t timer_task;
+ a4l_task_t timer_task;
/* Specific timing fields */
unsigned long scan_period_ns;
@@ -39,16 +39,16 @@ typedef struct test_attach_arg tstattr_t;
/* --- Channels / ranges part --- */
/* Channels descriptor */
-static comedi_chdesc_t test_chandesc = {
- .mode = COMEDI_CHAN_GLOBAL_CHANDESC,
+static a4l_chdesc_t test_chandesc = {
+ .mode = A4L_CHAN_GLOBAL_CHANDESC,
.length = 8,
.chans = {
- {COMEDI_CHAN_AREF_GROUND, TEST_NB_BITS},
+ {A4L_CHAN_AREF_GROUND, TEST_NB_BITS},
},
};
/* Ranges tab */
-static comedi_rngtab_t test_rngtab = {
+static a4l_rngtab_t test_rngtab = {
.length = 2,
.rngs = {
RANGE_V(-5,5),
@@ -56,10 +56,10 @@ static comedi_rngtab_t test_rngtab = {
},
};
/* Ranges descriptor */
-comedi_rngdesc_t test_rngdesc = RNG_GLOBAL(test_rngtab);
+a4l_rngdesc_t test_rngdesc = RNG_GLOBAL(test_rngtab);
/* Command options mask */
-static comedi_cmd_t test_cmd_mask = {
+static a4l_cmd_t test_cmd_mask = {
.idx_subd = 0,
.start_src = TRIG_NOW,
.scan_begin_src = TRIG_TIMER,
@@ -75,21 +75,21 @@ static sampl_t output_tab[8] = {
0x8000, 0xa000, 0xc000, 0x
};
static unsigned int output_idx;
-static comedi_lock_t output_lock = COMEDI_LOCK_UNLOCKED;
+static a4l_lock_t output_lock = A4L_LOCK_UNLOCKED;
static sampl_t test_output(tstprv_t *priv)
{
unsigned long flags;
unsigned int idx;
- comedi_lock_irqsave(&output_lock, flags);
+ a4l_lock_irqsave(&output_lock, flags);
output_idx += priv->quanta_cnt;
if(output_idx == 8)
output_idx = 0;
idx = o
