[OSADL-svn-commits] r50 - in fddi-20070618-1-trunk: src tests

[OSADL repository commits]

Author: robert
Date: Wed Jul 11 16:45:18 2007
New Revision: 50

Log:
add config call

Modified:
   fddi-20070618-1-trunk/src/libfddi_libmodbus.c
   fddi-20070618-1-trunk/tests/GNUmakefile.am
   fddi-20070618-1-trunk/tests/test_fddi_libmodbus1.c

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:45:18 2007
@@ -7,9 +7,7 @@
 
 int configure(fddi_iface_t *iface, const char *configfile, void *data)
 {
-
-
-
+	printf("parsing configfile: %s\n", configfile);
 
 	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:45:18 2007
@@ -31,7 +31,7 @@
 noinst_PROGRAMS = \
 	test_examplebus1 \
 	test_fddi_versionstr \
-	$(BACKEND_EXAMPLEBUS_TESTS)
+	$(BACKEND_EXAMPLEBUS_TESTS) \
 	$(BACKEND_LIBMODBUS_TESTS)
 
 lib_LTLIBRARIES = \
@@ -166,9 +166,18 @@
 test_fddi_libmodbus1_LDADD = \
 	$(top_builddir)/src/libfddi_libmodbus.la
 
+test_fddi_libmodbus1_DEPENDENCIES = \
+	test_fddi_libmodbus1.xml
+
+test_fddi_libmodbus1.xml:
+	cp $(top_srcdir)/busconfig/Pengutronix/modbus-example.xml test_fddi_libmodbus1.xml
+
 EXTRA_DIST = \
 	examplebus.h
 
 MAINTAINERCLEANFILES = \
 	GNUmakefile.in
 
+CLEANFILES = \
+	test_fddi_libmodbus1.xml
+

Modified: fddi-20070618-1-trunk/tests/test_fddi_libmodbus1.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_libmodbus1.c	(original)
+++ fddi-20070618-1-trunk/tests/test_fddi_libmodbus1.c	Wed Jul 11 16:45:18 2007
@@ -1,4 +1,35 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <osadl/fddi.h>
+
 int main(void)
 {
-	return 0;
+	fddi_iface_attr_t modbus0_attr;
+	fddi_iface_t modbus0_iface;
+
+	int ret;
+
+	/* instanciate io_interface */
+	fddi_iface_attr_init(&modbus0_attr);
+	fddi_iface_attr_setclass(&modbus0_attr, "libfddi_libmodbus.so");
+	fddi_iface_attr_setdevice(&modbus0_attr, "demosystem.controller.modbus0");
+
+	ret = fddi_iface_init(&modbus0_iface, &modbus0_attr);
+	if (ret) {
+		fprintf(stderr, "fddi_iface_init() failed\n");
+		return ret;
+	}
+
+	ret = fddi_iface_configure(&modbus0_iface,"test_fddi_libmodbus1.xml", NULL);
+	if (ret) {
+		fprintf(stderr, "fddi_iface_configure() failed\n");
+		return ret;
+	}
+
+	/* destruct io_interface */
+	fddi_iface_destroy(&modbus0_iface);
+
+	exit(0);
 }
+