[Xenomai-git] Alexis Berlemont : analogy: some Comedi - Analogy forgotten renamings
Module: xenomai-abe
Branch: analogy
Commit: ec3eaf851cfc16d1ec862e73eaedc25caae01d4c
URL:
http://git.xenomai.org/?p=xenomai-abe.git;a=commit;h=ec3eaf851cfc16d1ec862e73eaedc25caae01d4c
Author: Alexis Berlemont alexis.berlem...@gmail.com
Date: Wed Oct 28 00:43:57 2009 +0100
analogy: some Comedi - Analogy forgotten renamings
---
ksrc/drivers/analogy/instruction.c |2 +-
ksrc/drivers/analogy/national_instruments/mite.c |2 +-
ksrc/drivers/analogy/testing/Config.in |4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ksrc/drivers/analogy/instruction.c
b/ksrc/drivers/analogy/instruction.c
index 41fd1b7..1121d1f 100644
--- a/ksrc/drivers/analogy/instruction.c
+++ b/ksrc/drivers/analogy/instruction.c
@@ -336,7 +336,7 @@ int a4l_free_ilstdsc(a4l_cxt_t * cxt, a4l_kilst_t * dsc)
}
/* This function is not optimized in terms of memory footprint and
- CPU charge; however, the whole comedi instruction system was not
+ CPU charge; however, the whole analogy instruction system was not
designed for performance issues */
int a4l_ioctl_insnlist(a4l_cxt_t * cxt, void *arg)
{
diff --git a/ksrc/drivers/analogy/national_instruments/mite.c
b/ksrc/drivers/analogy/national_instruments/mite.c
index edf9ced..3aa89a3 100644
--- a/ksrc/drivers/analogy/national_instruments/mite.c
+++ b/ksrc/drivers/analogy/national_instruments/mite.c
@@ -246,7 +246,7 @@ void mite_list_devices(void)
{
struct list_head *this;
- printk(Comedi: MITE: Available NI device IDs:);
+ printk(Analogy: MITE: Available NI device IDs:);
list_for_each(this, mite_devices) {
struct mite_struct *mite =
list_entry(this, struct mite_struct, list);
diff --git a/ksrc/drivers/analogy/testing/Config.in
b/ksrc/drivers/analogy/testing/Config.in
index d9503bb..f4abecf 100644
--- a/ksrc/drivers/analogy/testing/Config.in
+++ b/ksrc/drivers/analogy/testing/Config.in
@@ -3,6 +3,6 @@
# Xenomai configuration for Linux v2.4
#
-dep_tristate 'Fake driver' CONFIG_XENO_DRIVERS_COMEDI_FAKE
$CONFIG_XENO_DRIVERS_COMEDI
+dep_tristate 'Fake driver' CONFIG_XENO_DRIVERS_ANALOGY_FAKE
$CONFIG_XENO_DRIVERS_ANALOGY
-dep_tristate 'Loop driver' CONFIG_XENO_DRIVERS_COMEDI_LOOP
$CONFIG_XENO_DRIVERS_COMEDI
+dep_tristate 'Loop driver' CONFIG_XENO_DRIVERS_ANALOGY_LOOP
$CONFIG_XENO_DRIVERS_ANALOGY
___
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
[Xenomai-git] Alexis Berlemont : analogy: fix comments
Module: xenomai-abe
Branch: analogy
Commit: a81b580e46fc700810c9dfb1e4da5d1f69b317c2
URL:
http://git.xenomai.org/?p=xenomai-abe.git;a=commit;h=a81b580e46fc700810c9dfb1e4da5d1f69b317c2
Author: Alexis Berlemont alexis.berlem...@gmail.com
Date: Wed Oct 28 01:00:40 2009 +0100
analogy: fix comments
---
src/utils/analogy/analogy_config.c | 22
src/utils/analogy/cmd_read.c | 50 ++--
src/utils/analogy/cmd_write.c | 44
src/utils/analogy/insn_read.c | 32 +++---
4 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/src/utils/analogy/analogy_config.c
b/src/utils/analogy/analogy_config.c
index a40a178..316dcd4 100644
--- a/src/utils/analogy/analogy_config.c
+++ b/src/utils/analogy/analogy_config.c
@@ -31,12 +31,12 @@
#include analogy/analogy.h
-/* Declares precompilation constants */
+/* Declare precompilation constants */
#define __NBMIN_ARG 2
#define __NBMAX_ARG 3
#define __OPTS_DELIMITER ,
-/* Declares prog variables */
+/* Declare prog variables */
int vlevel = 1;
int unatt_act = 0;
struct option a4l_conf_opts[] = {
@@ -55,7 +55,7 @@ int compute_opts(char *opts, unsigned int *nb, unsigned int
*res)
int ret = 0, len, ofs;
- /* Checks arg and inits it */
+ /* Check arg and inits it */
if (nb == NULL)
return -EINVAL;
*nb = 0;
@@ -103,10 +103,10 @@ int main(int argc, char *argv[])
a4l_lnkdesc_t lnkdsc;
int chk_nb, ret = 0, fd = -1;
- /* Inits the descriptor structure */
+ /* Init the descriptor structure */
memset(lnkdsc, 0, sizeof(a4l_lnkdesc_t));
- /* Computes arguments */
+ /* Compute arguments */
while ((c =
getopt_long(argc, argv, hvqVrR:W:, a4l_conf_opts,
NULL)) = 0) {
@@ -133,23 +133,23 @@ int main(int argc, char *argv[])
}
}
- /* Checks the last arguments */
+ /* Check the last arguments */
chk_nb = (unatt_act == 0) ? __NBMIN_ARG : __NBMIN_ARG - 1;
if (argc - optind chk_nb) {
do_print_usage();
goto out_a4l_config;
}
- /* Gets the device file name */
+ /* Get the device file name */
devfile = argv[optind];
- /* Fills the descriptor with the driver name */
+ /* Fill the descriptor with the driver name */
if (unatt_act == 0) {
lnkdsc.bname = argv[optind + 1];
lnkdsc.bname_size = strlen(argv[optind + 1]);
}
- /* Handles the last arguments: the driver-specific args */
+ /* Handle the last arguments: the driver-specific args */
if (unatt_act == 1 || argc - optind != __NBMAX_ARG)
lnkdsc.opts_size = 0;
else {
@@ -182,7 +182,7 @@ int main(int argc, char *argv[])
}
}
- /* Opens the specified file */
+ /* Open the specified file */
fd = a4l_sys_open(devfile);
if (fd 0) {
ret = fd;
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
goto out_a4l_config;
}
- /* Triggers the ioctl */
+ /* Trigger the ioctl */
if (unatt_act == 0)
ret = a4l_sys_attach(fd, lnkdsc);
else
diff --git a/src/utils/analogy/cmd_read.c b/src/utils/analogy/cmd_read.c
index c71c339..90518d9 100644
--- a/src/utils/analogy/cmd_read.c
+++ b/src/utils/analogy/cmd_read.c
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
void *map = NULL;
a4l_desc_t dsc;
- /* Computes arguments */
+ /* Compute arguments */
while ((ret = getopt_long(argc,
argv,
vrd:s:S:c:mh, cmd_read_opts, NULL)) = 0) {
@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
}
}
- /* Recovers the channels to compute */
+ /* Recover the channels to compute */
do {
cmd.nb_chan++;
len = strlen(str_chans);
@@ -156,7 +156,7 @@ int main(int argc, char *argv[])
str_chans += ofs + 1;
} while (len != ofs);
- /* Updates the command structure */
+ /* Update the command structure */
cmd.scan_end_arg = cmd.nb_chan;
if (real_time != 0) {
@@ -164,7 +164,7 @@ int main(int argc, char *argv[])
if (verbose != 0)
printf(cmd_read: switching to real-time mode\n);
- /* Prevents any memory-swapping for this program */
+ /* Prevent any memory-swapping for this program */
ret = mlockall(MCL_CURRENT | MCL_FUTURE);
if (ret 0) {
ret = errno;
@@ -173,7 +173,7 @@ int main(int argc, char *argv[])
goto out_main;
}
- /* Turns the
[Xenomai-git] Jan Kiszka : buildsystem: Fix shared libs generation
Module: xenomai-abe Branch: analogy Commit: e97f6879ff8c4e4e4f9fb9ffe7aeb0128e8e4890 URL: http://git.xenomai.org/?p=xenomai-abe.git;a=commit;h=e97f6879ff8c4e4e4f9fb9ffe7aeb0128e8e4890 Author: Jan Kiszka jan.kis...@siemens.com Date: Thu Oct 29 11:33:13 2009 +0100 buildsystem: Fix shared libs generation This fixes a regression of dbbd33f50d: There must be no AC_DISABLE_SHARED without AS_ENABLE_SHARED for the cases where it shall remain enabled. Signed-off-by: Jan Kiszka jan.kis...@siemens.com --- configure.in | 12 ++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 40683fe..9cce885 100644 --- a/configure.in +++ b/configure.in @@ -117,7 +117,6 @@ case $build_for in XENO_LINUX_ARCH=nios2 XENO_LINUX_INSTALL_TARGET=install CONFIG_XENO_DEFAULT_PERIOD=1000 - AC_DISABLE_SHARED ;; *) echo echo *** @@ -128,9 +127,18 @@ case $build_for in esac AC_MSG_RESULT([$XENO_TARGET_ARCH]) -AC_PROG_LIBTOOL AM_CONDITIONAL(XENO_LINUX_ARCH_I386,[test $XENO_LINUX_ARCH = i386]) +case $XENO_TARGET_ARCH in + nios2) + AC_DISABLE_SHARED + ;; + *) + AC_ENABLE_SHARED + ;; +esac +AC_PROG_LIBTOOL + dnl dnl Parse options dnl ___ Xenomai-git mailing list Xenomai-git@gna.org https://mail.gna.org/listinfo/xenomai-git
