[OSADL-svn-commits] r48 - in fddi-20070618-1-trunk: . include/osadl src tests
OSADL repository commits
osadl-svn-commits at lists.osadl.org
Tue Oct 2 11:44:22 CEST 2007
Author: robert
Date: Wed Jul 11 16:28:44 2007
New Revision: 48
Log:
refacture readconfig -> configure
Modified:
fddi-20070618-1-trunk/TODO
fddi-20070618-1-trunk/configure.ac
fddi-20070618-1-trunk/include/osadl/fddi.h
fddi-20070618-1-trunk/src/GNUmakefile.am
fddi-20070618-1-trunk/src/libfddi.c
fddi-20070618-1-trunk/src/libfddi_libmodbus.c
fddi-20070618-1-trunk/tests/GNUmakefile.am
fddi-20070618-1-trunk/tests/libfddi_examplebus.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus1.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_readconfig.c
Modified: fddi-20070618-1-trunk/TODO
==============================================================================
--- fddi-20070618-1-trunk/TODO (original)
+++ fddi-20070618-1-trunk/TODO Wed Jul 11 16:28:44 2007
@@ -0,0 +1,8 @@
+TODO
+----
+
+[ ] invent performant data transport model with persistence
+
+
+
+
Modified: fddi-20070618-1-trunk/configure.ac
==============================================================================
--- fddi-20070618-1-trunk/configure.ac (original)
+++ fddi-20070618-1-trunk/configure.ac Wed Jul 11 16:28:44 2007
@@ -170,6 +170,17 @@
AC_MSG_RESULT([${CONFIG_BACKEND_LIBMODBUS}])
if test "${CONFIG_BACKEND_LIBMODBUS}" = "yes"; then
+
+ REQUIRES_LIBMODBUS="libmodbus >= 1.0.3"
+ AC_SUBST(REQUIRES_LIBMODBUS)
+ PKG_CHECK_MODULES([libmodbus],
+ [${REQUIRES_LIBMODBUS}],
+ [],
+ [AC_MSG_ERROR([${REQUIRES_LIBMODBUS} not found by pkg-config on your system])]
+ )
+ AC_SUBST(libmodbus_CFLAGS)
+ AC_SUBST(libmodbus_LIBS)
+
AC_MSG_CHECKING([whether libmodbus backend finds an xml parser])
if test "${CONFIG_XMLPARSER}" != "libxml2"; then
AC_MSG_RESULT([no])
@@ -177,6 +188,7 @@
else
AC_MSG_RESULT([yes])
fi
+
fi
Modified: fddi-20070618-1-trunk/include/osadl/fddi.h
==============================================================================
--- fddi-20070618-1-trunk/include/osadl/fddi.h (original)
+++ fddi-20070618-1-trunk/include/osadl/fddi.h Wed Jul 11 16:28:44 2007
@@ -94,7 +94,7 @@
};
struct fddi_iface_backend_ops {
- int (*readconfig) (fddi_iface_t *iface, const char *configfile);
+ int (*configure) (fddi_iface_t *iface, const char *configfile, void *data);
int (*setstate) (fddi_iface_t *iface, fddi_state_enum_t state);
int (*cmd) (fddi_iface_t *iface, fddi_cmd_enum_t cmd);
};
@@ -119,7 +119,7 @@
/* fddi_iface_t */
extern int fddi_iface_init(fddi_iface_t *iface, fddi_iface_attr_t *attr);
extern int fddi_iface_destroy(fddi_iface_t *iface);
-extern int fddi_iface_readconfig(fddi_iface_t *iface, const char *configfile);
+extern int fddi_iface_configure(fddi_iface_t *iface, const char *configfile, void *data);
extern int fddi_iface_setstate(fddi_iface_t *iface, fddi_state_enum_t state);
extern int fddi_iface_cmd(fddi_iface_t *iface, fddi_cmd_enum_t cmd);
extern int fddi_iface_getname(fddi_iface_t *iface, char *name, size_t len);
Modified: fddi-20070618-1-trunk/src/GNUmakefile.am
==============================================================================
--- fddi-20070618-1-trunk/src/GNUmakefile.am (original)
+++ fddi-20070618-1-trunk/src/GNUmakefile.am Wed Jul 11 16:28:44 2007
@@ -34,8 +34,12 @@
libfddi_libmodbus_la_SOURCES = \
libfddi_libmodbus.c
+libfddi_libmodbus_la_CPPFLAGS = \
+ $(libmodbus_CFLAGS)
+
libfddi_libmodbus_la_LIBADD = \
- $(top_builddir)/src/libfddi.la
+ $(top_builddir)/src/libfddi.la \
+ $(libmodbus_LIBS)
MAINTAINERCLEANFILES = \
GNUmakefile.in
Modified: fddi-20070618-1-trunk/src/libfddi.c
==============================================================================
--- fddi-20070618-1-trunk/src/libfddi.c (original)
+++ fddi-20070618-1-trunk/src/libfddi.c Wed Jul 11 16:28:44 2007
@@ -96,7 +96,7 @@
lt_dlerror();
/* register backend functions */
- iface->backend.readconfig = lt_dlsym(iface->backend_lib, "readconfig");
+ iface->backend.configure = lt_dlsym(iface->backend_lib, "configure");
if ((error_string = lt_dlerror())) {
pthread_mutex_unlock(<_dl_mutex);
goto iface_init_err;
@@ -142,15 +142,15 @@
return 0;
}
-int fddi_iface_readconfig(fddi_iface_t *iface, const char *configfile)
+int fddi_iface_configure(fddi_iface_t *iface, const char *configfile, void *data)
{
if ((!iface) || (!configfile))
return EINVAL;
- if (!iface->backend.readconfig)
+ if (!iface->backend.configure)
return ENOSYS;
- return iface->backend.readconfig(iface, configfile);
+ return iface->backend.configure(iface, configfile, data);
}
int fddi_iface_setstate(fddi_iface_t *iface, fddi_state_enum_t state)
Modified: fddi-20070618-1-trunk/src/libfddi_libmodbus.c
==============================================================================
--- fddi-20070618-1-trunk/src/libfddi_libmodbus.c (original)
+++ fddi-20070618-1-trunk/src/libfddi_libmodbus.c Wed Jul 11 16:28:44 2007
@@ -5,8 +5,12 @@
#include <stdio.h>
#include <osadl/fddi.h>
-int readconfig(fddi_iface_t *iface, const char *configfile)
+int configure(fddi_iface_t *iface, const char *configfile, void *data)
{
+
+
+
+
return 0;
}
Modified: fddi-20070618-1-trunk/tests/GNUmakefile.am
==============================================================================
--- fddi-20070618-1-trunk/tests/GNUmakefile.am (original)
+++ fddi-20070618-1-trunk/tests/GNUmakefile.am Wed Jul 11 16:28:44 2007
@@ -1,7 +1,7 @@
BACKEND_EXAMPLEBUS_TESTS = \
test_fddi_examplebus1 \
test_fddi_examplebus_attach_backend \
- test_fddi_examplebus_readconfig \
+ test_fddi_examplebus_configure \
test_fddi_examplebus_cmd_start \
test_fddi_examplebus_cmd_stop \
test_fddi_examplebus_cmd_quiterr \
@@ -84,10 +84,10 @@
test_fddi_versionstr_LDADD = \
$(top_builddir)/src/libfddi.la
-test_fddi_examplebus_readconfig_SOURCES = \
- test_fddi_examplebus_readconfig.c
+test_fddi_examplebus_configure_SOURCES = \
+ test_fddi_examplebus_configure.c
-test_fddi_examplebus_readconfig_LDADD = \
+test_fddi_examplebus_configure_LDADD = \
$(top_builddir)/src/libfddi.la
test_fddi_examplebus_cmd_start_SOURCES = \
Modified: fddi-20070618-1-trunk/tests/libfddi_examplebus.c
==============================================================================
--- fddi-20070618-1-trunk/tests/libfddi_examplebus.c (original)
+++ fddi-20070618-1-trunk/tests/libfddi_examplebus.c Wed Jul 11 16:28:44 2007
@@ -5,7 +5,7 @@
#include <stdio.h>
#include <osadl/fddi.h>
-int readconfig(fddi_iface_t *iface, const char *configfile)
+int configure(fddi_iface_t *iface, const char *configfile, void *data)
{
return 0;
}
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus1.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus1.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus1.c Wed Jul 11 16:28:44 2007
@@ -38,7 +38,7 @@
fddi_iface_init(&exb0_iface, &exb0_attr);
/* some things you can do with ifaces */
- fddi_iface_readconfig(&exb0_iface, "config.xml");
+ fddi_iface_configure(&exb0_iface, "config.xml", NULL);
fddi_iface_setstate(&exb0_iface, STATE_UNCONFIGURED); /* add blocking/nonblocking */
fddi_iface_cmd(&exb0_iface, CMD_START); /* propagates to devices behind iface */
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_readconfig.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_readconfig.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_readconfig.c Wed Jul 11 16:28:44 2007
@@ -21,9 +21,9 @@
return ret;
}
- ret = fddi_iface_readconfig(&exb0_iface, "test_fddi_examplebus_readconfig.xml");
+ ret = fddi_iface_configure(&exb0_iface, "test_fddi_examplebus_configure.xml", NULL);
if (ret) {
- fprintf(stderr, "fddi_iface_readconfig() failed\n");
+ fprintf(stderr, "fddi_iface_configure() failed\n");
return ret;
}
More information about the OSADL-svn-commits
mailing list