[OSADL-svn-commits] r56 - in fddi-20070618-1-trunk: . busconfig/Pengutronix include/osadl src tests
OSADL repository commits
osadl-svn-commits at lists.osadl.org
Tue Oct 2 11:45:04 CEST 2007
Author: robert
Date: Thu Jul 12 16:23:24 2007
New Revision: 56
Log:
split header files and refactoring
Added:
fddi-20070618-1-trunk/include/osadl/fddi_id.h
Modified:
fddi-20070618-1-trunk/TODO
fddi-20070618-1-trunk/busconfig/Pengutronix/modbus-example.xml
fddi-20070618-1-trunk/include/osadl/fddi_device.h
fddi-20070618-1-trunk/include/osadl/fddi_iface.h
fddi-20070618-1-trunk/include/osadl/fddi_param.h
fddi-20070618-1-trunk/include/osadl/fddi_pv.h
fddi-20070618-1-trunk/include/osadl/fddi_tpu.h
fddi-20070618-1-trunk/include/osadl/fddi_types.h
fddi-20070618-1-trunk/src/libfddi.c
fddi-20070618-1-trunk/src/libfddi_libmodbus.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus1.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_attach_backend.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_identify.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_quiterr.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_reset.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_start.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_stop.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_configure.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_configerror.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_missing.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_operation_error.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_operational.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_preoperational.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_unconfigured.c
fddi-20070618-1-trunk/tests/test_fddi_examplebus_tpu_usecase.c
fddi-20070618-1-trunk/tests/test_fddi_libmodbus1.c
fddi-20070618-1-trunk/tests/test_fddi_versionstr.c
Modified: fddi-20070618-1-trunk/TODO
==============================================================================
--- fddi-20070618-1-trunk/TODO (original)
+++ fddi-20070618-1-trunk/TODO Thu Jul 12 16:23:24 2007
@@ -3,6 +3,3 @@
[ ] invent performant data transport model with persistence
-
-
-
Modified: fddi-20070618-1-trunk/busconfig/Pengutronix/modbus-example.xml
==============================================================================
--- fddi-20070618-1-trunk/busconfig/Pengutronix/modbus-example.xml (original)
+++ fddi-20070618-1-trunk/busconfig/Pengutronix/modbus-example.xml Thu Jul 12 16:23:24 2007
@@ -10,7 +10,7 @@
<name>Controller PC</name>
- <port id="eth0">
+ <port prefix="eth" index="0">
<device prefix="eth" index="0" direction="inout"/>
<name>Ethernet</name>
<portEthernet>
@@ -22,6 +22,7 @@
</port>
<ioInterface prefix="modbus" index="0">
+ <device prefix="eth" index="0" direction="inout"/>
<ioInterfaceModbus>
<role>master</role>
</ioInterfaceModbus>
@@ -33,7 +34,7 @@
<name>Wago IO Box</name>
- <port id="eth0">
+ <port prefix="eth" index="0">
<device prefix="eth" index="0" direction="inout"/>
<name>Ethernet</name>
<portEthernet>
@@ -45,6 +46,7 @@
</port>
<ioInterface prefix="modbus" index="0">
+ <device prefix="eth" index="0" direction="inout"/>
<ioInterfaceModbus>
<role>slave</role>
</ioInterfaceModbus>
Modified: fddi-20070618-1-trunk/include/osadl/fddi_device.h
==============================================================================
--- fddi-20070618-1-trunk/include/osadl/fddi_device.h (original)
+++ fddi-20070618-1-trunk/include/osadl/fddi_device.h Thu Jul 12 16:23:24 2007
@@ -23,15 +23,22 @@
#define OSADL_FDDI_DEVICE_H
#include <osadl/fddi_types.h>
+#include <osadl/fddi_id.h>
struct fddi_device {
- char *name;
+ /* public */
+ fddi_id_t id;
fddi_state_enum_t state;
+
+ /* private */
struct fddi_device *next;
struct fddi_device *previous;
+
fddi_param_t *param_list;
+ void *priv;
+
};
/* fddi_device_t */
Added: fddi-20070618-1-trunk/include/osadl/fddi_id.h
==============================================================================
--- (empty file)
+++ fddi-20070618-1-trunk/include/osadl/fddi_id.h Thu Jul 12 16:23:24 2007
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2007 Robert Schwebel <r.schwebel at pengutronix.de>
+ *
+ * This file is part of the OSADL Fieldbus Framework.
+ *
+ * The OSADL Fieldbus Framework is free software; you can redistribute it
+ * and/or modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation. Note that there
+ * is a special link exception; see COPYING for details.
+ *
+ * The OSADL Fieldbus Framework is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the OSADL Fieldbus Framework; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ */
+
+#ifndef OSADL_FDDI_ID_H
+#define OSADL_FDDI_ID_H
+
+#include <osadl/fddi_types.h>
+
+struct fddi_id {
+
+ /* public */
+
+ /* private */
+ char *prefix;
+ int index;
+ char *postfix;
+
+ char *id_as_string;
+ size_t id_as_str_len;
+
+ void *priv;
+};
+
+extern int fddi_id_init(fddi_id_t *fddi_id, const char *prefix, int index, const char *postfix);
+extern int fddi_id_getid(fddi_id_t *fddi_id, char *id_string, size_t len);
+extern int fddi_id_destroy(fddi_id_t *fddi_id);
+
+#endif
+
Modified: fddi-20070618-1-trunk/include/osadl/fddi_iface.h
==============================================================================
--- fddi-20070618-1-trunk/include/osadl/fddi_iface.h (original)
+++ fddi-20070618-1-trunk/include/osadl/fddi_iface.h Thu Jul 12 16:23:24 2007
@@ -24,8 +24,11 @@
struct fddi_iface_attr {
- char *fddi_class_name;
- char *fddi_device_name;
+ /* public */
+ char *path;
+ fddi_id_t id;
+
+ char *fddi_class_name; /* FIXME */
};
@@ -39,27 +42,29 @@
struct fddi_iface {
- char *name;
+ /* public */
+ fddi_id_t id;
fddi_state_enum_t state;
+ /* private */
fddi_device_t *devlist_head;
unsigned int nodev;
fddi_tpu_t *tpulist_head;
unsigned int notpus;
+
unsigned int nopvs;
void *backend_lib;
fddi_iface_backend_ops_t backend;
- /* FIXME: add private data for derived backends */
-
+ void *priv;
};
/* fddi_iface_attr_t */
extern int fddi_iface_attr_init(fddi_iface_attr_t *attr);
extern int fddi_iface_attr_setclass(fddi_iface_attr_t *attr, char *fddi_class_name);
-extern int fddi_iface_attr_setdevice(fddi_iface_attr_t *attr, char *device_name);
+extern int fddi_iface_attr_setid(fddi_iface_attr_t *attr, const char *path, fddi_id_t device_id);
/* fddi_iface_t */
extern int fddi_iface_init(fddi_iface_t *iface, fddi_iface_attr_t *attr);
@@ -67,8 +72,8 @@
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);
-extern int fddi_iface_setname(fddi_iface_t *iface, char *name);
+extern int fddi_iface_getid(fddi_iface_t *iface, fddi_id_t *id);
+extern int fddi_iface_setid(fddi_iface_t *iface, fddi_id_t id);
extern int fddi_iface_getnodev(fddi_iface_t *iface);
extern int fddi_iface_getnotpus(fddi_iface_t *iface);
extern int fddi_iface_getnopvs(fddi_iface_t *iface);
Modified: fddi-20070618-1-trunk/include/osadl/fddi_param.h
==============================================================================
--- fddi-20070618-1-trunk/include/osadl/fddi_param.h (original)
+++ fddi-20070618-1-trunk/include/osadl/fddi_param.h Thu Jul 12 16:23:24 2007
@@ -24,12 +24,17 @@
struct fddi_param {
+ /* public */
char *key;
char *val;
unsigned long flags;
+
+ /* private */
struct fddi_param *next;
struct fddi_param *previous;
+ void *priv;
+
};
/* fddi_param_t */
Modified: fddi-20070618-1-trunk/include/osadl/fddi_pv.h
==============================================================================
--- fddi-20070618-1-trunk/include/osadl/fddi_pv.h (original)
+++ fddi-20070618-1-trunk/include/osadl/fddi_pv.h Thu Jul 12 16:23:24 2007
@@ -24,21 +24,19 @@
struct fddi_pv {
- /* FIXME: maybe put into generic list implementation */
+ /* public */
+ fddi_id_t id;
+ fddi_param_t *name;
+ fddi_pv_type_enum_t type;
+
+ /* private */
struct fddi_pv *next;
struct fddi_pv *previous;
-
- char *id_prefix;
- int id_index;
- char *id_postfix;
- char *id;
-
fddi_param_t *param_list_head;
- fddi_param_t *name;
- fddi_pv_type_enum_t type;
unsigned int offset;
unsigned int bit;
+ void *priv;
};
/* fddi_pv_t */
Modified: fddi-20070618-1-trunk/include/osadl/fddi_tpu.h
==============================================================================
--- fddi-20070618-1-trunk/include/osadl/fddi_tpu.h (original)
+++ fddi-20070618-1-trunk/include/osadl/fddi_tpu.h Thu Jul 12 16:23:24 2007
@@ -32,26 +32,25 @@
struct fddi_tpu {
- /* FIXME: maybe put into generic list implementation */
- struct fddi_tpu *next;
- struct fddi_tpu *previous;
-
- char *id_prefix;
- int id_index;
- char *id_postfix;
- char *id;
-
- uint64_t cycletime; /* ns */
+ /* public */
+ fddi_id_t id;
+ uint64_t cycletime; /* ns */
fddi_tpu_direction_enum_t direction;
+
+ /* private */
+ struct fddi_tpu *next; /* TODO: generic list */
+ struct fddi_tpu *previous;
fddi_pv_t *pv_list_head;
unsigned long flags;
char *payload;
+
+ void *priv;
+
};
/* fddi_tpu_t */
extern int fddi_tpu_getnext(fddi_tpu_t **tpu);
-extern int fddi_tpu_getname(fddi_tpu_t *tpu, char **name);
-extern int fddi_tpu_getid(fddi_tpu_t *tpu, int *id);
+extern int fddi_tpu_getid(fddi_tpu_t *tpu, fddi_id_t *id);
extern int fddi_tpu_gettimestamp(fddi_tpu_t *tpu, int *timestamp); /* FIXME tv */
extern int fddi_tpu_getflags(fddi_tpu_t *tpu, unsigned long *flags);
extern int fddi_tpu_setcallback(fddi_tpu_t *tpu, int(*tpu_callback)(fddi_tpu_t *tpu));
Modified: fddi-20070618-1-trunk/include/osadl/fddi_types.h
==============================================================================
--- fddi-20070618-1-trunk/include/osadl/fddi_types.h (original)
+++ fddi-20070618-1-trunk/include/osadl/fddi_types.h Thu Jul 12 16:23:24 2007
@@ -52,6 +52,7 @@
} fddi_pv_type_enum_t;
+typedef struct fddi_id fddi_id_t;
typedef struct fddi_param fddi_param_t;
typedef struct fddi_device fddi_device_t;
typedef struct fddi_iface_attr fddi_iface_attr_t;
Modified: fddi-20070618-1-trunk/src/libfddi.c
==============================================================================
--- fddi-20070618-1-trunk/src/libfddi.c (original)
+++ fddi-20070618-1-trunk/src/libfddi.c Thu Jul 12 16:23:24 2007
@@ -44,28 +44,28 @@
return 0;
}
-int fddi_iface_attr_setclass(fddi_iface_attr_t *attr, char *fddi_class_name)
+int fddi_iface_attr_setclass(fddi_iface_attr_t *attr, char *class)
{
- if ((!attr) || (!fddi_class_name))
+ if ((!attr) || (!class))
return EINVAL;
- attr->fddi_class_name = fddi_class_name;
+ attr->fddi_class_name = strdup(class);
+ /* FIXME: where to free() this memory? */
return 0;
}
-int fddi_iface_attr_setdevice(fddi_iface_attr_t *attr, char *fddi_device_name)
+int fddi_iface_attr_setid(fddi_iface_attr_t *attr, const char *path, fddi_id_t id)
{
if (!attr)
return EINVAL;
- attr->fddi_device_name = malloc(strlen(fddi_device_name));
- if (!attr->fddi_device_name)
- return ENOMEM;
+ if (path)
+ attr->path = strdup(path);
- strcpy(attr->fddi_device_name, fddi_device_name);
+ memcpy(&attr->id, &id, sizeof(fddi_id_t));
- return 0;
+ return EINVAL;
}
/* fddi_iface_t */
@@ -76,12 +76,12 @@
if ((!iface) || (!attr))
return EINVAL;
- if ((attr->fddi_class_name == NULL) || (attr->fddi_device_name == NULL))
+ if (attr->fddi_class_name == NULL)
return EINVAL;
/* initialize instance variables */
memset(iface, 0, sizeof(fddi_iface_t));
- iface->name = attr->fddi_device_name;
+ memcpy(&iface->id, &attr->id, sizeof(fddi_id_t));
/* attach to backend library */
@@ -137,9 +137,6 @@
if (!iface)
return EINVAL;
- if (iface->name != NULL)
- free(iface->name);
-
pthread_mutex_lock(<_dl_mutex);
lt_dlclose(iface->backend_lib);
pthread_mutex_unlock(<_dl_mutex);
@@ -180,29 +177,22 @@
return iface->backend.cmd(iface, cmd);
}
-int fddi_iface_getname(fddi_iface_t *iface, char *name, size_t len)
+int fddi_iface_getid(fddi_iface_t *iface, fddi_id_t *id)
{
- if ((!iface) || (!name))
+ if ((!iface) || (!id))
return EINVAL;
- strncpy(name, iface->name, len);
+ memcpy(id, &iface->id, sizeof(fddi_id_t));
return 0;
}
-int fddi_iface_setname(fddi_iface_t *iface, char *name)
+int fddi_iface_setid(fddi_iface_t *iface, fddi_id_t id)
{
- if ((!iface) || (!name))
+ if (!iface)
return EINVAL;
- if (iface->name != NULL)
- free(iface->name);
-
- iface->name = malloc(strlen(name)+1);
- if (!iface->name)
- return ENOMEM;
-
- strncpy(iface->name, name, strlen(name)+1);
+ memcpy(&iface->id, &id, sizeof(fddi_id_t));
return 0;
}
@@ -276,12 +266,13 @@
return 0;
}
-int fddi_dev_getname(fddi_device_t *dev, char **name)
+int fddi_dev_getid(fddi_device_t *dev, fddi_id_t *id)
{
- if ((!dev) || (!name))
+ if ((!dev) || (!id))
return EINVAL;
- *name = dev->name;
+ memcpy(id, &dev->id, sizeof(fddi_id_t));
+
return 0;
}
@@ -409,24 +400,14 @@
return 0;
}
-/* FIXME: change into ID scheme */
-int fddi_tpu_getname(fddi_tpu_t *tpu, char **name)
+int fddi_tpu_getid(fddi_tpu_t *tpu, fddi_id_t *id)
{
- if ((!tpu) || (!name))
+ if ((!tpu) || (!id))
return EINVAL;
- *name = tpu->id;
- return 0;
-}
+ memcpy(id, &tpu->id, sizeof(fddi_id_t));
-/* FIXME: change into ID scheme */
-int fddi_tpu_getid(fddi_tpu_t *tpu, int *id)
-{
- if ((!tpu) || (!id))
- return EINVAL;
-
-// *id = tpu->id;
- return EINVAL;
+ return 0;
}
int fddi_tpu_gettimestamp(fddi_tpu_t *tpu, int *timestamp) /* FIXME tv */
@@ -489,12 +470,88 @@
return 0;
}
-int fddi_pv_getname(fddi_pv_t *pv, char **name)
+int fddi_pv_getid(fddi_pv_t *pv, fddi_id_t *id)
{
- if ((!pv) || (!name))
+ if ((!pv) || (!id))
return EINVAL;
- *name = NULL;
+ memcpy(id, &pv->id, sizeof(fddi_id_t));
+
+ return 0;
+}
+
+/* fddi_id_t */
+
+int fddi_id_init(fddi_id_t *fddi_id, const char *prefix, int index, const char *postfix)
+{
+ int prefix_len;
+ int index_len;
+ int postfix_len;
+ char index_as_string[30]; /* FIXME: find out max strlen of printf(int) */
+
+ memset(fddi_id, 0, sizeof(fddi_id_t));
+
+ /* FIXME: is it allowed to have things without index? */
+ snprintf(index_as_string, 30, "%i", index);
+ index_len = strlen(index_as_string);
+
+ if (prefix) {
+ prefix_len = strlen(prefix);
+ fddi_id->prefix = strdup(prefix);
+ if (!fddi_id->prefix)
+ goto prefix_err;
+ } else
+ prefix_len = 0;
+
+ if (postfix) {
+ postfix_len = strlen(postfix);
+ fddi_id->postfix = strdup(postfix);
+ if (!fddi_id->postfix)
+ goto postfix_err;
+ } else
+ postfix_len = 0;
+
+
+ fddi_id->id_as_str_len = prefix_len + index_len + postfix_len;
+
+ fddi_id->id_as_string = malloc(fddi_id->id_as_str_len + 1);
+ if (!fddi_id->id_as_string)
+ goto id_as_str_err;
+
+ sprintf(fddi_id->id_as_string, "%s%s%s",
+ fddi_id->prefix ? fddi_id->prefix : "",
+ index_as_string ? index_as_string : "",
+ fddi_id->postfix ? fddi_id->postfix: "");
+
+ return 0;
+
+id_as_str_err:
+ fddi_id->id_as_str_len = 0;
+ free(fddi_id->postfix);
+ fddi_id->postfix = NULL;
+postfix_err:
+ free(fddi_id->prefix);
+ fddi_id->prefix = NULL;
+prefix_err:
+ return ENOMEM;
+}
+
+int fddi_id_getid(fddi_id_t *fddi_id, char *id_string, size_t len)
+{
+ if (len < fddi_id->id_as_str_len)
+ return EINVAL; /* FIXME */
+
+ strcpy(id_string, fddi_id->id_as_string);
+
+ return 0;
+}
+
+int fddi_id_destroy(fddi_id_t *fddi_id)
+{
+ free(fddi_id->prefix);
+ free(fddi_id->postfix);
+ free(fddi_id->id_as_string);
+
return 0;
}
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 Thu Jul 12 16:23:24 2007
@@ -8,19 +8,21 @@
#include <osadl/fddi.h>
static fddi_tpu_t tpu = {
- .id_prefix = "dout",
- .id_index = -1,
- .id_postfix = "",
- .id = "dout",
+ .id = {
+ .prefix = "dout",
+ .index = -1,
+ .postfix = "",
+ },
.direction = IN,
.cycletime = (10*1000*1000),
};
static fddi_pv_t pv1 = {
- .id_prefix = "signal_red",
- .id_index = -1,
- .id_postfix = "",
- .id = "signal_red",
+ .id = {
+ .prefix = "signal_red",
+ .index = -1,
+ .postfix = "",
+ },
.param_list_head = NULL,
.name = NULL,
.type = BOOL,
@@ -29,10 +31,11 @@
};
static fddi_pv_t pv2 = {
- .id_prefix = "signal_yellow",
- .id_index = -1,
- .id_postfix = "",
- .id = "signal_yellow",
+ .id = {
+ .prefix = "signal_yellow",
+ .index = -1,
+ .postfix = "",
+ },
.param_list_head = NULL,
.name = NULL,
.type = BOOL,
@@ -41,10 +44,11 @@
};
static fddi_pv_t pv3 = {
- .id_prefix = "signal_green",
- .id_index = -1,
- .id_postfix = "",
- .id = "signal_green",
+ .id = {
+ .prefix = "signal_green",
+ .index = -1,
+ .postfix = "",
+ },
.param_list_head = NULL,
.name = NULL,
.type = BOOL,
@@ -59,7 +63,7 @@
int fddi_backend_configure(fddi_iface_t *iface, const char *configfile, void *data)
{
printf("parsing configfile: %s\n", configfile);
- printf("for interface: %s\n", iface->name);
+ printf("for interface: %s\n", iface->id.id_as_string); /* FIXME private */
/* FIXME: everything's hardcoded for now, we add an xml parser later */
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 Thu Jul 12 16:23:24 2007
@@ -22,6 +22,10 @@
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
fddi_tpu_t *tpu;
fddi_pv_t *pv; /* FIXME: pv_t ? */
@@ -33,7 +37,7 @@
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
fddi_iface_init(&exb0_iface, &exb0_attr);
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_attach_backend.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_attach_backend.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_attach_backend.c Thu Jul 12 16:23:24 2007
@@ -8,13 +8,17 @@
{
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
+ fddi_id_t exb0id = {
+ .prefix="exb",
+ .index=0,
+ };
int ret;
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret)
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_identify.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_identify.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_identify.c Thu Jul 12 16:23:24 2007
@@ -7,13 +7,17 @@
{
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
int ret;
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret) {
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_quiterr.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_quiterr.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_quiterr.c Thu Jul 12 16:23:24 2007
@@ -7,13 +7,17 @@
{
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
int ret;
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret) {
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_reset.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_reset.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_reset.c Thu Jul 12 16:23:24 2007
@@ -7,13 +7,17 @@
{
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
int ret;
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret) {
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_start.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_start.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_start.c Thu Jul 12 16:23:24 2007
@@ -7,13 +7,17 @@
{
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
int ret;
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret) {
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_stop.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_stop.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_cmd_stop.c Thu Jul 12 16:23:24 2007
@@ -7,13 +7,17 @@
{
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
int ret;
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret) {
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_configure.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_configure.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_configure.c Thu Jul 12 16:23:24 2007
@@ -7,13 +7,17 @@
{
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
int ret;
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret) {
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_configerror.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_configerror.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_configerror.c Thu Jul 12 16:23:24 2007
@@ -7,13 +7,17 @@
{
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
int ret;
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret) {
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_missing.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_missing.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_missing.c Thu Jul 12 16:23:24 2007
@@ -7,13 +7,17 @@
{
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
int ret;
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret) {
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_operation_error.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_operation_error.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_operation_error.c Thu Jul 12 16:23:24 2007
@@ -7,13 +7,17 @@
{
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
int ret;
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret) {
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_operational.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_operational.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_operational.c Thu Jul 12 16:23:24 2007
@@ -7,13 +7,17 @@
{
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
int ret;
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret) {
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_preoperational.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_preoperational.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_preoperational.c Thu Jul 12 16:23:24 2007
@@ -7,13 +7,17 @@
{
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
int ret;
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret) {
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_unconfigured.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_unconfigured.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_setstate_unconfigured.c Thu Jul 12 16:23:24 2007
@@ -7,13 +7,17 @@
{
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
int ret;
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret) {
Modified: fddi-20070618-1-trunk/tests/test_fddi_examplebus_tpu_usecase.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_examplebus_tpu_usecase.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_examplebus_tpu_usecase.c Thu Jul 12 16:23:24 2007
@@ -8,13 +8,17 @@
fddi_iface_attr_t exb0_attr;
fddi_iface_t exb0_iface;
fddi_tpu_t *tpu;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
int ret;
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret) {
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 Thu Jul 12 16:23:24 2007
@@ -6,19 +6,22 @@
static int endme;
static int countdown = 500;
+/* FIXME: we have to agree on a bus start workflow! */
+
int main(void)
{
fddi_iface_attr_t modbus0_attr;
fddi_iface_t modbus0_iface;
+ fddi_id_t modbus0_id;
int ret;
- /* FIXME: we have to agree on a bus start workflow! */
+ fddi_id_init(&modbus0_id, "modbus", 0, NULL);
/* 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");
+ fddi_iface_attr_setid(&modbus0_attr, "demosystem.controller", modbus0_id);
ret = fddi_iface_init(&modbus0_iface, &modbus0_attr);
if (ret) {
Modified: fddi-20070618-1-trunk/tests/test_fddi_versionstr.c
==============================================================================
--- fddi-20070618-1-trunk/tests/test_fddi_versionstr.c (original)
+++ fddi-20070618-1-trunk/tests/test_fddi_versionstr.c Thu Jul 12 16:23:24 2007
@@ -11,11 +11,15 @@
int ret;
const char *version;
+ fddi_id_t exb0_id = {
+ .prefix="exb",
+ .index=0,
+ };
/* instanciate io_interface */
fddi_iface_attr_init(&exb0_attr);
fddi_iface_attr_setclass(&exb0_attr, "libfddi_examplebus.so");
- fddi_iface_attr_setdevice(&exb0_attr, "exb0");
+ fddi_iface_attr_setid(&exb0_attr, NULL, exb0_id);
ret = fddi_iface_init(&exb0_iface, &exb0_attr);
if (ret)
More information about the OSADL-svn-commits
mailing list