[Xenomai-git] Alexis Berlemont : Fix modules compilations issues
Module: xenomai-gch
Branch: for-head
Commit: 094c9365f41b07ef5e368c74104ae837f1f7c759
URL:
http://git.xenomai.org/?p=xenomai-gch.git;a=commit;h=094c9365f41b07ef5e368c74104ae837f1f7c759
Author: Alexis Berlemont alexis.berlem...@gmail.com
Date: Sat Oct 17 16:41:00 2009 +0200
Fix modules compilations issues
---
ksrc/drivers/comedi/intel/8255.c |6 +--
ksrc/drivers/comedi/intel/8255.h |3 +-
.../comedi/national_instruments/mio_common.c | 57 +---
ksrc/drivers/comedi/national_instruments/mite.c|1 +
4 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/ksrc/drivers/comedi/intel/8255.c b/ksrc/drivers/comedi/intel/8255.c
index f6321f6..e9c2ae1 100644
--- a/ksrc/drivers/comedi/intel/8255.c
+++ b/ksrc/drivers/comedi/intel/8255.c
@@ -51,10 +51,6 @@ void subdev_8255_interrupt(comedi_subd_t *subd)
{
sampl_t d;
- /* Considering the current Comedi API, using asynchronous
- buffer is only possible on the main read/write subdevice.
- Then, this function needs only one argument: the device */
-
/* Retrieve the sample... */
d = CALLBACK_FUNC(0, _8255_DATA, 0, CALLBACK_ARG);
d |= (CALLBACK_FUNC(0, _8255_DATA + 1, 0, CALLBACK_ARG) 8);
@@ -64,6 +60,7 @@ void subdev_8255_interrupt(comedi_subd_t *subd)
comedi_buf_evt(subd, 0);
}
+EXPORT_SYMBOL(subdev_8255_interrupt);
static int subdev_8255_cb(int dir, int port, int data, unsigned long arg)
{
@@ -229,6 +226,7 @@ void subdev_8255_init(comedi_subd_t *subd)
do_config(subd);
}
+EXPORT_SYMBOL(subdev_8255_init);
/*
diff --git a/ksrc/drivers/comedi/intel/8255.h b/ksrc/drivers/comedi/intel/8255.h
index 79177d3..45bc850 100644
--- a/ksrc/drivers/comedi/intel/8255.h
+++ b/ksrc/drivers/comedi/intel/8255.h
@@ -33,7 +33,8 @@ typedef struct subd_8255_struct {
int io_bits;
} subd_8255_t;
-#ifdef CONFIG_XENO_DRIVERS_COMEDI_8255
+#if (defined(CONFIG_XENO_DRIVERS_COMEDI_8255) || \
+ defined(CONFIG_XENO_DRIVERS_COMEDI_8255_MODULE))
#define _8255_SIZE 4
diff --git a/ksrc/drivers/comedi/national_instruments/mio_common.c
b/ksrc/drivers/comedi/national_instruments/mio_common.c
index 68e87ff..9f0b1b7 100644
--- a/ksrc/drivers/comedi/national_instruments/mio_common.c
+++ b/ksrc/drivers/comedi/national_instruments/mio_common.c
@@ -206,7 +206,8 @@ static void handle_cdio_interrupt(comedi_dev_t *dev);
static void ni_load_channelgain_list(comedi_dev_t *dev,
unsigned int n_chan, unsigned int *list);
-#ifndef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (!defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) \
+ !defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
static void ni_handle_fifo_half_full(comedi_subd_t *subd);
static int ni_ao_fifo_half_empty(comedi_subd_t *subd);
#endif /* !CONFIG_XENO_DRIVERS_COMEDI_NI_MITE */
@@ -779,7 +780,8 @@ static void handle_a_interrupt(comedi_dev_t *dev,
a_status=%04x ai_mite_status=%08x\n,status,
ai_mite_status);
ni_mio_print_status_a(status);
-#ifdef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) || \
+ defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
if (ai_mite_status CHSR_LINKC)
ni_sync_ai_dma(subd);
@@ -827,8 +829,8 @@ static void handle_a_interrupt(comedi_dev_t *dev,
}
}
-#ifndef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
-
+#if (!defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) \
+ !defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
if (status AI_FIFO_Half_Full_St) {
int i;
static const int timeout = 10;
@@ -894,7 +896,8 @@ static void handle_b_interrupt(comedi_dev_t * dev,
b_status, ao_mite_status);
ni_mio_print_status_b(b_status);
-#ifdef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) || \
+ defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
/* Currently, mite.c requires us to handle LINKC */
if (ao_mite_status CHSR_LINKC) {
mite_handle_b_linkc(subd);
@@ -928,7 +931,8 @@ static void handle_b_interrupt(comedi_dev_t * dev,
comedi_buf_evt(subd, COMEDI_BUF_EOA);
}
-#ifndef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (!defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) \
+ !defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
if (b_status AO_FIFO_Request_St) {
int ret;
@@ -1002,7 +1006,8 @@ int ni_E_interrupt(unsigned int irq, void *d)
return 0;
}
-#ifndef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (!defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) \
+ !defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
static void ni_ao_fifo_load(comedi_subd_t *subd, int n)
{
@@ -1163,7 +1168,8 @@ static void ni_handle_fifo_half_full(comedi_subd_t *subd)
#endif /* !CONFIG_XENO_DRIVERS_COMEDI_NI_MITE */
-#ifdef
[Xenomai-git] Alexis Berlemont : Fix modules compilations issues
Module: xenomai-abe
Branch: analogy
Commit: d442bf472f8f4e5e1038fb4df6efe421175e8f24
URL:
http://git.xenomai.org/?p=xenomai-abe.git;a=commit;h=d442bf472f8f4e5e1038fb4df6efe421175e8f24
Author: Alexis Berlemont alexis.berlem...@gmail.com
Date: Sat Oct 17 16:41:00 2009 +0200
Fix modules compilations issues
---
ksrc/drivers/comedi/intel/8255.c |6 +--
ksrc/drivers/comedi/intel/8255.h |3 +-
.../comedi/national_instruments/mio_common.c | 57 +---
ksrc/drivers/comedi/national_instruments/mite.c|1 +
4 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/ksrc/drivers/comedi/intel/8255.c b/ksrc/drivers/comedi/intel/8255.c
index f6321f6..e9c2ae1 100644
--- a/ksrc/drivers/comedi/intel/8255.c
+++ b/ksrc/drivers/comedi/intel/8255.c
@@ -51,10 +51,6 @@ void subdev_8255_interrupt(comedi_subd_t *subd)
{
sampl_t d;
- /* Considering the current Comedi API, using asynchronous
- buffer is only possible on the main read/write subdevice.
- Then, this function needs only one argument: the device */
-
/* Retrieve the sample... */
d = CALLBACK_FUNC(0, _8255_DATA, 0, CALLBACK_ARG);
d |= (CALLBACK_FUNC(0, _8255_DATA + 1, 0, CALLBACK_ARG) 8);
@@ -64,6 +60,7 @@ void subdev_8255_interrupt(comedi_subd_t *subd)
comedi_buf_evt(subd, 0);
}
+EXPORT_SYMBOL(subdev_8255_interrupt);
static int subdev_8255_cb(int dir, int port, int data, unsigned long arg)
{
@@ -229,6 +226,7 @@ void subdev_8255_init(comedi_subd_t *subd)
do_config(subd);
}
+EXPORT_SYMBOL(subdev_8255_init);
/*
diff --git a/ksrc/drivers/comedi/intel/8255.h b/ksrc/drivers/comedi/intel/8255.h
index 79177d3..45bc850 100644
--- a/ksrc/drivers/comedi/intel/8255.h
+++ b/ksrc/drivers/comedi/intel/8255.h
@@ -33,7 +33,8 @@ typedef struct subd_8255_struct {
int io_bits;
} subd_8255_t;
-#ifdef CONFIG_XENO_DRIVERS_COMEDI_8255
+#if (defined(CONFIG_XENO_DRIVERS_COMEDI_8255) || \
+ defined(CONFIG_XENO_DRIVERS_COMEDI_8255_MODULE))
#define _8255_SIZE 4
diff --git a/ksrc/drivers/comedi/national_instruments/mio_common.c
b/ksrc/drivers/comedi/national_instruments/mio_common.c
index 68e87ff..9f0b1b7 100644
--- a/ksrc/drivers/comedi/national_instruments/mio_common.c
+++ b/ksrc/drivers/comedi/national_instruments/mio_common.c
@@ -206,7 +206,8 @@ static void handle_cdio_interrupt(comedi_dev_t *dev);
static void ni_load_channelgain_list(comedi_dev_t *dev,
unsigned int n_chan, unsigned int *list);
-#ifndef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (!defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) \
+ !defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
static void ni_handle_fifo_half_full(comedi_subd_t *subd);
static int ni_ao_fifo_half_empty(comedi_subd_t *subd);
#endif /* !CONFIG_XENO_DRIVERS_COMEDI_NI_MITE */
@@ -779,7 +780,8 @@ static void handle_a_interrupt(comedi_dev_t *dev,
a_status=%04x ai_mite_status=%08x\n,status,
ai_mite_status);
ni_mio_print_status_a(status);
-#ifdef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) || \
+ defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
if (ai_mite_status CHSR_LINKC)
ni_sync_ai_dma(subd);
@@ -827,8 +829,8 @@ static void handle_a_interrupt(comedi_dev_t *dev,
}
}
-#ifndef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
-
+#if (!defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) \
+ !defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
if (status AI_FIFO_Half_Full_St) {
int i;
static const int timeout = 10;
@@ -894,7 +896,8 @@ static void handle_b_interrupt(comedi_dev_t * dev,
b_status, ao_mite_status);
ni_mio_print_status_b(b_status);
-#ifdef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) || \
+ defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
/* Currently, mite.c requires us to handle LINKC */
if (ao_mite_status CHSR_LINKC) {
mite_handle_b_linkc(subd);
@@ -928,7 +931,8 @@ static void handle_b_interrupt(comedi_dev_t * dev,
comedi_buf_evt(subd, COMEDI_BUF_EOA);
}
-#ifndef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (!defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) \
+ !defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
if (b_status AO_FIFO_Request_St) {
int ret;
@@ -1002,7 +1006,8 @@ int ni_E_interrupt(unsigned int irq, void *d)
return 0;
}
-#ifndef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (!defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) \
+ !defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
static void ni_ao_fifo_load(comedi_subd_t *subd, int n)
{
@@ -1163,7 +1168,8 @@ static void ni_handle_fifo_half_full(comedi_subd_t *subd)
#endif /* !CONFIG_XENO_DRIVERS_COMEDI_NI_MITE */
-#ifdef
[Xenomai-git] Alexis Berlemont : Fix modules compilations issues
Module: xenomai-abe
Branch: analogy
Commit: 094c9365f41b07ef5e368c74104ae837f1f7c759
URL:
http://git.xenomai.org/?p=xenomai-abe.git;a=commit;h=094c9365f41b07ef5e368c74104ae837f1f7c759
Author: Alexis Berlemont alexis.berlem...@gmail.com
Date: Sat Oct 17 16:41:00 2009 +0200
Fix modules compilations issues
---
ksrc/drivers/comedi/intel/8255.c |6 +--
ksrc/drivers/comedi/intel/8255.h |3 +-
.../comedi/national_instruments/mio_common.c | 57 +---
ksrc/drivers/comedi/national_instruments/mite.c|1 +
4 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/ksrc/drivers/comedi/intel/8255.c b/ksrc/drivers/comedi/intel/8255.c
index f6321f6..e9c2ae1 100644
--- a/ksrc/drivers/comedi/intel/8255.c
+++ b/ksrc/drivers/comedi/intel/8255.c
@@ -51,10 +51,6 @@ void subdev_8255_interrupt(comedi_subd_t *subd)
{
sampl_t d;
- /* Considering the current Comedi API, using asynchronous
- buffer is only possible on the main read/write subdevice.
- Then, this function needs only one argument: the device */
-
/* Retrieve the sample... */
d = CALLBACK_FUNC(0, _8255_DATA, 0, CALLBACK_ARG);
d |= (CALLBACK_FUNC(0, _8255_DATA + 1, 0, CALLBACK_ARG) 8);
@@ -64,6 +60,7 @@ void subdev_8255_interrupt(comedi_subd_t *subd)
comedi_buf_evt(subd, 0);
}
+EXPORT_SYMBOL(subdev_8255_interrupt);
static int subdev_8255_cb(int dir, int port, int data, unsigned long arg)
{
@@ -229,6 +226,7 @@ void subdev_8255_init(comedi_subd_t *subd)
do_config(subd);
}
+EXPORT_SYMBOL(subdev_8255_init);
/*
diff --git a/ksrc/drivers/comedi/intel/8255.h b/ksrc/drivers/comedi/intel/8255.h
index 79177d3..45bc850 100644
--- a/ksrc/drivers/comedi/intel/8255.h
+++ b/ksrc/drivers/comedi/intel/8255.h
@@ -33,7 +33,8 @@ typedef struct subd_8255_struct {
int io_bits;
} subd_8255_t;
-#ifdef CONFIG_XENO_DRIVERS_COMEDI_8255
+#if (defined(CONFIG_XENO_DRIVERS_COMEDI_8255) || \
+ defined(CONFIG_XENO_DRIVERS_COMEDI_8255_MODULE))
#define _8255_SIZE 4
diff --git a/ksrc/drivers/comedi/national_instruments/mio_common.c
b/ksrc/drivers/comedi/national_instruments/mio_common.c
index 68e87ff..9f0b1b7 100644
--- a/ksrc/drivers/comedi/national_instruments/mio_common.c
+++ b/ksrc/drivers/comedi/national_instruments/mio_common.c
@@ -206,7 +206,8 @@ static void handle_cdio_interrupt(comedi_dev_t *dev);
static void ni_load_channelgain_list(comedi_dev_t *dev,
unsigned int n_chan, unsigned int *list);
-#ifndef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (!defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) \
+ !defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
static void ni_handle_fifo_half_full(comedi_subd_t *subd);
static int ni_ao_fifo_half_empty(comedi_subd_t *subd);
#endif /* !CONFIG_XENO_DRIVERS_COMEDI_NI_MITE */
@@ -779,7 +780,8 @@ static void handle_a_interrupt(comedi_dev_t *dev,
a_status=%04x ai_mite_status=%08x\n,status,
ai_mite_status);
ni_mio_print_status_a(status);
-#ifdef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) || \
+ defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
if (ai_mite_status CHSR_LINKC)
ni_sync_ai_dma(subd);
@@ -827,8 +829,8 @@ static void handle_a_interrupt(comedi_dev_t *dev,
}
}
-#ifndef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
-
+#if (!defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) \
+ !defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
if (status AI_FIFO_Half_Full_St) {
int i;
static const int timeout = 10;
@@ -894,7 +896,8 @@ static void handle_b_interrupt(comedi_dev_t * dev,
b_status, ao_mite_status);
ni_mio_print_status_b(b_status);
-#ifdef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) || \
+ defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
/* Currently, mite.c requires us to handle LINKC */
if (ao_mite_status CHSR_LINKC) {
mite_handle_b_linkc(subd);
@@ -928,7 +931,8 @@ static void handle_b_interrupt(comedi_dev_t * dev,
comedi_buf_evt(subd, COMEDI_BUF_EOA);
}
-#ifndef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (!defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) \
+ !defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
if (b_status AO_FIFO_Request_St) {
int ret;
@@ -1002,7 +1006,8 @@ int ni_E_interrupt(unsigned int irq, void *d)
return 0;
}
-#ifndef CONFIG_XENO_DRIVERS_COMEDI_NI_MITE
+#if (!defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE) \
+ !defined(CONFIG_XENO_DRIVERS_COMEDI_NI_MITE_MODULE))
static void ni_ao_fifo_load(comedi_subd_t *subd, int n)
{
@@ -1163,7 +1168,8 @@ static void ni_handle_fifo_half_full(comedi_subd_t *subd)
#endif /* !CONFIG_XENO_DRIVERS_COMEDI_NI_MITE */
-#ifdef
