Index: branches/freebob-syt-experiments/config.h.in
===================================================================
--- branches/freebob-syt-experiments/config.h.in (revision 185)
+++ branches/freebob-syt-experiments/config.h.in (revision 185)
@@ -0,0 +1,94 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Freebob major version */
+#undef FREEBOB_MAJOR_VERSION
+
+/* Freebob micro version */
+#undef FREEBOB_MICRO_VERSION
+
+/* Freebob minor version */
+#undef FREEBOB_MINOR_VERSION
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+#undef HAVE_LIBPTHREAD
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if MMX assembly is available. */
+#undef USE_MMX
+
+/* Define to 1 if SSE assembly is available. */
+#undef USE_SSE
+
+/* Version number of package */
+#undef VERSION
+
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
+
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+   code using `volatile' can become incorrect without. Disable with care. */
+#undef volatile
+
+/* "Nope it's intel" */
+#undef x86
Index: branches/freebob-syt-experiments/libfreebob.pc.in
===================================================================
--- branches/freebob-syt-experiments/libfreebob.pc.in (revision 125)
+++ branches/freebob-syt-experiments/libfreebob.pc.in (revision 125)
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libfreebob
+Description: FreeBob
+Version: @VERSION@
+Libs: -L${libdir} -lfreebob
+Cflags: -I${includedir}
Index: branches/freebob-syt-experiments/tests/test-freebob.c
===================================================================
--- branches/freebob-syt-experiments/tests/test-freebob.c (revision 185)
+++ branches/freebob-syt-experiments/tests/test-freebob.c (revision 185)
@@ -0,0 +1,436 @@
+/* test-freebob.c
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include <config.h>
+
+#include "libfreebob/freebob.h"
+
+#include <argp.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+const char *argp_program_version = PACKAGE_STRING;
+const char *argp_program_bug_address = PACKAGE_BUGREPORT;
+
+// Program documentation.
+static char doc[] = "FreeBob -- a driver for BeBob devices (test application)\n\n"
+                    "OPERATION: discover\n"
+                    "           odisocver\n"
+                    "           setsamplerate\n"
+                    "           xmldump\n"
+                    "           testmultidevicediscovery\n"
+                    "           streamformats\n";
+
+// A description of the arguments we accept.
+static char args_doc[] = "OPERATION";
+
+struct arguments
+{
+    short silent;
+    short verbose;
+    int   port;
+    int   node_id;
+    int   node_id_set;
+    int   time;
+    char* args[2];  
+};
+
+// The options we understand.
+static struct argp_option options[] = {
+    {"quiet",    'q',       0,    0,  "Don't produce any output" },
+    {"silent",   's',       0,    OPTION_ALIAS },
+
+    {"verbose",  'v', "level",    0,  "Produce verbose output" },
+
+
+    {"node",     'n',    "id",    0,  "Node to use" },
+    {"port",     'p',    "nr",    0,  "IEEE1394 Port to use" },
+    {"time",     't',    "time",  0,  "Workaround: sleep <time> usec after AVC command\n" },
+    { 0 }
+};
+
+//-------------------------------------------------------------
+
+// Parse a single option.
+static error_t
+parse_opt( int key, char* arg, struct argp_state* state )
+{
+    // Get the input argument from `argp_parse', which we
+    // know is a pointer to our arguments structure.
+    struct arguments* arguments = ( struct arguments* ) state->input;
+    char* tail;
+
+    switch (key) {
+	case 'q': case 's':
+	    arguments->silent = 1;
+	    break;
+	case 'v':
+	    if (arg) {
+		arguments->verbose = strtol( arg, &tail, 0 );
+		if ( errno ) {
+		    fprintf( stderr,  "Could not parse 'verbose' argument\n" );
+		    return ARGP_ERR_UNKNOWN;
+		}
+	    }
+	    break;
+	case 't':
+	    if (arg) {
+		arguments->time = strtol( arg, &tail, 0 );
+		if ( errno ) {
+		    fprintf( stderr,  "Could not parse 'time' argument\n" );
+		    return ARGP_ERR_UNKNOWN;
+		}
+	    }
+	    break;
+	case 'p':
+	    if (arg) {
+		arguments->port = strtol( arg, &tail, 0 );
+		if ( errno ) {
+		    fprintf( stderr,  "Could not parse 'port' argument\n" );
+		    return ARGP_ERR_UNKNOWN;
+		}
+	    } else {
+		if ( errno ) {
+		    fprintf( stderr, "Could not parse 'port' argumen\n" );
+		    return ARGP_ERR_UNKNOWN;
+		}
+	    }
+	    break;
+	case 'n':
+	    if (arg) {
+		arguments->node_id = strtol( arg, &tail, 0 );
+		if ( errno ) {
+		    fprintf( stderr,  "Could not parse 'node' argument\n" );
+		    return ARGP_ERR_UNKNOWN;
+		}
+		arguments->node_id_set=1;
+	    } else {
+		if ( errno ) {
+		    fprintf( stderr, "Could not parse 'node' argumen\n" );
+		    return ARGP_ERR_UNKNOWN;
+		}
+	    }
+	    break;
+	case ARGP_KEY_ARG:
+	    if (state->arg_num >= 2) {
+		// Too many arguments.
+		argp_usage( state );
+	    }
+	    arguments->args[state->arg_num] = arg;
+	    break;
+	case ARGP_KEY_END:
+	    if (state->arg_num < 1) {
+		// Not enough arguments.
+		argp_usage( state );
+	    }
+	    break;
+	default:
+	    return ARGP_ERR_UNKNOWN;
+    }
+    return 0;
+}
+
+// Our argp parser.
+static struct argp argp = { options, parse_opt, args_doc, doc };
+
+int
+main( int argc, char **argv )
+{
+    struct arguments arguments;
+
+    // Default values.
+    arguments.silent      = 0;
+    arguments.verbose     = 0;
+    arguments.port        = 0;
+    arguments.node_id     = 0;
+    arguments.node_id_set = 0; // if we don't specify a node, discover all
+    arguments.time        = 0;
+    arguments.args[0]     = "";
+    arguments.args[1]     = "";
+
+    // Parse our arguments; every option seen by `parse_opt' will
+    // be reflected in `arguments'.
+    if ( argp_parse ( &argp, argc, argv, 0, 0, &arguments ) ) {
+        fprintf( stderr, "Could not parse command line\n" );
+        return -1;
+    }
+
+    printf("verbose level = %d\n", arguments.verbose);
+
+    printf( "Using freebob library version: %s\n\n", freebob_get_version() );
+
+    freebob_sleep_after_avc_command( arguments.time );
+
+    if ( strcmp( arguments.args[0], "discover" ) == 0 ) {
+	freebob_handle_t fb_handle = freebob_new_handle( arguments.port );
+	if ( !fb_handle ) {
+	    fprintf( stderr, "Could not create freebob handle\n" );
+	    return -1;
+	}
+		
+	if ( freebob_discover_devices( fb_handle, arguments.verbose ) != 0 ) {
+	    fprintf( stderr, "Could not discover devices\n" );
+	    freebob_destroy_handle( fb_handle );
+	    return -1;
+	}
+	
+	freebob_connection_info_t* test_info;
+	
+	if(arguments.node_id_set) {
+	    printf("  port = %d, node_id = %d\n", arguments.port, arguments.node_id);
+	    test_info = freebob_get_connection_info( fb_handle, 
+						     arguments.node_id, 
+						     0 );
+	    freebob_print_connection_info( test_info );
+	    freebob_free_connection_info( test_info );
+		
+	    printf("\n");
+		
+	    test_info = freebob_get_connection_info( fb_handle, 
+						     arguments.node_id,
+						     1 );
+	    freebob_print_connection_info( test_info );
+	    freebob_free_connection_info( test_info );
+	} else {
+	    int i=0;
+			
+	    int devices_on_bus = freebob_get_nb_devices_on_bus(fb_handle);
+	    printf("  port = %d, devices_on_bus = %d\n", arguments.port, devices_on_bus);
+			
+	    for(i=0;i<devices_on_bus;i++) {
+		int node_id=freebob_get_device_node_id(fb_handle, i);
+		printf("  get info for device = %d, node = %d\n", i, node_id);
+				
+		test_info = freebob_get_connection_info( fb_handle, 
+							 node_id, 
+							 0 );
+		freebob_print_connection_info( test_info );
+		freebob_free_connection_info( test_info );
+			
+		printf("\n");
+			
+		test_info = freebob_get_connection_info( fb_handle, 
+							 node_id,
+							 1 );
+		freebob_print_connection_info( test_info );
+		freebob_free_connection_info( test_info );
+	    }
+	}
+		
+	freebob_destroy_handle( fb_handle );
+		
+    } else if ( strcmp( arguments.args[0], "setsamplerate" ) == 0 ) {
+	char* tail;
+	int samplerate = strtol( arguments.args[1], &tail, 0 );
+	if ( errno ) {
+	    fprintf( stderr,  "Could not parse samplerate argument\n" );
+	    return -1;
+	}
+
+	freebob_handle_t fb_handle = freebob_new_handle( arguments.port );
+	if ( !fb_handle ) {
+	    fprintf( stderr, "Could not create freebob handle\n" );
+	    return -1;
+	}
+		
+	if ( freebob_discover_devices( fb_handle, arguments.verbose ) != 0 ) {
+	    fprintf( stderr, "Could not discover devices\n" );
+	    freebob_destroy_handle( fb_handle );
+	    return -1;
+	}
+	
+	if(arguments.node_id_set) {
+	    if (! freebob_set_samplerate(fb_handle, arguments.node_id, samplerate)) {
+		fprintf( stderr, "Could not set samplerate\n" );
+		freebob_destroy_handle( fb_handle );
+		return -1;
+	    }
+
+	} else {
+	    int i=0;
+			
+	    int devices_on_bus = freebob_get_nb_devices_on_bus(fb_handle);
+	    printf("  port = %d, devices_on_bus = %d\n", arguments.port, devices_on_bus);
+			
+	    for(i=0;i<devices_on_bus;i++) {
+		int node_id=freebob_get_device_node_id(fb_handle, i);
+		printf("  set samplerate for device = %d, node = %d\n", i, node_id);
+				
+		if (! freebob_set_samplerate(fb_handle, node_id, samplerate)) {
+		    fprintf( stderr, "Could not set samplerate\n" );
+		    freebob_destroy_handle( fb_handle );
+		    return -1;
+		}
+	    }
+
+	}
+		
+	freebob_destroy_handle( fb_handle );
+		
+    } else if ( strcmp( arguments.args[0], "odiscover" ) == 0 ) {
+	freebob_handle_t fb_handle = freebob_new_handle( arguments.port );
+	if ( !fb_handle ) {
+	    fprintf( stderr, "Could not create freebob handle\n" );
+	    return -1;
+	}
+		
+	if ( freebob_discover_devices( fb_handle, arguments.verbose ) != 0 ) {
+	    fprintf( stderr, "Could not discover devices\n" );
+	    freebob_destroy_handle( fb_handle );
+	    return -1;
+	}
+    } else if ( strcmp( arguments.args[0], "xmldump" ) == 0 ) {
+	freebob_handle_t fb_handle = freebob_new_handle( arguments.port );
+	if ( !fb_handle ) {
+	    fprintf( stderr, "Could not create freebob handle\n" );
+	    return -1;
+	}
+		
+	if ( freebob_discover_devices( fb_handle, 0 ) != 0 ) {
+	    fprintf( stderr, "Could not discover devices\n" );
+	    freebob_destroy_handle( fb_handle );
+	    return -1;
+	}
+	
+	if(arguments.node_id_set) {
+	    freebob_print_xml_description( fb_handle, 
+					   arguments.node_id, 
+					   0 );
+		
+	    printf("\n");
+		
+	    freebob_print_xml_description( fb_handle, 
+					   arguments.node_id,
+					   1 );
+	} else {
+	    int i=0;
+			
+	    int devices_on_bus = freebob_get_nb_devices_on_bus(fb_handle);
+			
+	    for(i=0;i<devices_on_bus;i++) {
+		int node_id=freebob_get_device_node_id(fb_handle, i);
+ 				
+		freebob_print_xml_description( fb_handle, 
+					       node_id, 
+					       0 );
+		printf("\n");
+			
+		freebob_print_xml_description( fb_handle, 
+					       node_id,
+					       1 );
+	    }
+	}
+		
+	freebob_destroy_handle( fb_handle );
+		    
+    } else if ( strcmp( arguments.args[0], "testmultidevicediscovery" ) == 0 ) {
+	freebob_connection_info_t* test_info;
+	freebob_handle_t fb_handle = freebob_new_handle( arguments.port );
+	if ( !fb_handle ) {
+	    fprintf( stderr, "Could not create freebob handle\n" );
+	    return -1;
+	}
+		
+	if ( freebob_discover_devices( fb_handle, arguments.verbose ) != 0 ) {
+	    fprintf( stderr, "Could not discover devices\n" );
+	    freebob_destroy_handle( fb_handle );
+	    return -1;
+	}
+	test_info = freebob_get_connection_info( fb_handle, 
+						 -1, 
+						 0 );
+	freebob_print_connection_info( test_info );
+	freebob_free_connection_info( test_info );
+	
+	printf("\n");
+	
+	test_info = freebob_get_connection_info( fb_handle, 
+						 -1,
+						 1 );
+	freebob_print_connection_info( test_info );
+	freebob_free_connection_info( test_info );		
+		
+	freebob_destroy_handle( fb_handle );
+    
+    } else if ( strcmp( arguments.args[0], "streamformats" ) == 0 ) {
+	freebob_handle_t fb_handle = freebob_new_handle( arguments.port );
+	if ( !fb_handle ) {
+	    fprintf( stderr, "Could not create freebob handle\n" );
+	    return -1;
+	}
+		
+	if ( freebob_discover_devices( fb_handle, arguments.verbose ) != 0 ) {
+	    fprintf( stderr, "Could not discover devices\n" );
+	    freebob_destroy_handle( fb_handle );
+	    return -1;
+	}
+
+	freebob_supported_stream_format_info_t* stream_info;
+	if(arguments.node_id_set) {
+	    printf("  port = %d, node_id = %d\n", arguments.port, arguments.node_id);
+	    stream_info = freebob_get_supported_stream_format_info( fb_handle, 
+								  arguments.node_id, 
+								  0 );
+	    freebob_print_supported_stream_format_info( stream_info );
+	    freebob_free_supported_stream_format_info( stream_info );
+		
+	    printf("\n");
+		
+	    stream_info = freebob_get_supported_stream_format_info( fb_handle, 
+								  arguments.node_id,
+								  1 );
+	    freebob_print_supported_stream_format_info( stream_info );
+	    freebob_free_supported_stream_format_info( stream_info );
+
+	} else {
+	    int i=0;
+			
+	    int devices_on_bus = freebob_get_nb_devices_on_bus(fb_handle);
+	    printf("  port = %d, devices_on_bus = %d\n", arguments.port, devices_on_bus);
+			
+	    for(i=0;i<devices_on_bus;i++) {
+		int node_id=freebob_get_device_node_id(fb_handle, i);
+		printf("  get info for device = %d, node = %d\n", i, node_id);
+				
+		stream_info = freebob_get_supported_stream_format_info( fb_handle, 
+									node_id, 
+									0 );
+		freebob_print_supported_stream_format_info( stream_info );
+		freebob_free_supported_stream_format_info( stream_info );
+		
+		printf("\n");
+		
+		stream_info = freebob_get_supported_stream_format_info( fb_handle, 
+									node_id,
+									1 );
+		freebob_print_supported_stream_format_info( stream_info );
+		freebob_free_supported_stream_format_info( stream_info );
+	    }
+	}
+		
+	freebob_destroy_handle( fb_handle );
+
+    } else {
+        printf( "unknown operation\n" );
+    }
+
+    return 0;
+}
Index: branches/freebob-syt-experiments/tests/Makefile.am
===================================================================
--- branches/freebob-syt-experiments/tests/Makefile.am (revision 192)
+++ branches/freebob-syt-experiments/tests/Makefile.am (revision 192)
@@ -0,0 +1,40 @@
+# Makefile.am - Makefile template
+# Copyright (C) 2005 by Daniel Wagner.
+#
+# This file is part of FreeBob.
+#
+# FreeBob is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# FreeBob 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 General Public License
+# along with FreeBob; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+SUBDIRS = streaming
+
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(LIBXML_CFLAGS) \
+	$(LIBAVC1394_CFLAGS)
+
+noinst_PROGRAMS = test-freebob test-extplugcmd freebob-server
+noinst_HEADERS = 
+
+test_freebob_SOURCES = test-freebob.c
+test_freebob_LDADD   = $(top_builddir)/src/libfreebob.la \
+	$(LIBXML_LIBS) $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS)
+
+test_extplugcmd_SOURCES = test-extplugcmd.cpp
+test_extplugcmd_LDADD = $(top_builddir)/src/libfreebobavc/libfreebobavc.la \
+	$(LIBAVC1394_LIBS)
+
+freebob_server_SOURCES = freebob-server.c
+freebob_server_LDADD   = $(top_builddir)/src/libfreebob.la $(LIBXML_LIBS) \
+	$(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS) -lrom1394
+
+
+#TESTS_ENVIRONMENT
+TEST = test-freebob
Index: branches/freebob-syt-experiments/tests/freebob-server.c
===================================================================
--- branches/freebob-syt-experiments/tests/freebob-server.c (revision 185)
+++ branches/freebob-syt-experiments/tests/freebob-server.c (revision 185)
@@ -0,0 +1,471 @@
+/*
+* avc_vcr.c - An example of an AV/C Tape Recorder target implementation
+*
+* Copyright Dan Dennedy <dan@dennedy.org>
+* 
+* Inspired by virtual_vcr from Bonin Franck <boninf@free.fr>
+* 
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program 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 General Public License
+* along with this program; if not, write to the Free Software Foundation,
+* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/poll.h>
+
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <signal.h>
+
+#include <libraw1394/raw1394.h>
+#include <libraw1394/csr.h>
+#include <libavc1394/avc1394.h>
+#include <libavc1394/rom1394.h>
+
+const char not_compatible[] = "\n"
+	"This libraw1394 does not work with your version of Linux. You need a different\n"
+	"version that matches your kernel (see kernel help text for the raw1394 option to\n"
+	"find out which is the correct version).\n";
+
+const char not_loaded[] = "\n"
+	"This probably means that you don't have raw1394 support in the kernel or that\n"
+	"you haven't loaded the raw1394 module.\n";
+
+
+unsigned char g_signal_mode = 0x05; // SD 525-60, TODO: get from media
+unsigned char g_transport_mode = AVC1394_VCR_CMD_WIND;
+unsigned char g_transport_state = AVC1394_VCR_OPERAND_WIND_STOP;
+
+static int g_done = 0;
+
+static void sighandler (int sig)
+{
+	printf("signal!\n");
+	g_done = 1;
+}
+
+/**** subunit handlers ****/
+int subunit_control( avc1394_cmd_rsp *cr )
+{
+	switch ( cr->opcode )
+	{
+	case AVC1394_VCR_CMD_PLAY:
+		switch ( cr->operand[0] )
+		{
+		case AVC1394_VCR_OPERAND_PLAY_FORWARD:
+			g_transport_mode = AVC1394_GET_OPCODE( AVC1394_VCR_RESPONSE_TRANSPORT_STATE_PLAY );
+			g_transport_state = AVC1394_VCR_OPERAND_PLAY_FORWARD;
+			cr->status = AVC1394_RESP_ACCEPTED;
+			printf("PLAY FORWARD\n");
+			break;
+		
+		case AVC1394_VCR_OPERAND_PLAY_FASTEST_FORWARD:
+			g_transport_mode = AVC1394_GET_OPCODE( AVC1394_VCR_RESPONSE_TRANSPORT_STATE_PLAY );
+			g_transport_state = AVC1394_VCR_OPERAND_PLAY_FASTEST_FORWARD;
+			cr->status = AVC1394_RESP_ACCEPTED;
+			printf("PLAY FASTEST FORWARD\n");
+			break;
+		
+		case AVC1394_VCR_OPERAND_PLAY_REVERSE_PAUSE:
+			g_transport_mode = AVC1394_GET_OPCODE( AVC1394_VCR_RESPONSE_TRANSPORT_STATE_PLAY );
+			g_transport_state = cr->operand[0];
+			cr->status = AVC1394_RESP_ACCEPTED;
+			printf("PAUSE PLAY\n");
+			break;
+		
+		case AVC1394_VCR_OPERAND_PLAY_REVERSE:
+			g_transport_mode = AVC1394_GET_OPCODE( AVC1394_VCR_RESPONSE_TRANSPORT_STATE_PLAY );
+			g_transport_state = AVC1394_VCR_OPERAND_PLAY_REVERSE;
+			cr->status = AVC1394_RESP_ACCEPTED;
+			printf("PLAY REVERSE\n");
+			break;
+
+		case AVC1394_VCR_OPERAND_PLAY_FASTEST_REVERSE:
+			g_transport_mode = AVC1394_GET_OPCODE( AVC1394_VCR_RESPONSE_TRANSPORT_STATE_PLAY );
+			g_transport_state = AVC1394_VCR_OPERAND_PLAY_FASTEST_REVERSE;
+			cr->status = AVC1394_RESP_ACCEPTED;
+			printf("PLAY FASTEST REVERSE\n");
+			break;
+		
+		case AVC1394_VCR_OPERAND_PLAY_NEXT_FRAME:
+			g_transport_mode = AVC1394_GET_OPCODE( AVC1394_VCR_RESPONSE_TRANSPORT_STATE_PLAY );
+			g_transport_state = cr->operand[0];
+			cr->status = AVC1394_RESP_ACCEPTED;
+			printf("PLAY NEXT FRAME\n");
+			break;
+		
+		case AVC1394_VCR_OPERAND_PLAY_PREVIOUS_FRAME:
+			g_transport_mode = AVC1394_GET_OPCODE( AVC1394_VCR_RESPONSE_TRANSPORT_STATE_PLAY );
+			g_transport_state = cr->operand[0];
+			cr->status = AVC1394_RESP_ACCEPTED;
+			printf("PLAY PREVIOUS FRAME\n");
+			break;
+		
+		default:
+			fprintf( stderr, "play mode 0x%02x non supported\n", cr->operand[0] );
+			return 0;
+		}
+		break;
+
+	default:
+		fprintf( stderr, "subunit control command 0x%02x non supported\n", cr->opcode );
+		return 0;
+	}
+	return 1;
+}
+
+
+int subunit_status( avc1394_cmd_rsp *cr )
+{
+	switch ( cr->opcode )
+	{
+	case AVC1394_VCR_CMD_OUTPUT_SIGNAL_MODE:
+		cr->status = AVC1394_RESP_STABLE;
+		cr->operand[0] = g_signal_mode;
+		break;
+	default:
+		fprintf( stderr, "subunit status command 0x%02x not supported\n", cr->opcode );
+		return 0;
+	}
+	return 1;
+}
+
+
+int subunit_inquiry( avc1394_cmd_rsp *cr )
+{
+	switch ( cr->opcode )
+	{
+	case AVC1394_VCR_CMD_PLAY:
+	case AVC1394_VCR_CMD_RECORD:
+	case AVC1394_VCR_CMD_WIND:
+	case AVC1394_VCR_CMD_OUTPUT_SIGNAL_MODE:
+	case AVC1394_VCR_CMD_INPUT_SIGNAL_MODE:
+	case AVC1394_VCR_CMD_TRANSPORT_STATE:
+	case AVC1394_VCR_CMD_TIME_CODE:
+	case AVC1394_VCR_CMD_MEDIUM_INFO:
+		cr->status = AVC1394_RESP_IMPLEMENTED;
+		return 1;
+	default:
+		fprintf( stderr, "subunit inquiry command 0x%02x not supported\n", cr->opcode );
+		return 0;
+	}
+	return 1;
+}
+
+
+/**** Unit handlers ****/
+int unit_control( avc1394_cmd_rsp *cr )
+{
+	switch ( cr->opcode )
+	{
+	default:
+		fprintf( stderr, "unit control command 0x%02x not supported\n", cr->opcode );
+		return 0;
+	}
+	return 1;
+}
+
+
+int unit_status( avc1394_cmd_rsp *cr )
+{
+	cr->operand[1] = 0xff;
+	cr->operand[2] = 0xff;
+	cr->operand[3] = 0xff;
+	cr->operand[4] = 0xff;
+	switch ( cr->opcode )
+	{
+	case AVC1394_CMD_UNIT_INFO:
+		cr->status = AVC1394_RESP_STABLE;
+		cr->operand[0] = AVC1394_OPERAND_UNIT_INFO_EXTENSION_CODE;
+		cr->operand[1] = AVC1394_SUBUNIT_TYPE_TAPE_RECORDER >> 19;
+		break;
+	case AVC1394_CMD_SUBUNIT_INFO:
+	{
+		int page = ( cr->operand[0] >> 4 ) & 7;
+		if ( page == 0 )
+		{
+			cr->status = AVC1394_RESP_STABLE;
+			cr->operand[0] = (page << 4) | AVC1394_OPERAND_UNIT_INFO_EXTENSION_CODE;
+			cr->operand[1] = AVC1394_SUBUNIT_TYPE_TAPE_RECORDER >> 19 << 3;
+		}
+
+		else
+		{
+			fprintf( stderr, "invalid page %d for subunit\n", page );
+			return 0;
+		}
+		break;
+	}
+	default:
+		fprintf( stderr, "unit status command 0x%02x not supported\n", cr->opcode );
+		return 0;
+	}
+	return 1;
+}
+
+
+int unit_inquiry( avc1394_cmd_rsp *cr )
+{
+	switch ( cr->opcode )
+	{
+	case AVC1394_CMD_SUBUNIT_INFO:
+	case AVC1394_CMD_UNIT_INFO:
+		cr->status = AVC1394_RESP_IMPLEMENTED;
+	default:
+		fprintf( stderr, "unit inquiry command 0x%02x not supported\n", cr->opcode );
+		return 0;
+	}
+	return 1;
+}
+
+
+/**** primary avc1394 target callback ****/
+int command_handler( avc1394_cmd_rsp *cr )
+{
+	switch ( cr->subunit_type )
+	{
+	case AVC1394_SUBUNIT_TAPE_RECORDER:
+		if ( cr->subunit_id != 0 )
+		{
+			fprintf( stderr, "subunit id 0x%02x not supported\n", cr->subunit_id );
+			return 0;
+		}
+		switch ( cr->status )
+		{
+		case AVC1394_CTYP_CONTROL:
+			return subunit_control( cr );
+			break;
+		case AVC1394_CTYP_STATUS:
+			return subunit_status( cr );
+			break;
+		case AVC1394_CTYP_GENERAL_INQUIRY:
+			return subunit_inquiry( cr );
+			break;
+		}
+		break;
+	case AVC1394_SUBUNIT_UNIT:
+		switch ( cr->status )
+		{
+		case AVC1394_CTYP_CONTROL:
+			return unit_control( cr );
+			break;
+		case AVC1394_CTYP_STATUS:
+			return unit_status( cr );
+			break;
+		case AVC1394_CTYP_GENERAL_INQUIRY:
+			return unit_inquiry( cr );
+			break;
+		}
+		break;
+	default:
+		fprintf( stderr, "subunit type 0x%02x not supported\n", cr->subunit_type );
+		return 0;
+	}
+	return 1;
+}
+
+struct configrom_backup {
+	quadlet_t rom[0x100];
+	size_t rom_size;
+	unsigned char rom_version;
+	
+};
+
+struct configrom_backup save_config_rom(raw1394handle_t handle)
+{
+	int retval;
+	struct configrom_backup tmp;
+	/* get the current rom image */
+	retval=raw1394_get_config_rom(handle, tmp.rom, 0x100, &tmp.rom_size, &tmp.rom_version);
+// 	tmp.rom_size=rom1394_get_size(tmp.rom);
+	printf("save_config_rom get_config_rom returned %d, romsize %d, rom_version %d:\n",retval,tmp.rom_size,tmp.rom_version);
+
+	return tmp;
+}
+
+int restore_config_rom(raw1394handle_t handle, struct configrom_backup old)
+{
+	int retval,i ;
+
+	quadlet_t current_rom[0x100];
+	size_t current_rom_size;
+	unsigned char current_rom_version;
+
+	retval=raw1394_get_config_rom(handle, current_rom, 0x100, &current_rom_size, &current_rom_version);
+	printf("restore_config_rom get_config_rom returned %d, romsize %d, rom_version %d:\n",retval,current_rom_size,current_rom_version);
+
+	printf("restore_config_rom restoring to romsize %d, rom_version %d:\n",old.rom_size,old.rom_version);
+
+	retval = raw1394_update_config_rom(handle, old.rom, old.rom_size, current_rom_version);
+	printf("restore_config_rom update_config_rom returned %d\n",retval);
+
+	/* get the current rom image */
+	retval=raw1394_get_config_rom(handle, current_rom, 0x100, &current_rom_size, &current_rom_version);
+	current_rom_size = rom1394_get_size(current_rom);
+	printf("get_config_rom returned %d, romsize %d, rom_version %d:",retval,current_rom_size,current_rom_version);
+	for (i = 0; i < current_rom_size; i++)
+	{
+		if (i % 4 == 0) printf("\n0x%04x:", CSR_CONFIG_ROM+i*4);
+		printf(" %08x", ntohl(current_rom[i]));
+	}
+	printf("\n");
+
+	return retval;
+}
+
+int init_config_rom(raw1394handle_t handle)
+{
+	int retval, i;
+	quadlet_t rom[0x100];
+	size_t rom_size;
+	unsigned char rom_version;
+	rom1394_directory dir;
+	char *leaf;
+	
+	/* get the current rom image */
+	retval=raw1394_get_config_rom(handle, rom, 0x100, &rom_size, &rom_version);
+	rom_size = rom1394_get_size(rom);
+	printf("get_config_rom returned %d, romsize %d, rom_version %d:",retval,rom_size,rom_version);
+	for (i = 0; i < rom_size; i++)
+	{
+		if (i % 4 == 0) printf("\n0x%04x:", CSR_CONFIG_ROM+i*4);
+		printf(" %08x", ntohl(rom[i]));
+	}
+	printf("\n");
+	
+	/* get the local directory */
+	rom1394_get_directory( handle, raw1394_get_local_id(handle) & 0x3f, &dir);
+	
+	/* change the vendor description for kicks */
+	i = strlen(dir.textual_leafs[0]);
+	strncpy(dir.textual_leafs[0], "FreeBob Server                            ", i);
+	retval = rom1394_set_directory(rom, &dir);
+	printf("rom1394_set_directory returned %d, romsize %d:",retval,rom_size);
+	for (i = 0; i < rom_size; i++)
+	{
+		if (i % 4 == 0) printf("\n0x%04x:", CSR_CONFIG_ROM+i*4);
+		printf(" %08x", ntohl(rom[i]));
+	}
+	printf("\n");
+	
+	/* free the allocated mem for the textual leaves */
+	rom1394_free_directory( &dir);
+	
+	/* add an AV/C unit directory */
+	dir.unit_spec_id    = 0x0000a02d;
+	dir.unit_sw_version = 0x00010001;
+	leaf = "freebob-server";
+	dir.nr_textual_leafs = 1;
+	dir.textual_leafs = &leaf;
+	
+	/* manipulate the rom */
+	retval = rom1394_add_unit( rom, &dir);
+	
+	/* get the computed size of the rom image */
+	rom_size = rom1394_get_size(rom);
+	
+	printf("rom1394_add_unit_directory returned %d, romsize %d:",retval,rom_size);
+	for (i = 0; i < rom_size; i++)
+	{
+		if (i % 4 == 0) printf("\n0x%04x:", CSR_CONFIG_ROM+i*4);
+		printf(" %08x", ntohl(rom[i]));
+	}
+	printf("\n");
+	
+	/* convert computed rom size from quadlets to bytes before update */
+	rom_size *= sizeof(quadlet_t);
+	retval = raw1394_update_config_rom(handle, rom, rom_size, rom_version);
+	printf("update_config_rom returned %d\n",retval);
+	
+	retval=raw1394_get_config_rom(handle, rom, 0x100, &rom_size, &rom_version);
+	printf("get_config_rom returned %d, romsize %d, rom_version %d:",retval,rom_size,rom_version);
+	for (i = 0; i < rom_size; i++)
+	{
+		if (i % 4 == 0) printf("\n0x%04x:", CSR_CONFIG_ROM+i*4);
+		printf(" %08x", ntohl(rom[i]));
+	}
+	printf("\n");
+	
+// 	printf("You need to reload your ieee1394 modules to reset the rom.\n");
+	
+	return 0;
+}
+
+
+int main( int argc, char **argv )
+{
+	raw1394handle_t handle;
+
+	signal (SIGINT, sighandler);
+	signal (SIGPIPE, sighandler);
+
+	handle = raw1394_new_handle();
+
+	if ( !handle )
+	{
+		if ( !errno )
+		{
+			printf( not_compatible );
+		}
+		else
+		{
+			perror( "couldn't get handle" );
+			printf( not_loaded );
+		}
+		exit( EXIT_FAILURE );
+	}
+
+	if ( raw1394_set_port( handle, 0 ) < 0 )
+	{
+		perror( "couldn't set port" );
+		exit( EXIT_FAILURE );
+	}
+
+	struct configrom_backup cfgrom_backup;
+ 	cfgrom_backup=save_config_rom( handle );
+
+	if ( init_config_rom( handle ) < 0 )
+	{
+		perror( "couldn't init config rom!" );
+		exit( EXIT_FAILURE );
+	}
+
+
+	avc1394_init_target( handle, command_handler );
+	
+	printf( "Starting AV/C target; press Ctrl+C to quit...\n" );
+	struct pollfd pfd = {
+		fd: raw1394_get_fd (handle),
+		events: POLLIN | POLLPRI,
+		revents: 0
+	};
+	int result = 0;
+	
+
+	do {
+		if (poll (&pfd, 1, 100) > 0 && (pfd.revents & POLLIN))
+		result = raw1394_loop_iterate (handle);
+		
+	} while (g_done == 0 && result == 0);
+	
+	avc1394_close_target( handle );
+	
+ 	restore_config_rom( handle, cfgrom_backup);
+
+	printf( "Bye...\n" );
+	exit( EXIT_SUCCESS );
+}
Index: branches/freebob-syt-experiments/tests/streaming/debugtools.c
===================================================================
--- branches/freebob-syt-experiments/tests/streaming/debugtools.c (revision 159)
+++ branches/freebob-syt-experiments/tests/streaming/debugtools.c (revision 159)
@@ -0,0 +1,176 @@
+#include <libfreebob/freebob.h>
+#include <libraw1394/raw1394.h>
+#include <libiec61883/iec61883.h>
+#include "debugtools.h"
+#include <stdio.h>
+#include <netinet/in.h>
+
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+
+unsigned char
+toAscii( unsigned char c )
+{
+    if ( ( c > 31 ) && ( c < 126) ) {
+        return c;
+    } else {
+        return '.';
+    }
+}
+
+/* converts a quadlet to a uchar * buffer
+ * not implemented optimally, but clear
+ */
+void
+quadlet2char( quadlet_t quadlet, unsigned char* buff )
+{
+    *(buff)   = (quadlet>>24)&0xFF;
+    *(buff+1) = (quadlet>>16)&0xFF;
+    *(buff+2) = (quadlet>> 8)&0xFF;
+    *(buff+3) = (quadlet)    &0xFF;
+}
+
+void
+hexDump( unsigned char *data_start, unsigned int length )
+{
+    unsigned int i=0;
+    unsigned int byte_pos;
+    unsigned int bytes_left;
+    //printf("hexdump: %p %d\n",data_start,length);
+
+    if ( length <= 0 ) {
+        return;
+    }
+    if ( length >= 7 ) {
+        for ( i = 0; i < (length-7); i += 8 ) {
+            printf( "%04X: %02X %02X %02X %02X %02X %02X %02X %02X "
+					"- [%c%c%c%c%c%c%c%c] - %2.5F %2.5F\n",
+
+                    i,
+
+                    *(data_start+i+0),
+                    *(data_start+i+1),
+                    *(data_start+i+2),
+                    *(data_start+i+3),
+                    *(data_start+i+4),
+                    *(data_start+i+5),
+                    *(data_start+i+6),
+                    *(data_start+i+7),
+
+                    toAscii( *(data_start+i+0) ),
+                    toAscii( *(data_start+i+1) ),
+                    toAscii( *(data_start+i+2) ),
+                    toAscii( *(data_start+i+3) ),
+                    toAscii( *(data_start+i+4) ),
+                    toAscii( *(data_start+i+5) ),
+                    toAscii( *(data_start+i+6) ),
+                    toAscii( *(data_start+i+7) ),
+					
+					(*((float *)(data_start+i+0))),
+					(*((float *)(data_start+i+4)))
+				  );
+        }
+    }
+    byte_pos = i;
+    bytes_left = length - byte_pos;
+
+    printf( "%04X:" ,i );
+    for ( i = byte_pos; i < length; i += 1 ) {
+        printf( " %02X", *(data_start+i) );
+    }
+    for ( i=0; i < 8-bytes_left; i+=1 ) {
+        printf( "   " );
+    }
+
+    printf( " - [" );
+    for ( i = byte_pos; i < length; i += 1) {
+        printf( "%c", toAscii(*(data_start+i)));
+    }
+    for ( i = 0; i < 8-bytes_left; i += 1) {
+        printf( " " );
+    }
+
+    printf( "]" );
+    printf( "\n" );
+}
+
+void
+hexDumpToFile( FILE* fid, unsigned char *data_start, unsigned int length )
+{
+    unsigned int i=0;
+    unsigned int byte_pos;
+    unsigned int bytes_left;
+    //printf("hexdump: %p %d\n",data_start,length);
+
+    if ( length <= 0 ) {
+        return;
+    }
+    if ( length >= 7 ) {
+        for ( i = 0; i < (length-7); i += 8 ) {
+			float *f1=(float *)(data_start+i+0);
+			
+            fprintf(fid, "%04X: %02X %02X %02X %02X %02X %02X %02X %02X "
+					"- [%c%c%c%c%c%c%c%c] - %2.5e %2.5e\n",
+
+                    i,
+
+                    *(data_start+i+0),
+                    *(data_start+i+1),
+                    *(data_start+i+2),
+                    *(data_start+i+3),
+                    *(data_start+i+4),
+                    *(data_start+i+5),
+                    *(data_start+i+6),
+                    *(data_start+i+7),
+
+                    toAscii( *(data_start+i+0) ),
+                    toAscii( *(data_start+i+1) ),
+                    toAscii( *(data_start+i+2) ),
+                    toAscii( *(data_start+i+3) ),
+                    toAscii( *(data_start+i+4) ),
+                    toAscii( *(data_start+i+5) ),
+                    toAscii( *(data_start+i+6) ),
+                    toAscii( *(data_start+i+7) ),
+                					
+					(*(f1)),
+					(*(f1+1))
+				   );
+        }
+    }
+    byte_pos = i;
+    bytes_left = length - byte_pos;
+
+    fprintf(fid, "%04X:" ,i );
+    for ( i = byte_pos; i < length; i += 1 ) {
+        fprintf(fid, " %02X", *(data_start+i) );
+    }
+    for ( i=0; i < 8-bytes_left; i+=1 ) {
+        fprintf(fid, "   " );
+    }
+
+    fprintf(fid, " - [" );
+    for ( i = byte_pos; i < length; i += 1) {
+        fprintf(fid, "%c", toAscii(*(data_start+i)));
+    }
+    for ( i = 0; i < 8-bytes_left; i += 1) {
+        fprintf(fid, " " );
+    }
+
+    fprintf(fid, "]" );
+    fprintf(fid, "\n" );
+}
+
+
+void
+hexDumpQuadlets( quadlet_t *data, unsigned int length )
+{
+    unsigned int i=0;
+
+    if ( length <= 0 ) {
+        return;
+    }
+    for (i=0;i<length;i+=1) {
+            printf( "%02d %04X: %08X (%08X)"
+                    "\n", i, i*4, data[i],ntohl(data[i]));
+    }
+}
Index: branches/freebob-syt-experiments/tests/streaming/Makefile.am
===================================================================
--- branches/freebob-syt-experiments/tests/streaming/Makefile.am (revision 192)
+++ branches/freebob-syt-experiments/tests/streaming/Makefile.am (revision 192)
@@ -0,0 +1,38 @@
+# Makefile.am - Makefile template
+# Copyright (C) 2005 by Daniel Wagner.
+# Copyright (C) 2006 by Pieter Palmers.
+#
+# This file is part of FreeBob.
+#
+# FreeBob is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# FreeBob 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 General Public License
+# along with FreeBob; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(LIBIEC61883_CFLAGS) 
+
+noinst_PROGRAMS = teststreaming teststreaming2 teststreaming3 testmidistreaming1
+noinst_HEADERS = debugtools.h
+
+teststreaming_SOURCES = teststreaming.c debugtools.c
+teststreaming_LDADD   = @top_builddir@src/libfreebob.la \
+	$(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS)
+
+teststreaming2_SOURCES = teststreaming2.c debugtools.c
+teststreaming2_LDADD   = @top_builddir@src/libfreebob.la \
+	$(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS)
+
+teststreaming3_SOURCES = teststreaming3.c debugtools.c
+teststreaming3_LDADD   = @top_builddir@src/libfreebob.la \
+	$(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS)
+
+testmidistreaming1_SOURCES = testmidistreaming1.c debugtools.c
+testmidistreaming1_LDADD   = @top_builddir@src/libfreebob.la -lasound \
+	$(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS)
Index: branches/freebob-syt-experiments/tests/streaming/teststreaming.c
===================================================================
--- branches/freebob-syt-experiments/tests/streaming/teststreaming.c (revision 194)
+++ branches/freebob-syt-experiments/tests/streaming/teststreaming.c (revision 194)
@@ -0,0 +1,229 @@
+/***************************************************************************
+  Copyright (C) 2005 by Pieter Palmers   *
+                                                                        *
+  This program is free software; you can redistribute it and/or modify  *
+  it under the terms of the GNU General Public License as published by  *
+  the Free Software Foundation; either version 2 of the License, or     *
+  (at your option) any later version.                                   *
+                                                                        *
+  This program 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 General Public License     *
+  along with this program; if not, write to the                         *
+  Free Software Foundation, Inc.,                                       *
+  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+/**
+ * Test application for the per-stream decode API
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <signal.h>
+
+#include "libfreebob/freebob_streaming.h"
+
+#include "debugtools.h"
+
+int run;
+
+static void sighandler (int sig)
+{
+	run = 0;
+}
+
+int main(int argc, char *argv[])
+{
+
+	#define PERIOD_SIZE 1024
+
+	int samplesread=0, sampleswritten=0;
+	int nb_in_channels=0, nb_out_channels=0;
+	int retval=0;
+	int i=0;
+
+	int nb_periods=0;
+
+	freebob_sample_t **audiobuffer;
+	freebob_sample_t *nullbuffer;
+	
+	run=1;
+
+	printf("Freebob streaming test application\n");
+
+	signal (SIGINT, sighandler);
+	signal (SIGPIPE, sighandler);
+
+	freebob_device_info_t device_info;
+
+	freebob_options_t dev_options;
+
+	dev_options.sample_rate=44100;
+	dev_options.period_size=PERIOD_SIZE;
+
+	dev_options.nb_buffers=3;
+
+	dev_options.port=0;
+	dev_options.node_id=-1;
+	
+	dev_options.realtime=0;
+	dev_options.packetizer_priority=60;
+
+	freebob_device_t *dev=freebob_streaming_init(&device_info, dev_options);
+	if (!dev) {
+		fprintf(stderr,"Could not init Freebob Streaming layer\n");
+		exit(-1);
+	}
+
+	nb_in_channels=freebob_streaming_get_nb_capture_streams(dev);
+	nb_out_channels=freebob_streaming_get_nb_playback_streams(dev);
+
+	/* allocate intermediate buffers */
+	audiobuffer=calloc(nb_in_channels,sizeof(freebob_sample_t *));
+	for (i=0;i<nb_in_channels;i++) {
+		audiobuffer[i]=calloc(PERIOD_SIZE+1,sizeof(freebob_sample_t));
+	}
+	
+	nullbuffer=calloc(PERIOD_SIZE+1,sizeof(freebob_sample_t));
+	
+	/* open the files to write to*/
+	FILE* fid_out[nb_out_channels];
+	FILE* fid_in[nb_in_channels];
+	char name[256];
+
+	for (i=0;i<nb_out_channels;i++) {
+		snprintf(name,sizeof(name),"out_ch_%02d",i);
+
+		fid_out[i]=fopen(name,"w");
+
+		freebob_streaming_get_playback_stream_name(dev,i,name,sizeof(name));
+		fprintf(fid_out[i],"Channel name: %s\n",name);
+		switch (freebob_streaming_get_playback_stream_type(dev,i)) {
+		case freebob_stream_type_audio:
+			fprintf(fid_out[i],"Channel type: audio\n");
+			break;
+		case freebob_stream_type_midi:
+			fprintf(fid_out[i],"Channel type: midi\n");
+			break;
+		case freebob_stream_type_unknown:
+			fprintf(fid_out[i],"Channel type: unknown\n");
+			break;
+		default:
+		case freebob_stream_type_invalid:
+			fprintf(fid_out[i],"Channel type: invalid\n");
+			break;
+		}
+
+	}
+	for (i=0;i<nb_in_channels;i++) {
+		snprintf(name,sizeof(name),"in_ch_%02d",i);
+		fid_in[i]=fopen(name,"w");
+
+		freebob_streaming_get_capture_stream_name(dev,i,name,sizeof(name));
+		fprintf(fid_in[i], "Channel name: %s\n",name);
+		switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+		case freebob_stream_type_audio:
+			fprintf(fid_in[i], "Channel type: audio\n");
+			break;
+		case freebob_stream_type_midi:
+			fprintf(fid_in[i], "Channel type: midi\n");
+			break;
+		case freebob_stream_type_unknown:
+			fprintf(fid_in[i],"Channel type: unknown\n");
+			break;
+		default:
+		case freebob_stream_type_invalid:
+			fprintf(fid_in[i],"Channel type: invalid\n");
+			break;
+		}
+	}
+
+	freebob_streaming_start(dev);
+
+	fprintf(stderr,"Entering receive loop (%d,%d)\n",nb_in_channels,nb_out_channels);
+	while(run) {
+		retval = freebob_streaming_wait(dev);
+		if (retval < 0) {
+			fprintf(stderr,"Xrun\n");
+			freebob_streaming_reset(dev);
+			continue;
+		}
+
+// 		freebob_streaming_transfer_buffers(dev);
+		freebob_streaming_transfer_capture_buffers(dev);
+		freebob_streaming_transfer_playback_buffers(dev);
+		
+		nb_periods++;
+
+		if((nb_periods % 32)==0) {
+			fprintf(stderr,"\r%05d periods",nb_periods);
+		}
+
+		for(i=0;i<nb_in_channels;i++) {
+			switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+				samplesread=freebob_streaming_read(dev, i, audiobuffer[i], PERIOD_SIZE);
+				break;
+			case freebob_stream_type_midi:
+				samplesread=freebob_streaming_read(dev, i, audiobuffer[i], PERIOD_SIZE);
+				break;
+			}
+//   			fprintf(fid_in[i], "---- Period read  (%d samples) ----\n",samplesread);
+//   			hexDumpToFile(fid_in[i],(unsigned char*)audiobuffer[i],samplesread*sizeof(freebob_sample_t));
+		}
+
+		for(i=0;i<nb_out_channels;i++) {
+			freebob_sample_t *buff;
+			if (i<nb_in_channels) {
+				buff=audiobuffer[i];
+			} else {
+				buff=nullbuffer;
+			}
+			
+			switch (freebob_streaming_get_playback_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+				sampleswritten=freebob_streaming_write(dev, i, buff, PERIOD_SIZE);
+				break;
+			case freebob_stream_type_midi:
+				sampleswritten=freebob_streaming_write(dev, i, buff, PERIOD_SIZE);
+				break;
+			}
+//  			fprintf(fid_out[i], "---- Period write (%d samples) ----\n",sampleswritten);
+//  			hexDumpToFile(fid_out[i],(unsigned char*)buff,sampleswritten*sizeof(freebob_sample_t));
+		}
+
+	}
+
+	fprintf(stderr,"\n");
+
+	fprintf(stderr,"Exiting receive loop\n");
+	
+	freebob_streaming_stop(dev);
+
+	freebob_streaming_finish(dev);
+
+	for (i=0;i<nb_out_channels;i++) {
+		fclose(fid_out[i]);
+
+	}
+	for (i=0;i<nb_in_channels;i++) {
+		fclose(fid_in[i]);
+	}
+	
+	for (i=0;i<nb_in_channels;i++) {
+		free(audiobuffer[i]);
+	}
+	free(nullbuffer);
+	free(audiobuffer);
+
+  return EXIT_SUCCESS;
+}
Index: branches/freebob-syt-experiments/tests/streaming/teststreaming2.c
===================================================================
--- branches/freebob-syt-experiments/tests/streaming/teststreaming2.c (revision 194)
+++ branches/freebob-syt-experiments/tests/streaming/teststreaming2.c (revision 194)
@@ -0,0 +1,271 @@
+/***************************************************************************
+  Copyright (C) 2005 by Pieter Palmers   *
+                                                                       *
+  This program is free software; you can redistribute it and/or modify  *
+  it under the terms of the GNU General Public License as published by  *
+  the Free Software Foundation; either version 2 of the License, or     *
+  (at your option) any later version.                                   *
+                                                                        *
+  This program 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 General Public License     *
+  along with this program; if not, write to the                         *
+  Free Software Foundation, Inc.,                                       *
+  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+
+/**
+ * Test application for the direct decode stream API
+ * 
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <signal.h>
+
+#include "libfreebob/freebob_streaming.h"
+
+#include "debugtools.h"
+
+int run;
+
+static void sighandler (int sig)
+{
+	run = 0;
+}
+
+int main(int argc, char *argv[])
+{
+
+	#define PERIOD_SIZE 1024
+
+	int samplesread=0, sampleswritten=0;
+	int nb_in_channels=0, nb_out_channels=0;
+	int retval=0;
+	int i=0;
+
+	int nb_periods=0;
+
+	freebob_sample_t **audiobuffer;
+	freebob_sample_t *nullbuffer;
+	
+	run=1;
+
+	printf("Freebob streaming test application (2)\n");
+
+	signal (SIGINT, sighandler);
+	signal (SIGPIPE, sighandler);
+
+	freebob_device_info_t device_info;
+
+	freebob_options_t dev_options;
+
+	dev_options.sample_rate=44100;
+	dev_options.period_size=PERIOD_SIZE;
+
+	dev_options.nb_buffers=3;
+
+	dev_options.port=1;
+	dev_options.node_id=-1;
+	
+	dev_options.realtime=0;
+	dev_options.packetizer_priority=60;
+
+	freebob_device_t *dev=freebob_streaming_init(&device_info, dev_options);
+	if (!dev) {
+		fprintf(stderr,"Could not init Freebob Streaming layer\n");
+		exit(-1);
+	}
+
+	nb_in_channels=freebob_streaming_get_nb_capture_streams(dev);
+	nb_out_channels=freebob_streaming_get_nb_playback_streams(dev);
+
+	/* allocate intermediate buffers */
+	audiobuffer=calloc(nb_in_channels,sizeof(freebob_sample_t *));
+	for (i=0;i<nb_in_channels;i++) {
+		audiobuffer[i]=calloc(PERIOD_SIZE+1,sizeof(freebob_sample_t));
+			
+		switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+				/* assign the audiobuffer to the stream */
+				freebob_streaming_set_capture_stream_buffer(dev, i, (char *)(audiobuffer[i]), freebob_buffer_type_uint24);
+				break;
+				// this is done with read/write routines because the nb of bytes can differ.
+			case freebob_stream_type_midi:
+			default:
+				break;
+		}
+	}
+	
+	nullbuffer=calloc(PERIOD_SIZE+1,sizeof(freebob_sample_t));
+	
+// 	for (i=0;i<nb_out_channels;i++) {
+// 		switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+// 			case freebob_stream_type_audio:
+// 				if (i<nb_in_channels) {
+// 					/* assign the audiobuffer to the stream */
+// 					freebob_streaming_set_playback_stream_buffer(dev, i, (char *)audiobuffer[i], freebob_buffer_type_uint24);
+// 				} else {
+// 					freebob_streaming_set_playback_stream_buffer(dev, i, (char *)nullbuffer, freebob_buffer_type_uint24);	
+// 				}
+// 				break;
+// 				// this is done with read/write routines because the nb of bytes can differ.
+// 			case freebob_stream_type_midi:
+// 			default:
+// 				break;
+// 		}
+// 	}
+	
+	/* open the files to write to*/
+	FILE* fid_out[nb_out_channels];
+	FILE* fid_in[nb_in_channels];
+	char name[256];
+
+	for (i=0;i<nb_out_channels;i++) {
+		snprintf(name,sizeof(name),"out_ch_%02d",i);
+
+		fid_out[i]=fopen(name,"w");
+
+		freebob_streaming_get_playback_stream_name(dev,i,name,sizeof(name));
+		fprintf(fid_out[i],"Channel name: %s\n",name);
+		switch (freebob_streaming_get_playback_stream_type(dev,i)) {
+		case freebob_stream_type_audio:
+			fprintf(fid_out[i],"Channel type: audio\n");
+			break;
+		case freebob_stream_type_midi:
+			fprintf(fid_out[i],"Channel type: midi\n");
+			break;
+		case freebob_stream_type_unknown:
+			fprintf(fid_out[i],"Channel type: unknown\n");
+			break;
+		default:
+		case freebob_stream_type_invalid:
+			fprintf(fid_out[i],"Channel type: invalid\n");
+			break;
+		}
+
+	}
+	for (i=0;i<nb_in_channels;i++) {
+		snprintf(name,sizeof(name),"in_ch_%02d",i);
+		fid_in[i]=fopen(name,"w");
+
+		freebob_streaming_get_capture_stream_name(dev,i,name,sizeof(name));
+		fprintf(fid_in[i], "Channel name: %s\n",name);
+		switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+		case freebob_stream_type_audio:
+			fprintf(fid_in[i], "Channel type: audio\n");
+			break;
+		case freebob_stream_type_midi:
+			fprintf(fid_in[i], "Channel type: midi\n");
+			break;
+		case freebob_stream_type_unknown:
+			fprintf(fid_in[i],"Channel type: unknown\n");
+			break;
+		default:
+		case freebob_stream_type_invalid:
+			fprintf(fid_in[i],"Channel type: invalid\n");
+			break;
+		}
+	}
+
+	// start the streaming layer
+	freebob_streaming_start(dev);
+
+	fprintf(stderr,"Entering receive loop (%d,%d)\n",nb_in_channels,nb_out_channels);
+	while(run) {
+		retval = freebob_streaming_wait(dev);
+		if (retval < 0) {
+			fprintf(stderr,"Xrun\n");
+			freebob_streaming_reset(dev);
+			continue;
+		}
+		
+		for (i=0;i<nb_in_channels;i++) {
+			memset(audiobuffer[i],0xCC,(PERIOD_SIZE+1)*sizeof(freebob_sample_t));
+		}
+
+// 		freebob_streaming_transfer_buffers(dev);
+		freebob_streaming_transfer_capture_buffers(dev);
+		freebob_streaming_transfer_playback_buffers(dev);
+		
+		nb_periods++;
+
+		if((nb_periods % 32)==0) {
+			fprintf(stderr,"\r%05d periods",nb_periods);
+		}
+
+		for(i=0;i<nb_in_channels;i++) {
+			
+			
+			switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+				// no need to get the buffers manually, we have set the API internal buffers to the audiobuffer[i]'s
+// 				//samplesread=freebob_streaming_read(dev, i, audiobuffer[i], PERIOD_SIZE);
+				samplesread=PERIOD_SIZE;
+				break;
+			case freebob_stream_type_midi:
+				samplesread=freebob_streaming_read(dev, i, audiobuffer[i], PERIOD_SIZE);
+				break;
+			}
+	
+/* 			fprintf(fid_in[i], "---- Period read  (%d samples) ----\n",samplesread);
+ 			hexDumpToFile(fid_in[i],(unsigned char*)audiobuffer[i],samplesread*sizeof(freebob_sample_t)+1);*/
+		}
+
+		for(i=0;i<nb_out_channels;i++) {
+			freebob_sample_t *buff;
+			if (i<nb_in_channels) {
+				buff=audiobuffer[i];
+			} else {
+				buff=nullbuffer;
+			}
+			
+			switch (freebob_streaming_get_playback_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+ 				sampleswritten=freebob_streaming_write(dev, i, buff, PERIOD_SIZE);
+//				sampleswritten=PERIOD_SIZE;
+				break;
+			case freebob_stream_type_midi:
+				sampleswritten=freebob_streaming_write(dev, i, buff, PERIOD_SIZE);
+				break;
+			}
+//  			fprintf(fid_out[i], "---- Period write (%d samples) ----\n",sampleswritten);
+//  			hexDumpToFile(fid_out[i],(unsigned char*)buff,sampleswritten*sizeof(freebob_sample_t));
+		}
+
+	}
+
+	fprintf(stderr,"\n");
+
+	fprintf(stderr,"Exiting receive loop\n");
+	
+	freebob_streaming_stop(dev);
+
+	freebob_streaming_finish(dev);
+
+	for (i=0;i<nb_out_channels;i++) {
+		fclose(fid_out[i]);
+
+	}
+	for (i=0;i<nb_in_channels;i++) {
+		fclose(fid_in[i]);
+	}
+	
+	for (i=0;i<nb_in_channels;i++) {
+		free(audiobuffer[i]);
+	}
+	free(nullbuffer);
+	free(audiobuffer);
+
+  return EXIT_SUCCESS;
+}
Index: branches/freebob-syt-experiments/tests/streaming/debugtools.h
===================================================================
--- branches/freebob-syt-experiments/tests/streaming/debugtools.h (revision 159)
+++ branches/freebob-syt-experiments/tests/streaming/debugtools.h (revision 159)
@@ -0,0 +1,18 @@
+#ifndef DEBUG_TOOLS_H
+#define DEBUG_TOOLS_H
+#include <libfreebob/freebob.h>
+#include <libraw1394/raw1394.h>
+#include <libiec61883/iec61883.h>
+#include <stdio.h>
+////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
+
+unsigned char toAscii( unsigned char c );
+
+void quadlet2char( quadlet_t quadlet, unsigned char* buff );
+
+void hexDump( unsigned char *data_start, unsigned int length );
+void hexDumpToFile( FILE* fid, unsigned char *data_start, unsigned int length );
+void hexDumpQuadlets( quadlet_t *data, unsigned int length );
+
+#endif
Index: branches/freebob-syt-experiments/tests/streaming/teststreaming3.c
===================================================================
--- branches/freebob-syt-experiments/tests/streaming/teststreaming3.c (revision 194)
+++ branches/freebob-syt-experiments/tests/streaming/teststreaming3.c (revision 194)
@@ -0,0 +1,274 @@
+/***************************************************************************
+  Copyright (C) 2005 by Pieter Palmers   *
+                                                                       *
+  This program is free software; you can redistribute it and/or modify  *
+  it under the terms of the GNU General Public License as published by  *
+  the Free Software Foundation; either version 2 of the License, or     *
+  (at your option) any later version.                                   *
+                                                                        *
+  This program 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 General Public License     *
+  along with this program; if not, write to the                         *
+  Free Software Foundation, Inc.,                                       *
+  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+
+/**
+ * Test application for the direct decode stream API
+ * for floating point use
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <signal.h>
+
+#include "libfreebob/freebob_streaming.h"
+
+#include "debugtools.h"
+
+int run;
+
+static void sighandler (int sig)
+{
+	run = 0;
+}
+
+int main(int argc, char *argv[])
+{
+
+	#define PERIOD_SIZE 256
+
+	int samplesread=0;
+// 	int sampleswritten=0;
+	int nb_in_channels=0, nb_out_channels=0;
+	int retval=0;
+	int i=0;
+
+	int nb_periods=0;
+
+	float **audiobuffers_in;
+	freebob_sample_t **audiobuffers_out;
+	freebob_sample_t *nullbuffer;
+	
+	run=1;
+
+	printf("Freebob streaming test application (3)\n");
+
+	signal (SIGINT, sighandler);
+	signal (SIGPIPE, sighandler);
+
+	freebob_device_info_t device_info;
+
+	freebob_options_t dev_options;
+
+	dev_options.sample_rate=44100;
+	dev_options.period_size=PERIOD_SIZE;
+
+	dev_options.nb_buffers=3;
+
+	dev_options.port=0;
+	dev_options.node_id=-1;
+
+	dev_options.realtime=1;
+	dev_options.packetizer_priority=70;
+	
+	freebob_device_t *dev=freebob_streaming_init(&device_info, dev_options);
+	if (!dev) {
+		fprintf(stderr,"Could not init Freebob Streaming layer\n");
+		exit(-1);
+	}
+
+	nb_in_channels=freebob_streaming_get_nb_capture_streams(dev);
+	nb_out_channels=freebob_streaming_get_nb_playback_streams(dev);
+
+	/* allocate intermediate buffers */
+	audiobuffers_in=calloc(nb_in_channels,sizeof(float *));
+	audiobuffers_out=calloc(nb_in_channels,sizeof(freebob_sample_t));
+	for (i=0;i<nb_in_channels;i++) {
+		audiobuffers_in[i]=calloc(PERIOD_SIZE+1,sizeof(float));
+		audiobuffers_out[i]=calloc(PERIOD_SIZE+1,sizeof(freebob_sample_t));
+			
+		switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+				/* assign the audiobuffer to the stream */
+				freebob_streaming_set_capture_stream_buffer(dev, i, (char *)(audiobuffers_in[i]), freebob_buffer_type_float);
+				break;
+				// this is done with read/write routines because the nb of bytes can differ.
+			case freebob_stream_type_midi:
+			default:
+				break;
+		}
+	}
+	
+	nullbuffer=calloc(PERIOD_SIZE+1,sizeof(freebob_sample_t));
+	
+	for (i=0;i<nb_out_channels;i++) {
+		switch (freebob_streaming_get_playback_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+				if (i<nb_in_channels) {
+					/* assign the audiobuffer to the stream */
+					freebob_streaming_set_playback_stream_buffer(dev, i, (char *)audiobuffers_in[i], freebob_buffer_type_float);
+				} else {
+					freebob_streaming_set_playback_stream_buffer(dev, i, (char *)nullbuffer, freebob_buffer_type_uint24);	
+				}
+				break;
+				// this is done with read/write routines because the nb of bytes can differ.
+			case freebob_stream_type_midi:
+			default:
+				break;
+		}
+	}
+	
+	/* open the files to write to*/
+	FILE* fid_out[nb_out_channels];
+	FILE* fid_in[nb_in_channels];
+	char name[256];
+
+	for (i=0;i<nb_out_channels;i++) {
+		snprintf(name,sizeof(name),"out_ch_%02d",i);
+
+		fid_out[i]=fopen(name,"w");
+
+		freebob_streaming_get_playback_stream_name(dev,i,name,sizeof(name));
+		fprintf(fid_out[i],"Channel name: %s\n",name);
+		switch (freebob_streaming_get_playback_stream_type(dev,i)) {
+		case freebob_stream_type_audio:
+			fprintf(fid_out[i],"Channel type: audio\n");
+			break;
+		case freebob_stream_type_midi:
+			fprintf(fid_out[i],"Channel type: midi\n");
+			break;
+		case freebob_stream_type_unknown:
+			fprintf(fid_out[i],"Channel type: unknown\n");
+			break;
+		default:
+		case freebob_stream_type_invalid:
+			fprintf(fid_out[i],"Channel type: invalid\n");
+			break;
+		}
+
+	}
+	for (i=0;i<nb_in_channels;i++) {
+		snprintf(name,sizeof(name),"in_ch_%02d",i);
+		fid_in[i]=fopen(name,"w");
+
+		freebob_streaming_get_capture_stream_name(dev,i,name,sizeof(name));
+		fprintf(fid_in[i], "Channel name: %s\n");
+		switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+		case freebob_stream_type_audio:
+			fprintf(fid_in[i], "Channel type: audio\n");
+			break;
+		case freebob_stream_type_midi:
+			fprintf(fid_in[i], "Channel type: midi\n");
+			break;
+		case freebob_stream_type_unknown:
+			fprintf(fid_in[i],"Channel type: unknown\n");
+			break;
+		default:
+		case freebob_stream_type_invalid:
+			fprintf(fid_in[i],"Channel type: invalid\n");
+			break;
+		}
+	}
+
+	// start the streaming layer
+	freebob_streaming_start(dev);
+
+	fprintf(stderr,"Entering receive loop (%d,%d)\n",nb_in_channels,nb_out_channels);
+	while(run) {
+		retval = freebob_streaming_wait(dev);
+		if (retval < 0) {
+			fprintf(stderr,"Xrun\n");
+			freebob_streaming_reset(dev);
+			continue;
+		}
+		
+// 		freebob_streaming_transfer_buffers(dev);
+		freebob_streaming_transfer_capture_buffers(dev);
+		freebob_streaming_transfer_playback_buffers(dev);
+		
+		nb_periods++;
+
+		if((nb_periods % 32)==0) {
+// 			fprintf(stderr,"\r%05d periods",nb_periods);
+		}
+
+		for(i=0;i<nb_in_channels;i++) {
+			
+			
+			switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+				// no need to get the buffers manually, we have set the API internal buffers to the audiobuffer[i]'s
+// 				//samplesread=freebob_streaming_read(dev, i, audiobuffer[i], PERIOD_SIZE);
+				samplesread=PERIOD_SIZE;
+				break;
+			case freebob_stream_type_midi:
+				samplesread=freebob_streaming_read(dev, i, audiobuffers_out[i], PERIOD_SIZE);
+				break;
+			}
+	
+//   			fprintf(fid_in[i], "---- Period read  (%d samples) ----\n",samplesread);
+//   			hexDumpToFile(fid_in[i],(unsigned char*)audiobuffers_in[i],samplesread*sizeof(float)+1);
+		}
+
+		for(i=0;i<nb_out_channels;i++) {
+			freebob_sample_t *buff;
+			int sampleswritten=0;
+			if (i<nb_in_channels) {
+				buff=audiobuffers_out[i];
+			} else {
+				buff=nullbuffer;
+			}
+			
+			switch (freebob_streaming_get_playback_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+//  				sampleswritten=freebob_streaming_write(dev, i, buff, PERIOD_SIZE);
+				sampleswritten=PERIOD_SIZE;
+				break;
+			case freebob_stream_type_midi:
+// 				sampleswritten=freebob_streaming_write(dev, i, buff, PERIOD_SIZE);
+				break;
+			}
+//   			fprintf(fid_out[i], "---- Period write (%d samples) ----\n",sampleswritten);
+//   			hexDumpToFile(fid_out[i],(unsigned char*)buff,sampleswritten*sizeof(freebob_sample_t));
+		}
+
+	}
+
+	fprintf(stderr,"\n");
+
+	fprintf(stderr,"Exiting receive loop\n");
+	
+	freebob_streaming_stop(dev);
+
+	freebob_streaming_finish(dev);
+
+	for (i=0;i<nb_out_channels;i++) {
+		fclose(fid_out[i]);
+
+	}
+	for (i=0;i<nb_in_channels;i++) {
+		fclose(fid_in[i]);
+	}
+	
+	for (i=0;i<nb_in_channels;i++) {
+		free(audiobuffers_in[i]);
+		free(audiobuffers_out[i]);
+	}
+	free(nullbuffer);
+	free(audiobuffers_in);
+	free(audiobuffers_out);
+
+  return EXIT_SUCCESS;
+}
Index: branches/freebob-syt-experiments/tests/streaming/testmidistreaming1.c
===================================================================
--- branches/freebob-syt-experiments/tests/streaming/testmidistreaming1.c (revision 194)
+++ branches/freebob-syt-experiments/tests/streaming/testmidistreaming1.c (revision 194)
@@ -0,0 +1,470 @@
+/***************************************************************************
+  Copyright (C) 2005 by Pieter Palmers   *
+                                                                       *
+  This program is free software; you can redistribute it and/or modify  *
+  it under the terms of the GNU General Public License as published by  *
+  the Free Software Foundation; either version 2 of the License, or     *
+  (at your option) any later version.                                   *
+                                                                        *
+  This program 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 General Public License     *
+  along with this program; if not, write to the                         *
+  Free Software Foundation, Inc.,                                       *
+  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+
+/**
+ * Test application for the direct decode stream API
+ * for floating point use
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <signal.h>
+#include <libiec61883/iec61883.h>
+#include <stdio.h>
+#include <sys/select.h>
+#include <signal.h>
+#include <string.h>
+#include <stdlib.h>
+#include <alsa/asoundlib.h>
+
+#include "libfreebob/freebob_streaming.h"
+
+#include "debugtools.h"
+#define IEC61883_AM824_LABEL_MIDI_NO_DATA 0x80 
+#define IEC61883_AM824_LABEL_MIDI_1X      0x81 
+#define IEC61883_AM824_LABEL_MIDI_2X      0x82
+#define IEC61883_AM824_LABEL_MIDI_3X      0x83
+	
+#define ALSA_SEQ_BUFF_SIZE 1024
+#define MAX_MIDI_PORTS   20
+#define MIDI_TRANSMIT_BUFFER_SIZE 1024
+
+int run;
+
+static void sighandler (int sig)
+{
+	run = 0;
+}
+
+typedef struct {
+	int seq_port_nr;
+	snd_midi_event_t *parser;
+	snd_seq_t *seq_handle;
+} freebob_midi_port_t;
+
+typedef struct {
+	snd_seq_t *seq_handle;
+	int nb_seq_ports;
+	freebob_midi_port_t *ports[MAX_MIDI_PORTS];
+} freebob_midi_ports_t;
+
+int open_seq(snd_seq_t **seq_handle, int in_ports[], int out_ports[], int num_in, int num_out);
+
+/* Open ALSA sequencer with num_in writeable ports and num_out readable ports. */
+/* The sequencer handle and the port IDs are returned.                        */  
+int open_seq(snd_seq_t **seq_handle, int in_ports[], int out_ports[], int num_in, int num_out) {
+
+	int l1;
+	char portname[64];
+
+	if (snd_seq_open(seq_handle, "default", SND_SEQ_OPEN_DUPLEX, SND_SEQ_NONBLOCK) < 0) {
+		fprintf(stderr, "Error opening ALSA sequencer.\n");
+		return(-1);
+	}
+	
+	snd_seq_set_client_name(*seq_handle, "FreeBob MIDI I/O test");
+	
+	for (l1 = 0; l1 < num_in; l1++) {
+		sprintf(portname, "MIDI OUT %d", l1);
+		if ((in_ports[l1] = snd_seq_create_simple_port(*seq_handle, portname,
+			 SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_WRITE,
+			 SND_SEQ_PORT_TYPE_MIDI_GENERIC)) < 0) {
+				 fprintf(stderr, "Error creating sequencer port.\n");
+				 return(-1);
+			 }
+	}
+	for (l1 = 0; l1 < num_out; l1++) {
+		sprintf(portname, "MIDI IN %d", l1);
+		if ((out_ports[l1] = snd_seq_create_simple_port(*seq_handle, portname,
+			 SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ,
+			 SND_SEQ_PORT_TYPE_MIDI_GENERIC)) < 0) {
+				 fprintf(stderr, "Error creating sequencer port.\n");
+				 return(-1);
+			 }
+	}
+	return(0);
+}
+
+void decode_midi_byte (freebob_midi_port_t *port, int byte) {
+	snd_seq_event_t ev;
+	if ((snd_midi_event_encode_byte(port->parser,byte, &ev)) > 0) {
+// 		printf("message ok, sending it to %d\n", port->seq_port_nr);
+		// a midi message is complete, send it out to ALSA
+		snd_seq_ev_set_subs(&ev);  
+		snd_seq_ev_set_direct(&ev);
+		snd_seq_ev_set_source(&ev, port->seq_port_nr);
+		snd_seq_event_output_direct(port->seq_handle, &ev);						
+	}	else {
+		
+	}
+}
+
+int encode_midi_bytes(freebob_midi_port_t *port, unsigned char *byte_buff, int len) {
+	return 0;
+}
+
+int main(int argc, char *argv[])
+{
+
+	#define PERIOD_SIZE 512
+
+	int samplesread=0, sampleswritten=0;
+	int nb_in_channels=0, nb_out_channels=0;
+	int retval=0;
+	int i=0;
+
+	int nb_periods=0;
+
+	freebob_sample_t **audiobuffers_in;
+	freebob_sample_t **audiobuffers_out;
+	freebob_sample_t *nullbuffer;
+	
+	run=1;
+
+	printf("Freebob MIDI streaming test application (1)\n");
+
+	signal (SIGINT, sighandler);
+	signal (SIGPIPE, sighandler);
+
+	freebob_device_info_t device_info;
+
+	freebob_options_t dev_options;
+
+	dev_options.sample_rate=-1; // -1 = detect from discovery
+	dev_options.period_size=PERIOD_SIZE;
+
+	dev_options.nb_buffers=3;
+
+	dev_options.port=1;
+	dev_options.node_id=-1;
+	
+	dev_options.realtime=0;
+	dev_options.packetizer_priority=60;
+	
+	freebob_device_t *dev=freebob_streaming_init(&device_info, dev_options);
+	if (!dev) {
+		fprintf(stderr,"Could not init Freebob Streaming layer\n");
+		exit(-1);
+	}
+
+	nb_in_channels=freebob_streaming_get_nb_capture_streams(dev);
+	nb_out_channels=freebob_streaming_get_nb_playback_streams(dev);
+
+	int midi_in_nbchannels=0;
+	int midi_out_nbchannels=0;
+	
+	/* allocate intermediate buffers */
+	audiobuffers_in=calloc(nb_in_channels,sizeof(freebob_sample_t *));
+	audiobuffers_out=calloc(nb_in_channels,sizeof(freebob_sample_t));
+	for (i=0;i<nb_in_channels;i++) {
+		audiobuffers_in[i]=calloc(PERIOD_SIZE+1,sizeof(freebob_sample_t));
+		audiobuffers_out[i]=calloc(PERIOD_SIZE+1,sizeof(freebob_sample_t));
+			
+		switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+				/* assign the audiobuffer to the stream */
+				freebob_streaming_set_capture_stream_buffer(dev, i, (char *)(audiobuffers_in[i]), freebob_buffer_type_float);
+				break;
+				
+			// this is done with read/write routines because the nb of bytes can differ.
+			case freebob_stream_type_midi:
+				midi_in_nbchannels++;
+			default:
+				break;
+		}
+	}
+	
+	nullbuffer=calloc(PERIOD_SIZE+1,sizeof(freebob_sample_t));
+	
+	for (i=0;i<nb_out_channels;i++) {
+		switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+				if (i<nb_in_channels) {
+					/* assign the audiobuffer to the stream */
+					freebob_streaming_set_playback_stream_buffer(dev, i, (char *)audiobuffers_in[i], freebob_buffer_type_float);
+				} else {
+					freebob_streaming_set_playback_stream_buffer(dev, i, (char *)nullbuffer, freebob_buffer_type_uint24);	
+				}
+				break;
+				// this is done with read/write routines because the nb of bytes can differ.
+			case freebob_stream_type_midi:
+				midi_out_nbchannels++;
+			default:
+				break;
+		}
+	}
+	
+	/* open the files to write to*/
+	FILE* fid_out[nb_out_channels];
+	FILE* fid_in[nb_in_channels];
+	char name[256];
+
+	for (i=0;i<nb_out_channels;i++) {
+		snprintf(name,sizeof(name),"out_ch_%02d",i);
+
+		fid_out[i]=fopen(name,"w");
+
+		freebob_streaming_get_playback_stream_name(dev,i,name,sizeof(name));
+		fprintf(fid_out[i],"Channel name: %s\n",name);
+		switch (freebob_streaming_get_playback_stream_type(dev,i)) {
+		case freebob_stream_type_audio:
+			fprintf(fid_out[i],"Channel type: audio\n");
+			break;
+		case freebob_stream_type_midi:
+			fprintf(fid_out[i],"Channel type: midi\n");
+			break;
+		case freebob_stream_type_unknown:
+			fprintf(fid_out[i],"Channel type: unknown\n");
+			break;
+		default:
+		case freebob_stream_type_invalid:
+			fprintf(fid_out[i],"Channel type: invalid\n");
+			break;
+		}
+
+	}
+	for (i=0;i<nb_in_channels;i++) {
+		snprintf(name,sizeof(name),"in_ch_%02d",i);
+		fid_in[i]=fopen(name,"w");
+
+		freebob_streaming_get_capture_stream_name(dev,i,name,sizeof(name));
+		fprintf(fid_in[i], "Channel name: %s\n");
+		switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+		case freebob_stream_type_audio:
+			fprintf(fid_in[i], "Channel type: audio\n");
+			break;
+		case freebob_stream_type_midi:
+			fprintf(fid_in[i], "Channel type: midi\n");
+			break;
+		case freebob_stream_type_unknown:
+			fprintf(fid_in[i],"Channel type: unknown\n");
+			break;
+		default:
+		case freebob_stream_type_invalid:
+			fprintf(fid_in[i],"Channel type: invalid\n");
+			break;
+		}
+	}
+
+	// setup the ALSA midi seq clients
+	snd_seq_t *seq_handle;
+	int in_ports[midi_in_nbchannels], out_ports[midi_out_nbchannels];
+	
+    // open sequencer
+	// the number of midi ports is statically set to 2
+	if (open_seq(&seq_handle, in_ports, out_ports, midi_in_nbchannels, midi_out_nbchannels) < 0) {
+		fprintf(stderr, "ALSA Error.\n");
+		exit(1);
+	}
+
+	freebob_midi_port_t* midi_out_portmap[nb_out_channels];
+	freebob_midi_port_t* midi_in_portmap[nb_in_channels];
+	
+	int cnt=0;
+	
+	for (i=0;i<nb_out_channels;i++) {
+		freebob_midi_port_t *midi_out_port;
+		switch (freebob_streaming_get_playback_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+				midi_out_portmap[i]=NULL;
+				break;
+			case freebob_stream_type_midi:
+				midi_out_port=malloc(sizeof(freebob_midi_port_t));
+				if(!midi_out_port) {
+					fprintf(stderr, "Could not allocate memory for MIDI OUT port %d\n",i);
+					exit(1); // this could be/is a memory leak, I know...
+				} else {
+					midi_out_port->seq_port_nr=in_ports[cnt++];
+					midi_out_port->seq_handle=seq_handle;
+					if (snd_midi_event_new  ( ALSA_SEQ_BUFF_SIZE, &(midi_out_port->parser)) < 0) {
+						fprintf(stderr, "ALSA Error: could not init parser for MIDI OUT port %d\n",i);
+						exit(1); // this too
+					}   
+					midi_out_portmap[i]=midi_out_port;
+				}
+				break;
+		}
+	}
+	
+	cnt=0;
+	for (i=0;i<nb_in_channels;i++) {
+		freebob_midi_port_t *midi_in_port;
+		switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+				midi_in_portmap[i]=NULL;
+				break;
+			case freebob_stream_type_midi:
+		
+				midi_in_port=malloc(sizeof(freebob_midi_port_t));
+				if(!midi_in_port) {
+					fprintf(stderr, "Could not allocate memory for MIDI IN port %d\n",i);
+					exit(1); // this could be/is a memory leak, I know...
+				} else {
+					midi_in_port->seq_port_nr=out_ports[cnt++];
+					midi_in_port->seq_handle=seq_handle;
+			
+					if (snd_midi_event_new  ( ALSA_SEQ_BUFF_SIZE, &(midi_in_port->parser)) < 0) {
+						fprintf(stderr, "ALSA Error: could not init parser for MIDI IN port %d\n",i);
+						exit(1); // this too
+					}   
+					midi_in_portmap[i]=midi_in_port;
+				}
+			break;
+		}
+	}	
+	
+	// start the streaming layer
+	freebob_streaming_start(dev);
+
+	fprintf(stderr,"Entering receive loop (%d,%d)\n",nb_in_channels,nb_out_channels);
+	while(run) {
+		retval = freebob_streaming_wait(dev);
+		if (retval < 0) {
+			fprintf(stderr,"Xrun\n");
+			freebob_streaming_reset(dev);
+			continue;
+		}
+		
+// 		freebob_streaming_transfer_buffers(dev);
+		freebob_streaming_transfer_capture_buffers(dev);
+		freebob_streaming_transfer_playback_buffers(dev);
+		
+		nb_periods++;
+
+		if((nb_periods % 32)==0) {
+// 			fprintf(stderr,"\r%05d periods",nb_periods);
+		}
+
+		for(i=0;i<nb_in_channels;i++) {
+			int s;
+			
+			switch (freebob_streaming_get_capture_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+				// no need to get the buffers manually, we have set the API internal buffers to the audiobuffer[i]'s
+// 				//samplesread=freebob_streaming_read(dev, i, audiobuffer[i], PERIOD_SIZE);
+				samplesread=PERIOD_SIZE;
+				break;
+			case freebob_stream_type_midi:
+				samplesread=freebob_streaming_read(dev, i, audiobuffers_in[i], PERIOD_SIZE);
+				quadlet_t *buff=(quadlet_t *)audiobuffers_in[i];
+				for (s=0;s<samplesread;s++) {
+					quadlet_t *byte=(buff+s) ;
+//  					printf("%08X ",*byte);
+					decode_midi_byte (midi_in_portmap[i], (*byte) & 0xFF);
+				}
+				if(samplesread>0) {
+	   				fprintf(fid_in[i], "---- Period read (%d samples) ----\n",samplesread);
+					hexDumpToFile(fid_in[i],(unsigned char*)audiobuffers_in[i],samplesread*sizeof(freebob_sample_t));
+				}
+				break;
+			}
+//   			fprintf(fid_in[i], "---- Period read (%d samples) ----\n",samplesread);
+//   			hexDumpToFile(fid_in[i],(unsigned char*)buff,samplesread*sizeof(freebob_sample_t));
+	
+		}
+
+		for(i=0;i<nb_out_channels;i++) {
+			freebob_sample_t *buff;
+			int b=0;
+			unsigned char* byte_buff;
+			
+			if (i<nb_in_channels) {
+				buff=audiobuffers_out[i];
+			} else {
+				buff=nullbuffer;
+			}
+			
+			switch (freebob_streaming_get_playback_stream_type(dev,i)) {
+			case freebob_stream_type_audio:
+//  				sampleswritten=freebob_streaming_write(dev, i, buff, PERIOD_SIZE);
+//				sampleswritten=PERIOD_SIZE;
+				break;
+			case freebob_stream_type_midi:
+				
+				#define max_midi_bytes_to_write PERIOD_SIZE/8
+				byte_buff=(unsigned char*)buff;
+				
+				sampleswritten=encode_midi_bytes(midi_out_portmap[i], byte_buff, max_midi_bytes_to_write);
+				
+				for(b=0;b<sampleswritten;b++) {
+					freebob_sample_t tmp_event=*(byte_buff+b);
+					freebob_streaming_write(dev, i, &tmp_event, 1);
+				}
+				
+				
+				fprintf(fid_out[i], "---- Period write (%d samples) ----\n",sampleswritten);
+				hexDumpToFile(fid_out[i],(unsigned char*)buff,sampleswritten*sizeof(freebob_sample_t));
+				break;
+			}
+		}
+
+	}
+
+	fprintf(stderr,"\n");
+
+	fprintf(stderr,"Exiting receive loop\n");
+	
+	freebob_streaming_stop(dev);
+
+	freebob_streaming_finish(dev);
+
+	for (i=0;i<nb_out_channels;i++) {
+		fclose(fid_out[i]);
+
+	}
+	for (i=0;i<nb_in_channels;i++) {
+		fclose(fid_in[i]);
+	}
+	
+	for (i=0;i<nb_in_channels;i++) {
+		free(audiobuffers_in[i]);
+		free(audiobuffers_out[i]);
+	}
+	free(nullbuffer);
+	free(audiobuffers_in);
+	free(audiobuffers_out);
+	
+	// free the MIDI to seq parsers and port structures
+	for(i=0;i<midi_in_nbchannels;i++) {
+		freebob_midi_port_t *midi_in_port=midi_in_portmap[i];
+		
+		if(midi_in_port) {
+			snd_midi_event_free  (  midi_in_port->parser );
+			free(midi_in_port);
+		}
+	}
+	// free the MIDI to seq parsers and port structures
+	for(i=0;i<midi_out_nbchannels;i++) {
+		freebob_midi_port_t *midi_out_port=midi_out_portmap[i];
+
+		if(midi_out_port) {
+			snd_midi_event_free  (  midi_out_port->parser );
+			free(midi_out_port);
+		}
+	}
+
+  return EXIT_SUCCESS;
+}
Index: branches/freebob-syt-experiments/tests/test-extplugcmd.cpp
===================================================================
--- branches/freebob-syt-experiments/tests/test-extplugcmd.cpp (revision 155)
+++ branches/freebob-syt-experiments/tests/test-extplugcmd.cpp (revision 155)
@@ -0,0 +1,218 @@
+/* test-extplugcmd.cpp
+ * Copyright (C) 2005,06 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "libfreebobavc/avc_extended_plug_info.h"
+#include "libfreebobavc/avc_plug_info.h"
+#include "libfreebobavc/serialize.h"
+#include "libfreebobavc/ieee1394service.h"
+
+#include <argp.h>
+
+using namespace std;
+
+////////////////////////////////////////////////
+// arg parsing
+////////////////////////////////////////////////
+const char *argp_program_version = "test-extplugcmd 0.2";
+const char *argp_program_bug_address = "<freebob-devel@lists.sf.net>";
+static char doc[] = "test-extplugcmd -- tests some extended plug info commands on a BeBoB device";
+static char args_doc[] = "NODE_ID";
+static struct argp_option options[] = {
+    {"verbose",   'v', 0,           0,  "Produce verbose output" },
+    {"port",      'p', "PORT",      0,  "Set port" },
+   { 0 }
+};
+
+struct arguments
+{
+    arguments()
+        : verbose( false )
+        , test( false )
+        , port( 0 )
+        {
+            args[0] = 0;
+        }
+
+    char* args[1];
+    bool  verbose;
+    bool  test;
+    int   port;
+} arguments;
+
+// Parse a single option.
+static error_t
+parse_opt( int key, char* arg, struct argp_state* state )
+{
+    // Get the input argument from `argp_parse', which we
+    // know is a pointer to our arguments structure.
+    struct arguments* arguments = ( struct arguments* ) state->input;
+
+    char* tail;
+    switch (key) {
+    case 'v':
+        arguments->verbose = true;
+        break;
+    case 't':
+        arguments->test = true;
+        break;
+    case 'p':
+        errno = 0;
+        arguments->port = strtol(arg, &tail, 0);
+        if (errno) {
+            perror("argument parsing failed:");
+            return errno;
+        }
+        break;
+    case ARGP_KEY_ARG:
+        if (state->arg_num >= 1) {
+            // Too many arguments.
+            argp_usage (state);
+        }
+        arguments->args[state->arg_num] = arg;
+        break;
+    case ARGP_KEY_END:
+        if (state->arg_num < 1) {
+            // Not enough arguments.
+            argp_usage (state);
+        }
+        break;
+    default:
+        return ARGP_ERR_UNKNOWN;
+    }
+    return 0;
+}
+
+static struct argp argp = { options, parse_opt, args_doc, doc };
+
+////////////////////////////////////////
+// Application
+////////////////////////////////////////
+
+bool
+doPlugType( Ieee1394Service& ieee1394service, int node_id )
+{
+    ExtendedPlugInfoCmd extPlugInfoCmd( &ieee1394service );
+    UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR, 0 );
+    extPlugInfoCmd.setPlugAddress( PlugAddress( PlugAddress::ePD_Input,
+                                                PlugAddress::ePAM_Unit,
+                                                unitPlugAddress ) );
+    extPlugInfoCmd.setNodeId( node_id );
+    extPlugInfoCmd.setCommandType( AVCCommand::eCT_Status );
+    extPlugInfoCmd.setVerbose( arguments.verbose );
+    ExtendedPlugInfoInfoType extendedPlugInfoInfoType( ExtendedPlugInfoInfoType::eIT_PlugType );
+    extendedPlugInfoInfoType.initialize();
+    extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+
+    if ( extPlugInfoCmd.fire() ) {
+        CoutSerializer se;
+        extPlugInfoCmd.serialize( se );
+    }
+
+    ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+    if ( infoType
+         && infoType->m_plugType )
+    {
+            plug_type_t plugType = infoType->m_plugType->m_plugType;
+
+            printf( "iso input plug %d is of type %d (%s)\n",
+                    0,
+                    plugType,
+                    extendedPlugInfoPlugTypeToString( plugType ) );
+    } else {
+        fprintf( stderr, "Not plug name specific data found\n" );
+        return false;
+    }
+
+    return true;
+}
+
+
+bool
+doPlugName( Ieee1394Service& ieee1394service, int node_id )
+{
+    ExtendedPlugInfoCmd extPlugInfoCmd( &ieee1394service );
+    UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR, 0 );
+    extPlugInfoCmd.setPlugAddress( PlugAddress( PlugAddress::ePD_Input,
+                                                PlugAddress::ePAM_Unit,
+                                                unitPlugAddress ) );
+    extPlugInfoCmd.setNodeId( node_id );
+    extPlugInfoCmd.setCommandType( AVCCommand::eCT_Status );
+    extPlugInfoCmd.setVerbose( arguments.verbose );
+    ExtendedPlugInfoInfoType extendedPlugInfoInfoType( ExtendedPlugInfoInfoType::eIT_PlugName );
+    extendedPlugInfoInfoType.initialize();
+    extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+
+    if ( extPlugInfoCmd.fire() ) {
+        CoutSerializer se;
+        extPlugInfoCmd.serialize( se );
+    }
+
+    ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+    if ( infoType
+         && infoType->m_plugName )
+    {
+        printf( "iso input plug %d has name '%s'\n",
+                0,
+               infoType->m_plugName->m_name.c_str() );
+    } else {
+        fprintf( stderr, "Not plug name specific data found\n" );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+doApp(Ieee1394Service& ieee1394service, int node_id )
+{
+    bool success;
+
+    success = doPlugType( ieee1394service, node_id );
+    success &= doPlugName( ieee1394service, node_id );
+
+    return success;
+}
+
+///////////////////////////
+// main
+//////////////////////////
+int
+main(int argc, char **argv)
+{
+    // arg parsing
+    argp_parse (&argp, argc, argv, 0, 0, &arguments);
+
+    errno = 0;
+    char* tail;
+    int node_id = strtol(arguments.args[0], &tail, 0);
+    if (errno) {
+	perror("argument parsing failed:");
+	return -1;
+    }
+    Ieee1394Service ieee1394service;
+    if ( !ieee1394service.initialize( arguments.port ) ) {
+        fprintf( stderr, "could not set port on ieee1394service\n" );
+        return -1;
+    }
+
+    doApp( ieee1394service, node_id );
+
+    return 0;
+}
Index: branches/freebob-syt-experiments/tests/.cvsignore
===================================================================
--- branches/freebob-syt-experiments/tests/.cvsignore (revision 134)
+++ branches/freebob-syt-experiments/tests/.cvsignore (revision 134)
@@ -0,0 +1,9 @@
+.cvsignore
+Makefile
+Makefile.in
+.deps
+.libs
+*.lo
+*.la
+test-extplugcmd
+test-freebob
Index: branches/freebob-syt-experiments/configure.ac
===================================================================
--- branches/freebob-syt-experiments/configure.ac (revision 194)
+++ branches/freebob-syt-experiments/configure.ac (revision 194)
@@ -0,0 +1,255 @@
+# configure.ac - Configure script for FreeBob.
+# Copyright (C) 2005,06 by Daniel Wagner.
+# Copyright (C) 2006    by Pieter Palmers.
+#
+# This file is part of FreeBob.
+#
+# FreeBob is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# FreeBob 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 General Public License
+# along with FreeBob; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.57)
+
+m4_define(freebob_major_version, 0)
+m4_define(freebob_minor_version, 8)
+m4_define(freebob_micro_version, 2)
+
+m4_define(freebob_version, freebob_major_version.freebob_minor_version.freebob_micro_version)
+
+AC_INIT(libfreebob, freebob_version, <freebob-devel@lists.sf.net>)
+
+# Before making a release, the LT_VERSION string should be modified.
+# The string is of the form C:R:A.
+# - If interfaces have been changed or added, but binary compatibility has
+#   been preserved, change to C+1:0:A+1
+# - If binary compatibility has been broken (eg removed or changed interfaces)
+#   change to C+1:0:0
+# - If the interface is the same as the previous version, change to C:R+1:A
+
+LT_VERSION=1:0:1
+AC_SUBST(LT_VERSION)
+
+AC_DEFINE(FREEBOB_MAJOR_VERSION, freebob_major_version,[Freebob major version])
+AC_DEFINE(FREEBOB_MINOR_VERSION, freebob_minor_version,[Freebob minor version])
+AC_DEFINE(FREEBOB_MICRO_VERSION, freebob_micro_version,[Freebob micro version])
+AC_SUBST(FREEBOB_MINOR_VERSION, freebob_minor_version)
+AC_SUBST(FREEBOB_MAJOR_VERSION, freebob_major_version)
+AC_SUBST(FREEBOB_MICRO_VERSION, freebob_micro_version)
+
+AM_INIT_AUTOMAKE([subdir-objects])
+AM_MAINTAINER_MODE
+AC_CONFIG_SRCDIR([src/freebob.cpp])
+AC_CONFIG_HEADER([config.h])
+AC_GNU_SOURCE
+AC_LANG(C++)
+
+# Prefix handling
+AC_MSG_CHECKING(prefix)
+defaultprefix=/usr/local
+if test -z "$prefix" -o "$prefix" = "NONE"; then
+	prefix=$defaultprefix
+fi
+AC_PREFIX_DEFAULT($prefix)
+AC_MSG_RESULT($prefix)
+
+maintainer_mode=${enable_maintainer_mode-no}
+
+# Checks for programs.
+# AC_PROG_CC and AC_PROG_CXX will add by default "-g -O2" if 
+# CFLAGS and CXXFLAGS do not exists.  Disable this feature.
+test ".$CFLAGS" = "." && CFLAGS=""
+test ".$CXXFLAGS" = "." && CXXFLAGS=""
+AC_PROG_CC
+AC_PROG_CXX
+AM_PROG_AS
+AM_PROG_CC_C_O
+AC_PROG_LIBTOOL
+AC_CHECK_TOOL([AR], [ar], :)
+AC_CHECK_TOOL([NM], [nm], :)
+AC_PATH_PROG([SED], [sed], :)
+AC_PATH_PROG([SORT], [sort], :)
+
+# Required for building the documentation
+
+# Checks for libraries.
+AC_PROG_LIBTOOL
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_CANONICAL_HOST
+AC_C_CONST
+AC_C_VOLATILE
+AC_TYPE_SIZE_T
+
+# XXX Debian specific hack:
+# by Marcelo Magallon <mmagallo@efis.ucr.ac.cr>
+# Turn around -rpath problem with libtool 1.0c
+# This define should be improbable enough to not conflict with anything
+case ${host} in
+  *-pc-linux-gnu)
+    AC_MSG_RESULT([Fixing libtool for -rpath problems.])
+    sed < libtool > libtool-2 \
+    's/^hardcode_libdir_flag_spec.*$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
+    mv libtool-2 libtool
+    chmod 755 libtool
+  ;;
+esac
+
+AC_CHECK_LIB(pthread, pthread_create,,
+[
+        AC_ERROR(You need the pthread library to compile freebob)
+])
+
+# Check for dependencies
+PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 1.2.1)
+PKG_CHECK_MODULES(LIBIEC61883, libiec61883 >= 1.1.0)
+PKG_CHECK_MODULES(LIBAVC1394, libavc1394 >= 0.5.2)
+PKG_CHECK_MODULES(ALSA, alsa >= 1.0.0)
+PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6.0)
+
+# Setup CFLAGS and CXXFLAGS
+AC_ARG_ENABLE(debug,
+[  --enable-debug    Turn on debugging],
+[case "${enableval}" in
+  yes) debug=true;;
+  no)  ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
+esac],[debug=false])
+
+
+dnl Check for MMX assembly
+
+AC_ARG_ENABLE(mmx,
+    [  --enable-mmx            enable MMX support (default=auto)],,
+    enable_mmx=yes)
+
+AC_ARG_ENABLE(sse,
+    [  --enable-sse            enable SSE support (default=auto)],,
+    enable_sse=$enable_mmx)
+
+if test "x$enable_mmx" = xyes; then
+    
+    AC_MSG_CHECKING(whether we can compile MMX code)
+    
+    AC_COMPILE_IFELSE([asm ("movq 0, %mm0");],
+	
+	AC_DEFINE(USE_MMX, 1, [Define to 1 if MMX assembly is available.])
+	AC_MSG_RESULT(yes)
+	MMX_FLAGS="-mmmx -DENABLE_MMX"
+	
+	if test "x$enable_sse" = xyes; then
+	      
+	      AC_MSG_CHECKING(whether we can compile SSE code)
+	      
+	      AC_COMPILE_IFELSE([asm ("movntps %xmm0, 0");],
+		  AC_DEFINE(USE_SSE, 1,
+                            [Define to 1 if SSE assembly is available.])
+		  SSE_FLAGS="-msse -mfpmath=sse -DENABLE_SSE"
+		  AC_MSG_RESULT(yes)
+		  ,
+		  enable_sse=no
+		  AC_MSG_RESULT(no)
+		  AC_MSG_WARN(
+                      [The assembler does not support the SSE command set.]
+                  )
+	      )
+	      
+	  fi
+	  ,
+	  enable_mmx=no
+	  AC_MSG_RESULT(no)
+	  AC_MSG_WARN([The assembler does not support the MMX command set.])
+      )
+  fi
+
+  AC_DEFINE(x86, 1, "Nope it's intel")
+  COMMON_X86_OPT_FLAGS="-DREENTRANT -O3 -fomit-frame-pointer -ffast-math -funroll-loops"
+
+  if test "$target_cpu" = "i586"; then
+      FREEBOB_OPT_CFLAGS="-march=i586 "
+  elif test "$target_cpu" = "i686"; then
+      FREEBOB_OPT_CFLAGS="-march=i686"
+  else
+      :
+  fi
+
+  FREEBOB_OPT_CFLAGS="$COMMON_X86_OPT_FLAGS $FREEBOB_OPT_CFLAGS $MMX_FLAGS $SSE_FLAGS"
+
+
+AC_ARG_ENABLE(optimize,
+    AC_HELP_STRING([--enable-optimize],
+		   [ask the compiler for its best optimizations]),
+    [ if test x$enable_optimize != xno ; then
+	CFLAGS="$CFLAGS $FREEBOB_OPT_CFLAGS" ;
+	CXXFLAGS="$CXXFLAGS $FREEBOB_OPT_CFLAGS"
+      fi 
+    ]
+)
+
+
+CFLAGS="$CFLAGS -Wall -std=gnu99"
+CXXFLAGS="$CXXFLAGS -Wall"
+
+if test "${debug}" = true; then
+   CFLAGS="$CFLAGS -g -DDEBUG"
+   CXXFLAGS="$CXXFLAGS -g -DDEBUG" 
+fi;
+
+AC_SUBST([CFLAGS])
+AC_SUBST([CXXFLAGS])
+
+# Configure components.
+AC_ENABLE_STATIC(yes)
+AC_ENABLE_SHARED(yes)
+
+AC_SUBST([LIBSIGC_CFLAGS])
+AC_SUBST([LIBSIGC_LIBS])
+AC_SUBST([ALSA_CFLAGS])
+AC_SUBST([ALSA_LIBS])
+AC_SUBST([LIBRAW1394_CFLAGS])
+AC_SUBST([LIBRAW1394_LIBS])
+AC_SUBST([LIBIEC61883_CFLAGS])
+AC_SUBST([LIBIEC61883_LIBS])
+AC_SUBST([LIBAVC1394_CFLAGS])
+AC_SUBST([LIBAVC1394_LIBS])
+AC_SUBST([LIBXML_LIBS])
+AC_SUBST([LIBXML_CFLAGS])
+
+AC_CONFIG_FILES([Makefile
+		 libfreebob/Makefile
+		 src/debugmodule/Makefile
+		 src/libfreebobavc/Makefile
+		 src/libfreebobstreaming/Makefile
+		 src/Makefile
+		 tests/Makefile
+		 tests/streaming/Makefile
+		 libfreebob.pc])
+
+AC_OUTPUT
+
+# Print a summary so that important information isn't missed.
+AC_MSG_RESULT([
+
+FreeBob $VERSION is now configured for $canonical_host_type
+
+  Source directory:     $srcdir
+  Installation prefix:  $prefix
+  C++ compiler:         $CXX $CXXFLAGS
+
+  libraw1394 CFLAGS:    $LIBRAW1394_CFLAGS
+  libraw1394 LIBS:      $LIBRAW1394_LIBS
+  libiec61883 CFLAGS:   $LIBIEC61883_CFLAGS
+  libiec61883 LIBS:     $LIBIEC61883_LIBS
+  libavc1394 CFLAGS:    $LIBAVC1394_CFLAGS
+  libavc1394 LIBS:      $LIBAVC1394_LIBS
+])
Index: branches/freebob-syt-experiments/AUTHORS
===================================================================
--- branches/freebob-syt-experiments/AUTHORS (revision 125)
+++ branches/freebob-syt-experiments/AUTHORS (revision 125)
@@ -0,0 +1,1 @@
+Daniel Wagner <wagi@monom.org>
Index: branches/freebob-syt-experiments/TODO
===================================================================
--- branches/freebob-syt-experiments/TODO (revision 142)
+++ branches/freebob-syt-experiments/TODO (revision 142)
@@ -0,0 +1,10 @@
+- xml output is a bit wierd -> generate a more generic output
+- correct string encoding
+- position information of channel in stream: bebob indexes from 1 
+  but iec61883 expects it from 0. see todo in avdevice.cpp
+- check all std::cout and std:cerr if they couldn't be replaced with 
+  the DebugModule's methods. The idea is to have a more consistant
+  code.
+- All libfreebobavc interfaces should use references instead of pointers
+  like in  ExtendedPlugInfoCmd( Ieee1394Service* ieee1394service, ... )
+  ->  ExtendedPlugInfoCmd( Ieee1394Service& ieee1394service,
Index: branches/freebob-syt-experiments/ChangeLog
===================================================================
--- branches/freebob-syt-experiments/ChangeLog (revision 194)
+++ branches/freebob-syt-experiments/ChangeLog (revision 194)
@@ -0,0 +1,553 @@
+2006-05-12  Pieter Palmers  <pieterpalmers@users.sourceforge.net>
+	* src/libfreebobstreaming/*: 
+	- Code cleanup
+	- Improved SSE code
+	- ISO connection parameters are calculated instead of being user
+	  specified. Note: you need a new jackd backend version due to this.
+	
+	* configure.ac: Version bumped to 0.8.2
+
+2006-05-06  Daniel Wagner  <wagi@monom.org>
+
+	* This patch fixes two issues when building:
+	- libfreebob include files aren't found when build dir != source dir
+	- some libraries aren't found when they're not in a system install dir
+
+	Jeremy Kerr
+
+2006-05-04  Pieter Palmers  <pieterpalmers@users.sourceforge.net>
+
+	* configure.ac: Version bumped to 0.8.1
+
+	* Introduced SSE-accellerated packet encoders/decoders
+
+2006-05-04  Daniel Wagner  <wagi@monom.org>
+
+	* configure.ac: Version bumped to 0.8.0
+
+	* Discovering code ported stable 0.2.0 version
+	to head and activated for default discovering.
+
+2006-05-04  Daniel Wagner  <wagi@monom.org>
+
+	* configure.ac: Version bumped to 0.7.2
+
+	* src/bebob: Some cleanup on naming and
+	namespaces.
+
+2006-05-03  Daniel Wagner  <wagi@monom.org>
+
+	* configure.ac: Version bumped to 0.7.1
+
+	* Fixed bug in SignalSource command which
+	prevented one to set the samplerate.
+
+2006-04-23  Daniel Wagner  <wagi@monom.org>
+
+	* configure.ac: Version bumped to 0.7.0
+
+	* Abstract interface IAvDevice introduced. 
+	* BeBoB device discovering code moved into bebob directory.
+	* Bounce device added.
+
+2006-04-17  Daniel Wagner  <wagi@monom.org>
+
+	* configure.ac: Version bumped to 0.6.4
+
+	* src/libfreebobavc/avc_generic.cpp (serialize): Decode subunit_type 
+	and subunit_id field.
+	(fire): avc1394_transaction_block2 inteface change update.
+	* src/libfreebobavc/ieee1394service.cpp (transactionBlock): Likewise.
+	* src/libfreebobavc/ieee1394service.h: Likewise.
+
+2006-04-11  Daniel Wagner  <wagi@monom.org>
+
+	* configure.ac: Version bumped to 0.6.3
+	
+	* src/avdevicesubunit.cpp (discoverFunctionBlocks): reformating.
+	(discoverFunctionBlocksDo): Really added a correct
+	bugfix for the reuse of ExtendedSubunitInfoCmd.
+
+2006-04-07  Pieter Palmers <pieterpalmers@users.sourceforge.net>
+
+	* src/avdevice.h src/avdevice.cpp: moved the include of stdint.h
+	from the implementation to the header, to fix certain compilation
+	problems wrt uint64_t. This datatype is also used in the class
+	definition in avdevice.h.
+
+2006-04-05  Pieter Palmers <pieterpalmers@users.sourceforge.net>
+
+	* configure.ac: Version bump to 0.6.2
+
+	* src/freebob.cpp: Retry setting the sample rate if it fails the
+	first time.
+	
+	* src/libfreebobstreaming/*: Added an way to choose for playback
+	or capture only (for ALSA plugin), using the options passed when
+	creating the freebob device.  * src/libfreebobstreaming/*: fixed
+	the bug that prevented playback only operation.
+
+2006-04-04  Daniel Wagner  <wagi@monom.org>
+
+	* configure.ac: Version bump to 0.6.1
+
+	* src/avdevicesubunit.cpp (discoverFunctionBlocksDo): 
+	ExtendedSubunitInfoCmd is not reusable at this point. 
+	Moved into its own block so that's initatilialized correctly.
+
+2006-03-30  Daniel Wagner  <wagi@monom.org>
+
+	* configure.ac: Version bump to 0.6.0
+
+	* src/*: Verbose bool turned int verbose level.
+	
+	* src/libfreebobavc/*: Moved fire implementation to 
+	base class (AVCCommand). 
+	
+	* libfreebob/freebob.h: freebob_sleep_after_avc_command
+	workaround added.
+
+	* tests/test-freebob.c: Verbose bool turned into verbose level.
+	Workaround: sleep after avc command added.
+
+	* tests/streaming/Makefile.am (*_SOURCES): Added libavc1394 to LDADD.
+	* tests/Makefile.am (*_SOURCES): Likewise.
+	
+	* tests/streaming/teststreaming2.c (fid_in): compiler warning fixed.
+
+2006-03-20  Daniel Wagner  <wagi@monom.org>
+
+	* configure.ac: Version bump to 0.5.2
+
+	* src/avplug.cpp (discoverStreamFormat): If no stream format information
+	is available or format hierarchy root is not Audio&Music skip plug. 
+	(discoverSupportedStreamFormats): Added 'support' for IEC60968-3 (SPDIF transparent)
+
+2006-03-15  Daniel Wagner  <wagi@monom.org>
+
+	* configure.ac: Version bump to 0.5.1
+	
+	* src/libfreebobavc/avc_extended_plug_info.cpp (fire): 
+	  Handle NOT_IMPLEMENTED.
+	
+	* src/avplug.h: Input and output plug discovering part
+	fixed. Now connection are correctly handled.
+	* src/avplug.cpp: Likewise.
+	* src/avdevicesubunit.cpp: Likewise.
+
+2006-03-12  Daniel Wagner  <wagi@monom.org>
+
+	* src/libfreebobavc/ieee1394service.cpp (transactionBlock): Set retry
+	value to 10. 
+
+2006-03-10  Daniel Wagner  <wagi@monom.org>
+
+	* configure.ac: Version bump to 0.5.0
+
+	* src/avdevice.cpp: Plug connection discovering
+	finished. 
+	* src/avdevicesubunit.cpp: Likewise.
+	* src/avdevicesubunit.h: Likewise.
+	* src/avplug.cpp: Likewise.
+	* src/avplug.h: Likewise.
+	* src/functionblock.cpp: Likewise.
+	* src/functionblock.h: Likewise.
+	
+	* src/libfreebobavc/Makefile.am: New files added.
+	* src/libfreebobavc/avc_extended_subunit_info.cpp: Likewise.
+	* src/libfreebobavc/avc_extended_subunit_info.h: Likewise
+
+	* src/libfreebobavc/avc_definitions.h: Several small improvements.
+	* src/libfreebobavc/avc_extended_cmd_generic.cpp: Likewise.
+	* src/libfreebobavc/avc_extended_cmd_generic.h: Likewise.
+	* src/libfreebobavc/avc_extended_plug_info.cpp: Likewise.
+	* src/libfreebobavc/avc_generic.cpp: Likewise.
+
+2006-03-05  Daniel Wagner  <wagi@monom.org>
+
+	* src/avdevice.cpp: Plug connection discovering also on
+	subunits (disabled because missing funciton blocks).
+	Sync connections code cleanup.
+	* src/avdevice.h: Likewise.
+	* src/avdevicesubunit.cpp: Likewise.
+	* src/avdevicesubunit.h: Likewise.
+	* src/avplug.cpp: Likewise.
+	* src/avplug.h: Likewise.
+
+	* src/Makefile.am: Added functionblock.cpp and
+	functionblock.h
+	* src/functionblock.cpp: New file
+	* src/functionblock.h: Likewise.
+
+2006-03-04  Daniel Wagner  <wagi@monom.org>
+
+	* src/avdevice.cpp: Sync mode discovering improved.
+	* src/avdevice.h: Likewise.
+	* src/avplug.cpp: Likewise.
+	* src/avplug.h: Likewise.
+
+	* tests/test-freebob.c: Added 'odiscover' command which
+	does not print the xml stuff.
+
+	* src/avdevice.cpp: Added 'verbose' argument to constructor
+	and set debug level to DEBUG_LEVEL_VERBOSE if 'verbose'
+	is true, e.g enables verbose mode with '-v' argument passed
+	to test-freebob.
+	* src/avdevice.h: Likewsise.
+	* src/avdevicesubunit.cpp: Likewsise.
+	* src/avdevicesubunit.h: Likewsise.
+	* src/avplug.cpp: Likewsise.
+	* src/avplug.h: Likewsise.
+	* src/devicemanager.cpp: Likewsise.
+	* src/debugmodule/debugmodule.cpp: Likewsise.
+	* src/debugmodule/debugmodule.h: Likewsise.
+	* src/debugmodule/test_debugmodule.cpp: Likewsise.
+	
+	* src/avdevice.cpp: eAP_* renamed into eAPA_*.
+	EAvPlugDirection and EAvPlugType introduced. All PlugAddress:ePD_ and 
+	ExtendedPlugInfoPlugTypeSpecificData::eEPIPT_* exchanged with corresponding
+	AvPlug definitions.
+	* src/avdevice.h: Likewise.
+	* src/avdevicesubunit.cpp: Likewise.
+	* src/avdevicesubunit.h: Likewise.
+	* src/avdevicexml.cpp: Likewise.
+	* src/avplug.cpp: Likewise.
+	* src/avplug.h: Likewise.
+
+2006-03-02  Daniel Wagner  <wagi@monom.org>
+
+	* src/avplug.cpp (discoverStreamFormat): Sanity check turned
+	into warning.
+
+	* configure.ac: bumb minor version to 0.4
+
+	* src/libfreebobavc/avc_extended_cmd_generic.h: plugAddressPlugDirectionToString
+	and plugAddressAddressModeToString added.
+	* src/libfreebobavc/avc_extended_cmd_generic.cpp: Likewise.
+
+	* src/avplug.h: Enum EAvPlugType renamed to EAvPlugAddressType.
+	getPlugAddressType added. getPlugType returns now real plug type.
+	(class AvPlugManager): getPlugByType added.
+
+	* src/avdevice.h: getPlugByType added.
+	* src/avdevice.cpp: Likewise.
+	(discoverSyncModes): Use getPlugByType instead
+	of hardcoded id to find sync plugs.
+
+	* src/devicemanager.h: Verbose argument not in constructor
+	instead in discover method.
+	* src/devicemanager.cpp: Likewise.
+
+	* libfreebob/freebob.h (freebob_discover_devices): Verbose argument
+	added.
+	* src/libfreebobstreaming/freebob_streaming.c: Likewise.
+	* src/freebob.cpp: Likewise.
+	* tests/test-freebob.c: Likewise.
+
+2006-03-01  Daniel Wagner  <wagi@monom.org>
+
+	* configure.ac: bumb minor version to 0.3
+
+	* src/avdevice.cpp: Discover connections between plugs.
+	* src/avdevice.h: Likewise.
+	* src/avdevicesubunit.cpp: Likewise.
+	* src/avdevicesubunit.h: Likewise.
+	* src/avdevicexml.cpp: Likewise.
+	* src/avplug.cpp: Likewise.
+	* src/avplug.h: Likewise.
+	* src/devicemanager.cpp: Likewise.
+	* src/devicemanager.h: Likewise.
+	* src/freebob.cpp: Likewise.
+
+	* src/libfreebobavc/avc_extended_cmd_generic.cpp: Give
+	return value to caller. New undefined plug address
+	introduced. Handling of response message is more rebust now.
+	* src/libfreebobavc/avc_extended_cmd_generic.h: Likewise.
+	* src/libfreebobavc/avc_extended_plug_info.cpp: Likewise.
+	* src/libfreebobavc/avc_extended_stream_format.cpp: Likewise.
+	* src/libfreebobavc/avc_extended_stream_format.h: Likewise.
+	* src/libfreebobavc/avc_plug_info.cpp: Likewise.
+	* src/libfreebobavc/avc_signal_source.cpp: Likewise.
+	* src/libfreebobavc/avc_signal_source.h: Likewise.
+	* src/libfreebobavc/avc_subunit_info.cpp: Likewise.
+	* src/libfreebobavc/avc_unit_info.cpp: Likewise.
+	* src/libfreebobavc/avc_extended_plug_info.cpp: Likewise.
+	* src/libfreebobavc/avc_extended_stream_format.cpp: Likewise.
+	* src/libfreebobavc/avc_extended_cmd_generic.cpp:
+	* src/libfreebobavc/avc_extended_cmd_generic.h: Likewise.
+
+	* src/libfreebobstreaming/freebob_debug.h: DEBUG is defined through --enable-debug
+	switch.
+
+	* src/libfreebobstreaming/freebob_connections.h: Removed double defined variable 
+	if DEBUG is defined.
+
+2006-02-28  Pieter Palmers <pieterpalmers@users.sourceforge.net>
+	* Added the streaming API that was previously hardcoded into the jackd backend
+	  to the library as src/libfreebobstreaming.
+	* Added test programs for the streaming API in tests/streaming
+
+2006-02-26  Daniel Wagner  <wagi@monom.org>
+
+	* src/avdevice.cpp: Some more refactoring (m_isoInputPlugs and m_isoOutputPlugs
+	unified into m_isoPlugs). Discovering of unit external plugs.
+	* src/avdevice.h: Likewise.
+	* src/avdevicexml.cpp: Likewise.
+	* src/avdevicesubunit.cpp: Likewise.
+	* src/avdevicesubunit.h: Likewise.
+	* src/avplug.cpp: Likewise.
+	* src/avplug.h: Likewise.
+
+	* src/libfreebobavc/avc_extended_cmd_generic.h (class UnitPlugAddress): 
+	ePT_Unknown enum added.
+
+2006-02-22  Daniel Wagner  <wagi@monom.org>
+
+	*  configure.ac
+	src/Makefile.am
+        src/avdevice.cpp
+        src/avdevice.h
+        src/avdevicesubunit.cpp
+        src/avdevicesubunit.h
+        src/avdevicexml.cpp
+        src/avplug.cpp
+	src/avplug.h
+        src/avplugxml.cpp
+        src/libfreebobavc/avc_extended_plug_info.cpp
+        src/libfreebobavc/avc_extended_plug_info.h
+        src/libfreebobavc/avc_extended_stream_format.cpp
+        src/libfreebobavc/avc_extended_stream_format.h
+        src/libfreebobavc/avc_plug_info.cpp
+        src/libfreebobavc/avc_plug_info.h:
+	Refactoring: plug discovering is now part of AvPlug
+	instead of AvDevice.
+	All plugs of music and audio subunit are now also
+	discovered.
+	libfreebobavc: Copy constructor added.
+
+	The overhaul is not finished. This is the first
+	version which works again.
+
+2006-01-19  Daniel Wagner  <wagi@monom.org>
+
+        * This patch cleans up the external dependency detection for 
+	libfreebob. At present, building libfreebob is not possible 
+	if libraries are outside the system include/library paths 
+	(ie /usr/ and /usr/local). Use the results of pkg-config to 
+	specify the correct paths to the automake system.
+
+	Becuase we're using pkgconfig, there's no real need to use 
+	AC_CHECK_LIB or AC_CHECK_HEADERS. However, these could 
+	potentially be reinstated, but need to be fixed to check in 
+	the locations specified by pkgconfig.
+
+	* It is not currently possible to build freebob in a directory 
+	outside the source dir (ie, builddir != srcdir). This patch 
+	fixes the include paths to allow this. (it's handy for keeping 
+	the source tree clean, or when building on multiple architectures 
+	- I use a build dir of $srcdir/obj-$arch-$os)
+
+	Both patches are written by Jeremy Kerr <jk@ozlabs.org>
+
+2006-01-12  Daniel Wagner  <wagi@monom.org>
+
+	* src/avdevice.cpp: Include stdint.h.
+	Some compilers seem to need the definitions.
+
+2006-01-08  Daniel Wagner  <wagi@monom.org>
+
+	*  libfreebob/freebob.h
+	libfreebob/xmlparser.h
+	src/avdevice.cpp
+	src/xmlparser.c
+	tests/test-freebob.c:
+	Add stream format info support.
+
+        * src/avdevice.h
+	src/avdevice.cpp: 
+	Refactoring and code duplication removal.
+	
+	* src/avdevice.cpp (getModelName): 
+	Return model name and not vendor name.
+	(getVendorName): 
+	Return vendor name and not model name.
+	(discoverStep10Plug): Implementation added.
+	(enumerateSubUnits): max_subunit_id removed.
+	(addXmlDescription): Add stream format infos.
+
+	* src/avdevice.h: discoverStep10 added.
+	Renaming of addPlugToXmlDescription to addXmlDescriptionPlug.
+	ESampleRate to ESamplingFrequency changes.
+
+	* src/avplug.cpp (getSampleRate): 
+	Use convertESamplingFrequency instead of
+	local implementation.
+
+	* src/avplug.h: 
+	ESampleRate to ESamplingFrequency changes.
+	Added FormatInfo struct.
+
+	* src/devicemanager.cpp (getXmlDescription): 
+	Print GUID correctly.
+
+	* src/freebob.cpp (parseSampleRate): 
+	Moved to avc_definitions.cpp
+
+	* src/libfreebobavc/avc_definitions.h
+	src/libfreebobavc/avc_definitions.cpp: 
+	Renamed ESampleRate back to ESamlingFrequency.
+	Added connvert functions for ESamplingFrequency.
+
+	* configure.ac: New micro version.
+
+2006-01-06  Daniel Wagner  <wagi@monom.org>
+
+	* tests/test-freebob.c (main): setsamplerate on all
+	devices takes now the samplerate argument.
+
+	* src/freebob.cpp (freebob_set_samplerate): After setting
+	sampling rate rediscover devices.
+
+	* src/devicemanager.cpp (discover): Clear vector as well after
+	delete all elements. Cout and cerr replaced with debugModule.
+
+	* src/avdevice.cpp (discoverStep8): Skip sync plug.
+	(discoverStep9): Sanity check fixed and reenabled.
+
+	* configure.ac: New micro version.
+
+	* src/avdevice.h 
+	src/avdevice.cpp (setSampleRate): Implementation added.
+
+	* src/devicemanager.cpp 
+	src/devicemanager.h (getAvDevice): New functions
+	(setNodeSampleFrequency): removed.
+
+	* src/freebob.cpp (parseSampleRate): New function.
+	(freebob_set_samplerate): Use AvDevice directly
+	for setting samplerate.
+
+	* src/libfreebobavc/avc_definitions.h
+	src/libfreebobavc/avc_definitions.cpp: Changed ESampleFrequency
+	to ESampleRate.
+
+	* tests/test-freebob.c: Info added about OPERATION arguments.
+	Parse sample rate for setsamplerate command.
+	Let emacs reindent code. Sorry Pieter :)
+
+2006-01-04  Daniel Wagner  <wagi@monom.org>
+
+	* tests/test-extplugcmd.cpp: Changed test application
+	to use PlugType and PlugName command for testing.
+
+	* src/libfreebobavc/avc_extended_plug_info.cpp (serialize): 
+	The string.length() thing did not work as expected. A workaround
+	added which converts the C++ string into a C string before strlen
+	is used.
+
+2006-01-03  Daniel Wagner  <wagi@monom.org>
+
+	* src/devicemanager.cpp (discover): If config rom initializing
+	failes just skip this device. The PHY might be in power safe 
+	mode and then there is no config rom to be discovered.
+
+2006-01-02  Pieter Palmer <pieterpalmers@users.sourceforge.net>
+
+	* tests/test-freebob.c: Added support for scanning the whole bus.
+	Added xmldump operation to dump an XML description of the FW bus.
+
+	* src/freebob.cpp src/freebob.h: Added freebob_print_xml_description 
+	to print an XML description of the bus.
+	Added freebob_node_is_valid_freebob_device().
+	Added freebob_get_nb_devices_on_bus().
+	Added freebob_get_device_node_id().
+	Added freebob_set_samplerate() as a dummy (unimplemented)
+
+	* src/libfreebobavc/avc_connect.cpp 
+	src/libfreebobavc/avc_extended_stream_format.cpp
+	src/libfreebobavc/avc_extended_stream_format.h
+	src/libfreebobavc/avc_plug_info.cpp
+	src/libfreebobavc/avc_signal_source.cpp
+	src/avcdevice.cpp 
+	src/avdevice.h 
+	src/avplug.cpp 
+	src/avplug.h
+	src/devicemanager.cpp
+	src/devicemanager.h:
+	Fixed NodeId bug.
+	Commented out sanity check that failed for midi channels.
+	Fixed Dimension bug.
+	Increased all "XXX random length" requests.
+	Made a mess of clean code ;)
+
+	* configure.ac: Bumped library verson
+
+	* src/xmlparser.c
+	tests/test-freeebob.c: Added support to detect & use 
+	multiple devices on the bus.
+
+	* src/libfreebobavc/avc_extendec_plug_info.cpp
+	src/configrom.cpp:
+	Some small memory access bugfixes.
+	
+2006-01-02  Daniel Wagner  <wagi@monom.org>
+
+	* src/avdevice.cpp (discoverStep9): Sanity check: 8 logical
+	midi channel fit into 1 channel.
+
+2005-12-31  Daniel Wagner  <wagi@monom.org>
+
+	* src/debugmodule/debugmodule.h: debugFatal, debugError
+	and debugWarning declaration always declared.
+
+	* src/xmlparser.c (freebob_xmlparse_connection): Parse IsoChannel
+	node.
+
+	* src/freebob.cpp (freebob_print_connection_info): Print all
+	members from connection_spec (IsoChannel and IsMaster).
+
+	* src/avdevice.cpp (addPlugToXmlDescription): Set direction
+	according library interface definition and not according
+	avc model. 
+	Add IsoChannel node.
+
+	* configure.ac: Version set to 0.0.2
+
+2005-12-30  Daniel Wagner  <wagi@monom.org>
+
+	* src/libfreebobavc/avc_extended_stream_format.cpp (fire): Buffer
+	length increased.
+
+	* src/avdevice.cpp (discoverStep9): Error message extended.
+	More debug info added.
+
+	* src/debugmodule/debugmodule.h: Enable debugFatal, debugError and 
+	also in the release case.
+
+2005-12-28  Daniel Wagner  <wagi@monom.org>
+
+	* tests/test-freebob.c (main): Debug info added.
+
+	* src/libfreebobavc/ieee1394service.cpp (initialize): Use 
+	raw1394_new_handle_on_port instead of raw1394_new_handle and
+	raw1394_set_port.
+
+	* src/devicemanager.cpp (initialize): After deleteing 1394 service 
+	clear also pointer.
+
+	* libfreebob/freebob.h: freebob_direction enum names changed
+	members which jack backed freebob needs to freebob_connection added
+	
+	* configure.ac: Update library version depency.
+
+2005-12-27  Daniel Wagner  <wagi@monom.org>
+
+	* src/libfreebobavc/avc_extended_plug_info.cpp (serialize): 
+	Do cast of the length field to let the compiler know which version
+	of the serializing code it has to take.
+
+2005-12-26  Daniel Wagner  <wagi@monom.org>
+
+	* Initial check-in and first beta relase 'late x-mass gift'.
+	
+
Index: branches/freebob-syt-experiments/src/devicemanager.h
===================================================================
--- branches/freebob-syt-experiments/src/devicemanager.h (revision 185)
+++ branches/freebob-syt-experiments/src/devicemanager.h (revision 185)
@@ -0,0 +1,70 @@
+/* template.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef FREEBOBDEVICEMANAGER_H
+#define FREEBOBDEVICEMANAGER_H
+
+#include "debugmodule/debugmodule.h"
+
+#include "libfreebob/xmlparser.h"
+
+#include <vector>
+
+class Ieee1394Service;
+class IAvDevice;
+
+typedef std::vector< IAvDevice* > IAvDeviceVector;
+typedef std::vector< IAvDevice* >::iterator IAvDeviceVectorIterator;
+
+typedef IAvDevice* (*ProbeFunction)(Ieee1394Service&, int, int);
+typedef std::vector<ProbeFunction> ProbeFunctionVector;
+typedef std::vector<ProbeFunction>::iterator ProbeFunctionVectorIterator;
+
+class DeviceManager{
+ public:
+    DeviceManager();
+    ~DeviceManager();
+
+    bool initialize( int port );
+    bool deinitialize();
+
+    bool discover( int verboseLevel );
+
+    bool isValidNode( int node );
+    int getNbDevices();
+    int getDeviceNodeId( int deviceNr );
+
+    IAvDevice* getAvDevice( int nodeId );
+
+    xmlDocPtr getXmlDescription();
+
+protected:
+    static IAvDevice* probeBeBoB(Ieee1394Service& service, int id, int level);
+    static IAvDevice* probeBounce(Ieee1394Service& service, int id, int level);
+
+protected:
+    Ieee1394Service* m_1394Service;
+    IAvDeviceVector  m_avDevices;
+    ProbeFunctionVector m_probeList;
+
+    DECLARE_DEBUG_MODULE;
+};
+
+#endif
Index: branches/freebob-syt-experiments/src/csr1212.h
===================================================================
--- branches/freebob-syt-experiments/src/csr1212.h (revision 125)
+++ branches/freebob-syt-experiments/src/csr1212.h (revision 125)
@@ -0,0 +1,734 @@
+/*
+ * csr1212.h -- IEEE 1212 Control and Status Register support for Linux
+ *
+ * Copyright (C) 2003 Francois Retief <fgretief@sun.ac.za>
+ *                    Steve Kinneberg <kinnebergsteve@acmsystems.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *    3. The name of the author may not be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __CSR1212_H__
+#define __CSR1212_H__
+
+#ifdef __cplusplus 
+  extern "C" {
+#endif
+
+/* Compatibility layer */
+#ifdef __KERNEL__
+
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/sched.h>
+#include <linux/vmalloc.h>
+#include <asm/pgalloc.h>
+
+#define CSR1212_MALLOC(size)		vmalloc((size))
+#define CSR1212_FREE(ptr)		vfree(ptr)
+#define CSR1212_BE16_TO_CPU(quad)	be16_to_cpu(quad)
+#define CSR1212_CPU_TO_BE16(quad)	cpu_to_be16(quad)
+#define CSR1212_BE32_TO_CPU(quad)	be32_to_cpu(quad)
+#define CSR1212_CPU_TO_BE32(quad)	cpu_to_be32(quad)
+#define CSR1212_BE64_TO_CPU(quad)	be64_to_cpu(quad)
+#define CSR1212_CPU_TO_BE64(quad)	cpu_to_be64(quad)
+
+#define CSR1212_LE16_TO_CPU(quad)	le16_to_cpu(quad)
+#define CSR1212_CPU_TO_LE16(quad)	cpu_to_le16(quad)
+#define CSR1212_LE32_TO_CPU(quad)	le32_to_cpu(quad)
+#define CSR1212_CPU_TO_LE32(quad)	cpu_to_le32(quad)
+#define CSR1212_LE64_TO_CPU(quad)	le64_to_cpu(quad)
+#define CSR1212_CPU_TO_LE64(quad)	cpu_to_le64(quad)
+
+#include <linux/errno.h>
+#define CSR1212_SUCCESS (0)
+#define CSR1212_EINVAL	(-EINVAL)
+#define CSR1212_ENOMEM	(-ENOMEM)
+#define CSR1212_ENOENT	(-ENOENT)
+#define CSR1212_EIO	(-EIO)
+#define CSR1212_EBUSY	(-EBUSY)
+
+#else	/* Userspace */
+
+#include <sys/types.h>
+#include <malloc.h>
+#define CSR1212_MALLOC(size)		calloc(1,size)
+#define CSR1212_FREE(ptr)		free(ptr)
+#include <endian.h>
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#include <byteswap.h>
+#define CSR1212_BE16_TO_CPU(quad)	bswap_16(quad)
+#define CSR1212_CPU_TO_BE16(quad)	bswap_16(quad)
+#define CSR1212_BE32_TO_CPU(quad)	bswap_32(quad)
+#define CSR1212_CPU_TO_BE32(quad)	bswap_32(quad)
+#define CSR1212_BE64_TO_CPU(quad)	bswap_64(quad)
+#define CSR1212_CPU_TO_BE64(quad)	bswap_64(quad)
+
+#define CSR1212_LE16_TO_CPU(quad)	(quad)
+#define CSR1212_CPU_TO_LE16(quad)	(quad)
+#define CSR1212_LE32_TO_CPU(quad)	(quad)
+#define CSR1212_CPU_TO_LE32(quad)	(quad)
+#define CSR1212_LE64_TO_CPU(quad)	(quad)
+#define CSR1212_CPU_TO_LE64(quad)	(quad)
+#else
+#define CSR1212_BE16_TO_CPU(quad)	(quad)
+#define CSR1212_CPU_TO_BE16(quad)	(quad)
+#define CSR1212_BE32_TO_CPU(quad)	(quad)
+#define CSR1212_CPU_TO_BE32(quad)	(quad)
+#define CSR1212_BE64_TO_CPU(quad)	(quad)
+#define CSR1212_CPU_TO_BE64(quad)	(quad)
+
+#define CSR1212_LE16_TO_CPU(quad)	bswap_16(quad)
+#define CSR1212_CPU_TO_LE16(quad)	bswap_16(quad)
+#define CSR1212_LE32_TO_CPU(quad)	bswap_32(quad)
+#define CSR1212_CPU_TO_LE32(quad)	bswap_32(quad)
+#define CSR1212_LE64_TO_CPU(quad)	bswap_64(quad)
+#define CSR1212_CPU_TO_LE64(quad)	bswap_64(quad)
+#endif
+
+#include <errno.h>
+#define CSR1212_SUCCESS (0)
+#define CSR1212_EINVAL	(EINVAL)
+#define CSR1212_ENOMEM	(ENOMEM)
+#define CSR1212_ENOENT	(ENOENT)
+#define CSR1212_EIO	(EIO)
+#define CSR1212_EBUSY	(EBUSY)
+
+#endif
+
+
+#define CSR1212_KV_VAL_MASK			0xffffff
+#define CSR1212_KV_KEY_SHIFT			24
+#define CSR1212_KV_KEY_TYPE_SHIFT		6
+#define CSR1212_KV_KEY_ID_MASK			0x3f
+#define CSR1212_KV_KEY_TYPE_MASK		0x3		/* After shift */
+
+
+/* CSR 1212 key types */
+#define CSR1212_KV_TYPE_IMMEDIATE		0
+#define CSR1212_KV_TYPE_CSR_OFFSET		1
+#define CSR1212_KV_TYPE_LEAF			2
+#define CSR1212_KV_TYPE_DIRECTORY		3
+
+
+/* CSR 1212 key ids */
+#define CSR1212_KV_ID_DESCRIPTOR		0x01
+#define CSR1212_KV_ID_BUS_DEPENDENT_INFO	0x02
+#define CSR1212_KV_ID_VENDOR			0x03
+#define CSR1212_KV_ID_HARDWARE_VERSION		0x04
+#define CSR1212_KV_ID_MODULE			0x07
+#define CSR1212_KV_ID_NODE_CAPABILITIES		0x0C
+#define CSR1212_KV_ID_EUI_64			0x0D
+#define CSR1212_KV_ID_UNIT			0x11
+#define CSR1212_KV_ID_SPECIFIER_ID		0x12
+#define CSR1212_KV_ID_VERSION			0x13
+#define CSR1212_KV_ID_DEPENDENT_INFO		0x14
+#define CSR1212_KV_ID_UNIT_LOCATION		0x15
+#define CSR1212_KV_ID_MODEL			0x17
+#define CSR1212_KV_ID_INSTANCE			0x18
+#define CSR1212_KV_ID_KEYWORD			0x19
+#define CSR1212_KV_ID_FEATURE			0x1A
+#define CSR1212_KV_ID_EXTENDED_ROM		0x1B
+#define CSR1212_KV_ID_EXTENDED_KEY_SPECIFIER_ID	0x1C
+#define CSR1212_KV_ID_EXTENDED_KEY		0x1D
+#define CSR1212_KV_ID_EXTENDED_DATA		0x1E
+#define CSR1212_KV_ID_MODIFIABLE_DESCRIPTOR	0x1F
+#define CSR1212_KV_ID_DIRECTORY_ID		0x20
+#define CSR1212_KV_ID_REVISION			0x21
+
+
+/* IEEE 1212 Address space map */
+#define CSR1212_ALL_SPACE_BASE			(0x000000000000ULL)
+#define CSR1212_ALL_SPACE_SIZE			(1ULL << 48)
+#define CSR1212_ALL_SPACE_END			(CSR1212_ALL_SPACE_BASE + CSR1212_ALL_SPACE_SIZE)
+
+#define  CSR1212_MEMORY_SPACE_BASE		(0x000000000000ULL)
+#define  CSR1212_MEMORY_SPACE_SIZE		((256ULL * (1ULL << 40)) - (512ULL * (1ULL << 20)))
+#define  CSR1212_MEMORY_SPACE_END		(CSR1212_MEMORY_SPACE_BASE + CSR1212_MEMORY_SPACE_SIZE)
+
+#define  CSR1212_PRIVATE_SPACE_BASE		(0xffffe0000000ULL)
+#define  CSR1212_PRIVATE_SPACE_SIZE		(256ULL * (1ULL << 20))
+#define  CSR1212_PRIVATE_SPACE_END		(CSR1212_PRIVATE_SPACE_BASE + CSR1212_PRIVATE_SPACE_SIZE)
+
+#define  CSR1212_REGISTER_SPACE_BASE		(0xfffff0000000ULL)
+#define  CSR1212_REGISTER_SPACE_SIZE		(256ULL * (1ULL << 20))
+#define  CSR1212_REGISTER_SPACE_END		(CSR1212_REGISTER_SPACE_BASE + CSR1212_REGISTER_SPACE_SIZE)
+
+#define  CSR1212_CSR_ARCH_REG_SPACE_BASE	(0xfffff0000000ULL)
+#define  CSR1212_CSR_ARCH_REG_SPACE_SIZE	(512)
+#define  CSR1212_CSR_ARCH_REG_SPACE_END		(CSR1212_CSR_ARCH_REG_SPACE_BASE + CSR1212_CSR_ARCH_REG_SPACE_SIZE)
+#define  CSR1212_CSR_ARCH_REG_SPACE_OFFSET	(CSR1212_CSR_ARCH_REG_SPACE_BASE - CSR1212_REGISTER_SPACE_BASE)
+
+#define  CSR1212_CSR_BUS_DEP_REG_SPACE_BASE	(0xfffff0000200ULL)
+#define  CSR1212_CSR_BUS_DEP_REG_SPACE_SIZE	(512)
+#define  CSR1212_CSR_BUS_DEP_REG_SPACE_END	(CSR1212_CSR_BUS_DEP_REG_SPACE_BASE + CSR1212_CSR_BUS_DEP_REG_SPACE_SIZE)
+#define  CSR1212_CSR_BUS_DEP_REG_SPACE_OFFSET	(CSR1212_CSR_BUS_DEP_REG_SPACE_BASE - CSR1212_REGISTER_SPACE_BASE)
+
+#define  CSR1212_CONFIG_ROM_SPACE_BASE		(0xfffff0000400ULL)
+#define  CSR1212_CONFIG_ROM_SPACE_SIZE		(1024)
+#define  CSR1212_CONFIG_ROM_SPACE_END		(CSR1212_CONFIG_ROM_SPACE_BASE + CSR1212_CONFIG_ROM_SPACE_SIZE)
+#define  CSR1212_CONFIG_ROM_SPACE_OFFSET	(CSR1212_CONFIG_ROM_SPACE_BASE - CSR1212_REGISTER_SPACE_BASE)
+
+#define  CSR1212_UNITS_SPACE_BASE		(0xfffff0000800ULL)
+#define  CSR1212_UNITS_SPACE_SIZE		((256ULL * (1ULL << 20)) - 2048)
+#define  CSR1212_UNITS_SPACE_END		(CSR1212_UNITS_SPACE_BASE + CSR1212_UNITS_SPACE_SIZE)
+#define  CSR1212_UNITS_SPACE_OFFSET		(CSR1212_UNITS_SPACE_BASE - CSR1212_REGISTER_SPACE_BASE)
+
+#define  CSR1212_EXTENDED_ROM_SIZE		(0x10000 * sizeof(u_int32_t))
+
+
+/* Config ROM image structures */
+struct csr1212_bus_info_block_img {
+	u_int8_t length;
+	u_int8_t crc_length;
+	u_int16_t crc;
+
+	/* Must be last */
+	u_int32_t data[0];	/* older gcc can't handle [] which is standard */
+};
+
+#define CSR1212_KV_KEY(quad)		(CSR1212_BE32_TO_CPU(quad) >> CSR1212_KV_KEY_SHIFT)
+#define CSR1212_KV_KEY_TYPE(quad)	(CSR1212_KV_KEY(quad) >> CSR1212_KV_KEY_TYPE_SHIFT)
+#define CSR1212_KV_KEY_ID(quad)		(CSR1212_KV_KEY(quad) & CSR1212_KV_KEY_ID_MASK)
+#define CSR1212_KV_VAL(quad)		(CSR1212_BE32_TO_CPU(quad) & CSR1212_KV_VAL_MASK)
+
+#define CSR1212_SET_KV_KEY(quad, key)	((quad) = \
+	CSR1212_CPU_TO_BE32(CSR1212_KV_VAL(quad) | ((key) << CSR1212_KV_KEY_SHIFT)))
+#define CSR1212_SET_KV_VAL(quad, val)	((quad) = \
+	CSR1212_CPU_TO_BE32((CSR1212_KV_KEY(quad) << CSR1212_KV_KEY_SHIFT) | (val)))
+#define CSR1212_SET_KV_TYPEID(quad, type, id)	((quad) = \
+	CSR1212_CPU_TO_BE32(CSR1212_KV_VAL(quad) | \
+	(((((type) & CSR1212_KV_KEY_TYPE_MASK) << CSR1212_KV_KEY_TYPE_SHIFT) | \
+	  ((id) & CSR1212_KV_KEY_ID_MASK)) << CSR1212_KV_KEY_SHIFT)))
+
+typedef u_int32_t csr1212_quad_t;
+
+
+struct csr1212_keyval_img {
+	u_int16_t length;
+	u_int16_t crc;
+
+	/* Must be last */
+	csr1212_quad_t data[0];	/* older gcc can't handle [] which is standard */
+};
+
+struct csr1212_leaf {
+	int len;
+	u_int32_t *data;
+};
+
+struct csr1212_dentry {
+	struct csr1212_dentry *next, *prev;
+	struct csr1212_keyval *kv;
+};
+
+struct csr1212_directory {
+	int len;
+	struct csr1212_dentry *dentries_head, *dentries_tail;
+};
+
+struct csr1212_keyval {
+	struct {
+		u_int8_t type;
+		u_int8_t id;
+	} key;
+	union {
+		u_int32_t immediate;
+		u_int32_t csr_offset;
+		struct csr1212_leaf leaf;
+		struct csr1212_directory directory;
+	} value;
+	struct csr1212_keyval *associate;
+	int refcnt;
+
+	/* used in generating and/or parsing CSR image */
+	struct csr1212_keyval *next, *prev;	/* flat list of CSR elements */
+	u_int32_t offset;	/* position in CSR from 0xffff f000 0000 */
+	u_int8_t valid;		/* flag indicating keyval has valid data*/
+};
+
+
+struct csr1212_cache_region {
+	struct csr1212_cache_region *next, *prev;
+	u_int32_t offset_start;		/* inclusive */
+	u_int32_t offset_end;		/* exclusive */
+};
+
+struct csr1212_csr_rom_cache {
+	struct csr1212_csr_rom_cache *next, *prev;
+	struct csr1212_cache_region *filled_head, *filled_tail;
+	struct csr1212_keyval *layout_head, *layout_tail;
+	size_t size;
+	u_int32_t offset;
+	struct csr1212_keyval *ext_rom;
+	size_t len;
+
+	/* Must be last */
+	u_int32_t data[0];	/* older gcc can't handle [] which is standard */
+};
+
+struct csr1212_csr {
+	size_t bus_info_len;	/* bus info block length in bytes */
+	size_t crc_len;		/* crc length in bytes */
+	u_int32_t *bus_info_data;	/* bus info data incl bus name and EUI */
+
+	void *private_data;		/* private_data, bus specific data */
+	struct csr1212_bus_ops *ops;
+
+	struct csr1212_keyval *root_kv;
+
+	int max_rom;		/* max bytes readable in Config ROM region */
+
+	/* Items below used for image parsing and generation */
+	struct csr1212_csr_rom_cache *cache_head, *cache_tail;
+};
+
+struct csr1212_bus_ops {
+	/* This function is used by csr1212 to read additional information
+	 * from remote nodes when parsing a Config ROM (i.e., read Config ROM
+	 * entries located in the Units Space.  Must return 0 on success
+	 * anything else indicates an error. */
+	int (*bus_read) (struct csr1212_csr *csr, u_int64_t addr,
+			 u_int16_t length, void *buffer, void *private_data);
+
+	/* This function is used by csr1212 to allocate a region in units space
+	 * in the event that Config ROM entries don't all fit in the predefined
+	 * 1K region.  The void *private_data parameter is private_data member of struct
+	 * csr1212_csr. */
+	u_int64_t (*allocate_addr_range) (u_int64_t size, u_int32_t alignment,
+					  void *private_data);
+
+
+	/* This function is used by csr1212 to release a region in units space
+	 * that is no longer needed. */
+	void (*release_addr) (u_int64_t addr, void *private_data);
+
+	/* This function is used by csr1212 to determine the max read request
+	 * supported by a remote node when reading the ConfigROM space.  Must
+	 * return 0, 1, or 2 per IEEE 1212.  */
+	int (*get_max_rom) (u_int32_t *bus_info, void *private_data);
+};
+
+
+
+
+/* Descriptor Leaf manipulation macros */
+#define CSR1212_DESCRIPTOR_LEAF_TYPE_SHIFT 24
+#define CSR1212_DESCRIPTOR_LEAF_SPECIFIER_ID_MASK 0xffffff
+#define CSR1212_DESCRIPTOR_LEAF_OVERHEAD (1 * sizeof(u_int32_t))
+
+#define CSR1212_DESCRIPTOR_LEAF_TYPE(kv) \
+	(CSR1212_BE32_TO_CPU((kv)->value.leaf.data[0]) >> CSR1212_DESCRIPTOR_LEAF_TYPE_SHIFT)
+#define CSR1212_DESCRIPTOR_LEAF_SPECIFIER_ID(kv) \
+	(CSR1212_BE32_TO_CPU((kv)->value.leaf.data[0]) & \
+	 CSR1212_DESCRIPTOR_LEAF_SPECIFIER_ID_MASK)
+#define CSR1212_DESCRIPTOR_LEAF_DATA(kv) \
+	(&((kv)->value.leaf.data[1]))
+
+#define CSR1212_DESCRIPTOR_LEAF_SET_TYPE(kv, type) \
+	((kv)->value.leaf.data[0] = \
+	 CSR1212_CPU_TO_BE32(CSR1212_DESCRIPTOR_LEAF_SPECIFIER_ID(kv) | \
+			     ((type) << CSR1212_DESCRIPTOR_LEAF_TYPE_SHIFT)))
+#define CSR1212_DESCRIPTOR_LEAF_SET_SPECIFIER_ID(kv, spec_id) \
+	((kv)->value.leaf.data[0] = \
+	 CSR1212_CPU_TO_BE32((CSR1212_DESCRIPTOR_LEAF_TYPE(kv) << \
+			      CSR1212_DESCRIPTOR_LEAF_TYPE_SHIFT) | \
+			     ((spec_id) & CSR1212_DESCRIPTOR_LEAF_SPECIFIER_ID_MASK)))
+
+/* Text Descriptor Leaf manipulation macros */
+#define CSR1212_TEXTUAL_DESCRIPTOR_LEAF_WIDTH_SHIFT 28
+#define CSR1212_TEXTUAL_DESCRIPTOR_LEAF_WIDTH_MASK 0xf /* after shift */
+#define CSR1212_TEXTUAL_DESCRIPTOR_LEAF_CHAR_SET_SHIFT 16
+#define CSR1212_TEXTUAL_DESCRIPTOR_LEAF_CHAR_SET_MASK 0xfff  /* after shift */
+#define CSR1212_TEXTUAL_DESCRIPTOR_LEAF_LANGUAGE_MASK 0xffff
+#define CSR1212_TEXTUAL_DESCRIPTOR_LEAF_OVERHEAD (1 * sizeof(u_int32_t))
+
+#define CSR1212_TEXTUAL_DESCRIPTOR_LEAF_WIDTH(kv) \
+	(CSR1212_BE32_TO_CPU((kv)->value.leaf.data[1]) >> \
+	 CSR1212_TEXTUAL_DESCRIPTOR_LEAF_WIDTH_SHIFT)
+#define CSR1212_TEXTUAL_DESCRIPTOR_LEAF_CHAR_SET(kv) \
+	((CSR1212_BE32_TO_CPU((kv)->value.leaf.data[1]) >> \
+			     CSR1212_TEXTUAL_DESCRIPTOR_LEAF_CHAR_SET_SHIFT) & \
+			    CSR1212_TEXTUAL_DESCRIPTOR_LEAF_CHAR_SET_MASK)
+#define CSR1212_TEXTUAL_DESCRIPTOR_LEAF_LANGUAGE(kv) \
+	(CSR1212_BE32_TO_CPU((kv)->value.leaf.data[1]) & \
+	 CSR1212_TEXTUAL_DESCRIPTOR_LEAF_LANGUAGE_MASK)
+#define CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA(kv) \
+	(&((kv)->value.leaf.data[2]))
+
+#define CSR1212_TEXTUAL_DESCRIPTOR_LEAF_SET_WIDTH(kv, width) \
+	((kv)->value.leaf.data[1] = \
+	 ((kv)->value.leaf.data[1] & \
+	  CSR1212_CPU_TO_BE32(~(CSR1212_TEXTUAL_DESCRIPTOR_LEAF_WIDTH_MASK << \
+				CSR1212_TEXTUAL_DESCRIPTOR_LEAF_WIDTH_SHIFT))) | \
+	 CSR1212_CPU_TO_BE32(((width) & \
+			      CSR1212_TEXTUAL_DESCRIPTOR_LEAF_WIDTH_MASK) << \
+			     CSR1212_TEXTUAL_DESCRIPTOR_LEAF_WIDTH_SHIFT))
+#define CSR1212_TEXTUAL_DESCRIPTOR_LEAF_SET_CHAR_SET(kv, char_set) \
+	((kv)->value.leaf.data[1] = \
+	 ((kv)->value.leaf.data[1] & \
+	  CSR1212_CPU_TO_BE32(~(CSR1212_TEXTUAL_DESCRIPTOR_LEAF_CHAR_SET_MASK << \
+				CSR1212_TEXTUAL_DESCRIPTOR_LEAF_CHAR_SET_SHIFT))) | \
+	 CSR1212_CPU_TO_BE32(((char_set) & \
+			      CSR1212_TEXTUAL_DESCRIPTOR_LEAF_CHAR_SET_MASK) << \
+			     CSR1212_TEXTUAL_DESCRIPTOR_LEAF_CHAR_SET_SHIFT))
+#define CSR1212_TEXTUAL_DESCRIPTOR_LEAF_SET_LANGUAGE(kv, language) \
+	((kv)->value.leaf.data[1] = \
+	 ((kv)->value.leaf.data[1] & \
+	  CSR1212_CPU_TO_BE32(~(CSR1212_TEXTUAL_DESCRIPTOR_LEAF_LANGUAGE_MASK))) | \
+	 CSR1212_CPU_TO_BE32(((language) & \
+			      CSR1212_TEXTUAL_DESCRIPTOR_LEAF_LANGUAGE_MASK)))
+
+
+/* Icon Descriptor Leaf manipulation macros */
+#define CSR1212_ICON_DESCRIPTOR_LEAF_VERSION_MASK 0xffffff
+#define CSR1212_ICON_DESCRIPTOR_LEAF_PALETTE_DEPTH_SHIFT 30
+#define CSR1212_ICON_DESCRIPTOR_LEAF_PALETTE_DEPTH_MASK 0x3 /* after shift */
+#define CSR1212_ICON_DESCRIPTOR_LEAF_COLOR_SPACE_SHIFT 16
+#define CSR1212_ICON_DESCRIPTOR_LEAF_COLOR_SPACE_MASK 0xf /* after shift */
+#define CSR1212_ICON_DESCRIPTOR_LEAF_LANGUAGE_MASK 0xffff
+#define CSR1212_ICON_DESCRIPTOR_LEAF_HSCAN_SHIFT 16
+#define CSR1212_ICON_DESCRIPTOR_LEAF_HSCAN_MASK 0xffff /* after shift */
+#define CSR1212_ICON_DESCRIPTOR_LEAF_VSCAN_MASK 0xffff
+#define CSR1212_ICON_DESCRIPTOR_LEAF_OVERHEAD (3 * sizeof(u_int32_t))
+
+#define CSR1212_ICON_DESCRIPTOR_LEAF_VERSION(kv) \
+	(CSR1212_BE32_TO_CPU((kv)->value.leaf.data[2]) & \
+	 CSR1212_ICON_DESCRIPTOR_LEAF_VERSION_MASK)
+
+#define CSR1212_ICON_DESCRIPTOR_LEAF_PALETTE_DEPTH(kv) \
+	(CSR1212_BE32_TO_CPU((kv)->value.leaf.data[3]) >> \
+	 CSR1212_ICON_DESCRIPTOR_LEAF_PALETTE_DEPTH_SHIFT)
+
+#define CSR1212_ICON_DESCRIPTOR_LEAF_COLOR_SPACE(kv) \
+	((CSR1212_BE32_TO_CPU((kv)->value.leaf.data[3]) >> \
+	  CSR1212_ICON_DESCRIPTOR_LEAF_COLOR_SPACE_SHIFT) & \
+	 CSR1212_ICON_DESCRIPTOR_LEAF_COLOR_SPACE_MASK)
+
+#define CSR1212_ICON_DESCRIPTOR_LEAF_LANGUAGE(kv) \
+	(CSR1212_BE32_TO_CPU((kv)->value.leaf.data[3]) & \
+	 CSR1212_ICON_DESCRIPTOR_LEAF_LANGUAGE_MASK)
+
+#define CSR1212_ICON_DESCRIPTOR_LEAF_HSCAN(kv) \
+	((CSR1212_BE32_TO_CPU((kv)->value.leaf.data[4]) >> \
+	  CSR1212_ICON_DESCRIPTOR_LEAF_COLOR_HSCAN_SHIFT) & \
+	 CSR1212_ICON_DESCRIPTOR_LEAF_COLOR_HSCAN_MASK)
+
+#define CSR1212_ICON_DESCRIPTOR_LEAF_VSCAN(kv) \
+	(CSR1212_BE32_TO_CPU((kv)->value.leaf.data[4]) & \
+	 CSR1212_ICON_DESCRIPTOR_LEAF_VSCAN_MASK)
+
+#define CSR1212_ICON_DESCRIPTOR_LEAF_PALETTE(kv) \
+	(&((kv)->value.leaf.data[5]))
+
+static inline u_int32_t *CSR1212_ICON_DESCRIPTOR_LEAF_PIXELS(struct csr1212_keyval *kv)
+{
+	static const int pd[4] = { 0, 4, 16, 256 };
+	static const int cs[16] = { 4, 2 };
+	int ps = pd[CSR1212_ICON_DESCRIPTOR_LEAF_PALETTE_DEPTH(kv)];
+
+	return &kv->value.leaf.data[5 +
+				    (ps * cs[CSR1212_ICON_DESCRIPTOR_LEAF_COLOR_SPACE(kv)]) /
+			   sizeof(u_int32_t)];
+}
+
+#define CSR1212_ICON_DESCRIPTOR_LEAF_SET_VERSION(kv, version) \
+	((kv)->value.leaf.data[2] = \
+	 ((kv)->value.leaf.data[2] & \
+	  CSR1212_CPU_TO_BE32(~(CSR1212_ICON_DESCRIPTOR_LEAF_VERSION_MASK))) | \
+	 CSR1212_CPU_TO_BE32(((version) & \
+			      CSR1212_ICON_DESCRIPTOR_LEAF_VERSION_MASK)))
+
+#define CSR1212_ICON_DESCRIPTOR_LEAF_SET_PALETTE_DEPTH(kv, palette_depth) \
+	((kv)->value.leaf.data[3] = \
+	 ((kv)->value.leaf.data[3] & \
+	  CSR1212_CPU_TO_BE32(~(CSR1212_ICON_DESCRIPTOR_LEAF_PALETTE_DEPTH_MASK << \
+				CSR1212_ICON_DESCRIPTOR_LEAF_PALETTE_DEPTH_SHIFT))) | \
+	 CSR1212_CPU_TO_BE32(((palette_depth) & \
+			      CSR1212_ICON_DESCRIPTOR_LEAF_PALETTE_DEPTH_MASK) << \
+			     CSR1212_ICON_DESCRIPTOR_LEAF_PALETTE_DEPTH_SHIFT))
+
+#define CSR1212_ICON_DESCRIPTOR_LEAF_SET_COLOR_SPACE(kv, color_space) \
+	((kv)->value.leaf.data[3] = \
+	 ((kv)->value.leaf.data[3] & \
+	  CSR1212_CPU_TO_BE32(~(CSR1212_ICON_DESCRIPTOR_LEAF_COLOR_SPACE_MASK << \
+				CSR1212_ICON_DESCRIPTOR_LEAF_COLOR_SPACE_SHIFT))) | \
+	 CSR1212_CPU_TO_BE32(((color_space) & \
+			      CSR1212_ICON_DESCRIPTOR_LEAF_COLOR_SPACE_MASK) << \
+			     CSR1212_ICON_DESCRIPTOR_LEAF_COLOR_SPACE_SHIFT))
+
+#define CSR1212_ICON_DESCRIPTOR_LEAF_SET_LANGUAGE(kv, language) \
+	((kv)->value.leaf.data[3] = \
+	 ((kv)->value.leaf.data[3] & \
+	  CSR1212_CPU_TO_BE32(~(CSR1212_ICON_DESCRIPTOR_LEAF_LANGUAGE_MASK))) | \
+	 CSR1212_CPU_TO_BE32(((language) & \
+			      CSR1212_ICON_DESCRIPTOR_LEAF_LANGUAGE_MASK)))
+
+#define CSR1212_ICON_DESCRIPTOR_LEAF_SET_HSCAN(kv, hscan) \
+	((kv)->value.leaf.data[4] = \
+	 ((kv)->value.leaf.data[4] & \
+	  CSR1212_CPU_TO_BE32(~(CSR1212_ICON_DESCRIPTOR_LEAF_HSCAN_MASK << \
+				CSR1212_ICON_DESCRIPTOR_LEAF_HSCAN_SHIFT))) | \
+	 CSR1212_CPU_TO_BE32(((hscan) & \
+			      CSR1212_ICON_DESCRIPTOR_LEAF_HSCAN_MASK) << \
+			     CSR1212_ICON_DESCRIPTOR_LEAF_HSCAN_SHIFT))
+
+#define CSR1212_ICON_DESCRIPTOR_LEAF_SET_VSCAN(kv, vscan) \
+	((kv)->value.leaf.data[4] = \
+	 (((kv)->value.leaf.data[4] & \
+	  CSR1212_CPU_TO_BE32(~CSR1212_ICON_DESCRIPTOR_LEAF_VSCAN_MASK))) | \
+	 CSR1212_CPU_TO_BE32(((vscan) & \
+			      CSR1212_ICON_DESCRIPTOR_LEAF_VSCAN_MASK)))
+
+
+/* Modifiable Descriptor Leaf manipulation macros */
+#define CSR1212_MODIFIABLE_DESCRIPTOR_LEAF_MAX_SIZE_SHIFT 16
+#define CSR1212_MODIFIABLE_DESCRIPTOR_LEAF_MAX_SIZE_MASK 0xffff
+#define CSR1212_MODIFIABLE_DESCRIPTOR_LEAF_ADDR_HI_SHIFT 32
+#define CSR1212_MODIFIABLE_DESCRIPTOR_LEAF_ADDR_HI_MASK 0xffff
+#define CSR1212_MODIFIABLE_DESCRIPTOR_LEAF_ADDR_LO_MASK 0xffffffffULL
+
+#define CSR1212_MODIFIABLE_DESCRIPTOR_MAX_SIZE(kv) \
+	CSR1212_BE16_TO_CPU((kv)->value.leaf.data[0] >> CSR1212_MODIFIABLE_DESCRIPTOR_MAX_SIZE_SHIFT)
+
+#define CSR1212_MODIFIABLE_DESCRIPTOR_ADDRESS(kv) \
+	(CSR1212_BE16_TO_CPU(((u_int64_t)((kv)->value.leaf.data[0])) << \
+			     CSR1212_MODIFIABLE_DESCRIPTOR_ADDR_HI_SHIFT) | \
+	 CSR1212_BE32_TO_CPU((kv)->value.leaf.data[1]))
+
+#define CSR1212_MODIFIABLE_DESCRIPTOR_SET_MAX_SIZE(kv, size) \
+	((kv)->value.leaf.data[0] = \
+	 ((kv)->value.leaf.data[0] & \
+	  CSR1212_CPU_TO_BE32(~(CSR1212_MODIFIABLE_DESCRIPTOR_LEAF_MAX_SIZE_MASK << \
+				CSR1212_MODIFIABLE_DESCRIPTOR_LEAF_MAX_SIZE_SHIFT))) | \
+	 CSR1212_CPU_TO_BE32(((size) & \
+			      CSR1212_MODIFIABLE_DESCRIPTOR_LEAF_MAX_SIZE_MASK) << \
+			     CSR1212_MODIFIABLE_DESCRIPTOR_LEAF_MAX_SIZE_SHIFT))
+
+#define CSR1212_MODIFIABLE_DESCRIPTOR_SET_ADDRESS_HI(kv, addr) \
+	((kv)->value.leaf.data[0] = \
+	 ((kv)->value.leaf.data[0] & \
+	  CSR1212_CPU_TO_BE32(~(CSR1212_MODIFIABLE_DESCRIPTOR_LEAF_ADDR_HI_MASK))) | \
+	  CSR1212_CPU_TO_BE32(((addr) & \
+			       CSR1212_MODIFIABLE_DESCRIPTOR_LEAF_ADDR_HI_MASK)))
+
+#define CSR1212_MODIFIABLE_DESCRIPTOR_SET_ADDRESS_LO(kv, addr) \
+	((kv)->value.leaf.data[1] = \
+	 CSR1212_CPU_TO_BE32(addr & CSR1212_MODIFIABLE_DESCRIPTOR_LEAF_ADDR_LO_MASK))
+
+
+
+/* The following 2 function are for creating new Configuration ROM trees.  The
+ * first function is used for both creating local trees and parsing remote
+ * trees.  The second function adds pertinent information to local Configuration
+ * ROM trees - namely data for the bus information block. */
+extern struct csr1212_csr *csr1212_create_csr(struct csr1212_bus_ops *ops,
+					      size_t bus_info_size,
+					      void *private_data);
+extern void csr1212_init_local_csr(struct csr1212_csr *csr,
+				   const u_int32_t *bus_info_data, int max_rom);
+
+
+/* The following function destroys a Configuration ROM tree and release all
+ * memory taken by the tree. */
+extern void csr1212_destroy_csr(struct csr1212_csr *csr);
+
+
+/* The following set of functions are fore creating new keyvals for placement in
+ * a Configuration ROM tree.  Code that creates new keyvals with these functions
+ * must release those keyvals with csr1212_release_keyval() when they are no
+ * longer needed. */
+extern struct csr1212_keyval *csr1212_new_immediate(u_int8_t key, u_int32_t value);
+extern struct csr1212_keyval *csr1212_new_leaf(u_int8_t key, const void *data,
+					       size_t data_len);
+extern struct csr1212_keyval *csr1212_new_csr_offset(u_int8_t key,
+						     u_int32_t csr_offset);
+extern struct csr1212_keyval *csr1212_new_directory(u_int8_t key);
+extern struct csr1212_keyval *csr1212_new_extended_immediate(u_int32_t spec,
+							     u_int32_t key,
+							     u_int32_t value);
+extern struct csr1212_keyval *csr1212_new_extended_leaf(u_int32_t spec,
+							u_int32_t key,
+							const void *data,
+							size_t data_len);
+extern struct csr1212_keyval *csr1212_new_descriptor_leaf(u_int8_t dtype,
+							  u_int32_t specifier_id,
+							  const void *data,
+							  size_t data_len);
+extern struct csr1212_keyval *csr1212_new_textual_descriptor_leaf(u_int8_t cwidth,
+								  u_int16_t cset,
+								  u_int16_t language,
+								  const void *data,
+								  size_t data_len);
+extern struct csr1212_keyval *csr1212_new_string_descriptor_leaf(const char *s);
+extern struct csr1212_keyval *csr1212_new_icon_descriptor_leaf(u_int32_t version,
+							       u_int8_t palette_depth,
+							       u_int8_t color_space,
+							       u_int16_t language,
+							       u_int16_t hscan,
+							       u_int16_t vscan,
+							       u_int32_t *palette,
+							       u_int32_t *pixels);
+extern struct csr1212_keyval *csr1212_new_modifiable_descriptor_leaf(u_int16_t max_size,
+								     u_int64_t address);
+extern struct csr1212_keyval *csr1212_new_keyword_leaf(int strc,
+						       const char *strv[]);
+
+
+/* The following functions manage association between keyvals.  Typically,
+ * Descriptor Leaves and Directories will be associated with another keyval and
+ * it is desirable for the Descriptor keyval to be place immediately after the
+ * keyval that it is associated with.*/
+extern int csr1212_associate_keyval(struct csr1212_keyval *kv,
+				    struct csr1212_keyval *associate);
+extern void csr1212_disassociate_keyval(struct csr1212_keyval *kv);
+
+
+/* The following functions manage the association of a keyval and directories.
+ * A keyval may be attached to more than one directory. */
+extern int csr1212_attach_keyval_to_directory(struct csr1212_keyval *dir,
+					      struct csr1212_keyval *kv);
+extern void csr1212_detach_keyval_from_directory(struct csr1212_keyval *dir,
+						 struct csr1212_keyval *kv);
+
+
+/* The following functions create a Configuration ROM image from the tree of
+ * keyvals provided.  csr1212_generate_csr_image() creates a complete image in
+ * the list of caches available via csr->cache_head.  The other functions are
+ * provided should there be a need to create a flat image without restrictions
+ * placed by IEEE 1212. */
+extern struct csr1212_keyval *csr1212_generate_positions(struct csr1212_csr_rom_cache *cache,
+							 struct csr1212_keyval *start_kv,
+							 int start_pos);
+extern size_t csr1212_generate_layout_order(struct csr1212_keyval *kv);
+extern void csr1212_fill_cache(struct csr1212_csr_rom_cache *cache);
+extern int csr1212_generate_csr_image(struct csr1212_csr *csr);
+
+
+/* This is a convience function for reading a block of data out of one of the
+ * caches in the csr->cache_head list. */
+extern int csr1212_read(struct csr1212_csr *csr, u_int32_t offset, void *buffer,
+			u_int32_t len);
+
+
+/* The following functions are in place for parsing Configuration ROM images.
+ * csr1212_parse_keyval() is used should there be a need to directly parse a
+ * Configuration ROM directly. */
+extern int csr1212_parse_keyval(struct csr1212_keyval *kv,
+				struct csr1212_csr_rom_cache *cache);
+extern int csr1212_parse_csr(struct csr1212_csr *csr);
+
+/* These are internal functions referenced by inline functions below. */
+extern int _csr1212_read_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv);
+extern void _csr1212_destroy_keyval(struct csr1212_keyval *kv);
+
+
+/* This function allocates a new cache which may be used for either parsing or
+ * generating sub-sets of Configuration ROM images. */
+static inline struct csr1212_csr_rom_cache *csr1212_rom_cache_malloc(u_int32_t offset,
+								     size_t size)
+{
+	struct csr1212_csr_rom_cache *cache;
+
+	cache = (struct csr1212_csr_rom_cache*)CSR1212_MALLOC(sizeof(struct csr1212_csr_rom_cache) + size);
+	if (!cache)
+		return NULL;
+
+	cache->next = NULL;
+	cache->prev = NULL;
+	cache->filled_head = NULL;
+	cache->filled_tail = NULL;
+	cache->layout_head = NULL;
+	cache->layout_tail = NULL;
+	cache->offset = offset;
+	cache->size = size;
+	cache->ext_rom = NULL;
+
+	return cache;
+}
+
+
+/* This function ensures that a keyval contains data when referencing a keyval
+ * created by parsing a Configuration ROM. */
+static inline struct csr1212_keyval *csr1212_get_keyval(struct csr1212_csr *csr,
+							struct csr1212_keyval *kv)
+{
+	if (!kv)
+		return NULL;
+	if (!kv->valid)
+		if (_csr1212_read_keyval(csr, kv) != CSR1212_SUCCESS)
+			return NULL;
+	return kv;
+}
+
+
+/* This function increments the reference count for a keyval should there be a
+ * need for code to retain a keyval that has been parsed. */
+static inline void csr1212_keep_keyval(struct csr1212_keyval *kv)
+{
+	kv->refcnt++;
+}
+
+
+/* This function decrements a keyval's reference count and will destroy the
+ * keyval when there are no more users of the keyval.  This should be called by
+ * any code that calls csr1212_keep_keyval() or any of the keyval creation
+ * routines csr1212_new_*(). */
+static inline void csr1212_release_keyval(struct csr1212_keyval *kv)
+{
+	if (kv->refcnt > 1)
+		kv->refcnt--;
+	else
+		_csr1212_destroy_keyval(kv);
+}
+
+
+/*
+ * This macro allows for looping over the keyval entries in a directory and it
+ * ensures that keyvals from remote ConfigROMs are parsed properly.
+ *
+ * _csr is a struct csr1212_csr * that points to CSR associated with dir.
+ * _kv is a struct csr1212_keyval * that'll point to the current keyval (loop index).
+ * _dir is a struct csr1212_keyval * that points to the directory to be looped.
+ * _pos is a struct csr1212_dentry * that is used internally for indexing.
+ *
+ * kv will be NULL upon exit of the loop.
+ */
+#define csr1212_for_each_dir_entry(_csr, _kv, _dir, _pos)			\
+	for (csr1212_get_keyval((_csr), (_dir)),				\
+	     _pos = (_dir)->value.directory.dentries_head,			\
+	     _kv = (_pos) ? csr1212_get_keyval((_csr), _pos->kv) : NULL;	\
+	     (_kv) && (_pos);							\
+	     (_kv->associate == NULL) ?						\
+		     ((_pos = _pos->next), 					\
+		      (_kv = (_pos) ? csr1212_get_keyval((_csr), _pos->kv) :	\
+                          NULL)) :						\
+		     (_kv = csr1212_get_keyval((_csr), _kv->associate)))
+
+
+
+#ifdef __cplusplus
+   } 
+#endif
+
+#endif /* __CSR1212_H__ */
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_plug_info.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_plug_info.h (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_plug_info.h (revision 183)
@@ -0,0 +1,315 @@
+/* avc_extended_plug_info.h
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef AVCEXTENDEDPLUGINFO_H
+#define AVCEXTENDEDPLUGINFO_H
+
+#include "avc_extended_cmd_generic.h"
+#include "avc_generic.h"
+
+#include <libavc1394/avc1394.h>
+
+#include <string>
+#include <vector>
+
+class ExtendedPlugInfoPlugTypeSpecificData : public IBusData
+{
+public:
+    enum EExtendedPlugInfoPlugType {
+        eEPIPT_IsoStream   = 0x0,
+        eEPIPT_AsyncStream = 0x1,
+        eEPIPT_Midi        = 0x2,
+        eEPIPT_Sync        = 0x3,
+        eEPIPT_Analog      = 0x4,
+        eEPIPT_Digital     = 0x5,
+
+        eEPIPT_Unknown     = 0xff,
+    };
+
+    ExtendedPlugInfoPlugTypeSpecificData( EExtendedPlugInfoPlugType ePlugType =  eEPIPT_Unknown);
+    virtual ~ExtendedPlugInfoPlugTypeSpecificData();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual ExtendedPlugInfoPlugTypeSpecificData* clone() const;
+
+    typedef byte_t plug_type_t;
+
+    plug_type_t m_plugType;
+};
+
+const char* extendedPlugInfoPlugTypeToString( plug_type_t plugType );
+
+/////////////////////////////////////////
+
+class ExtendedPlugInfoPlugNameSpecificData : public IBusData
+{
+public:
+    ExtendedPlugInfoPlugNameSpecificData();
+    virtual ~ExtendedPlugInfoPlugNameSpecificData();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual ExtendedPlugInfoPlugNameSpecificData* clone() const;
+
+    std::string m_name;
+};
+
+/////////////////////////////////////////
+
+class ExtendedPlugInfoPlugNumberOfChannelsSpecificData : public IBusData
+{
+public:
+    ExtendedPlugInfoPlugNumberOfChannelsSpecificData();
+    virtual ~ExtendedPlugInfoPlugNumberOfChannelsSpecificData();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual ExtendedPlugInfoPlugNumberOfChannelsSpecificData* clone() const;
+
+    nr_of_channels_t m_nrOfChannels;
+};
+
+
+/////////////////////////////////////////
+
+class ExtendedPlugInfoPlugChannelPositionSpecificData : public IBusData
+{
+public:
+    enum ELocation {
+        eEPI_LeftFront        = 0x01,
+        eEPI_RightFront       = 0x02,
+        eEPI_Center           = 0x03,
+        eEPI_Subwoofer        = 0x04,
+        eEPI_LeftSurround     = 0x05,
+        eEPI_RightSurround    = 0x06,
+        eEPI_LeftOfCenter     = 0x07,
+        eEPI_RightOfCenter    = 0x08,
+        eEPI_Surround         = 0x09,
+        eEPI_SideLeft         = 0x0a,
+        eEPI_SideRight        = 0x0b,
+        eEPI_Top              = 0x0c,
+        eEPI_Bottom           = 0x0d,
+        eEPI_LeftFrontEffect  = 0x0e,
+        eEPI_RightFrontEffect = 0x0f,
+        eEPI_NoPostion        = 0xff,
+    };
+
+    struct ChannelInfo {
+        stream_position_t          m_streamPosition;
+        stream_position_location_t m_location;
+    };
+
+    typedef std::vector<ChannelInfo> ChannelInfoVector;
+
+    struct ClusterInfo {
+        nr_of_channels_t         m_nrOfChannels;
+        ChannelInfoVector        m_channelInfos;
+    };
+
+    ExtendedPlugInfoPlugChannelPositionSpecificData();
+    virtual ~ExtendedPlugInfoPlugChannelPositionSpecificData();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual ExtendedPlugInfoPlugChannelPositionSpecificData* clone() const;
+
+    typedef std::vector<ClusterInfo> ClusterInfoVector;
+
+    nr_of_clusters_t         m_nrOfClusters;
+    ClusterInfoVector        m_clusterInfos;
+};
+
+/////////////////////////////////////////
+
+class ExtendedPlugInfoPlugChannelNameSpecificData : public IBusData
+{
+public:
+    ExtendedPlugInfoPlugChannelNameSpecificData();
+    virtual ~ExtendedPlugInfoPlugChannelNameSpecificData();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual ExtendedPlugInfoPlugChannelNameSpecificData* clone() const;
+
+    stream_position_t m_streamPosition;
+    string_length_t   m_stringLength;
+    std::string       m_plugChannelName;
+};
+
+/////////////////////////////////////////
+
+class ExtendedPlugInfoPlugInputSpecificData : public IBusData
+{
+public:
+    ExtendedPlugInfoPlugInputSpecificData();
+    ExtendedPlugInfoPlugInputSpecificData( const ExtendedPlugInfoPlugInputSpecificData& rhs );
+    virtual ~ExtendedPlugInfoPlugInputSpecificData();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual ExtendedPlugInfoPlugInputSpecificData* clone() const;
+
+    PlugAddressSpecificData* m_plugAddress;
+};
+
+
+/////////////////////////////////////////
+
+class ExtendedPlugInfoPlugOutputSpecificData : public IBusData
+{
+public:
+    ExtendedPlugInfoPlugOutputSpecificData();
+    ExtendedPlugInfoPlugOutputSpecificData( const ExtendedPlugInfoPlugOutputSpecificData& rhs );
+    virtual ~ExtendedPlugInfoPlugOutputSpecificData();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual ExtendedPlugInfoPlugOutputSpecificData* clone() const;
+
+    number_of_output_plugs_t m_nrOfOutputPlugs;
+
+    typedef std::vector<PlugAddressSpecificData*> PlugAddressVector;
+    PlugAddressVector m_outputPlugAddresses;
+};
+
+/////////////////////////////////////////
+
+class ExtendedPlugInfoClusterInfoSpecificData : public IBusData
+{
+public:
+    enum EPortType {
+        ePT_Speaker            = 0x00,
+        ePT_Headphone          = 0x01,
+        ePT_Microphone         = 0x02,
+        ePT_Line               = 0x03,
+        ePT_SPDIF              = 0x04,
+        ePT_ADAT               = 0x05,
+        ePT_TDIF               = 0x06,
+        ePT_MADI               = 0x07,
+        ePT_Analog             = 0x08,
+        ePT_Digital            = 0x09,
+        ePT_MIDI               = 0x0a,
+        ePT_NoType             = 0xff,
+    };
+
+    ExtendedPlugInfoClusterInfoSpecificData();
+    virtual ~ExtendedPlugInfoClusterInfoSpecificData();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual ExtendedPlugInfoClusterInfoSpecificData* clone() const;
+
+    cluster_index_t m_clusterIndex;
+    port_type_t     m_portType;
+    string_length_t m_stringLength;
+    std::string     m_clusterName;
+};
+
+const char* extendedPlugInfoClusterInfoPortTypeToString( port_type_t portType );
+
+/////////////////////////////////////////
+
+#define AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_TYPE                   0x00
+#define AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_NAME                   0x01
+#define AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_NO_OF_CHANNELS         0x02
+#define AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_CHANNEL_POSITION       0x03
+#define AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_CHANNEL_NAME           0x04
+#define AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_INPUT                  0x05
+#define AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_OUTPUT                 0x06
+#define AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_CLUSTER_INFO           0x07
+
+class ExtendedPlugInfoInfoType : public IBusData
+{
+public:
+    enum EInfoType {
+        eIT_PlugType        = AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_TYPE,
+        eIT_PlugName        = AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_NAME,
+        eIT_NoOfChannels    = AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_NO_OF_CHANNELS,
+        eIT_ChannelPosition = AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_CHANNEL_POSITION,
+        eIT_ChannelName     = AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_CHANNEL_NAME,
+        eIT_PlugInput       = AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_INPUT,
+        eIT_PlugOutput      = AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_OUTPUT,
+        eIT_ClusterInfo     = AVC1394_EXTENDED_PLUG_INFO_INFO_TYPE_PLUG_CLUSTER_INFO,
+    };
+
+    ExtendedPlugInfoInfoType(EInfoType eInfoType);
+    ExtendedPlugInfoInfoType( const ExtendedPlugInfoInfoType& rhs );
+    virtual ~ExtendedPlugInfoInfoType();
+
+    bool initialize();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual ExtendedPlugInfoInfoType* clone() const;
+
+    info_type_t m_infoType;
+
+    ExtendedPlugInfoPlugTypeSpecificData*               m_plugType;
+    ExtendedPlugInfoPlugNameSpecificData*               m_plugName;
+    ExtendedPlugInfoPlugNumberOfChannelsSpecificData*   m_plugNrOfChns;
+    ExtendedPlugInfoPlugChannelPositionSpecificData*    m_plugChannelPosition;
+    ExtendedPlugInfoPlugChannelNameSpecificData*        m_plugChannelName;
+    ExtendedPlugInfoPlugInputSpecificData*              m_plugInput;
+    ExtendedPlugInfoPlugOutputSpecificData*             m_plugOutput;
+    ExtendedPlugInfoClusterInfoSpecificData*            m_plugClusterInfo;
+};
+
+const char* extendedPlugInfoInfoTypeToString( info_type_t infoType );
+
+/////////////////////////////////////////////////////////
+
+#define AVC1394_PLUG_INFO_SUBFUNCTION_EXTENDED_PLUG_INFO_CMD   0xC0
+#define AVC1394_PLUG_INFO_SUBFUNCTION_SERIAL_BUS_NOT_USED      0xFF
+
+
+class ExtendedPlugInfoCmd: public AVCCommand
+{
+public:
+    enum ESubFunction {
+	eSF_ExtendedPlugInfoCmd                  = AVC1394_PLUG_INFO_SUBFUNCTION_EXTENDED_PLUG_INFO_CMD,
+        eSF_NotUsed                              = AVC1394_PLUG_INFO_SUBFUNCTION_SERIAL_BUS_NOT_USED,
+    };
+
+    ExtendedPlugInfoCmd( Ieee1394Service* ieee1394service,
+                         ESubFunction eSubFunction = eSF_ExtendedPlugInfoCmd );
+    ExtendedPlugInfoCmd( const ExtendedPlugInfoCmd& rhs );
+    virtual ~ExtendedPlugInfoCmd();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+
+    bool setPlugAddress( const PlugAddress& plugAddress );
+    bool setSubFunction( ESubFunction subFunction );
+    bool setInfoType( const ExtendedPlugInfoInfoType& infoType );
+    ExtendedPlugInfoInfoType* getInfoType()
+	{ return m_infoType; }
+
+    virtual const char* getCmdName() const
+	{ return "ExtendedPlugInfoCmd"; }
+
+protected:
+    subfunction_t             m_subFunction;
+    PlugAddress*              m_plugAddress;
+    ExtendedPlugInfoInfoType* m_infoType;
+};
+
+
+#endif
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_subunit_info.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_subunit_info.h (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_subunit_info.h (revision 183)
@@ -0,0 +1,73 @@
+/* avc_subunit_info.h
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef AVCSubUnitInfo_h
+#define AVCSubUnitInfo_h
+
+#include "avc_generic.h"
+
+#include <libavc1394/avc1394.h>
+
+
+// No extended subunit queries supported
+
+class SubUnitInfoCmd: public AVCCommand
+{
+public:
+    SubUnitInfoCmd( Ieee1394Service* ieee1349service );
+    virtual ~SubUnitInfoCmd();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+
+    virtual const char* getCmdName() const
+	{ return "SubUnitInfoCmd"; }
+
+    bool clear();
+
+    page_t           m_page;
+    extension_code_t m_extension_code;
+
+
+
+    enum {
+	eMaxSubunitsPerPage = 4,
+	eMaxSubunitsPerUnit = 32,
+    };
+
+    struct TableEntry {
+	subunit_type_t   m_subunit_type;
+	max_subunit_id_t m_max_subunit_id;
+    };
+
+    struct TableEntry m_table[eMaxSubunitsPerPage];
+
+    short getMaxNoOfPages()
+	{ return eMaxSubunitsPerUnit / eMaxSubunitsPerPage; }
+
+
+    short            m_nrOfValidEntries;
+    short getNrOfValidEntries()
+	{ return m_nrOfValidEntries; }
+
+};
+
+
+#endif // AVCSubUnitInfo_h
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_definitions.cpp
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_definitions.cpp (revision 151)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_definitions.cpp (revision 151)
@@ -0,0 +1,140 @@
+/* avc_defintions.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "avc_definitions.h"
+
+
+int
+convertESamplingFrequency(ESamplingFrequency freq)
+{
+    int value = 0;
+
+    switch ( freq ) {
+    case eSF_22050Hz:
+        value = 22050;
+        break;
+    case eSF_24000Hz:
+        value = 24000;
+        break;
+    case eSF_32000Hz:
+        value = 32000;
+        break;
+    case eSF_44100Hz:
+        value = 44100;
+        break;
+    case eSF_48000Hz:
+        value = 48000;
+        break;
+    case eSF_88200Hz:
+        value = 88200;
+        break;
+    case eSF_96000Hz:
+        value = 96000;
+        break;
+    case eSF_176400Hz:
+        value = 176400;
+        break;
+    case eSF_192000Hz:
+        value = 192000;
+        break;
+    default:
+        value = 0;
+    }
+
+
+    return value;
+}
+
+ESamplingFrequency
+parseSampleRate( int sampleRate )
+{
+    ESamplingFrequency efreq;
+    switch ( sampleRate ) {
+    case 22050:
+        efreq = eSF_22050Hz;
+        break;
+    case 24000:
+        efreq = eSF_24000Hz;
+        break;
+    case 32000:
+        efreq = eSF_32000Hz;
+        break;
+    case 44100:
+        efreq = eSF_44100Hz;
+        break;
+    case 48000:
+        efreq = eSF_48000Hz;
+        break;
+    case 88200:
+        efreq = eSF_88200Hz;
+        break;
+    case 96000:
+        efreq = eSF_96000Hz;
+        break;
+    case 176400:
+        efreq = eSF_176400Hz;
+        break;
+    case 192000:
+        efreq = eSF_192000Hz;
+        break;
+    default:
+        efreq = eSF_DontCare;
+    }
+
+    return efreq;
+}
+
+std::ostream& operator<<( std::ostream& stream, ESamplingFrequency samplingFrequency )
+{
+    char* str;
+    switch ( samplingFrequency ) {
+    case eSF_22050Hz:
+        str = "22050";
+        break;
+    case eSF_24000Hz:
+        str = "24000";
+        break;
+    case eSF_32000Hz:
+        str = "32000";
+        break;
+    case eSF_44100Hz:
+        str = "44100";
+        break;
+    case eSF_48000Hz:
+        str = "48000";
+        break;
+    case eSF_88200Hz:
+        str = "88200";
+        break;
+    case eSF_96000Hz:
+        str = "96000";
+        break;
+    case eSF_176400Hz:
+        str = "176400";
+        break;
+    case eSF_192000Hz:
+        str = "192000";
+        break;
+    case eSF_DontCare:
+    default:
+        str = "unknown";
+    }
+    return stream << str;
+};
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_generic.cpp
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_generic.cpp (revision 185)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_generic.cpp (revision 185)
@@ -0,0 +1,264 @@
+/* avc_generic.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "avc_generic.h"
+#include "serialize.h"
+#include "ieee1394service.h"
+
+#include <netinet/in.h>
+
+#define DEBUG_EXTRA_VERBOSE 2
+
+int AVCCommand::m_time = 0;
+
+AVCCommand::AVCCommand( Ieee1394Service* ieee1394service,
+                        opcode_t opcode )
+    : m_1394Service( ieee1394service )
+    , m_nodeId( 0 )
+    , m_ctype( eCT_Unknown )
+    , m_subunit( 0xff )
+    , m_opcode( opcode )
+    , m_eResponse( eR_Unknown )
+    , m_verboseLevel( 0 )
+{
+}
+
+bool
+AVCCommand::serialize( IOSSerialize& se )
+{
+    se.write( m_ctype, "AVCCommand ctype" );
+    // XXX \todo improve IOSSerialize::write interface
+    char* buf;
+    asprintf( &buf, "AVCCommand subunit (subunit_type = %d, subunit_id = %d)",
+              getSubunitType(), getSubunitId() );
+    se.write( m_subunit, buf );
+    se.write( m_opcode, "AVCCommand opcode" );
+    return true;
+}
+
+bool
+AVCCommand::deserialize( IISDeserialize& de )
+{
+    de.read( &m_ctype );
+    de.read( &m_subunit );
+    de.read( &m_opcode );
+    return true;
+}
+
+bool
+AVCCommand::setCommandType( ECommandType commandType )
+{
+    m_ctype = commandType;
+    m_commandType = commandType;
+    return true;
+}
+
+AVCCommand::ECommandType
+AVCCommand::getCommandType()
+{
+    return m_commandType;
+}
+
+AVCCommand::EResponse
+AVCCommand::getResponse()
+{
+    return m_eResponse;
+}
+
+bool
+AVCCommand::setSubunitType(ESubunitType subunitType)
+{
+    byte_t subT = subunitType;
+
+    m_subunit = ( subT << 3 ) | ( m_subunit & 0x7 );
+    return true;
+}
+
+bool
+AVCCommand::setNodeId( fb_nodeid_t nodeId )
+{
+    m_nodeId = nodeId;
+    return true;
+}
+
+bool
+AVCCommand::setSubunitId(subunit_id_t subunitId)
+{
+    m_subunit = ( subunitId & 0x7 ) | ( m_subunit & 0xf8 );
+    return true;
+}
+
+AVCCommand::ESubunitType
+AVCCommand::getSubunitType()
+{
+    return static_cast<ESubunitType>( ( m_subunit >> 3 ) );
+}
+
+subunit_id_t
+AVCCommand::getSubunitId()
+{
+    return m_subunit & 0x7;
+}
+
+bool
+AVCCommand::setVerbose( int verboseLevel )
+{
+    m_verboseLevel = verboseLevel;
+    return true;
+}
+
+int
+AVCCommand::getVerboseLevel()
+{
+    return m_verboseLevel;
+}
+
+
+void
+AVCCommand::showFcpFrame( const unsigned char* buf,
+                          unsigned short frameSize ) const
+{
+    for ( int i = 0; i < frameSize; ++i ) {
+        if ( ( i % 16 ) == 0 ) {
+            if ( i > 0 ) {
+                printf( "\n" );
+            }
+            printf( "  %3d:\t", i );
+        } else if ( ( i % 4 ) == 0 ) {
+            printf( " " );
+        }
+        printf( "%02x ", buf[i] );
+    }
+    printf( "\n" );
+}
+
+bool
+AVCCommand::fire()
+{
+    memset( &m_fcpFrame,  0x0,  sizeof( m_fcpFrame ) );
+
+    BufferSerialize se( m_fcpFrame, sizeof( m_fcpFrame ) );
+    if ( !serialize( se ) ) {
+        printf(  "ExtendedPlugInfoCmd::fire: Could not serialize\n" );
+        return false;
+    }
+
+    unsigned short fcpFrameSize = se.getNrOfProducesBytes();
+
+    if ( getVerboseLevel() >= DEBUG_EXTRA_VERBOSE ) {
+        printf( "%s:\n", getCmdName() );
+        puts( "  Request:");
+        showFcpFrame( m_fcpFrame, fcpFrameSize );
+
+        CoutSerializer se;
+        serialize( se );
+    }
+
+    unsigned int resp_len;
+    quadlet_t* resp = m_1394Service->transactionBlock( m_nodeId,
+                                                       (quadlet_t*)m_fcpFrame,
+                                                       ( fcpFrameSize+3 ) / 4,
+                                                       &resp_len );
+    bool result = false;
+    if ( resp ) {
+        resp_len *= 4;
+        unsigned char* buf = ( unsigned char* ) resp;
+
+        m_eResponse = ( EResponse )( *buf );
+        switch ( m_eResponse )
+        {
+        case eR_Implemented:
+        case eR_Rejected:
+        case eR_NotImplemented:
+        {
+            BufferDeserialize de( buf, resp_len );
+            result = deserialize( de );
+
+            if ( getVerboseLevel() >= DEBUG_EXTRA_VERBOSE) {
+                puts("  Response:");
+                showFcpFrame( buf, de.getNrOfConsumedBytes() );
+
+                CoutSerializer se;
+                serialize( se );
+            }
+        }
+        break;
+        default:
+            printf( "unexpected response received (0x%x)\n", m_eResponse );
+            if ( getVerboseLevel() >= DEBUG_EXTRA_VERBOSE) {
+                puts("  Response:");
+                BufferDeserialize de( buf, resp_len );
+                deserialize( de );
+
+                showFcpFrame( buf, resp_len );
+            }
+
+        }
+    } else {
+	printf( "no response\n" );
+    }
+
+    if ( getVerboseLevel() >= DEBUG_EXTRA_VERBOSE ) {
+        printf( "\n" );
+    }
+
+    m_1394Service->transactionBlockClose();
+
+    usleep( m_time );
+
+    return result;
+}
+
+void
+AVCCommand::setSleepAfterAVCCommand( int time )
+{
+    m_time = time;
+}
+
+const char* subunitTypeStrings[] =
+{
+    "Monitor",
+    "Audio",
+    "Printer",
+    "Disc recorder",
+    "Tape recorder/VCR",
+    "Tuner",
+    "CA",
+    "Video camera",
+    "unknown",
+    "Panel",
+    "Bulletin board",
+    "Camera storage",
+    "Music",
+};
+
+const char*
+subunitTypeToString( subunit_type_t subunitType )
+{
+    if ( subunitType == AVCCommand::eST_Unit ) {
+        return "Unit";
+    }
+    if ( subunitType > ( int ) ( sizeof( subunitTypeStrings )
+             / sizeof( subunitTypeStrings[0] ) ) ) {
+        return "unknown";
+    } else {
+        return subunitTypeStrings[subunitType];
+    }
+}
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_cmd_generic.cpp
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_cmd_generic.cpp (revision 172)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_cmd_generic.cpp (revision 172)
@@ -0,0 +1,556 @@
+/* avc_extended_cmd_generic.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "avc_extended_cmd_generic.h"
+#include "serialize.h"
+#include "ieee1394service.h"
+
+UnitPlugAddress::UnitPlugAddress( EPlugType plugType,  plug_type_t plugId )
+    : m_plugType( plugType )
+    , m_plugId( plugId )
+    , m_reserved( 0xff )
+{
+}
+
+UnitPlugAddress::~UnitPlugAddress()
+{
+}
+
+bool
+UnitPlugAddress::serialize( IOSSerialize& se )
+{
+    se.write( m_plugType, "UnitPlugAddress plugType" );
+    se.write( m_plugId, "UnitPlugAddress plugId" );
+    se.write( m_reserved, "UnitPlugAddress reserved" );
+    return true;
+}
+
+bool
+UnitPlugAddress::deserialize( IISDeserialize& de )
+{
+    de.read( &m_plugType );
+    de.read( &m_plugId );
+    de.read( &m_reserved );
+    return true;
+}
+
+UnitPlugAddress*
+UnitPlugAddress::clone() const
+{
+    return new UnitPlugAddress( *this );
+}
+
+////////////////////////////////////////////////////////////
+
+SubunitPlugAddress::SubunitPlugAddress( plug_id_t plugId )
+    : m_plugId( plugId )
+    , m_reserved0( 0xff )
+    , m_reserved1( 0xff )
+{
+}
+
+SubunitPlugAddress::~SubunitPlugAddress()
+{
+}
+
+bool
+SubunitPlugAddress::serialize( IOSSerialize& se )
+{
+    se.write( m_plugId, "SubunitPlugAddress plugId" );
+    se.write( m_reserved0, "SubunitPlugAddress reserved0" );
+    se.write( m_reserved1, "SubunitPlugAddress reserved1" );
+    return true;
+}
+
+bool
+SubunitPlugAddress::deserialize( IISDeserialize& de )
+{
+    de.read( &m_plugId );
+    de.read( &m_reserved0 );
+    de.read( &m_reserved1 );
+    return true;
+}
+
+SubunitPlugAddress*
+SubunitPlugAddress::clone() const
+{
+    return new SubunitPlugAddress( *this );
+}
+
+////////////////////////////////////////////////////////////
+
+FunctionBlockPlugAddress::FunctionBlockPlugAddress(  function_block_type_t functionBlockType,
+                                                     function_block_id_t functionBlockId,
+                                                     plug_id_t plugId )
+    : m_functionBlockType( functionBlockType )
+    , m_functionBlockId( functionBlockId )
+    , m_plugId( plugId )
+{
+}
+
+FunctionBlockPlugAddress::~FunctionBlockPlugAddress()
+{
+}
+
+bool
+FunctionBlockPlugAddress::serialize( IOSSerialize& se )
+{
+    se.write( m_functionBlockType, "FunctionBlockPlugAddress functionBlockType" );
+    se.write( m_functionBlockId, "FunctionBlockPlugAddress functionBlockId" );
+    se.write( m_plugId, "FunctionBlockPlugAddress plugId" );
+    return true;
+}
+
+bool
+FunctionBlockPlugAddress::deserialize( IISDeserialize& de )
+{
+    de.read( &m_functionBlockType );
+    de.read( &m_functionBlockId );
+    de.read( &m_plugId );
+    return true;
+}
+
+FunctionBlockPlugAddress*
+FunctionBlockPlugAddress:: clone() const
+{
+    return new FunctionBlockPlugAddress( *this );
+}
+
+////////////////////////////////////////////////////////////
+
+UndefinedPlugAddress::UndefinedPlugAddress()
+    : m_reserved0( 0xff )
+    , m_reserved1( 0xff )
+    , m_reserved2( 0xff )
+{
+}
+
+UndefinedPlugAddress::~UndefinedPlugAddress()
+{
+}
+
+bool
+UndefinedPlugAddress::serialize( IOSSerialize& se )
+{
+    se.write( m_reserved0, "UndefinedPlugAddress reserved0" );
+    se.write( m_reserved1, "UndefinedPlugAddress reserved1" );
+    se.write( m_reserved2, "UndefinedPlugAddress reserved2" );
+    return true;
+}
+
+bool
+UndefinedPlugAddress::deserialize( IISDeserialize& de )
+{
+    de.read( &m_reserved0 );
+    de.read( &m_reserved1 );
+    de.read( &m_reserved2 );
+    return true;
+}
+
+UndefinedPlugAddress*
+UndefinedPlugAddress:: clone() const
+{
+    return new UndefinedPlugAddress( *this );
+}
+
+////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
+
+UnitPlugSpecificDataPlugAddress::UnitPlugSpecificDataPlugAddress( EPlugType plugType,  plug_type_t plugId )
+    : m_plugType( plugType )
+    , m_plugId( plugId )
+    , m_reserved0( 0xff )
+    , m_reserved1( 0xff )
+    , m_reserved2( 0xff )
+{
+}
+
+UnitPlugSpecificDataPlugAddress::~UnitPlugSpecificDataPlugAddress()
+{
+}
+
+bool
+UnitPlugSpecificDataPlugAddress::serialize( IOSSerialize& se )
+{
+    se.write( m_plugType,  "UnitPlugSpecificDataPlugAddress plugType" );
+    se.write( m_plugId,    "UnitPlugSpecificDataPlugAddress plugId" );
+    se.write( m_reserved0, "UnitPlugSpecificDataPlugAddress reserved0" );
+    se.write( m_reserved1, "UnitPlugSpecificDataPlugAddress reserved1" );
+    se.write( m_reserved2, "UnitPlugSpecificDataPlugAddress reserved2" );
+    return true;
+}
+
+bool
+UnitPlugSpecificDataPlugAddress::deserialize( IISDeserialize& de )
+{
+    de.read( &m_plugType );
+    de.read( &m_plugId );
+    de.read( &m_reserved0 );
+    de.read( &m_reserved1 );
+    de.read( &m_reserved2 );
+    return true;
+}
+
+UnitPlugSpecificDataPlugAddress*
+UnitPlugSpecificDataPlugAddress::clone() const
+{
+    return new UnitPlugSpecificDataPlugAddress( *this );
+}
+
+////////////////////////////////////////////////////////////
+
+SubunitPlugSpecificDataPlugAddress::SubunitPlugSpecificDataPlugAddress(
+    AVCCommand::ESubunitType subunitType,
+    subunit_id_t subunitId,
+    plug_id_t plugId )
+    : m_subunitType( subunitType )
+    , m_subunitId( subunitId )
+    , m_plugId( plugId )
+    , m_reserved0( 0xff )
+    , m_reserved1( 0xff )
+{
+}
+
+SubunitPlugSpecificDataPlugAddress::~SubunitPlugSpecificDataPlugAddress()
+{
+}
+
+bool
+SubunitPlugSpecificDataPlugAddress::serialize( IOSSerialize& se )
+{
+    se.write( m_subunitType,  "SubunitPlugSpecificDataPlugAddress subunitType" );
+    se.write( m_subunitId,    "SubunitPlugSpecificDataPlugAddress subunitId" );
+    se.write( m_plugId,       "SubunitPlugSpecificDataPlugAddress plugId" );
+    se.write( m_reserved0,    "SubunitPlugSpecificDataPlugAddress reserved0" );
+    se.write( m_reserved1,    "SubunitPlugSpecificDataPlugAddress reserved1" );
+    return true;
+}
+
+bool
+SubunitPlugSpecificDataPlugAddress::deserialize( IISDeserialize& de )
+{
+    de.read( &m_subunitType );
+    de.read( &m_subunitId );
+    de.read( &m_plugId );
+    de.read( &m_reserved0 );
+    de.read( &m_reserved1 );
+    return true;
+}
+
+SubunitPlugSpecificDataPlugAddress*
+SubunitPlugSpecificDataPlugAddress::clone() const
+{
+    return new SubunitPlugSpecificDataPlugAddress( *this );
+}
+
+////////////////////////////////////////////////////////////
+
+FunctionBlockPlugSpecificDataPlugAddress::FunctionBlockPlugSpecificDataPlugAddress(
+    AVCCommand::ESubunitType subunitType,
+    subunit_id_t subunitId,
+    function_block_type_t functionBlockType,
+    function_block_id_t functionBlockId,
+    plug_id_t plugId )
+    : m_subunitType( subunitType )
+    , m_subunitId( subunitId )
+    , m_functionBlockType( functionBlockType )
+    , m_functionBlockId( functionBlockId )
+    , m_plugId( plugId )
+{
+}
+
+FunctionBlockPlugSpecificDataPlugAddress::~FunctionBlockPlugSpecificDataPlugAddress()
+{
+}
+
+bool
+FunctionBlockPlugSpecificDataPlugAddress::serialize( IOSSerialize& se )
+{
+    se.write( m_subunitType,       "FunctionPlugSpecificDataBlockPlugAddress subunitType" );
+    se.write( m_subunitId,         "FunctionPlugSpecificDataBlockPlugAddress subunitId" );
+    se.write( m_functionBlockType, "FunctionBlockPlugSpecificDataPlugAddress functionBlockType" );
+    se.write( m_functionBlockId,   "FunctionBlockPlugSpecificDataPlugAddress functionBlockId" );
+    se.write( m_plugId,            "FunctionBlockPlugSpecificDataPlugAddress plugId" );
+    return true;
+}
+
+bool
+FunctionBlockPlugSpecificDataPlugAddress::deserialize( IISDeserialize& de )
+{
+    de.read( &m_subunitType );
+    de.read( &m_subunitId );
+    de.read( &m_functionBlockType );
+    de.read( &m_functionBlockId );
+    de.read( &m_plugId );
+    return true;
+}
+
+FunctionBlockPlugSpecificDataPlugAddress*
+FunctionBlockPlugSpecificDataPlugAddress:: clone() const
+{
+    return new FunctionBlockPlugSpecificDataPlugAddress( *this );
+}
+
+////////////////////////////////////////////////////////////
+
+UndefinedPlugSpecificDataPlugAddress::UndefinedPlugSpecificDataPlugAddress()
+    : m_reserved0( 0xff )
+    , m_reserved1( 0xff )
+    , m_reserved2( 0xff )
+    , m_reserved3( 0xff )
+    , m_reserved4( 0xff )
+{
+}
+
+UndefinedPlugSpecificDataPlugAddress::~UndefinedPlugSpecificDataPlugAddress()
+{
+}
+
+bool
+UndefinedPlugSpecificDataPlugAddress::serialize( IOSSerialize& se )
+{
+    se.write( m_reserved0, "UndefinedPlugAddress reserved0" );
+    se.write( m_reserved1, "UndefinedPlugAddress reserved1" );
+    se.write( m_reserved2, "UndefinedPlugAddress reserved2" );
+    se.write( m_reserved3, "UndefinedPlugAddress reserved3" );
+    se.write( m_reserved4, "UndefinedPlugAddress reserved4" );
+    return true;
+}
+
+bool
+UndefinedPlugSpecificDataPlugAddress::deserialize( IISDeserialize& de )
+{
+    de.read( &m_reserved0 );
+    de.read( &m_reserved1 );
+    de.read( &m_reserved2 );
+    de.read( &m_reserved3 );
+    de.read( &m_reserved4 );
+    return true;
+}
+
+UndefinedPlugSpecificDataPlugAddress*
+UndefinedPlugSpecificDataPlugAddress:: clone() const
+{
+    return new UndefinedPlugSpecificDataPlugAddress( *this );
+}
+
+////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
+
+PlugAddress::PlugAddress( EPlugDirection plugDirection,
+                          EPlugAddressMode plugAddressMode,
+                          UnitPlugAddress& unitPlugAddress )
+    : m_plugDirection( plugDirection )
+    , m_addressMode( plugAddressMode )
+    , m_plugAddressData( new UnitPlugAddress( unitPlugAddress ) )
+{
+}
+
+PlugAddress::PlugAddress( EPlugDirection plugDirection,
+                          EPlugAddressMode plugAddressMode,
+                          SubunitPlugAddress& subUnitPlugAddress )
+    : m_plugDirection( plugDirection )
+    , m_addressMode( plugAddressMode )
+    , m_plugAddressData( new SubunitPlugAddress( subUnitPlugAddress ) )
+{
+}
+
+PlugAddress::PlugAddress( EPlugDirection plugDirection,
+                          EPlugAddressMode plugAddressMode,
+                          FunctionBlockPlugAddress& functionBlockPlugAddress )
+    : m_plugDirection( plugDirection )
+    , m_addressMode( plugAddressMode )
+    , m_plugAddressData( new FunctionBlockPlugAddress( functionBlockPlugAddress ) )
+{
+}
+
+PlugAddress::PlugAddress()
+    : m_plugDirection( ePD_Undefined )
+    , m_addressMode( ePAM_Undefined )
+    , m_plugAddressData( new UndefinedPlugAddress() )
+{
+}
+
+PlugAddress::PlugAddress( const PlugAddress& pa )
+    : m_plugDirection( pa.m_plugDirection )
+    , m_addressMode( pa.m_addressMode )
+    , m_plugAddressData( dynamic_cast<PlugAddressData*>( pa.m_plugAddressData->clone() ) )
+{
+}
+
+PlugAddress::~PlugAddress()
+{
+    delete m_plugAddressData;
+    m_plugAddressData = 0;
+}
+
+bool
+PlugAddress::serialize( IOSSerialize& se )
+{
+    se.write( m_plugDirection, "PlugAddress plugDirection" );
+    se.write( m_addressMode, "PlugAddress addressMode" );
+    return m_plugAddressData->serialize( se );
+}
+
+bool
+PlugAddress::deserialize( IISDeserialize& de )
+{
+    de.read( &m_plugDirection );
+    de.read( &m_addressMode );
+    return m_plugAddressData->deserialize( de );
+}
+
+PlugAddress*
+PlugAddress::clone() const
+{
+    return new PlugAddress( *this );
+}
+
+const char* plugAddressDirectionStrings[] =
+{
+    "Input",
+    "Output",
+    "Undefined",
+};
+
+const char* plugAddressAddressModeStrings[] =
+{
+    "Unit",
+    "Subunit",
+    "FunctionBlock",
+    "Undefined",
+};
+
+const char*
+plugAddressPlugDirectionToString( PlugAddress::EPlugDirection direction  )
+{
+    if ( direction > PlugAddress::ePD_Output ) {
+        direction = PlugAddress::ePD_Undefined;
+    }
+    return plugAddressDirectionStrings[direction];
+}
+
+const char*
+plugAddressAddressModeToString( PlugAddress::EPlugAddressMode mode )
+{
+    if ( mode > PlugAddress::ePAM_FunctionBlock ) {
+        mode = PlugAddress::ePAM_FunctionBlock;
+    }
+    return plugAddressAddressModeStrings[mode];
+}
+
+
+////////////////////////////////////////////////////////////
+
+PlugAddressSpecificData::PlugAddressSpecificData( EPlugDirection plugDirection,
+						  EPlugAddressMode plugAddressMode,
+						  UnitPlugSpecificDataPlugAddress& unitPlugAddress )
+    : m_plugDirection( plugDirection )
+    , m_addressMode( plugAddressMode )
+    , m_plugAddressData( new UnitPlugSpecificDataPlugAddress( unitPlugAddress ) )
+{
+}
+
+PlugAddressSpecificData::PlugAddressSpecificData( EPlugDirection plugDirection,
+						  EPlugAddressMode plugAddressMode,
+						  SubunitPlugSpecificDataPlugAddress& subUnitPlugAddress )
+    : m_plugDirection( plugDirection )
+    , m_addressMode( plugAddressMode )
+    , m_plugAddressData( new SubunitPlugSpecificDataPlugAddress( subUnitPlugAddress ) )
+{
+}
+
+PlugAddressSpecificData::PlugAddressSpecificData( EPlugDirection plugDirection,
+						  EPlugAddressMode plugAddressMode,
+						  FunctionBlockPlugSpecificDataPlugAddress& functionBlockPlugAddress )
+    : m_plugDirection( plugDirection )
+    , m_addressMode( plugAddressMode )
+    , m_plugAddressData( new FunctionBlockPlugSpecificDataPlugAddress( functionBlockPlugAddress ) )
+{
+}
+
+PlugAddressSpecificData::PlugAddressSpecificData( const PlugAddressSpecificData& pa )
+    : m_plugDirection( pa.m_plugDirection )
+    , m_addressMode( pa.m_addressMode )
+    , m_plugAddressData( dynamic_cast<PlugAddressData*>( pa.m_plugAddressData->clone() ) )
+{
+}
+
+PlugAddressSpecificData::~PlugAddressSpecificData()
+{
+    delete m_plugAddressData;
+    m_plugAddressData = 0;
+}
+
+bool
+PlugAddressSpecificData::serialize( IOSSerialize& se )
+{
+    se.write( m_plugDirection, "PlugAddressSpecificData plugDirection" );
+    se.write( m_addressMode, "PlugAddressSpecificData addressMode" );
+    return m_plugAddressData->serialize( se );
+}
+
+bool
+PlugAddressSpecificData::deserialize( IISDeserialize& de )
+{
+    de.read( &m_plugDirection );
+    de.read( &m_addressMode );
+    if ( m_plugAddressData ) {
+        delete m_plugAddressData;
+        m_plugAddressData = 0;
+    }
+    switch ( m_addressMode ) {
+    case ePAM_Unit:
+        m_plugAddressData =
+            new UnitPlugSpecificDataPlugAddress(
+                UnitPlugSpecificDataPlugAddress::ePT_PCR,
+                0xff );
+        break;
+    case ePAM_Subunit:
+        m_plugAddressData =
+            new SubunitPlugSpecificDataPlugAddress(
+                AVCCommand::eST_Reserved,
+                0xff,
+                0xff );
+        break;
+    case ePAM_FunctionBlock:
+        m_plugAddressData =
+            new FunctionBlockPlugSpecificDataPlugAddress(
+                AVCCommand::eST_Reserved,
+                0xff,
+                0xff,
+                0xff,
+                0xff);
+        break;
+    default:
+        m_plugAddressData =
+            new UndefinedPlugSpecificDataPlugAddress();
+    }
+
+    return m_plugAddressData->deserialize( de );
+}
+
+PlugAddressSpecificData*
+PlugAddressSpecificData::clone() const
+{
+    return new PlugAddressSpecificData( *this );
+}
+
+
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_definitions.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_definitions.h (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_definitions.h (revision 183)
@@ -0,0 +1,99 @@
+/* avc_definitions.h
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef AVCDefinitions_h
+#define AVCDefinitions_h
+
+#include <libavc1394/avc1394.h>
+#include <ostream>
+
+typedef byte_t ctype_t;
+typedef byte_t unit_t;
+typedef byte_t unit_type_t;
+typedef byte_t subunit_t;
+typedef byte_t opcode_t;
+typedef byte_t plug_type_t;
+typedef byte_t plug_id_t;
+typedef byte_t reserved_t;
+typedef byte_t function_block_type_t;
+typedef byte_t function_block_id_t;
+typedef byte_t plug_direction_t;
+typedef byte_t plug_address_mode_t;
+typedef byte_t status_t;
+typedef byte_t number_of_channels_t;
+typedef byte_t stream_format_t;
+typedef byte_t sampling_frequency_t;
+typedef byte_t rate_control_t;
+typedef byte_t number_of_stream_format_infos_t;
+typedef byte_t nr_of_plugs_t;
+typedef byte_t subunit_id_t;
+typedef byte_t subfunction_t;
+typedef byte_t opcode_t;
+typedef byte_t page_t;
+typedef byte_t extension_code_t;
+typedef byte_t subunit_type_t;
+typedef byte_t max_subunit_id_t;
+typedef byte_t nr_of_channels_t;
+typedef byte_t stream_position_t;
+typedef byte_t stream_position_location_t;
+typedef byte_t nr_of_clusters_t;
+typedef byte_t string_length_t;
+typedef byte_t cluster_index_t;
+typedef byte_t port_type_t;
+typedef byte_t number_of_output_plugs_t;
+typedef byte_t function_block_type_t;
+typedef byte_t function_block_id_t;
+typedef byte_t function_block_special_purpose_t;
+typedef byte_t no_of_input_plugs_t;
+typedef byte_t no_of_output_plugs_t;
+typedef byte_t info_type_t;
+
+typedef quadlet_t company_id_t;
+
+enum ESamplingFrequency {
+    eSF_22050Hz = 0x00,
+    eSF_24000Hz = 0x01,
+    eSF_32000Hz = 0x02,
+    eSF_44100Hz = 0x03,
+    eSF_48000Hz = 0x04,
+    eSF_88200Hz = 0x0A,
+    eSF_96000Hz = 0x05,
+    eSF_176400Hz = 0x06,
+    eSF_192000Hz = 0x07,
+    eSF_DontCare = 0x0F,
+};
+
+int convertESamplingFrequency(ESamplingFrequency freq);
+ESamplingFrequency parseSampleRate( int sampleRate );
+
+std::ostream& operator<<( std::ostream& stream, ESamplingFrequency samplingFrequency );
+
+#define AVC1394_SUBUNIT_AUDIO 1
+#define AVC1394_SUBUNIT_PRINTER 2
+#define AVC1394_SUBUNIT_CA 6
+#define AVC1394_SUBUNIT_PANEL 9
+#define AVC1394_SUBUNIT_BULLETIN_BOARD 0xA
+#define AVC1394_SUBUNIT_CAMERA_STORAGE 0xB
+#define AVC1394_SUBUNIT_MUSIC 0xC
+#define AVC1394_SUBUNIT_RESERVED 0x1D
+
+#define AVC1394_SUBUNIT_ID_RESERVED 0x06
+
+#endif // AVCDefinitions_h
Index: branches/freebob-syt-experiments/src/libfreebobavc/ieee1394service.cpp
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/ieee1394service.cpp (revision 185)
+++ branches/freebob-syt-experiments/src/libfreebobavc/ieee1394service.cpp (revision 185)
@@ -0,0 +1,114 @@
+/* tempate.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+#include "ieee1394service.h"
+
+#include <libavc1394/avc1394.h>
+
+#include <errno.h>
+#include <netinet/in.h>
+
+#include <iostream>
+
+using namespace std;
+
+Ieee1394Service::Ieee1394Service()
+    : m_handle( 0 )
+    , m_port( -1 )
+{
+}
+
+Ieee1394Service::~Ieee1394Service()
+{
+}
+
+bool
+Ieee1394Service::initialize( int port )
+{
+    m_handle = raw1394_new_handle_on_port( port );
+    if ( !m_handle ) {
+        if ( !errno ) {
+            cerr << "libraw1394 not compatible" << endl;
+        } else {
+            perror( "Ieee1394Service::initialize: Could not get 1394 handle" );
+            cerr << "Is ieee1394 and raw1394 driver loaded?" << endl;
+        }
+        return false;
+    }
+
+    m_port = port;
+    return true;
+}
+
+int
+Ieee1394Service::getNodeCount()
+{
+    return raw1394_get_nodecount( m_handle );
+}
+
+bool
+Ieee1394Service::read( fb_nodeid_t nodeId,
+                       fb_nodeaddr_t addr,
+                       size_t size,
+                       fb_quadlet_t* buffer )
+{
+    return raw1394_read( m_handle, nodeId, addr,  size,  buffer ) != 0;
+}
+
+bool
+Ieee1394Service::write( fb_nodeid_t   nodeId,
+                        fb_nodeaddr_t addr,
+                        size_t        length,
+                        fb_quadlet_t  *data )
+{
+    return raw1394_write( m_handle, nodeId, addr, length, data ) != 0;
+}
+
+fb_quadlet_t*
+Ieee1394Service::transactionBlock( fb_nodeid_t nodeId,
+                                   fb_quadlet_t* buf,
+                                   int len,
+                                   unsigned int* resp_len )
+{
+    for (int i = 0; i < len; ++i) {
+        buf[i] = ntohl( buf[i] );
+    }
+
+    fb_quadlet_t* result =
+        avc1394_transaction_block2( m_handle,
+                                    nodeId,
+                                    buf,
+                                    len,
+                                    resp_len,
+                                    10 );
+
+    for ( unsigned int i = 0; i < *resp_len; ++i ) {
+        result[i] = htonl( result[i] );
+    }
+
+    return result;
+}
+
+
+bool
+Ieee1394Service::transactionBlockClose()
+{
+    avc1394_transaction_block_close( m_handle );
+    return true;
+}
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_generic.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_generic.h (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_generic.h (revision 183)
@@ -0,0 +1,140 @@
+/* avc_generic.h
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef AVCGeneric_h
+#define AVCGeneric_h
+
+#include "avc_definitions.h"
+
+#include "../fbtypes.h"
+
+#include <libavc1394/avc1394.h>
+
+class IOSSerialize;
+class IISDeserialize;
+class Ieee1394Service;
+
+const int fcpFrameMaxLength = 512;
+typedef unsigned char fcp_frame_t[fcpFrameMaxLength];
+
+class IBusData {
+public:
+    IBusData() {}
+    virtual ~IBusData() {}
+
+    virtual bool serialize( IOSSerialize& se ) = 0;
+    virtual bool deserialize( IISDeserialize& de ) = 0;
+
+    virtual IBusData* clone() const = 0;
+};
+
+class AVCCommand
+{
+public:
+    enum EResponse {
+        eR_Unknown        = 0,
+        eR_NotImplemented = AVC1394_RESP_NOT_IMPLEMENTED,
+        eR_Accepted       = AVC1394_RESP_ACCEPTED,
+        eR_Rejected       = AVC1394_RESP_REJECTED,
+        eR_InTransition   = AVC1394_RESP_IN_TRANSITION,
+        eR_Implemented    = AVC1394_RESP_IMPLEMENTED,
+        eR_Changed        = AVC1394_RESP_CHANGED,
+        eR_Interim        = AVC1394_RESP_INTERIM,
+    };
+
+    enum ECommandType {
+        eCT_Control         = AVC1394_CTYP_CONTROL,
+        eCT_Status          = AVC1394_CTYP_STATUS,
+        eCT_SpecificInquiry = AVC1394_CTYP_SPECIFIC_INQUIRY,
+        eCT_Notify          = AVC1394_CTYP_NOTIFY,
+        eCT_GeneralInquiry  = AVC1394_CTYP_GENERAL_INQUIRY,
+        eCT_Unknown         = 0xff,
+    };
+
+    enum ESubunitType {
+        eST_Monitor       = AVC1394_SUBUNIT_VIDEO_MONITOR,
+        eST_Audio         = AVC1394_SUBUNIT_AUDIO,
+        eST_Printer       = AVC1394_SUBUNIT_PRINTER,
+        eST_Disc          = AVC1394_SUBUNIT_DISC_RECORDER,
+        eST_VCR           = AVC1394_SUBUNIT_VCR,
+        eST_Tuner         = AVC1394_SUBUNIT_TUNER,
+        eST_CA            = AVC1394_SUBUNIT_CA,
+        eST_Camera        = AVC1394_SUBUNIT_VIDEO_CAMERA,
+        eST_Panel         = AVC1394_SUBUNIT_PANEL,
+        eST_BulltinBoard  = AVC1394_SUBUNIT_BULLETIN_BOARD,
+        eST_CameraStorage = AVC1394_SUBUNIT_CAMERA_STORAGE,
+        eST_Music         = AVC1394_SUBUNIT_MUSIC,
+        eST_VendorUnique  = AVC1394_SUBUNIT_VENDOR_UNIQUE,
+        eST_Reserved      = AVC1394_SUBUNIT_RESERVED,
+        eST_Extended      = AVC1394_SUBUNIT_EXTENDED,
+        eST_Unit          = AVC1394_SUBUNIT_UNIT,
+    };
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+
+    virtual bool setCommandType( ECommandType commandType );
+    virtual bool fire();
+
+    EResponse getResponse();
+
+    bool setNodeId( fb_nodeid_t nodeId );
+    bool setSubunitType( ESubunitType subunitType );
+    bool setSubunitId( subunit_id_t subunitId );
+
+    ESubunitType getSubunitType();
+    subunit_id_t getSubunitId();
+
+    bool setVerbose( int verboseLevel );
+    int getVerboseLevel();
+
+    virtual const char* getCmdName() const = 0;
+
+    // workaround
+    static void setSleepAfterAVCCommand( int time );
+protected:
+    void showFcpFrame( const unsigned char* buf,
+		       unsigned short frameSize ) const;
+
+protected:
+    AVCCommand( Ieee1394Service* ieee1394service, opcode_t opcode );
+    virtual ~AVCCommand() {}
+
+    ECommandType getCommandType();
+
+    Ieee1394Service* m_1394Service;
+    fb_nodeid_t      m_nodeId;
+
+    fcp_frame_t      m_fcpFrame;
+
+private:
+    ctype_t      m_ctype;
+    subunit_t    m_subunit;
+    opcode_t     m_opcode;
+    EResponse    m_eResponse;
+    int          m_verboseLevel;
+    ECommandType m_commandType;
+    static int   m_time;
+};
+
+
+const char* subunitTypeToString( subunit_type_t subunitType );
+
+#endif // AVCGeneric_h
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_plug_info.cpp
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_plug_info.cpp (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_plug_info.cpp (revision 183)
@@ -0,0 +1,140 @@
+/* avc_plug_info.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "avc_plug_info.h"
+#include "serialize.h"
+#include "ieee1394service.h"
+
+#include <netinet/in.h>
+#include <iostream>
+
+using namespace std;
+
+PlugInfoCmd::PlugInfoCmd( Ieee1394Service* ieee1394service,
+                          ESubFunction eSubFunction )
+    : AVCCommand( ieee1394service, AVC1394_CMD_PLUG_INFO )
+    , m_serialBusIsochronousInputPlugs( 0xff )
+    , m_serialBusIsochronousOutputPlugs( 0xff )
+    , m_externalInputPlugs( 0xff )
+    , m_externalOutputPlugs( 0xff )
+    , m_serialBusAsynchronousInputPlugs( 0xff )
+    , m_serialBusAsynchronousOuputPlugs( 0xff )
+    , m_destinationPlugs( 0xff )
+    , m_sourcePlugs( 0xff )
+    , m_subFunction( eSubFunction )
+{
+}
+
+PlugInfoCmd::PlugInfoCmd( const PlugInfoCmd& rhs )
+    : AVCCommand( rhs )
+    , m_serialBusIsochronousInputPlugs( rhs.m_serialBusIsochronousInputPlugs )
+    , m_serialBusIsochronousOutputPlugs( rhs.m_serialBusIsochronousOutputPlugs )
+    , m_externalInputPlugs( rhs.m_externalInputPlugs )
+    , m_externalOutputPlugs( rhs.m_externalOutputPlugs )
+    , m_serialBusAsynchronousInputPlugs( rhs.m_serialBusAsynchronousInputPlugs )
+    , m_serialBusAsynchronousOuputPlugs( rhs.m_serialBusAsynchronousOuputPlugs )
+    , m_destinationPlugs( rhs.m_destinationPlugs )
+    , m_sourcePlugs( rhs.m_sourcePlugs )
+    , m_subFunction( rhs.m_subFunction )
+{
+}
+
+PlugInfoCmd::~PlugInfoCmd()
+{
+}
+
+bool
+PlugInfoCmd::serialize( IOSSerialize& se )
+{
+    byte_t reserved = 0xff;
+
+    AVCCommand::serialize( se );
+    se.write( m_subFunction, "PlugInfoCmd subFunction" );
+    switch( getSubunitType() ) {
+    case eST_Unit:
+        switch( m_subFunction ) {
+        case eSF_SerialBusIsochronousAndExternalPlug:
+            se.write( m_serialBusIsochronousInputPlugs, "PlugInfoCmd serialBusIsochronousInputPlugs" );
+            se.write( m_serialBusIsochronousOutputPlugs, "PlugInfoCmd serialBusIsochronousOutputPlugs" );
+            se.write( m_externalInputPlugs, "PlugInfoCmd externalInputPlugs" );
+            se.write( m_externalOutputPlugs, "PlugInfoCmd externalOutputPlugs" );
+            break;
+        case eSF_SerialBusAsynchonousPlug:
+            se.write( m_serialBusAsynchronousInputPlugs, "PlugInfoCmd serialBusAsynchronousInputPlugs" );
+            se.write( m_serialBusAsynchronousOuputPlugs, "PlugInfoCmd serialBusAsynchronousOuputPlugs" );
+            se.write( reserved, "PlugInfoCmd" );
+            se.write( reserved, "PlugInfoCmd" );
+            break;
+        default:
+            cerr << "Could not serialize with subfucntion " << m_subFunction << endl;
+            return false;
+        }
+        break;
+    default:
+        se.write( m_destinationPlugs, "PlugInfoCmd destinationPlugs" );
+        se.write( m_sourcePlugs, "PlugInfoCmd sourcePlugs" );
+        se.write( reserved, "PlugInfoCmd" );
+        se.write( reserved, "PlugInfoCmd" );
+    }
+    return true;
+}
+
+bool
+PlugInfoCmd::deserialize( IISDeserialize& de )
+{
+    byte_t reserved;
+
+    AVCCommand::deserialize( de );
+    de.read( &m_subFunction );
+    switch ( getSubunitType() ) {
+    case eST_Unit:
+        switch ( m_subFunction ) {
+        case eSF_SerialBusIsochronousAndExternalPlug:
+            de.read( &m_serialBusIsochronousInputPlugs );
+            de.read( &m_serialBusIsochronousOutputPlugs );
+            de.read( &m_externalInputPlugs );
+            de.read( &m_externalOutputPlugs );
+            break;
+        case eSF_SerialBusAsynchonousPlug:
+            de.read( &m_serialBusAsynchronousInputPlugs );
+            de.read( &m_serialBusAsynchronousOuputPlugs );
+            de.read( &reserved );
+            de.read( &reserved );
+            break;
+        default:
+            cerr << "Could not deserialize with subfunction " << m_subFunction << endl;
+            return false;
+        }
+        break;
+    default:
+        de.read( &m_destinationPlugs );
+        de.read( &m_sourcePlugs );
+        de.read( &reserved );
+        de.read( &reserved );
+    }
+    return true;
+}
+
+bool
+PlugInfoCmd::setSubFunction( ESubFunction subFunction )
+{
+    m_subFunction = subFunction;
+    return true;
+}
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_stream_format.cpp
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_stream_format.cpp (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_stream_format.cpp (revision 183)
@@ -0,0 +1,386 @@
+/* avc_extended_stream_format.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "avc_extended_stream_format.h"
+#include "serialize.h"
+#include "ieee1394service.h"
+
+#include <netinet/in.h>
+
+///////////////////////////////////////////////////////////
+std::ostream& operator<<( std::ostream& stream, StreamFormatInfo info )
+{
+/*    stream << info.m_freq << " Hz (";
+    if ( info.m_format ) {
+            stream << "sync ";
+    } else {
+        stream << "compound ";
+    }
+    stream << "stream, ";
+    stream << "audio channels: " << info.m_audioChannels
+           << ", midi channels: " << info.m_midiChannels << ")";
+*/
+ 	stream << "  NbChannels " << (int)info.m_numberOfChannels << ", Format " << (int)info.m_streamFormat;
+    return stream;
+}
+
+StreamFormatInfo::StreamFormatInfo()
+    : IBusData()
+{
+}
+
+bool
+StreamFormatInfo::serialize( IOSSerialize& se )
+{
+    se.write( m_numberOfChannels, "StreamFormatInfo numberOfChannels" );
+    se.write( m_streamFormat, "StreamFormatInfo streamFormat" );
+    return true;
+}
+
+bool
+StreamFormatInfo::deserialize( IISDeserialize& de )
+{
+    de.read( &m_numberOfChannels );
+    de.read( &m_streamFormat );
+    return true;
+}
+
+StreamFormatInfo*
+StreamFormatInfo::clone() const
+{
+    return new StreamFormatInfo( *this );
+}
+
+////////////////////////////////////////////////////////////
+
+FormatInformationStreamsSync::FormatInformationStreamsSync()
+    : FormatInformationStreams()
+    , m_reserved0( 0xff )
+    , m_samplingFrequency( eSF_DontCare )
+    , m_rateControl( eRC_DontCare )
+    , m_reserved1( 0xff )
+{
+}
+
+bool
+FormatInformationStreamsSync::serialize( IOSSerialize& se )
+{
+    se.write( m_reserved0, "FormatInformationStreamsSync reserved" );
+
+    // we have to clobber some bits
+    byte_t operand = ( m_samplingFrequency << 4 ) | 0x0e;
+    if ( m_rateControl == eRC_DontCare) {
+        operand |= 0x1;
+    }
+    se.write( operand, "FormatInformationStreamsSync sampling frequency and rate control" );
+
+    se.write( m_reserved1, "FormatInformationStreamsSync reserved" );
+    return true;
+}
+
+bool
+FormatInformationStreamsSync::deserialize( IISDeserialize& de )
+{
+    de.read( &m_reserved0 );
+
+    byte_t operand;
+    de.read( &operand );
+    m_samplingFrequency = operand >> 4;
+    m_rateControl = operand & 0x01;
+
+    de.read( &m_reserved1 );
+    return true;
+}
+
+FormatInformationStreamsSync*
+FormatInformationStreamsSync::clone() const
+{
+    return new FormatInformationStreamsSync( *this );
+}
+
+////////////////////////////////////////////////////////////
+std::ostream& operator<<( std::ostream& stream, FormatInformationStreamsCompound info )
+{
+    stream << (int)info.m_samplingFrequency << " Hz (rate control: ";
+	stream << (int)info.m_rateControl << ")" << std::endl;
+
+	for ( FormatInformationStreamsCompound::StreamFormatInfoVector::iterator it = info.m_streamFormatInfos.begin();
+		it != info.m_streamFormatInfos.end();
+		++it )
+	{
+		StreamFormatInfo* sfi=*it;
+		stream << "     > " << *sfi << std::endl;
+	}
+
+    return stream;
+}
+
+FormatInformationStreamsCompound::FormatInformationStreamsCompound()
+    : FormatInformationStreams()
+    , m_samplingFrequency( eSF_DontCare )
+    , m_rateControl( eRC_DontCare )
+    , m_numberOfStreamFormatInfos( 0 )
+{
+}
+
+FormatInformationStreamsCompound::~FormatInformationStreamsCompound()
+{
+    for ( StreamFormatInfoVector::iterator it = m_streamFormatInfos.begin();
+          it != m_streamFormatInfos.end();
+          ++it )
+    {
+        delete *it;
+    }
+}
+
+bool
+FormatInformationStreamsCompound::serialize( IOSSerialize& se )
+{
+    se.write( m_samplingFrequency, "FormatInformationStreamsCompound samplingFrequency" );
+    se.write( m_rateControl, "FormatInformationStreamsCompound rateControl" );
+    se.write( m_numberOfStreamFormatInfos, "FormatInformationStreamsCompound numberOfStreamFormatInfos" );
+    for ( StreamFormatInfoVector::iterator it = m_streamFormatInfos.begin();
+          it != m_streamFormatInfos.end();
+          ++it )
+    {
+        ( *it )->serialize( se );
+    }
+    return true;
+}
+
+bool
+FormatInformationStreamsCompound::deserialize( IISDeserialize& de )
+{
+    de.read( &m_samplingFrequency );
+    de.read( &m_rateControl );
+    de.read( &m_numberOfStreamFormatInfos );
+    for ( int i = 0; i < m_numberOfStreamFormatInfos; ++i ) {
+        StreamFormatInfo* streamFormatInfo = new StreamFormatInfo;
+        if ( !streamFormatInfo->deserialize( de ) ) {
+            return false;
+        }
+        m_streamFormatInfos.push_back( streamFormatInfo );
+    }
+    return true;
+}
+
+FormatInformationStreamsCompound*
+FormatInformationStreamsCompound::clone() const
+{
+    return new FormatInformationStreamsCompound( *this );
+}
+
+////////////////////////////////////////////////////////////
+
+FormatInformation::FormatInformation()
+    : IBusData()
+    , m_root( eFHR_Invalid )
+    , m_level1( eFHL1_AUDIOMUSIC_DONT_CARE )
+    , m_level2( eFHL2_AM824_DONT_CARE )
+    , m_streams( 0 )
+{
+}
+
+FormatInformation::FormatInformation( const FormatInformation& rhs )
+    : IBusData()
+    , m_root( rhs.m_root )
+    , m_level1( rhs.m_level1 )
+    , m_level2( rhs.m_level2 )
+    , m_streams( 0 )
+{
+    if ( rhs.m_streams ) {
+        m_streams = dynamic_cast<FormatInformationStreams*>( rhs.m_streams->clone() );
+    }
+}
+
+FormatInformation::~FormatInformation()
+{
+    delete m_streams;
+    m_streams = 0;
+}
+
+bool
+FormatInformation::serialize( IOSSerialize& se )
+{
+    if ( m_root != eFHR_Invalid ) {
+        se.write( m_root, "FormatInformation hierarchy root" );
+        if ( m_level1 != eFHL1_AUDIOMUSIC_DONT_CARE ) {
+            se.write( m_level1, "FormatInformation hierarchy level 1" );
+            if ( m_level2 != eFHL2_AM824_DONT_CARE ) {
+                se.write( m_level2, "FormatInformation hierarchy level 2" );
+            }
+        }
+    }
+    if ( m_streams ) {
+        return m_streams->serialize( se );
+    }
+    return true;
+}
+
+bool
+FormatInformation::deserialize( IISDeserialize& de )
+{
+    bool result = false;
+
+    delete m_streams;
+    m_streams = 0;
+
+    // this code just parses BeBoB replies.
+    de.read( &m_root );
+
+    // just parse an audio and music hierarchy
+    if ( m_root == eFHR_AudioMusic ) {
+        de.read( &m_level1 );
+
+        switch ( m_level1 ) {
+        case eFHL1_AUDIOMUSIC_AM824:
+        {
+            // note: compound streams don't have a second level
+            de.read( &m_level2 );
+
+            if (m_level2 == eFHL2_AM824_SYNC_STREAM ) {
+                m_streams = new FormatInformationStreamsSync();
+                result = m_streams->deserialize( de );
+            } else {
+                // anything but the sync stream workds currently.
+                printf( "could not parse format information. (format hierarchy level 2 not recognized)\n" );
+            }
+        }
+        break;
+        case  eFHL1_AUDIOMUSIC_AM824_COMPOUND:
+        {
+            m_streams = new FormatInformationStreamsCompound();
+            result = m_streams->deserialize( de );
+        }
+        break;
+        default:
+            printf( "could not parse format information. (format hierarchy level 1 not recognized)\n" );
+        }
+    }
+
+    return result;
+}
+
+FormatInformation*
+FormatInformation::clone() const
+{
+    return new FormatInformation( *this );
+}
+
+////////////////////////////////////////////////////////////
+
+ExtendedStreamFormatCmd::ExtendedStreamFormatCmd( Ieee1394Service* service,
+                                                  ESubFunction eSubFunction )
+    : AVCCommand( service, AVC1394_STREAM_FORMAT_SUPPORT )
+    , m_subFunction( eSubFunction )
+    , m_status( eS_NotUsed )
+    , m_indexInStreamFormat( 0 )
+    , m_formatInformation( new FormatInformation )
+{
+    UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR, 0x00 );
+    m_plugAddress = new PlugAddress( PlugAddress::ePD_Output, PlugAddress::ePAM_Unit, unitPlugAddress );
+}
+
+ExtendedStreamFormatCmd::ExtendedStreamFormatCmd(
+    const ExtendedStreamFormatCmd& rhs )
+    : AVCCommand( rhs )
+{
+    m_subFunction = rhs.m_subFunction;
+    m_plugAddress = new PlugAddress( *rhs.m_plugAddress );
+    m_formatInformation =
+        new FormatInformation( *rhs.m_formatInformation );
+}
+
+ExtendedStreamFormatCmd::~ExtendedStreamFormatCmd()
+{
+    delete m_plugAddress;
+    m_plugAddress = 0;
+    delete m_formatInformation;
+    m_formatInformation = 0;
+}
+
+bool
+ExtendedStreamFormatCmd::setPlugAddress( const PlugAddress& plugAddress )
+{
+    delete m_plugAddress;
+    m_plugAddress = plugAddress.clone();
+    return true;
+}
+
+bool
+ExtendedStreamFormatCmd::setIndexInStreamFormat( const int index )
+{
+    m_indexInStreamFormat = index;
+    return true;
+}
+
+bool
+ExtendedStreamFormatCmd::serialize( IOSSerialize& se )
+{
+    AVCCommand::serialize( se );
+    se.write( m_subFunction, "ExtendedStreamFormatCmd subFunction" );
+    m_plugAddress->serialize( se );
+    se.write( m_status, "ExtendedStreamFormatCmd status" );
+    if ( m_subFunction == eSF_ExtendedStreamFormatInformationCommandList ) {
+        se.write( m_indexInStreamFormat, "indexInStreamFormat" );
+    }
+    m_formatInformation->serialize( se );
+    return true;
+}
+
+bool
+ExtendedStreamFormatCmd::deserialize( IISDeserialize& de )
+{
+    AVCCommand::deserialize( de );
+    de.read( &m_subFunction );
+    m_plugAddress->deserialize( de );
+    de.read( &m_status );
+    if ( m_subFunction == eSF_ExtendedStreamFormatInformationCommandList ) {
+        de.read( &m_indexInStreamFormat );
+    }
+    m_formatInformation->deserialize( de );
+    return true;
+}
+
+ExtendedStreamFormatCmd::EStatus
+ExtendedStreamFormatCmd::getStatus()
+{
+    EStatus status = static_cast<EStatus>( m_status );
+    return status;
+}
+
+FormatInformation*
+ExtendedStreamFormatCmd::getFormatInformation()
+{
+    return m_formatInformation;
+}
+
+ExtendedStreamFormatCmd::index_in_stream_format_t
+ExtendedStreamFormatCmd::getIndex()
+{
+    return m_indexInStreamFormat;
+}
+
+bool
+ExtendedStreamFormatCmd::setSubFunction( ESubFunction subFunction )
+{
+    m_subFunction = subFunction;
+    return true;
+}
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_subunit_info.cpp
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_subunit_info.cpp (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_subunit_info.cpp (revision 183)
@@ -0,0 +1,154 @@
+/* avc_extended_subunit_info.cpp
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "avc_extended_subunit_info.h"
+#include "serialize.h"
+#include "ieee1394service.h"
+
+#include <netinet/in.h>
+
+#define NR_OF_PAGE_DATA 5
+#define SIZE_OF_PAGE_ENTRY 5
+
+ExtendedSubunitInfoPageData::ExtendedSubunitInfoPageData()
+    : IBusData()
+    , m_functionBlockType( 0xff )
+    , m_functionBlockId( 0xff )
+    , m_functionBlockSpecialPupose( eSP_NoSpecialPupose )
+    , m_noOfInputPlugs( 0xff )
+    , m_noOfOutputPlugs( 0xff )
+{
+}
+
+ExtendedSubunitInfoPageData::~ExtendedSubunitInfoPageData()
+{
+}
+
+bool
+ExtendedSubunitInfoPageData::serialize( IOSSerialize& se )
+{
+    se.write( m_functionBlockType, "ExtendedSubunitInfoPageData: function block type" );
+    se.write( m_functionBlockId, "ExtendedSubunitInfoPageData: function block id" );
+    se.write( m_functionBlockSpecialPupose, "ExtendedSubunitInfoPageData: function block special purpose" );
+    se.write( m_noOfInputPlugs, "ExtendedSubunitInfoPageData: number of input plugs" );
+    se.write( m_noOfOutputPlugs, "ExtendedSubunitInfoPageData: number of output plugs" );
+
+    return true;
+}
+
+bool
+ExtendedSubunitInfoPageData::deserialize( IISDeserialize& de )
+{
+    de.read( &m_functionBlockType );
+    de.read( &m_functionBlockId );
+    de.read( &m_functionBlockSpecialPupose );
+    de.read( &m_noOfInputPlugs );
+    de.read( &m_noOfOutputPlugs );
+    return true;
+}
+
+ExtendedSubunitInfoPageData*
+ExtendedSubunitInfoPageData::clone() const
+{
+    return new ExtendedSubunitInfoPageData( *this );
+}
+
+//////////////////////////////////////////////
+
+ExtendedSubunitInfoCmd::ExtendedSubunitInfoCmd( Ieee1394Service* ieee1394service )
+    : AVCCommand( ieee1394service, AVC1394_CMD_SUBUNIT_INFO )
+    , m_page( 0xff )
+    , m_fbType( eFBT_AllFunctinBlockType )
+{
+}
+
+ExtendedSubunitInfoCmd::ExtendedSubunitInfoCmd( const ExtendedSubunitInfoCmd& rhs )
+    : AVCCommand( rhs )
+    , m_page( rhs.m_page )
+    , m_fbType( rhs.m_fbType )
+{
+    for ( ExtendedSubunitInfoPageDataVector::const_iterator it =
+              rhs.m_infoPageDatas.begin();
+          it != rhs.m_infoPageDatas.end();
+          ++it )
+    {
+        m_infoPageDatas.push_back( ( *it )->clone() );
+    }
+}
+
+ExtendedSubunitInfoCmd::~ExtendedSubunitInfoCmd()
+{
+    for ( ExtendedSubunitInfoPageDataVector::iterator it =
+              m_infoPageDatas.begin();
+          it != m_infoPageDatas.end();
+          ++it )
+    {
+        delete *it;
+    }
+}
+
+bool
+ExtendedSubunitInfoCmd::serialize( IOSSerialize& se )
+{
+    bool status = false;
+    status = AVCCommand::serialize( se );
+    status &= se.write( m_page, "ExtendedSubunitInfoCmd: page" );
+    status &= se.write( m_fbType, "ExtendedSubunitInfoCmd: function block type" );
+    for ( ExtendedSubunitInfoPageDataVector::const_iterator it =
+              m_infoPageDatas.begin();
+          it != m_infoPageDatas.end();
+          ++it )
+    {
+        status &= ( *it )->serialize( se );
+    }
+
+    int startIndex = m_infoPageDatas.size() * SIZE_OF_PAGE_ENTRY;
+    int endIndex = SIZE_OF_PAGE_ENTRY * NR_OF_PAGE_DATA;
+    for ( int i = startIndex; i < endIndex; ++i ) {
+        byte_t dummy = 0xff;
+        se.write( dummy, "ExtendedSubunitInfoCmd: space fill" );
+    }
+    return status;
+}
+
+bool
+ExtendedSubunitInfoCmd::deserialize( IISDeserialize& de )
+{
+    bool status = false;
+    status = AVCCommand::deserialize( de );
+    status &= de.read( &m_page );
+    status &= de.read( &m_fbType );
+    for ( int i = 0; i < 5; ++i ) {
+        byte_t next;
+        de.peek( &next );
+        if ( next != 0xff ) {
+            ExtendedSubunitInfoPageData* infoPageData =
+                new ExtendedSubunitInfoPageData();
+            if ( !infoPageData->deserialize( de ) ) {
+                return false;
+            }
+            m_infoPageDatas.push_back( infoPageData );
+        } else {
+            return status;
+        }
+    }
+
+    return status;
+}
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_cmd_generic.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_cmd_generic.h (revision 172)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_cmd_generic.h (revision 172)
@@ -0,0 +1,286 @@
+/* avc_extended_cmd_generic.h
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef AVCEXTENDEDCMDGENERIC_H
+#define AVCEXTENDEDCMDGENERIC_H
+
+#include "avc_generic.h"
+
+////////////////////////////////////////////////////////////
+
+class PlugAddressData : public IBusData {
+};
+
+////////////////////////////////////////////////////////////
+
+class UnitPlugAddress : public PlugAddressData
+{
+public:
+    enum EPlugType {
+        ePT_PCR              = 0x00,
+        ePT_ExternalPlug     = 0x01,
+        ePT_AsynchronousPlug = 0x02,
+	ePT_Unknown          = 0xff,
+    };
+
+    UnitPlugAddress( EPlugType plugType,  plug_type_t plugId );
+    virtual ~UnitPlugAddress();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual UnitPlugAddress* clone() const;
+
+    plug_id_t   m_plugType;
+    plug_type_t m_plugId;
+    reserved_t  m_reserved;
+};
+
+////////////////////////////////////////////////////////////
+
+class SubunitPlugAddress : public PlugAddressData
+{
+public:
+    SubunitPlugAddress( plug_id_t plugId );
+    virtual ~SubunitPlugAddress();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual SubunitPlugAddress* clone() const;
+
+    plug_id_t m_plugId;
+    reserved_t m_reserved0;
+    reserved_t m_reserved1;
+};
+
+
+////////////////////////////////////////////////////////////
+
+class FunctionBlockPlugAddress : public PlugAddressData
+{
+public:
+    FunctionBlockPlugAddress( function_block_type_t functionBlockType,
+                              function_block_id_t functionBlockId,
+                              plug_id_t plugId );
+    virtual ~FunctionBlockPlugAddress();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual FunctionBlockPlugAddress* clone() const;
+
+    function_block_type_t m_functionBlockType;
+    function_block_id_t   m_functionBlockId;
+    plug_id_t             m_plugId;
+};
+
+////////////////////////////////////////////////////////////
+
+class UndefinedPlugAddress : public PlugAddressData
+{
+public:
+    UndefinedPlugAddress();
+    virtual ~UndefinedPlugAddress();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual UndefinedPlugAddress* clone() const;
+
+    reserved_t m_reserved0;
+    reserved_t m_reserved1;
+    reserved_t m_reserved2;
+};
+
+////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
+
+class UnitPlugSpecificDataPlugAddress : public PlugAddressData
+{
+public:
+    enum EPlugType {
+        ePT_PCR              = 0x00,
+        ePT_ExternalPlug     = 0x01,
+        ePT_AsynchronousPlug = 0x02,
+    };
+
+    UnitPlugSpecificDataPlugAddress( EPlugType plugType,
+                                     plug_type_t plugId );
+    virtual ~UnitPlugSpecificDataPlugAddress();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual UnitPlugSpecificDataPlugAddress* clone() const;
+
+    plug_type_t m_plugType;
+    plug_id_t   m_plugId;
+    reserved_t  m_reserved0;
+    reserved_t  m_reserved1;
+    reserved_t  m_reserved2;
+};
+
+////////////////////////////////////////////////////////////
+
+class SubunitPlugSpecificDataPlugAddress : public PlugAddressData
+{
+public:
+    SubunitPlugSpecificDataPlugAddress( AVCCommand::ESubunitType subunitType,
+                                        subunit_id_t subunitId,
+                                        plug_id_t plugId );
+    virtual ~SubunitPlugSpecificDataPlugAddress();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual SubunitPlugSpecificDataPlugAddress* clone() const;
+
+    subunit_type_t m_subunitType;
+    subunit_id_t   m_subunitId;
+    plug_id_t      m_plugId;
+    reserved_t     m_reserved0;
+    reserved_t     m_reserved1;
+};
+
+////////////////////////////////////////////////////////////
+
+class FunctionBlockPlugSpecificDataPlugAddress : public PlugAddressData
+{
+public:
+    FunctionBlockPlugSpecificDataPlugAddress( AVCCommand::ESubunitType subunitType,
+                                              subunit_id_t subunitId,
+                                              function_block_type_t functionBlockType,
+                                              function_block_id_t functionBlockId,
+                                              plug_id_t plugId);
+    virtual ~FunctionBlockPlugSpecificDataPlugAddress();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual FunctionBlockPlugSpecificDataPlugAddress* clone() const;
+
+    subunit_type_t        m_subunitType;
+    subunit_id_t          m_subunitId;
+    function_block_type_t m_functionBlockType;
+    function_block_id_t   m_functionBlockId;
+    plug_id_t             m_plugId;
+};
+
+////////////////////////////////////////////////////////////
+
+class UndefinedPlugSpecificDataPlugAddress : public PlugAddressData
+{
+public:
+    UndefinedPlugSpecificDataPlugAddress();
+    virtual ~UndefinedPlugSpecificDataPlugAddress();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual UndefinedPlugSpecificDataPlugAddress* clone() const;
+
+    reserved_t m_reserved0;
+    reserved_t m_reserved1;
+    reserved_t m_reserved2;
+    reserved_t m_reserved3;
+    reserved_t m_reserved4;
+};
+
+////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////
+
+class PlugAddress : public IBusData {
+public:
+    enum EPlugDirection {
+        ePD_Input     = 0x00,
+        ePD_Output    = 0x01,
+	ePD_Undefined = 0xff,
+    };
+
+    enum EPlugAddressMode {
+        ePAM_Unit          = 0x00,
+        ePAM_Subunit       = 0x01,
+        ePAM_FunctionBlock = 0x02,
+	ePAM_Undefined     = 0xff,
+    };
+
+    PlugAddress( EPlugDirection plugDirection,
+                 EPlugAddressMode plugAddressMode,
+                 UnitPlugAddress& unitPlugAddress );
+    PlugAddress( EPlugDirection plugDirection,
+                 EPlugAddressMode plugAddressMode,
+                 SubunitPlugAddress& subUnitPlugAddress );
+    PlugAddress( EPlugDirection plugDirection,
+                 EPlugAddressMode plugAddressMode,
+                 FunctionBlockPlugAddress& functionBlockPlugAddress );
+    PlugAddress( ); // undefined plug address
+    PlugAddress( const PlugAddress& pa );
+
+    virtual ~PlugAddress();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+
+    virtual PlugAddress* clone() const;
+
+    plug_direction_t    m_plugDirection;
+    plug_address_mode_t m_addressMode;
+    PlugAddressData*    m_plugAddressData;
+};
+
+const char* plugAddressPlugDirectionToString( PlugAddress::EPlugDirection direction  );
+const char* plugAddressAddressModeToString( PlugAddress::EPlugAddressMode mode );
+
+////////////////////////////////////////////////////////////
+
+class PlugAddressSpecificData : public IBusData {
+public:
+    enum EPlugDirection {
+        ePD_Input  = 0x00,
+        ePD_Output = 0x01,
+    };
+
+    enum EPlugAddressMode {
+        ePAM_Unit          = 0x00,
+        ePAM_Subunit       = 0x01,
+        ePAM_FunctionBlock = 0x02,
+        ePAM_Undefined     = 0xff,
+    };
+
+    PlugAddressSpecificData( EPlugDirection plugDirection,
+			     EPlugAddressMode plugAddressMode,
+			     UnitPlugSpecificDataPlugAddress& unitPlugAddress );
+    PlugAddressSpecificData( EPlugDirection plugDirection,
+			     EPlugAddressMode plugAddressMode,
+			     SubunitPlugSpecificDataPlugAddress& subUnitPlugAddress );
+    PlugAddressSpecificData( EPlugDirection plugDirection,
+			     EPlugAddressMode plugAddressMode,
+			     FunctionBlockPlugSpecificDataPlugAddress& functionBlockPlugAddress );
+    PlugAddressSpecificData( EPlugDirection plugDirection,
+			     EPlugAddressMode plugAddressMode );
+    PlugAddressSpecificData( const  PlugAddressSpecificData& pa );
+
+    virtual ~PlugAddressSpecificData();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+
+    virtual PlugAddressSpecificData* clone() const;
+
+    plug_direction_t    m_plugDirection;
+    plug_address_mode_t m_addressMode;
+    PlugAddressData*    m_plugAddressData;
+};
+
+
+#endif
Index: branches/freebob-syt-experiments/src/libfreebobavc/ieee1394service.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/ieee1394service.h (revision 185)
+++ branches/freebob-syt-experiments/src/libfreebobavc/ieee1394service.h (revision 185)
@@ -0,0 +1,94 @@
+/* Ieee1394Service.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef FREEBOBIEEE1394SERVICE_H
+#define FREEBOBIEEE1394SERVICE_H
+
+#include "fbtypes.h"
+
+#include <libraw1394/raw1394.h>
+
+class Ieee1394Service{
+public:
+    Ieee1394Service();
+    ~Ieee1394Service();
+
+    bool initialize( int port );
+
+    int getPort()
+	{ return m_port; }
+   /**
+    * getNodecount - get number of nodes on the bus
+    *
+    * Since the root node always has
+    * the highest node ID, this number can be used to determine that ID (it's
+    * LOCAL_BUS|(count-1)).
+    *
+    * Returns: the number of nodes on the bus to which the port is connected.
+    * This value can change with every bus reset.
+    */
+    int getNodeCount();
+
+   /**
+    * read - send async read request to a node and wait for response.
+    * @node: target node
+    * @addr: address to read from
+    * @length: amount of data to read in quadlets
+    * @buffer: pointer to buffer where data will be saved
+    *
+    * This does the complete transaction and will return when it's finished.
+    *
+    * Returns: truee on success or false on failure (sets errno)
+    */
+    bool read( fb_nodeid_t nodeId,
+	       fb_nodeaddr_t addr,
+	       size_t size,
+	       fb_quadlet_t* buffer );
+
+   /**
+    * write - send async write request to a node and wait for response.
+    * @node: target node
+    * @addr: address to write to
+    * @length: amount of data to write in quadlets
+    * @data: pointer to data to be sent
+    *
+    * This does the complete transaction and will return when it's finished.
+    *
+    * Returns: true on success or false on failure (sets errno)
+    */
+    bool write( fb_nodeid_t   nodeId,
+		fb_nodeaddr_t addr,
+		size_t        length,
+		fb_quadlet_t  *data );
+
+
+    fb_quadlet_t* transactionBlock( fb_nodeid_t nodeId,
+                                    fb_quadlet_t* buf,
+                                    int len,
+				    unsigned int* resp_len );
+
+    bool transactionBlockClose();
+    
+private:
+    raw1394handle_t m_handle;
+    int             m_port;
+};
+
+#endif
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_plug_info.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_plug_info.h (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_plug_info.h (revision 183)
@@ -0,0 +1,72 @@
+/* avc_plug_info.h
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef AVCPlugInfo_h
+#define AVCPlugInfo_h
+
+#include "avc_generic.h"
+
+#include <libavc1394/avc1394.h>
+
+#define AVC1394_PLUG_INFO_SUBFUNCTION_SERIAL_BUS_ISOCHRONOUS_AND_EXTERNAL_PLUG 0x00
+#define AVC1394_PLUG_INFO_SUBFUNCTION_SERIAL_BUS_ASYNCHRONOUS_PLUG             0x01
+#define AVC1394_PLUG_INFO_SUBFUNCTION_SERIAL_BUS_GENERIC_BUS_PLUG_BLUETOOTH    0x40
+#define AVC1394_PLUG_INFO_SUBFUNCTION_SERIAL_BUS_NOT_USED                      0xFF
+
+
+class PlugInfoCmd: public AVCCommand
+{
+public:
+    enum ESubFunction {
+        eSF_SerialBusIsochronousAndExternalPlug  = AVC1394_PLUG_INFO_SUBFUNCTION_SERIAL_BUS_ISOCHRONOUS_AND_EXTERNAL_PLUG,
+        eSF_SerialBusAsynchonousPlug             = AVC1394_PLUG_INFO_SUBFUNCTION_SERIAL_BUS_ASYNCHRONOUS_PLUG,
+        eSF_SerialBusPlug                        = AVC1394_PLUG_INFO_SUBFUNCTION_SERIAL_BUS_GENERIC_BUS_PLUG_BLUETOOTH,
+        eSF_NotUsed                              = AVC1394_PLUG_INFO_SUBFUNCTION_SERIAL_BUS_NOT_USED,
+    };
+
+    PlugInfoCmd( Ieee1394Service* ieee1394service,
+		 ESubFunction eSubFunction = eSF_SerialBusIsochronousAndExternalPlug );
+    PlugInfoCmd( const PlugInfoCmd& rhs );
+    virtual ~PlugInfoCmd();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+
+    virtual const char* getCmdName() const
+	{ return "PlugInfoCmd"; }
+
+    nr_of_plugs_t m_serialBusIsochronousInputPlugs;
+    nr_of_plugs_t m_serialBusIsochronousOutputPlugs;
+    nr_of_plugs_t m_externalInputPlugs;
+    nr_of_plugs_t m_externalOutputPlugs;
+    nr_of_plugs_t m_serialBusAsynchronousInputPlugs;
+    nr_of_plugs_t m_serialBusAsynchronousOuputPlugs;
+    nr_of_plugs_t m_destinationPlugs;
+    nr_of_plugs_t m_sourcePlugs;
+
+    bool setSubFunction( ESubFunction subFunction );
+
+protected:
+    subfunction_t m_subFunction;
+
+};
+
+
+#endif // AVCPlugInfo_h
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_stream_format.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_stream_format.h (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_stream_format.h (revision 183)
@@ -0,0 +1,286 @@
+/* avc_extended_stream_format.h
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef AVCExtendedStreamFormat_h
+#define AVCExtendedStreamFormat_h
+
+#include "avc_generic.h"
+#include "avc_extended_cmd_generic.h"
+
+#include <libavc1394/avc1394.h>
+#include <iostream>
+#include <vector>
+
+#define AVC1394_STREAM_FORMAT_SUPPORT            0x2F
+#define AVC1394_STREAM_FORMAT_SUBFUNCTION_INPUT  0x00
+#define AVC1394_STREAM_FORMAT_SUBFUNCTION_OUTPUT 0x01
+
+// BridgeCo extensions
+#define AVC1394_STREAM_FORMAT_SUBFUNCTION_EXTENDED_STREAM_FORMAT      0xC0
+#define AVC1394_STREAM_FORMAT_SUBFUNCTION_EXTENDED_STREAM_FORMAT_LIST 0xC1
+
+
+#define AVC1394_STREAM_FORMAT_HIERARCHY_ROOT_DVCR       0x80
+#define AVC1394_STREAM_FORMAT_HIERARCHY_ROOT_AUDIOMUSIC 0x90
+#define AVC1394_STREAM_FORMAT_HIERARCHY_ROOT_INVALID    0xFF
+
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_DVCR_SD525_60                     0x00
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_DVCR_SDL525_60                    0x04
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_DVCR_HD1125_60                    0x08
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_DVCR_SD625_60                     0x80
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_DVCR_SDL625_50                    0x84
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_DVCR_HD1250_50                    0x88
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_AUDIOMUSIC_AM824                  0x00
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_AUDIOMUSIC_24_4_AUDIO_PACK        0x01
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_AUDIOMUSIC_32_FLOATING_POINT_DATA 0x02
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_AUDIOMUSIC_AM824_COMPOUND         0x40
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_AUDIOMUSIC_DONT_CARE              0xFF
+
+
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC60968_3                            0x00
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_3                            0x01
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_4                            0x02
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_5                            0x03
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_6                            0x04
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_7                            0x05
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_MULTI_BIT_LINEAR_AUDIO_RAW            0x06
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_MULTI_BIT_LINEAR_AUDIO_DVD_AUDIO      0x07
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_ONE_BIT_AUDIO_PLAIN_RAW               0x08
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_ONE_BIT_AUDIO_PLAIN_SACD              0x09
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_ONE_BIT_AUDIO_ENCODED_RAW             0x0A
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_ONE_BIT_AUDIO_ENCODED_SACD            0x0B
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_HIGH_PRECISION_MULTIBIT_LINEAR_AUDIO  0x0C
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_MIDI_CONFORMANT                       0x0D
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_SYNC_STREAM                           0x40
+#define AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_DONT_CARE                             0xFF
+
+#define AVC1394_STREAM_FORMAT_AM824_IEC60968_3                            0x00
+#define AVC1394_STREAM_FORMAT_AM824_IEC61937_3                            0x01
+#define AVC1394_STREAM_FORMAT_AM824_IEC61937_4                            0x02
+#define AVC1394_STREAM_FORMAT_AM824_IEC61937_5                            0x03
+#define AVC1394_STREAM_FORMAT_AM824_IEC61937_6                            0x04
+#define AVC1394_STREAM_FORMAT_AM824_IEC61937_7                            0x05
+#define AVC1394_STREAM_FORMAT_AM824_MULTI_BIT_LINEAR_AUDIO_RAW            0x06
+#define AVC1394_STREAM_FORMAT_AM824_MULTI_BIT_LINEAR_AUDIO_DVD_AUDIO      0x07
+#define AVC1394_STREAM_FORMAT_AM824_HIGH_PRECISION_MULTIBIT_LINEAR_AUDIO  0x0C
+#define AVC1394_STREAM_FORMAT_AM824_MIDI_CONFORMANT                       0x0D
+#define AVC1394_STREAM_FORMAT_AM824_DONT_CARE                             0xFF
+
+/*
+// As defined in 'AV/C Stream Format Information Specification 1.0 TA Document 2001002'
+// Not used for extended stream format
+#define AVC1394_STREAM_FORMAT_SUPPORT_STATUS_SUPPORTED_AND_CONFIGURED              0x00
+#define AVC1394_STREAM_FORMAT_SUPPORT_STATUS_SUPPORTED_AND_HAS_NOT_BEEN_CONFIGURED 0x01
+#define AVC1394_STREAM_FORMAT_SUPPORT_STATUS_SUPPORTED_AND_READY_TO_CONFIGURE      0x02
+#define AVC1394_STREAM_FORMAT_SUPPORT_STATUS_SUPPORTED_AND_NOT_CONFIGURED          0x03
+#define AVC1394_STREAM_FORMAT_SUPPORT_STATUS_NOT_SUPPORTED                         0x04
+// 0x05 - 0xFE reserved
+#define AVC1394_STREAM_FORMAT_SUPPORT_STATUS_NO_INFORMATION                        0xFF
+*/
+
+#define AVC1394_EXTENDED_STREAM_FORMAT_INFO_STATUS_ACTIVE           0x00
+#define AVC1394_EXTENDED_STREAM_FORMAT_INFO_STATUS_INACTIVE         0x01
+#define AVC1394_EXTENDED_STREAM_FORMAT_INFO_STATUS_NO_STREAM_FORMAT 0x02
+#define AVC1394_EXTENDED_STREAM_FORMAT_INFO_STATUS_NOT_USED         0xff
+
+class IOSSerialize;
+class IISDeserialize;
+
+enum ERateControl {
+    eRC_Supported = 0x00,
+    eRC_DontCare  = 0x01,
+};
+
+////////////////////////////////////////////////////////////
+
+class StreamFormatInfo: public IBusData
+{
+public:
+    StreamFormatInfo();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+
+    virtual StreamFormatInfo* clone() const;
+
+    number_of_channels_t m_numberOfChannels;
+    stream_format_t      m_streamFormat;
+};
+std::ostream& operator<<( std::ostream& stream, StreamFormatInfo info );
+
+////////////////////////////////////////////////////////////
+
+class FormatInformationStreams: public IBusData
+{
+public:
+    FormatInformationStreams() {}
+    virtual ~FormatInformationStreams() {}
+};
+
+////////////////////////////////////////////////////////////
+
+class FormatInformationStreamsSync: public FormatInformationStreams
+{
+public:
+    FormatInformationStreamsSync();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual FormatInformationStreamsSync* clone() const;
+
+    reserved_t           m_reserved0;
+    sampling_frequency_t m_samplingFrequency;
+    rate_control_t       m_rateControl;
+    reserved_t           m_reserved1;
+};
+
+////////////////////////////////////////////////////////////
+
+class FormatInformationStreamsCompound: public FormatInformationStreams
+{
+public:
+    FormatInformationStreamsCompound();
+    virtual ~FormatInformationStreamsCompound();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual FormatInformationStreamsCompound* clone() const;
+
+    sampling_frequency_t                     m_samplingFrequency;
+    rate_control_t                           m_rateControl;
+    number_of_stream_format_infos_t          m_numberOfStreamFormatInfos;
+
+    typedef std::vector< StreamFormatInfo* > StreamFormatInfoVector;
+    StreamFormatInfoVector                   m_streamFormatInfos;
+};
+std::ostream& operator<<( std::ostream& stream, FormatInformationStreamsCompound info );
+
+
+////////////////////////////////////////////////////////////
+
+class FormatInformation: public IBusData
+{
+public:
+    enum EFormatHierarchyRoot {
+        eFHR_DVCR            = AVC1394_STREAM_FORMAT_HIERARCHY_ROOT_DVCR,
+        eFHR_AudioMusic      = AVC1394_STREAM_FORMAT_HIERARCHY_ROOT_AUDIOMUSIC,
+        eFHR_Invalid         = AVC1394_STREAM_FORMAT_HIERARCHY_ROOT_INVALID,
+    };
+
+    enum EFomatHierarchyLevel1 {
+        eFHL1_DVCR_SD525_60                     = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_DVCR_SD525_60,
+        eFHL1_DVCR_SDL525_60                    = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_DVCR_SDL525_60,
+        eFHL1_DVCR_HD1125_60                    = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_DVCR_HD1125_60,
+        eFHL1_DVCR_SD625_60                     = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_DVCR_SD625_60,
+        eFHL1_DVCR_SDL625_50                    = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_DVCR_SDL625_50,
+        eFHL1_DVCR_HD1250_50                    = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_DVCR_HD1250_50,
+        eFHL1_AUDIOMUSIC_AM824                  = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_AUDIOMUSIC_AM824,
+        eFHL1_AUDIOMUSIC_24_4_AUDIO_PACK        = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_AUDIOMUSIC_24_4_AUDIO_PACK,
+        eFHL1_AUDIOMUSIC_32_FLOATING            = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_AUDIOMUSIC_32_FLOATING_POINT_DATA,
+        eFHL1_AUDIOMUSIC_AM824_COMPOUND         = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_AUDIOMUSIC_AM824_COMPOUND,
+        eFHL1_AUDIOMUSIC_DONT_CARE              = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_1_AUDIOMUSIC_DONT_CARE,
+    };
+
+    enum EFormatHierarchyLevel2 {
+        eFHL2_AM824_IEC60968_3 = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC60968_3,
+        eFHL2_AM824_IEC61937_3 = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_3,
+        eFHL2_AM824_IEC61937_4 = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_4,
+        eFHL2_AM824_IEC61937_5 = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_5,
+        eFHL2_AM824_IEC61937_6 = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_6,
+        eFHL2_AM824_IEC61937_7 = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_IEC61937_7,
+        eFHL2_AM824_MULTI_BIT_LINEAR_AUDIO_RAW = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_MULTI_BIT_LINEAR_AUDIO_RAW,
+        eFHL2_AM824_MULTI_BIT_LINEAR_AUDIO_DVD_AUDIO = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_MULTI_BIT_LINEAR_AUDIO_DVD_AUDIO,
+        eFHL2_AM824_ONE_BIT_AUDIO_PLAIN_RAW = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_ONE_BIT_AUDIO_PLAIN_RAW,
+        eFHL2_AM824_ONE_BIT_AUDIO_PLAIN_SACD = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_ONE_BIT_AUDIO_PLAIN_SACD,
+        eFHL2_AM824_ONE_BIT_AUDIO_ENCODED_RAW = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_ONE_BIT_AUDIO_ENCODED_RAW,
+        eFHL2_AM824_ONE_BIT_AUDIO_ENCODED_SACD = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_ONE_BIT_AUDIO_ENCODED_SACD,
+        eFHL2_AM824_HIGH_PRECISION_MULTIBIT_LINEAR_AUDIO = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_HIGH_PRECISION_MULTIBIT_LINEAR_AUDIO,
+        eFHL2_AM824_MIDI_CONFORMANT = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_MIDI_CONFORMANT,
+        eFHL2_AM824_SYNC_STREAM = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_SYNC_STREAM,
+        eFHL2_AM824_DONT_CARE = AVC1394_STREAM_FORMAT_HIERARCHY_LEVEL_2_AM824_DONT_CARE,
+    };
+
+    typedef byte_t format_hierarchy_root_t;
+    typedef byte_t format_hierarchy_level1_t;
+    typedef byte_t format_hierarchy_level2_t;
+
+    FormatInformation();
+    FormatInformation( const FormatInformation& rhs );
+    virtual ~FormatInformation();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+
+    virtual FormatInformation* clone() const;
+
+    format_hierarchy_root_t m_root;
+    format_hierarchy_level1_t m_level1;
+    format_hierarchy_level2_t m_level2;
+    FormatInformationStreams* m_streams;
+};
+
+///////////////////////////////////////////////////////////
+
+class ExtendedStreamFormatCmd: public AVCCommand
+{
+public:
+    enum ESubFunction {
+        eSF_Input                                               = AVC1394_STREAM_FORMAT_SUBFUNCTION_INPUT,
+        eSF_Output                                              = AVC1394_STREAM_FORMAT_SUBFUNCTION_OUTPUT,
+        eSF_ExtendedStreamFormatInformationCommand              = AVC1394_STREAM_FORMAT_SUBFUNCTION_EXTENDED_STREAM_FORMAT,
+        eSF_ExtendedStreamFormatInformationCommandList          = AVC1394_STREAM_FORMAT_SUBFUNCTION_EXTENDED_STREAM_FORMAT_LIST,
+    };
+
+    enum EStatus {
+        eS_Active         = AVC1394_EXTENDED_STREAM_FORMAT_INFO_STATUS_ACTIVE,
+        eS_Inactive       = AVC1394_EXTENDED_STREAM_FORMAT_INFO_STATUS_INACTIVE,
+        eS_NoStreamFormat = AVC1394_EXTENDED_STREAM_FORMAT_INFO_STATUS_NO_STREAM_FORMAT,
+        eS_NotUsed        = AVC1394_EXTENDED_STREAM_FORMAT_INFO_STATUS_NOT_USED,
+    };
+    typedef byte_t status_t;
+    typedef byte_t index_in_stream_format_t;
+
+    ExtendedStreamFormatCmd( Ieee1394Service* ieee1349service, ESubFunction eSubFunction = eSF_ExtendedStreamFormatInformationCommand );
+    ExtendedStreamFormatCmd( const ExtendedStreamFormatCmd& rhs );
+    virtual ~ExtendedStreamFormatCmd();
+
+    bool setPlugAddress( const PlugAddress& plugAddress );
+    bool setIndexInStreamFormat( const int index );
+    bool setSubFunction( ESubFunction subFunction );
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+
+    EStatus getStatus();
+    FormatInformation* getFormatInformation();
+    index_in_stream_format_t getIndex();
+
+    virtual const char* getCmdName() const
+	{ return "ExtendedStreamFormatCmd"; }
+
+protected:
+    subfunction_t            m_subFunction;
+    PlugAddress*             m_plugAddress;
+    status_t                 m_status;
+    index_in_stream_format_t m_indexInStreamFormat;
+    FormatInformation*       m_formatInformation;
+};
+
+#endif // AVCExtendedStreamFormat_h
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_subunit_info.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_subunit_info.h (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_subunit_info.h (revision 183)
@@ -0,0 +1,103 @@
+/* avc_extended_subunit_info.h
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef AVCEXTENDEDSUBUNITINFO_H
+#define AVCEXTENDEDSUBUNITINFO_H
+
+#include "avc_generic.h"
+
+#include <libavc1394/avc1394.h>
+
+#include <string>
+#include <vector>
+
+class ExtendedSubunitInfoPageData: public IBusData
+{
+ public:
+    enum ESpecialPurpose {
+        eSP_InputGain       = 0x00,
+        eSP_OutputVolume    = 0x01,
+        eSP_NoSpecialPupose = 0xff,
+    };
+
+    ExtendedSubunitInfoPageData();
+    virtual ~ExtendedSubunitInfoPageData();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual ExtendedSubunitInfoPageData* clone() const;
+
+    function_block_type_t            m_functionBlockType;
+    function_block_id_t              m_functionBlockId;
+    function_block_special_purpose_t m_functionBlockSpecialPupose;
+    no_of_input_plugs_t              m_noOfInputPlugs;
+    no_of_output_plugs_t             m_noOfOutputPlugs;
+};
+
+typedef std::vector<ExtendedSubunitInfoPageData*> ExtendedSubunitInfoPageDataVector;
+
+class ExtendedSubunitInfoCmd: public AVCCommand
+{
+public:
+    enum EFunctionBlockType {
+        eFBT_AllFunctinBlockType    = 0xff,
+        eFBT_AudioSubunitSelector   = 0x80,
+        eFBT_AudioSubunitFeature    = 0x81,
+        eFBT_AudioSubunitProcessing = 0x82,
+        eFBT_AudioSubunitCodec      = 0x83,
+    };
+
+    enum EProcessingType {
+        ePT_Mixer                   = 0x01,
+        ePT_Generic                 = 0x02,
+        ePT_UpDown                  = 0x03,
+        ePT_DolbyProLogic           = 0x04,
+        ePT_3DStereoExtender        = 0x05,
+        ePT_Reverberation           = 0x06,
+        ePT_Chorus                  = 0x07,
+        ePT_DynamicRangeCompression = 0x08,
+        ePT_EnhancedMixer           = 0x82,
+        ePT_Reserved                = 0xff,
+    };
+
+    enum ECodecType {
+        eCT_AC3Decoder  = 0x01,
+        eCT_MPEGDecoder = 0x02,
+        eCT_DTSDecoder  = 0x03,
+        eCT_Reserved    = 0xff,
+
+    };
+
+    ExtendedSubunitInfoCmd( Ieee1394Service* ieee1394service );
+    ExtendedSubunitInfoCmd( const ExtendedSubunitInfoCmd& rhs );
+    virtual ~ExtendedSubunitInfoCmd();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+
+    virtual const char* getCmdName() const
+	{ return "ExtendedSubunitInfoCmd"; }
+
+    page_t                m_page;
+    function_block_type_t m_fbType;
+    ExtendedSubunitInfoPageDataVector m_infoPageDatas;
+};
+
+#endif
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_connect.cpp
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_connect.cpp (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_connect.cpp (revision 183)
@@ -0,0 +1,51 @@
+/* avc_connect.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "avc_connect.h"
+#include "serialize.h"
+#include "ieee1394service.h"
+
+#include <netinet/in.h>
+#include <iostream>
+
+using namespace std;
+
+ConnectCmd::ConnectCmd(Ieee1394Service* ieee1394service)
+    : AVCCommand( ieee1394service, AVC1394_CMD_CONNECT )
+{
+}
+
+ConnectCmd::~ConnectCmd()
+{
+}
+
+bool
+ConnectCmd::serialize( IOSSerialize& se )
+{
+    AVCCommand::serialize( se );
+    return true;
+}
+
+bool
+ConnectCmd::deserialize( IISDeserialize& de )
+{
+    AVCCommand::deserialize( de );
+    return true;
+}
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_unit_info.cpp
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_unit_info.cpp (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_unit_info.cpp (revision 183)
@@ -0,0 +1,82 @@
+/* avc_unit_info.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "avc_unit_info.h"
+#include "serialize.h"
+#include "ieee1394service.h"
+
+#include <netinet/in.h>
+#include <iostream>
+
+using namespace std;
+
+UnitInfoCmd::UnitInfoCmd( Ieee1394Service* ieee1349service )
+    : AVCCommand( ieee1349service, AVC1394_CMD_UNIT_INFO )
+    , m_reserved( 0xff )
+    , m_unit_type( 0xff )
+    , m_unit( 0xff )
+    , m_company_id( 0xffffffff )
+{
+}
+
+UnitInfoCmd::~UnitInfoCmd()
+{
+}
+
+bool
+UnitInfoCmd::serialize( IOSSerialize& se )
+{
+    AVCCommand::serialize( se );
+
+    se.write( m_reserved, "UnitInfoCmd reserved" );
+    byte_t operand = ( m_unit_type << 3 ) | ( m_unit & 0x7 );
+    se.write( operand, "UnitInfoCmd unit_type and unit" );
+    operand = ( m_company_id >> 16 ) & 0xff;
+    se.write( operand, "UnitInfoCmd company_ID (2)" );
+    operand = ( m_company_id >> 8 ) & 0xff;
+    se.write( operand, "UnitInfoCmd company_ID (1)" );
+    operand = ( m_company_id >> 0 ) & 0xff;
+    se.write( operand, "UnitInfoCmd company_ID (0)" );
+
+    return true;
+}
+
+bool
+UnitInfoCmd::deserialize( IISDeserialize& de )
+{
+    AVCCommand::deserialize( de );
+
+    de.read( &m_reserved );
+
+    byte_t operand;
+    de.read( &operand );
+    m_unit_type = ( operand >> 3 );
+    m_unit = ( operand & 0x7 );
+
+    de.read( &operand );
+    m_company_id = 0;
+    m_company_id |= operand << 16;
+    de.read( &operand );
+    m_company_id |= operand << 8;
+    de.read( &operand );
+    m_company_id |= operand;
+
+    return true;
+}
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_signal_source.cpp
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_signal_source.cpp (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_signal_source.cpp (revision 183)
@@ -0,0 +1,281 @@
+/* avc_signal_source.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "avc_signal_source.h"
+#include "serialize.h"
+#include "ieee1394service.h"
+
+#include <netinet/in.h>
+#include <iostream>
+
+using namespace std;
+
+#define AVC1394_CMD_SIGNAL_SOURCE 0x1A
+
+SignalUnitAddress::SignalUnitAddress()
+    : m_plugId( ePI_Invalid )
+{
+}
+
+bool
+SignalUnitAddress::serialize( IOSSerialize& se )
+{
+    byte_t reserved = 0xff;
+    se.write( reserved, "SignalUnitAddress" );
+    se.write( m_plugId, "SignalUnitAddress plugId" );
+    return true;
+}
+
+bool
+SignalUnitAddress::deserialize( IISDeserialize& de )
+{
+    byte_t operand;
+    de.read( &operand );
+    de.read( &m_plugId );
+    return true;
+}
+
+SignalUnitAddress*
+SignalUnitAddress::clone() const
+{
+    return new SignalUnitAddress( *this );
+}
+
+////////////////////////////////////////
+
+SignalSubunitAddress::SignalSubunitAddress()
+    : m_subunitType( AVC1394_SUBUNIT_RESERVED )
+    , m_subunitId( AVC1394_SUBUNIT_ID_RESERVED )
+    , m_plugId( ePI_Invalid )
+{
+}
+
+bool
+SignalSubunitAddress::serialize( IOSSerialize& se )
+{
+    byte_t operand = ( m_subunitType << 3 ) | ( m_subunitId & 0x7 );
+    se.write( operand,  "SignalSubunitAddress subunitType & subunitId" );
+    se.write( m_plugId, "SignalSubunitAddress plugId" );
+    return true;
+}
+
+bool
+SignalSubunitAddress::deserialize( IISDeserialize& de )
+{
+    byte_t operand;
+    de.read( &operand );
+    m_subunitType = operand >> 3;
+    m_subunitId = operand & 0x7;
+    de.read( &m_plugId );
+    return true;
+}
+
+SignalSubunitAddress*
+SignalSubunitAddress::clone() const
+{
+    return new SignalSubunitAddress( *this );
+}
+
+////////////////////////////////////////
+
+
+SignalSourceCmd::SignalSourceCmd( Ieee1394Service* ieee1394service )
+    : AVCCommand( ieee1394service, AVC1394_CMD_SIGNAL_SOURCE )
+    , m_resultStatus( 0xff )
+    , m_outputStatus( 0xff )
+    , m_conv( 0xff )
+    , m_signalStatus( 0xff )
+    , m_signalSource( 0 )
+    , m_signalDestination( 0 )
+{
+}
+
+SignalSourceCmd::~SignalSourceCmd()
+{
+    delete m_signalSource;
+    m_signalSource = 0;
+    delete m_signalDestination;
+    m_signalDestination = 0;
+}
+
+bool
+SignalSourceCmd::serialize( IOSSerialize& se )
+{
+    AVCCommand::serialize( se );
+
+    byte_t operand;
+    switch ( getCommandType() ) {
+    case eCT_Status:
+        operand = ( m_outputStatus << 5 )
+                  | ( ( m_conv & 0x1 ) << 4 )
+                  | ( m_signalStatus & 0xf );
+        se.write( operand, "SignalSourceCmd outputStatus & conv & signalStatus" );
+        break;
+    case eCT_Control:
+    case eCT_SpecificInquiry:
+        operand = m_resultStatus & 0xf;
+        se.write( operand, "SignalSourceCmd resultStatus" );
+        break;
+    default:
+        cerr << "Can't handle command type " << getCommandType() << endl;
+        return false;
+    }
+
+    switch( getSubunitType() ) {
+    case eST_Unit:
+    case eST_Audio:
+    case eST_Music:
+        {
+            if ( m_signalSource ) {
+                m_signalSource->serialize( se );
+            } else {
+                byte_t reserved = 0xff;
+                se.write( reserved, "SignalSourceCmd" );
+                se.write( reserved, "SignalSourceCmd" );
+            }
+
+            if ( m_signalDestination ) {
+                m_signalDestination->serialize( se );
+            } else {
+                byte_t reserved = 0xff;
+                se.write( reserved, "SignalSourceCmd" );
+                se.write( reserved, "SignalSourceCmd" );
+            }
+        }
+        break;
+    default:
+        cerr << "Can't handle subunit type " << getSubunitType() << endl;
+        return false;
+    }
+
+    return true;
+}
+
+bool
+SignalSourceCmd::deserialize( IISDeserialize& de )
+{
+    delete m_signalSource;
+    m_signalSource = 0;
+    delete m_signalDestination;
+    m_signalDestination = 0;
+
+    AVCCommand::deserialize( de );
+
+    byte_t operand;
+    switch ( getCommandType() ) {
+    case eCT_Status:
+        de.read( &operand );
+        m_outputStatus = operand >> 5;
+        m_conv = ( operand & 0x10 ) >> 4;
+        m_signalStatus = operand & 0xf;
+        break;
+    case eCT_Control:
+    case eCT_SpecificInquiry:
+        de.read( &operand );
+        m_resultStatus = operand & 0xf;
+        break;
+    default:
+        cerr << "Can't handle command type " << getCommandType() << endl;
+        return false;
+    }
+
+    switch( getSubunitType() ) {
+    case eST_Unit:
+    case eST_Audio:
+    case eST_Music:
+        {
+            byte_t operand;
+            de.peek( &operand );
+            if ( operand == 0xff ) {
+                m_signalSource = new SignalUnitAddress;
+            } else {
+                m_signalSource = new SignalSubunitAddress;
+            }
+
+            m_signalSource->deserialize( de );
+
+            de.peek( &operand );
+            if ( operand == 0xff ) {
+                m_signalDestination = new SignalUnitAddress;
+            } else {
+                m_signalDestination = new SignalSubunitAddress;
+            }
+            m_signalDestination->deserialize( de );
+        }
+        break;
+    default:
+        cerr << "Can't handle subunit type " << getSubunitType() << endl;
+        return false;
+    }
+
+    return true;
+}
+
+bool
+SignalSourceCmd::setSignalSource( SignalUnitAddress& signalAddress )
+{
+    if ( m_signalSource ) {
+        delete m_signalSource;
+    }
+    m_signalSource = signalAddress.clone();
+    return true;
+}
+
+bool
+SignalSourceCmd::setSignalSource( SignalSubunitAddress& signalAddress )
+{
+    if ( m_signalSource ) {
+        delete m_signalSource;
+    }
+    m_signalSource = signalAddress.clone();
+    return true;
+}
+
+bool
+SignalSourceCmd::setSignalDestination( SignalUnitAddress& signalAddress )
+{
+    if ( m_signalDestination ) {
+        delete m_signalDestination;
+    }
+    m_signalDestination = signalAddress.clone();
+    return true;
+}
+
+bool
+SignalSourceCmd::setSignalDestination( SignalSubunitAddress& signalAddress )
+{
+    if ( m_signalDestination ) {
+        delete m_signalDestination;
+    }
+    m_signalDestination = signalAddress.clone();
+    return true;
+}
+
+SignalAddress*
+SignalSourceCmd::getSignalSource()
+{
+    return m_signalSource;
+}
+
+SignalAddress*
+SignalSourceCmd::getSignalDestination()
+{
+    return m_signalDestination;
+}
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_connect.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_connect.h (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_connect.h (revision 183)
@@ -0,0 +1,42 @@
+/* avc_connect.h
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef AVCConnect_h
+#define AVCConnect_h
+
+#include "avc_generic.h"
+
+#include <libavc1394/avc1394.h>
+
+class ConnectCmd: public AVCCommand
+{
+public:
+    ConnectCmd(Ieee1394Service* ieee1394service);
+    virtual ~ConnectCmd();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+
+    virtual const char* getCmdName() const
+	{ return "ConnectCmd"; }
+};
+
+
+#endif // AVCConnect_h
Index: branches/freebob-syt-experiments/src/libfreebobavc/serialize.cpp
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/serialize.cpp (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/serialize.cpp (revision 183)
@@ -0,0 +1,137 @@
+/* serialize.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "serialize.h"
+
+#include <iostream>
+#include <iomanip>
+
+#include <netinet/in.h>
+
+bool
+CoutSerializer::write( byte_t d, const char* name )
+{
+    printf( "  %3d:\t0x%02x\t%s\n", m_cnt, d, name );
+    m_cnt += sizeof( byte_t );
+
+    return true;
+}
+
+bool
+CoutSerializer::write( quadlet_t d, const char* name )
+{
+    printf( "  %3d:\t0x%08x\t%s\n", m_cnt, d, name );
+    m_cnt += sizeof( quadlet_t );
+    return true;
+}
+
+//////////////////////////////////////////////////
+
+bool
+BufferSerialize::write( byte_t value, const char* name )
+{
+    bool result = false;
+    if ( isCurPosValid() ) {
+        *m_curPos = value;
+        m_curPos += sizeof( byte_t );
+        result = true;
+    }
+    return result;
+}
+
+bool
+BufferSerialize::write( quadlet_t value,  const char* name )
+{
+    bool result = false;
+    if ( isCurPosValid() ) {
+        * ( quadlet_t* )m_curPos = value;
+        m_curPos += sizeof( quadlet_t );
+        result = true;
+    }
+    return result;
+}
+
+bool
+BufferSerialize::isCurPosValid() const
+{
+    if ( static_cast<size_t>( ( m_curPos - m_buffer ) ) >= m_length ) {
+        return false;
+    }
+    return true;
+}
+
+//////////////////////////////////////////////////
+
+bool
+BufferDeserialize::read( byte_t* value )
+{
+    bool result = false;
+    if ( isCurPosValid() ) {
+        *value = *m_curPos;
+        m_curPos += sizeof( byte_t );
+        result = true;
+    }
+    return result;
+}
+
+bool
+BufferDeserialize::read( quadlet_t* value )
+{
+    bool result = false;
+    if ( isCurPosValid() ) {
+        *value = *m_curPos;
+        m_curPos += sizeof( quadlet_t );
+        result = true;
+    }
+    return result;
+}
+
+bool
+BufferDeserialize::read( char** value, size_t length )
+{
+    bool result = false;
+    if ( isCurPosValid() ) {
+        *value = ( char* )m_curPos;
+        m_curPos += length;
+        result = true;
+    }
+    return result;
+}
+
+bool
+BufferDeserialize::peek( byte_t* value )
+{
+    bool result = false;
+    if ( isCurPosValid() ) {
+        *value = *m_curPos;
+        result = true;
+    }
+    return result;
+}
+
+bool
+BufferDeserialize::isCurPosValid() const
+{
+    if ( static_cast<size_t>( ( m_curPos - m_buffer ) ) >= m_length ) {
+        return false;
+    }
+    return true;
+}
+
Index: branches/freebob-syt-experiments/src/libfreebobavc/Makefile.am
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/Makefile.am (revision 172)
+++ branches/freebob-syt-experiments/src/libfreebobavc/Makefile.am (revision 172)
@@ -0,0 +1,53 @@
+# Makefile.am - Makefile template
+# Copyright (C) 2005 by Daniel Wagner.
+#
+# This file is part of FreeBob.
+#
+# FreeBob is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# FreeBob 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 General Public License
+# along with FreeBob; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+noinst_LTLIBRARIES = libfreebobavc.la
+
+libfreebobavc_la_SOURCES =  				\
+		avc_connect.cpp 			\
+		avc_connect.h 				\
+		avc_definitions.cpp 			\
+		avc_definitions.h 			\
+		avc_extended_cmd_generic.cpp		\
+		avc_extended_cmd_generic.h		\
+		avc_extended_plug_info.cpp		\
+		avc_extended_plug_info.h		\
+		avc_extended_stream_format.cpp 		\
+		avc_extended_stream_format.h 		\
+		avc_extended_subunit_info.h		\
+		avc_extended_subunit_info.cpp		\
+		avc_generic.cpp 			\
+		avc_generic.h 				\
+		avc_plug_info.cpp 			\
+		avc_plug_info.h 			\
+		avc_signal_source.cpp 			\
+		avc_signal_source.h 			\
+		avc_subunit_info.cpp			\
+		avc_subunit_info.h			\
+		avc_unit_info.cpp			\
+		avc_unit_info.h				\
+		ieee1394service.cpp			\
+		ieee1394service.h       		\
+		serialize.cpp				\
+		serialize.h
+
+INCLUDES = $(LIBRAW1394_CFLAGS) $(LIBIEC61883_CFLAGS) $(LIBAVC1394_CFLAGS) \
+	-I$(top_srcdir)/src
+libfreebobavc_la_LIBADD  = $(LIBRAW1394_LIBS) $(LIBIEC61883_LIBS) \
+	$(LIBAVC1394_LIBS)
+
+MAINTAINERCLEANFILES = Makefile.in
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_unit_info.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_unit_info.h (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_unit_info.h (revision 183)
@@ -0,0 +1,68 @@
+/* avc_unit_info.h
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef AVCUnitInfo_h
+#define AVCUnitInfo_h
+
+#include "avc_generic.h"
+
+#include <libavc1394/avc1394.h>
+
+class UnitInfoCmd: public AVCCommand
+{
+public:
+
+    enum EUnitType {
+        eUT_Monitor       = AVC1394_SUBUNIT_VIDEO_MONITOR,
+        eUT_Audio         = AVC1394_SUBUNIT_AUDIO,
+        eUT_Printer       = AVC1394_SUBUNIT_PRINTER,
+        eUT_Disc          = AVC1394_SUBUNIT_DISC_RECORDER,
+        eUT_VCR           = AVC1394_SUBUNIT_VCR,
+        eUT_Tuner         = AVC1394_SUBUNIT_TUNER,
+        eUT_CA            = AVC1394_SUBUNIT_CA,
+        eUT_Camera        = AVC1394_SUBUNIT_VIDEO_CAMERA,
+        eUT_Panel         = AVC1394_SUBUNIT_PANEL,
+        eUT_BulltinBoard  = AVC1394_SUBUNIT_BULLETIN_BOARD,
+        eUT_CameraStorage = AVC1394_SUBUNIT_CAMERA_STORAGE,
+        eUT_Music         = AVC1394_SUBUNIT_MUSIC,
+        eUT_VendorUnique  = AVC1394_SUBUNIT_VENDOR_UNIQUE,
+        eUT_Reserved      = AVC1394_SUBUNIT_RESERVED,
+        eUT_Extended      = AVC1394_SUBUNIT_EXTENDED,
+        eUT_Unit          = AVC1394_SUBUNIT_UNIT,
+    };
+
+    UnitInfoCmd( Ieee1394Service* ieee1349service );
+    virtual ~UnitInfoCmd();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+
+    virtual const char* getCmdName() const
+	{ return "UnitInfoCmd"; }
+
+    reserved_t  m_reserved;
+    unit_type_t m_unit_type;
+    unit_t      m_unit;
+
+    company_id_t m_company_id;
+};
+
+
+#endif // AVCUnitInfo_h
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_plug_info.cpp
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_plug_info.cpp (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_extended_plug_info.cpp (revision 183)
@@ -0,0 +1,851 @@
+/* avc_extended_plug_info.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "avc_extended_plug_info.h"
+#include "serialize.h"
+#include "ieee1394service.h"
+
+#include <netinet/in.h>
+#include <iostream>
+
+using namespace std;
+
+/////////////////////////////////////////
+/////////////////////////////////////////
+
+ExtendedPlugInfoPlugTypeSpecificData::ExtendedPlugInfoPlugTypeSpecificData( EExtendedPlugInfoPlugType ePlugType )
+    : IBusData()
+    , m_plugType( ePlugType )
+{
+}
+
+ExtendedPlugInfoPlugTypeSpecificData::~ExtendedPlugInfoPlugTypeSpecificData()
+{
+}
+
+bool
+ExtendedPlugInfoPlugTypeSpecificData::serialize( IOSSerialize& se )
+{
+    se.write( m_plugType, "ExtendedPlugInfoPlugTypeSpecificData plugType" );
+    return true;
+}
+
+
+bool
+ExtendedPlugInfoPlugTypeSpecificData::deserialize( IISDeserialize& de )
+{
+    de.read( &m_plugType );
+    return true;
+}
+
+ExtendedPlugInfoPlugTypeSpecificData* ExtendedPlugInfoPlugTypeSpecificData::clone() const
+{
+    return new ExtendedPlugInfoPlugTypeSpecificData( *this );
+}
+
+const char* extendedPlugInfoPlugTypeStrings[] =
+{
+    "IsoStream",
+    "AsyncStream",
+    "Midi",
+    "Sync",
+    "Analog",
+    "Digital",
+    "Unknown",
+};
+
+const char* extendedPlugInfoPlugTypeToString( plug_type_t plugType )
+{
+    if ( plugType > sizeof( extendedPlugInfoPlugTypeStrings ) ) {
+        return "Unknown";
+    } else {
+        return extendedPlugInfoPlugTypeStrings[plugType];
+    }
+}
+
+/////////////////////////////////////////
+/////////////////////////////////////////
+
+ExtendedPlugInfoPlugNameSpecificData::ExtendedPlugInfoPlugNameSpecificData()
+    : IBusData()
+{
+}
+
+ExtendedPlugInfoPlugNameSpecificData::~ExtendedPlugInfoPlugNameSpecificData()
+{
+}
+
+bool
+ExtendedPlugInfoPlugNameSpecificData::serialize( IOSSerialize& se )
+{
+    byte_t length = strlen( m_name.c_str() );
+    se.write( length,
+              "ExtendedPlugInfoPlugNameSpecificData: string length" );
+    for ( unsigned int i = 0; i < length; ++i ) {
+        se.write( static_cast<byte_t>( m_name[i] ),
+                  "ExtendedPlugInfoPlugNameSpecificData: char" );
+    }
+
+    return true;
+}
+
+bool
+ExtendedPlugInfoPlugNameSpecificData::deserialize( IISDeserialize& de )
+{
+    byte_t length;
+    de.read( &length );
+    m_name.clear();
+    char* name;
+    de.read( &name, length );
+    m_name = name;
+
+    return true;
+}
+
+ExtendedPlugInfoPlugNameSpecificData::ExtendedPlugInfoPlugNameSpecificData*
+ExtendedPlugInfoPlugNameSpecificData::clone() const
+{
+    return new ExtendedPlugInfoPlugNameSpecificData( *this );
+}
+
+
+/////////////////////////////////////////
+/////////////////////////////////////////
+
+ExtendedPlugInfoPlugNumberOfChannelsSpecificData::ExtendedPlugInfoPlugNumberOfChannelsSpecificData()
+    : IBusData()
+    , m_nrOfChannels( 0 )
+{
+}
+
+ExtendedPlugInfoPlugNumberOfChannelsSpecificData::~ExtendedPlugInfoPlugNumberOfChannelsSpecificData()
+{
+}
+
+bool
+ExtendedPlugInfoPlugNumberOfChannelsSpecificData::serialize( IOSSerialize& se )
+{
+    se.write( m_nrOfChannels,
+              "ExtendedPlugInfoPlugNumberOfChannelsSpecificData: "
+              "number of channels" );
+    return true;
+}
+
+bool
+ExtendedPlugInfoPlugNumberOfChannelsSpecificData::deserialize( IISDeserialize& de )
+{
+    de.read( &m_nrOfChannels );
+    return true;
+}
+
+ExtendedPlugInfoPlugNumberOfChannelsSpecificData::ExtendedPlugInfoPlugNumberOfChannelsSpecificData*
+ExtendedPlugInfoPlugNumberOfChannelsSpecificData::clone() const
+{
+    return new ExtendedPlugInfoPlugNumberOfChannelsSpecificData( *this );
+}
+
+/////////////////////////////////////////
+/////////////////////////////////////////
+
+ExtendedPlugInfoPlugChannelPositionSpecificData::ExtendedPlugInfoPlugChannelPositionSpecificData()
+    : IBusData()
+    , m_nrOfClusters( 0 )
+{
+}
+
+ExtendedPlugInfoPlugChannelPositionSpecificData::~ExtendedPlugInfoPlugChannelPositionSpecificData()
+{
+}
+
+bool
+ExtendedPlugInfoPlugChannelPositionSpecificData::serialize( IOSSerialize& se )
+{
+    se.write( m_nrOfClusters,
+              "ExtendedPlugInfoPlugChannelPositionSpecificData: "
+              "number of clusters" );
+
+    for ( ClusterInfoVector::const_iterator it = m_clusterInfos.begin();
+          it != m_clusterInfos.end();
+          ++it )
+    {
+        const ClusterInfo* clusterInfo = &( *it );
+
+        se.write( clusterInfo->m_nrOfChannels,
+                  "ExtendedPlugInfoPlugChannelPositionSpecificData: "
+                  "number of channels" );
+        for ( ChannelInfoVector::const_iterator cit
+                  = clusterInfo->m_channelInfos.begin();
+              cit != clusterInfo->m_channelInfos.end();
+              ++cit )
+        {
+            const ChannelInfo* channelInfo = &( *cit );
+            se.write( channelInfo->m_streamPosition,
+                      "ExtendedPlugInfoPlugChannelPositionSpecificData: "
+                      "stream position" );
+            se.write( channelInfo->m_location,
+                      "ExtendedPlugInfoPlugChannelPositionSpecificData: "
+                      "location" );
+        }
+    }
+
+    return true;
+}
+
+bool
+ExtendedPlugInfoPlugChannelPositionSpecificData::deserialize( IISDeserialize& de )
+{
+    m_clusterInfos.clear();
+
+    de.read( &m_nrOfClusters );
+    for ( int i = 0; i < m_nrOfClusters; ++i ) {
+        ClusterInfo clusterInfo;
+        de.read ( &clusterInfo.m_nrOfChannels );
+        for ( int j = 0; j < clusterInfo.m_nrOfChannels; ++j ) {
+            ChannelInfo channelInfo;
+            de.read( &channelInfo.m_streamPosition );
+            de.read( &channelInfo.m_location );
+            clusterInfo.m_channelInfos.push_back( channelInfo );
+        }
+        m_clusterInfos.push_back( clusterInfo );
+    }
+    return true;
+}
+
+ExtendedPlugInfoPlugChannelPositionSpecificData::ExtendedPlugInfoPlugChannelPositionSpecificData*
+ExtendedPlugInfoPlugChannelPositionSpecificData::clone() const
+{
+    return new ExtendedPlugInfoPlugChannelPositionSpecificData( *this );
+}
+
+/////////////////////////////////////////
+/////////////////////////////////////////
+
+ExtendedPlugInfoPlugChannelNameSpecificData::ExtendedPlugInfoPlugChannelNameSpecificData()
+    : IBusData()
+    , m_streamPosition( 0 )
+    , m_stringLength( 0xff )
+{
+}
+
+ExtendedPlugInfoPlugChannelNameSpecificData::~ExtendedPlugInfoPlugChannelNameSpecificData()
+{
+}
+
+bool
+ExtendedPlugInfoPlugChannelNameSpecificData::serialize( IOSSerialize& se )
+{
+    se.write( m_streamPosition,
+              "ExtendedPlugInfoPlugChannelNameSpecificData: stream position" );
+    se.write( m_stringLength,
+              "ExtendedPlugInfoPlugChannelNameSpecificData: string length" );
+    for ( unsigned int i = 0; i < m_plugChannelName.size(); ++i ) {
+        se.write( static_cast<byte_t>( m_plugChannelName[i] ),
+                  "ExtendedPlugInfoPlugChannelNameSpecificData: char" );
+    }
+
+    return true;
+}
+
+bool
+ExtendedPlugInfoPlugChannelNameSpecificData::deserialize( IISDeserialize& de )
+{
+    de.read( &m_streamPosition );
+    de.read( &m_stringLength );
+
+    char* name = new char[m_stringLength+1];
+    for ( int i = 0; i < m_stringLength; ++i ) {
+        byte_t c;
+        de.read( &c );
+        // \todo do correct encoding
+        if ( c == '&' ) {
+            c = '+';
+        }
+        name[i] = c;
+    }
+    name[m_stringLength] = '\0';
+    m_plugChannelName = name;
+    delete[] name;
+
+    return true;
+}
+
+ExtendedPlugInfoPlugChannelNameSpecificData::ExtendedPlugInfoPlugChannelNameSpecificData*
+ExtendedPlugInfoPlugChannelNameSpecificData::clone() const
+{
+    return new ExtendedPlugInfoPlugChannelNameSpecificData( *this );
+}
+
+/////////////////////////////////////////
+/////////////////////////////////////////
+ExtendedPlugInfoPlugInputSpecificData::ExtendedPlugInfoPlugInputSpecificData()
+    : IBusData()
+{
+    UnitPlugSpecificDataPlugAddress
+        unitPlug( UnitPlugSpecificDataPlugAddress::ePT_PCR,  0x00 );
+    m_plugAddress
+        = new PlugAddressSpecificData( PlugAddressSpecificData::ePD_Output,
+                                       PlugAddressSpecificData::ePAM_Unit,
+                                       unitPlug );
+}
+
+ExtendedPlugInfoPlugInputSpecificData::ExtendedPlugInfoPlugInputSpecificData(const ExtendedPlugInfoPlugInputSpecificData& rhs )
+{
+    m_plugAddress = rhs.m_plugAddress->clone();
+}
+
+
+ExtendedPlugInfoPlugInputSpecificData::~ExtendedPlugInfoPlugInputSpecificData()
+{
+    delete m_plugAddress;
+    m_plugAddress = 0;
+}
+
+bool
+ExtendedPlugInfoPlugInputSpecificData::serialize( IOSSerialize& se )
+{
+    if ( m_plugAddress ) {
+        return m_plugAddress->serialize( se );
+    } else {
+        return false;
+    }
+}
+
+bool
+ExtendedPlugInfoPlugInputSpecificData::deserialize( IISDeserialize& de )
+{
+    return m_plugAddress->deserialize( de );
+}
+
+ExtendedPlugInfoPlugInputSpecificData::ExtendedPlugInfoPlugInputSpecificData*
+ExtendedPlugInfoPlugInputSpecificData::clone() const
+{
+    return new ExtendedPlugInfoPlugInputSpecificData( *this );
+}
+
+/////////////////////////////////////////
+/////////////////////////////////////////
+
+ExtendedPlugInfoPlugOutputSpecificData::ExtendedPlugInfoPlugOutputSpecificData()
+    : IBusData()
+    , m_nrOfOutputPlugs( 0 )
+{
+}
+
+ExtendedPlugInfoPlugOutputSpecificData::ExtendedPlugInfoPlugOutputSpecificData( const ExtendedPlugInfoPlugOutputSpecificData& rhs)
+    : IBusData()
+    , m_nrOfOutputPlugs( rhs.m_nrOfOutputPlugs )
+{
+    for ( PlugAddressVector::const_iterator it = rhs.m_outputPlugAddresses.begin();
+          it != rhs.m_outputPlugAddresses.end();
+          ++it )
+    {
+        m_outputPlugAddresses.push_back( ( *it )->clone() );
+    }
+
+}
+
+
+ExtendedPlugInfoPlugOutputSpecificData::~ExtendedPlugInfoPlugOutputSpecificData()
+{
+    for ( PlugAddressVector::iterator it = m_outputPlugAddresses.begin();
+          it != m_outputPlugAddresses.end();
+          ++it )
+    {
+        delete *it;
+    }
+}
+
+bool
+ExtendedPlugInfoPlugOutputSpecificData::serialize( IOSSerialize& se )
+{
+    se.write( m_nrOfOutputPlugs, "ExtendedPlugInfoPlugOutputSpecificData: number of output plugs" );
+    for ( PlugAddressVector::const_iterator it = m_outputPlugAddresses.begin();
+          it != m_outputPlugAddresses.end();
+          ++it )
+    {
+        ( *it )->serialize( se );
+    }
+
+    return true;
+}
+
+bool
+ExtendedPlugInfoPlugOutputSpecificData::deserialize( IISDeserialize& de )
+{
+    de.read( &m_nrOfOutputPlugs );
+
+    for ( int i = 0; i < m_nrOfOutputPlugs; ++i )
+    {
+        UnitPlugSpecificDataPlugAddress
+            unitPlug( UnitPlugSpecificDataPlugAddress::ePT_PCR,  0x00 );
+        PlugAddressSpecificData* plugAddress
+            = new PlugAddressSpecificData( PlugAddressSpecificData::ePD_Output,
+                                           PlugAddressSpecificData::ePAM_Unit,
+                                           unitPlug );
+        if ( !plugAddress->deserialize( de ) ) {
+            return false;
+        }
+
+        m_outputPlugAddresses.push_back( plugAddress );
+    }
+
+    return true;
+}
+
+ExtendedPlugInfoPlugOutputSpecificData::ExtendedPlugInfoPlugOutputSpecificData*
+ExtendedPlugInfoPlugOutputSpecificData::clone() const
+{
+    return new ExtendedPlugInfoPlugOutputSpecificData( *this );
+}
+
+/////////////////////////////////////////
+/////////////////////////////////////////
+ExtendedPlugInfoClusterInfoSpecificData::ExtendedPlugInfoClusterInfoSpecificData()
+    : IBusData()
+    , m_clusterIndex( 0 )
+    , m_portType( ePT_NoType )
+    , m_stringLength( 0xff )
+{
+}
+
+ExtendedPlugInfoClusterInfoSpecificData::~ExtendedPlugInfoClusterInfoSpecificData()
+{
+}
+
+bool
+ExtendedPlugInfoClusterInfoSpecificData::serialize( IOSSerialize& se )
+{
+    se.write( m_clusterIndex,
+              "ExtendedPlugInfoClusterInfoSpecificData: cluster index" );
+    se.write( m_portType,
+              "ExtendedPlugInfoClusterInfoSpecificData: port type" );
+    se.write( m_stringLength,
+              "ExtendedPlugInfoClusterInfoSpecificData: string length" );
+    for ( unsigned int i = 0; i < m_clusterName.length(); ++i ) {
+        se.write( static_cast<byte_t>( m_clusterName[i] ),
+                  "ExtendedPlugInfoClusterInfoSpecificData: char" );
+    }
+
+    return true;
+}
+
+bool
+ExtendedPlugInfoClusterInfoSpecificData::deserialize( IISDeserialize& de )
+{
+
+    de.read( &m_clusterIndex );
+    de.read( &m_portType );
+    de.read( &m_stringLength );
+
+    char* name = new char[m_stringLength+1];
+    for ( int i = 0; i < m_stringLength; ++i ) {
+        byte_t c;
+        de.read( &c );
+        // \todo do correct encoding
+        if ( c == '&' ) {
+            c = '+';
+        }
+        name[i] = c;
+    }
+    name[m_stringLength] = '\0';
+    m_clusterName = name;
+    delete[] name;
+
+    return true;
+}
+
+ExtendedPlugInfoClusterInfoSpecificData::ExtendedPlugInfoClusterInfoSpecificData*
+ExtendedPlugInfoClusterInfoSpecificData::clone() const
+{
+    return new ExtendedPlugInfoClusterInfoSpecificData( *this );
+}
+
+const char* extendedPlugInfoPortTypeStrings[] =
+{
+    "Speaker",
+    "Headphone",
+    "Microphone",
+    "Line",
+    "SPDIF",
+    "ADAT",
+    "TDIF",
+    "MADI",
+    "Analog",
+    "Digital",
+    "MIDI",
+};
+
+const char* extendedPlugInfoClusterInfoPortTypeToString( port_type_t portType )
+{
+    if ( portType > ( ( sizeof( extendedPlugInfoPortTypeStrings ) )
+                      / ( sizeof( extendedPlugInfoPortTypeStrings[0] ) ) ) ) {
+        return "Unknown";
+    } else {
+        return extendedPlugInfoPortTypeStrings[portType];
+    }
+}
+
+/////////////////////////////////////////
+/////////////////////////////////////////
+/////////////////////////////////////////
+/////////////////////////////////////////
+
+ExtendedPlugInfoInfoType::ExtendedPlugInfoInfoType(EInfoType eInfoType)
+    : IBusData()
+    , m_infoType( eInfoType )
+    , m_plugType( 0 )
+    , m_plugName( 0 )
+    , m_plugNrOfChns( 0 )
+    , m_plugChannelPosition( 0 )
+    , m_plugChannelName( 0 )
+    , m_plugInput( 0 )
+    , m_plugOutput( 0 )
+    , m_plugClusterInfo( 0 )
+{
+}
+
+ExtendedPlugInfoInfoType::ExtendedPlugInfoInfoType( const ExtendedPlugInfoInfoType& rhs )
+    : IBusData()
+    , m_infoType( rhs.m_infoType )
+    , m_plugType( 0 )
+    , m_plugName( 0 )
+    , m_plugNrOfChns( 0 )
+    , m_plugChannelPosition( 0 )
+    , m_plugChannelName( 0 )
+    , m_plugInput( 0 )
+    , m_plugOutput( 0 )
+    , m_plugClusterInfo( 0 )
+{
+    switch( m_infoType ) {
+    case eIT_PlugType:
+        m_plugType =
+            new ExtendedPlugInfoPlugTypeSpecificData( *rhs.m_plugType );
+        break;
+    case eIT_PlugName:
+        m_plugName =
+            new ExtendedPlugInfoPlugNameSpecificData( *rhs.m_plugName );
+        break;
+    case eIT_NoOfChannels:
+        m_plugNrOfChns =
+            new ExtendedPlugInfoPlugNumberOfChannelsSpecificData( *rhs.m_plugNrOfChns );
+        break;
+    case eIT_ChannelPosition:
+        m_plugChannelPosition =
+            new ExtendedPlugInfoPlugChannelPositionSpecificData( *rhs.m_plugChannelPosition );
+        break;
+    case eIT_ChannelName:
+        m_plugChannelName =
+            new ExtendedPlugInfoPlugChannelNameSpecificData( *rhs.m_plugChannelName );
+        break;
+    case eIT_PlugInput:
+        m_plugInput =
+            new ExtendedPlugInfoPlugInputSpecificData( *rhs.m_plugInput );
+        break;
+    case eIT_PlugOutput:
+        m_plugOutput =
+            new ExtendedPlugInfoPlugOutputSpecificData( *rhs.m_plugOutput );
+        break;
+    case eIT_ClusterInfo:
+        m_plugClusterInfo =
+            new ExtendedPlugInfoClusterInfoSpecificData( *rhs.m_plugClusterInfo );
+        break;
+    }
+}
+
+ExtendedPlugInfoInfoType::~ExtendedPlugInfoInfoType()
+{
+    delete( m_plugType );
+    delete( m_plugName );
+    delete( m_plugNrOfChns );
+    delete( m_plugChannelPosition );
+    delete( m_plugChannelName );
+    delete( m_plugInput );
+    delete( m_plugOutput );
+    delete( m_plugClusterInfo );
+ }
+
+bool
+ExtendedPlugInfoInfoType::initialize()
+{
+    switch ( m_infoType ) {
+    case eIT_PlugType:
+        m_plugType = new ExtendedPlugInfoPlugTypeSpecificData;
+        break;
+    case eIT_PlugName:
+        m_plugName = new ExtendedPlugInfoPlugNameSpecificData;
+        break;
+    case eIT_NoOfChannels:
+        m_plugNrOfChns = new ExtendedPlugInfoPlugNumberOfChannelsSpecificData;
+        break;
+    case eIT_ChannelPosition:
+        m_plugChannelPosition = new ExtendedPlugInfoPlugChannelPositionSpecificData;
+        break;
+    case eIT_ChannelName:
+        m_plugChannelName = new ExtendedPlugInfoPlugChannelNameSpecificData;
+        break;
+    case eIT_PlugInput:
+        m_plugInput = new ExtendedPlugInfoPlugInputSpecificData;
+        break;
+    case eIT_PlugOutput:
+        m_plugOutput = new ExtendedPlugInfoPlugOutputSpecificData;
+        break;
+    case eIT_ClusterInfo:
+        m_plugClusterInfo = new ExtendedPlugInfoClusterInfoSpecificData;
+        break;
+    default:
+        return false;
+    }
+
+    return true;
+}
+
+bool
+ExtendedPlugInfoInfoType::serialize( IOSSerialize& se )
+{
+    // XXX \todo improve IOSSerialize::write interface
+    char* buf;
+    asprintf( &buf, "ExtendedPlugInfoInfoType infoType (%s)",
+              extendedPlugInfoInfoTypeToString( m_infoType ) );
+    se.write( m_infoType, buf );
+
+    switch ( m_infoType ) {
+    case eIT_PlugType:
+        if ( m_plugType ) {
+            m_plugType->serialize( se );
+        }
+        break;
+    case eIT_PlugName:
+        if ( m_plugName ) {
+            m_plugName->serialize( se );
+        }
+        break;
+    case eIT_NoOfChannels:
+        if ( m_plugNrOfChns ) {
+            m_plugNrOfChns->serialize( se );
+        }
+        break;
+    case eIT_ChannelPosition:
+        if ( m_plugChannelPosition ) {
+            m_plugChannelPosition->serialize( se );
+        }
+        break;
+    case eIT_ChannelName:
+        if ( m_plugChannelName ) {
+            m_plugChannelName->serialize( se );
+        }
+        break;
+    case eIT_PlugInput:
+        if ( m_plugInput ) {
+            m_plugInput->serialize( se );
+        }
+        break;
+    case eIT_PlugOutput:
+        if ( m_plugOutput ) {
+            m_plugOutput->serialize( se );
+        }
+        break;
+    case eIT_ClusterInfo:
+        if ( m_plugClusterInfo ) {
+            m_plugClusterInfo->serialize( se );
+        }
+        break;
+    default:
+        return false;
+    }
+
+    return true;
+}
+
+bool
+ExtendedPlugInfoInfoType::deserialize( IISDeserialize& de )
+{
+    bool status = false;
+
+    de.read( &m_infoType );
+
+    switch ( m_infoType ) {
+    case eIT_PlugType:
+        if ( !m_plugType ) {
+            m_plugType = new ExtendedPlugInfoPlugTypeSpecificData;
+        }
+        status = m_plugType->deserialize( de );
+        break;
+    case eIT_PlugName:
+        if ( !m_plugName ) {
+            m_plugName = new ExtendedPlugInfoPlugNameSpecificData;
+        }
+        status = m_plugName->deserialize( de );
+        break;
+    case eIT_NoOfChannels:
+        if ( !m_plugNrOfChns ) {
+            m_plugNrOfChns =
+                new ExtendedPlugInfoPlugNumberOfChannelsSpecificData;
+        }
+        status = m_plugNrOfChns->deserialize( de );
+        break;
+    case eIT_ChannelPosition:
+        if ( !m_plugChannelPosition ) {
+            m_plugChannelPosition =
+                new ExtendedPlugInfoPlugChannelPositionSpecificData;
+        }
+        status = m_plugChannelPosition->deserialize( de );
+        break;
+    case eIT_ChannelName:
+        if ( !m_plugChannelName ) {
+            m_plugChannelName =
+                new ExtendedPlugInfoPlugChannelNameSpecificData;
+        }
+        status = m_plugChannelName->deserialize( de );
+        break;
+    case eIT_PlugInput:
+        if ( !m_plugInput ) {
+            m_plugInput = new ExtendedPlugInfoPlugInputSpecificData;
+        }
+        status = m_plugInput->deserialize( de );
+        break;
+    case eIT_PlugOutput:
+        if ( !m_plugOutput ) {
+            m_plugOutput = new ExtendedPlugInfoPlugOutputSpecificData;
+        }
+        status = m_plugOutput->deserialize( de );
+        break;
+    case eIT_ClusterInfo:
+        if ( !m_plugClusterInfo ) {
+            m_plugClusterInfo = new ExtendedPlugInfoClusterInfoSpecificData;
+        }
+        status =m_plugClusterInfo->deserialize( de );
+        break;
+    default:
+        return false;
+    }
+
+    return status;
+}
+
+ExtendedPlugInfoInfoType*
+ExtendedPlugInfoInfoType::clone() const
+{
+   ExtendedPlugInfoInfoType* extPlugInfoInfoType
+       = new ExtendedPlugInfoInfoType( *this );
+   extPlugInfoInfoType->initialize();
+   return extPlugInfoInfoType;
+}
+
+const char* extendedPlugInfoInfoTypeStrings[] =
+{
+    "PlugType",
+    "PlugName",
+    "NoOfChannels",
+    "ChannelPosition",
+    "ChannelName",
+    "PlugInput",
+    "PlugOutput",
+    "ClusterInfo",
+};
+
+const char* extendedPlugInfoInfoTypeToString( info_type_t infoType )
+{
+    if ( infoType > ( ( sizeof( extendedPlugInfoInfoTypeStrings ) )
+                      / ( sizeof( extendedPlugInfoInfoTypeStrings[0] ) ) ) )  {
+        return "Unknown";
+    } else {
+        return extendedPlugInfoInfoTypeStrings[infoType];
+    }
+}
+
+
+//////////////////////////////////////////////
+
+ExtendedPlugInfoCmd::ExtendedPlugInfoCmd( Ieee1394Service* ieee1394service,
+                                          ESubFunction eSubFunction )
+    : AVCCommand( ieee1394service, AVC1394_CMD_PLUG_INFO )
+{
+    setSubFunction( eSubFunction );
+    UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR, 0x00 );
+    m_plugAddress = new PlugAddress( PlugAddress::ePD_Output,
+                                      PlugAddress::ePAM_Unit,
+                                      unitPlugAddress );
+    m_infoType =
+        new ExtendedPlugInfoInfoType( ExtendedPlugInfoInfoType::eIT_PlugType );
+    m_infoType->initialize();
+}
+
+ExtendedPlugInfoCmd::ExtendedPlugInfoCmd( const ExtendedPlugInfoCmd& rhs )
+    : AVCCommand( rhs )
+{
+    m_subFunction = rhs.m_subFunction;
+    m_plugAddress = new PlugAddress( *rhs.m_plugAddress );
+    m_infoType = new ExtendedPlugInfoInfoType( *rhs.m_infoType );
+}
+
+ExtendedPlugInfoCmd::~ExtendedPlugInfoCmd()
+{
+    delete m_plugAddress;
+    m_plugAddress = 0;
+    delete m_infoType;
+    m_infoType = 0;
+}
+
+bool
+ExtendedPlugInfoCmd::serialize( IOSSerialize& se )
+{
+    bool status = false;
+    AVCCommand::serialize( se );
+    se.write( m_subFunction, "ExtendedPlugInfoCmd subFunction" );
+    status = m_plugAddress->serialize( se );
+    status &= m_infoType->serialize( se );
+
+    return status;
+}
+
+bool
+ExtendedPlugInfoCmd::deserialize( IISDeserialize& de )
+{
+    bool status = false;
+    AVCCommand::deserialize( de );
+    de.read( &m_subFunction );
+    status = m_plugAddress->deserialize( de );
+    status &= m_infoType->deserialize( de );
+
+    return status;
+}
+
+bool
+ExtendedPlugInfoCmd::setPlugAddress( const PlugAddress& plugAddress )
+{
+    delete m_plugAddress;
+    m_plugAddress = plugAddress.clone();
+    return true;
+}
+
+bool
+ExtendedPlugInfoCmd::setSubFunction( ESubFunction subFunction )
+{
+    m_subFunction = subFunction;
+    return true;
+}
+
+bool
+ExtendedPlugInfoCmd::setInfoType( const ExtendedPlugInfoInfoType& infoType )
+{
+    delete m_infoType;
+    m_infoType = infoType.clone();
+    return true;
+}
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_signal_source.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_signal_source.h (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_signal_source.h (revision 183)
@@ -0,0 +1,98 @@
+/* avc_signal_source.h
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef AVCSignalSource_h
+#define AVCSignalSource_h
+
+#include "avc_generic.h"
+#include "avc_definitions.h"
+
+#include <libavc1394/avc1394.h>
+
+class SignalAddress: public IBusData
+{
+public:
+    enum EPlugId {
+        ePI_AnyAvailableSerialBusPlug = 0x7e,
+        ePI_Invalid                   = 0xfe,
+        ePI_AnyAvailableExternalPlug  = 0xff,
+    };
+};
+
+class SignalUnitAddress: public SignalAddress
+{
+public:
+    SignalUnitAddress();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual SignalUnitAddress* clone() const;
+
+    byte_t m_plugId;
+};
+
+class SignalSubunitAddress: public SignalAddress
+{
+public:
+    SignalSubunitAddress();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual SignalSubunitAddress* clone() const;
+
+    byte_t m_subunitType;
+    byte_t m_subunitId;
+    byte_t m_plugId;
+};
+
+class SignalSourceCmd: public AVCCommand
+{
+public:
+    SignalSourceCmd( Ieee1394Service* ieee1394service );
+    virtual ~SignalSourceCmd();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+
+    virtual const char* getCmdName() const
+	{ return "SignalSourceCmd"; }
+
+    bool setSignalSource( SignalUnitAddress& signalAddress );
+    bool setSignalSource( SignalSubunitAddress& signalAddress );
+    bool setSignalDestination( SignalUnitAddress& signalAddress );
+    bool setSignalDestination( SignalSubunitAddress& signalAddress );
+
+    SignalAddress* getSignalSource();
+    SignalAddress* getSignalDestination();
+
+    // Control response
+    byte_t m_resultStatus;
+
+    // Status response
+    byte_t m_outputStatus;
+    byte_t m_conv;
+    byte_t m_signalStatus;
+
+    SignalAddress* m_signalSource;
+    SignalAddress* m_signalDestination;
+};
+
+
+#endif // AVCSignalSource_h
Index: branches/freebob-syt-experiments/src/libfreebobavc/.cvsignore
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/.cvsignore (revision 134)
+++ branches/freebob-syt-experiments/src/libfreebobavc/.cvsignore (revision 134)
@@ -0,0 +1,7 @@
+.cvsignore
+Makefile
+Makefile.in
+.deps
+.libs
+*.lo
+*.la
Index: branches/freebob-syt-experiments/src/libfreebobavc/serialize.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/serialize.h (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/serialize.h (revision 183)
@@ -0,0 +1,119 @@
+/* serialize.h
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef Serialize_h
+#define Serialize_h
+
+#include <libraw1394/raw1394.h> // byte_t and quadlet_t declaration
+
+// Interfaces
+
+class IOSSerialize {
+public:
+    IOSSerialize() {}
+    virtual ~IOSSerialize() {}
+
+    virtual bool write( byte_t value, const char* name = "" ) = 0;
+    virtual bool write( quadlet_t value, const char* name = "" ) = 0;
+};
+
+class IISDeserialize {
+public:
+    IISDeserialize() {}
+    virtual ~IISDeserialize() {}
+
+    virtual bool read( byte_t* value ) = 0;
+    virtual bool read( quadlet_t* value ) = 0;
+    virtual bool read( char** value, size_t length ) = 0;
+    virtual bool peek( byte_t* value ) = 0;
+};
+
+// Specialized implementations of previously defined interfaces
+
+class CoutSerializer: public IOSSerialize {
+public:
+    CoutSerializer()
+        : IOSSerialize()
+        , m_cnt( 0 )
+        {}
+    virtual ~CoutSerializer() {}
+
+    virtual bool write( byte_t value, const char* name = "" );
+    virtual bool write( quadlet_t value,  const char* name = "" );
+
+private:
+    unsigned int m_cnt;
+
+};
+
+class BufferSerialize: public IOSSerialize {
+public:
+    BufferSerialize( unsigned char* buffer, size_t length )
+        : IOSSerialize()
+        , m_buffer( buffer )
+        , m_curPos( m_buffer )
+        , m_length( length )
+        {}
+    virtual ~BufferSerialize() {}
+
+    virtual bool write( byte_t value, const char* name = "" );
+    virtual bool write( quadlet_t value,  const char* name = "" );
+
+    int getNrOfProducesBytes() const
+	{ return m_curPos - m_buffer; }
+
+protected:
+    inline bool isCurPosValid() const;
+
+private:
+    unsigned char* m_buffer;
+    unsigned char* m_curPos;
+    size_t m_length;
+};
+
+class BufferDeserialize: public IISDeserialize {
+public:
+    BufferDeserialize( const unsigned char* buffer, size_t length )
+        : IISDeserialize()
+        , m_buffer( const_cast<unsigned char*>( buffer ) )
+        , m_curPos( m_buffer )
+        , m_length( length )
+        {}
+    virtual ~BufferDeserialize() {}
+
+    virtual bool read( byte_t* value );
+    virtual bool read( quadlet_t* value );
+    virtual bool read( char** value, size_t length );
+    virtual bool peek( byte_t* value );
+
+    int getNrOfConsumedBytes()  const
+        { return m_curPos - m_buffer; }
+
+protected:
+    inline bool isCurPosValid() const;
+
+private:
+    unsigned char* m_buffer; // start of the buffer
+    unsigned char* m_curPos; // current read pos
+    size_t m_length;         // size of buffer
+};
+
+#endif // Serialize_h
+
Index: branches/freebob-syt-experiments/src/libfreebobavc/avc_subunit_info.cpp
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobavc/avc_subunit_info.cpp (revision 183)
+++ branches/freebob-syt-experiments/src/libfreebobavc/avc_subunit_info.cpp (revision 183)
@@ -0,0 +1,94 @@
+/* avc_subunit_info.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "avc_subunit_info.h"
+#include "serialize.h"
+#include "ieee1394service.h"
+
+#include <netinet/in.h>
+#include <iostream>
+
+using namespace std;
+
+SubUnitInfoCmd::SubUnitInfoCmd( Ieee1394Service* ieee1349service )
+    : AVCCommand( ieee1349service, AVC1394_CMD_SUBUNIT_INFO )
+{
+    clear();
+}
+
+bool
+SubUnitInfoCmd::clear()
+{
+    m_page = 0xff;
+    m_extension_code = 0x7;
+    for ( int i = 0; i < eMaxSubunitsPerPage; ++i ) {
+        m_table[i].m_subunit_type = 0xff;
+        m_table[i].m_max_subunit_id = 0xff;
+    }
+    m_nrOfValidEntries = 0;
+    return true;
+}
+
+
+SubUnitInfoCmd::~SubUnitInfoCmd()
+{
+}
+
+bool
+SubUnitInfoCmd::serialize( IOSSerialize& se )
+{
+    AVCCommand::serialize( se );
+
+    byte_t operand = 0;
+    operand = ((  m_page & 0x7 ) << 4 ) | ( m_extension_code & 0x7 );
+    se.write( operand, "SubUnitInfoCmd page and extension_code" );
+
+    for ( int i = 0; i < eMaxSubunitsPerPage; ++i ) {
+        operand =  ( m_table[i].m_subunit_type << 3 )
+                   | ( m_table[i].m_max_subunit_id & 0x7 );
+        se.write( operand, "SubUnitInfoCmd subunit_type and max_subunit_ID" );
+    }
+
+    return true;
+}
+
+bool
+SubUnitInfoCmd::deserialize( IISDeserialize& de )
+{
+    AVCCommand::deserialize( de );
+
+    byte_t operand;
+    de.read( &operand );
+    m_page = ( operand >> 4 ) & 0x7;
+    m_extension_code = operand & 0x7;
+
+    m_nrOfValidEntries = 0;
+    for ( int i = 0; i < eMaxSubunitsPerPage; ++i ) {
+        de.read( &operand );
+        m_table[i].m_subunit_type = operand >> 3;
+        m_table[i].m_max_subunit_id = operand & 0x7;
+
+        if ( operand != 0xff ) {
+            m_nrOfValidEntries++;
+        }
+    }
+
+    return true;
+}
Index: branches/freebob-syt-experiments/src/iavdevice.h
===================================================================
--- branches/freebob-syt-experiments/src/iavdevice.h (revision 185)
+++ branches/freebob-syt-experiments/src/iavdevice.h (revision 185)
@@ -0,0 +1,41 @@
+/* iavdevice.h
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef IAVDEVICE_H
+#define IAVDEVICE_H
+
+#include "libfreebobavc/avc_definitions.h"
+#include "libfreebob/xmlparser.h"
+
+class ConfigRom;
+class Ieee1394Service;
+
+class IAvDevice {
+public:
+    virtual ~IAvDevice() {}
+
+    virtual ConfigRom& getConfigRom() const = 0;
+    virtual bool discover() = 0;
+    virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency ) = 0;
+    virtual bool addXmlDescription( xmlNodePtr deviceNode ) = 0;
+    virtual void showDevice() const = 0;
+};
+
+#endif
Index: branches/freebob-syt-experiments/src/freebob.cpp
===================================================================
--- branches/freebob-syt-experiments/src/freebob.cpp (revision 186)
+++ branches/freebob-syt-experiments/src/freebob.cpp (revision 186)
@@ -0,0 +1,343 @@
+/* freebob.h
+ * Copyright (C) 2005 Pieter Palmers, Daniel Wagner
+ *
+ * This file is part of FreeBoB
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include "config.h"
+
+#include "libfreebob/freebob.h"
+#include "libfreebob/xmlparser.h"
+
+#include "debugmodule/debugmodule.h"
+#include "fbtypes.h"
+#include "devicemanager.h"
+#include "iavdevice.h"
+
+#include "libfreebobavc/avc_generic.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
+
+DECLARE_GLOBAL_DEBUG_MODULE;
+IMPL_GLOBAL_DEBUG_MODULE( FreeBob, DEBUG_LEVEL_VERBOSE );
+
+const char*
+freebob_get_version() {
+    return PACKAGE_STRING;
+}
+
+freebob_handle_t
+freebob_new_handle( int port )
+{
+    freebob_handle_t handle = new struct freebob_handle;
+    if (! handle ) {
+        debugFatal( "Could not allocate memory for new handle\n" );
+        return 0;
+    }
+
+    handle->m_deviceManager = new DeviceManager();
+    if ( !handle->m_deviceManager ) {
+        debugFatal( "Could not allocate device manager\n" );
+        delete handle;
+        return 0;
+    }
+    if ( !handle->m_deviceManager->initialize( port ) ) {
+        debugFatal( "Could not initialize device manager\n" );
+        delete handle->m_deviceManager;
+        delete handle;
+        return 0;
+    }
+    return handle;
+}
+
+int
+freebob_destroy_handle( freebob_handle_t freebob_handle )
+{
+    delete freebob_handle->m_deviceManager;
+    delete freebob_handle;
+    return 0;
+}
+
+int
+freebob_discover_devices( freebob_handle_t freebob_handle, int verbose )
+{
+    return freebob_handle->m_deviceManager->discover(verbose)? 0 : -1;
+}
+
+freebob_connection_info_t*
+freebob_get_connection_info( freebob_handle_t freebob_handle,
+                             int node_id,
+                             enum freebob_direction direction )
+{
+    xmlDocPtr doc;
+    doc = freebob_handle->m_deviceManager->getXmlDescription();
+    if ( !doc ) {
+        debugFatal( "Could not get XML description\n" );
+        return 0;
+    }
+
+    return freebob_xmlparse_get_connection_info( doc, node_id, direction );
+}
+
+freebob_supported_stream_format_info_t*
+freebob_get_supported_stream_format_info( freebob_handle_t freebob_handle,
+                                          int node_id,
+                                          enum freebob_direction direction )
+{
+    xmlDocPtr doc;
+    doc = freebob_handle->m_deviceManager->getXmlDescription();
+    if ( !doc ) {
+        debugFatal( "Could not get XML description\n" );
+        return 0;
+    }
+
+    return freebob_xmlparse_get_stream_formats( doc, node_id, direction );
+}
+
+int
+freebob_node_is_valid_freebob_device( freebob_handle_t freebob_handle, int node_id )
+{
+    return freebob_handle->m_deviceManager->isValidNode( node_id );
+}
+
+int
+freebob_get_nb_devices_on_bus( freebob_handle_t freebob_handle )
+{
+    return freebob_handle->m_deviceManager->getNbDevices();
+}
+
+int
+freebob_get_device_node_id( freebob_handle_t freebob_handle, int device_nr )
+{
+    return freebob_handle->m_deviceManager->getDeviceNodeId(device_nr);
+}
+
+int
+freebob_set_samplerate( freebob_handle_t freebob_handle, int node_id, int samplerate )
+{
+    IAvDevice* avDevice = freebob_handle->m_deviceManager->getAvDevice( node_id );
+    if ( avDevice ) {
+        if ( avDevice->setSamplingFrequency( parseSampleRate( samplerate ) ) ) {
+            return freebob_handle->m_deviceManager->discover(0)? 1 : 0;
+        } else {
+	    return -1;
+	}
+    }
+    return -1;
+}
+
+void
+freebob_free_connection_info( freebob_connection_info_t* connection_info )
+{
+    if ( !connection_info ) {
+	return;
+    }
+
+    for ( int i = 0; i < connection_info->nb_connections; ++i ) {
+	freebob_free_connection_spec( connection_info->connections[i] );
+    }
+
+    free( connection_info->connections );
+    free( connection_info );
+}
+
+void
+freebob_free_connection_spec( freebob_connection_spec_t* connection_spec )
+{
+    if ( !connection_spec ) {
+	return;
+    }
+
+    freebob_free_stream_info( connection_spec->stream_info );
+    free( connection_spec );
+}
+
+void freebob_free_stream_info( freebob_stream_info_t* stream_info )
+{
+    if ( !stream_info ) {
+	return;
+    }
+
+    for ( int i = 0; i < stream_info->nb_streams; ++i ) {
+	freebob_free_stream_spec( stream_info->streams[i] );
+    }
+
+    free(stream_info->streams);
+    free(stream_info);
+}
+
+void freebob_free_stream_spec( freebob_stream_spec_t* stream_spec )
+{
+    if ( !stream_spec ) {
+	return;
+    }
+
+    free( stream_spec );
+}
+
+void
+freebob_free_supported_stream_format_info( freebob_supported_stream_format_info_t* stream_info )
+{
+    if ( !stream_info ) {
+	return;
+    }
+
+    for ( int i = 0; i < stream_info->nb_formats; ++i ) {
+	freebob_free_supported_stream_format_spec( stream_info->formats[i] );
+    }
+
+    free(stream_info->formats);
+    free(stream_info);
+}
+
+void
+freebob_free_supported_stream_format_spec( freebob_supported_stream_format_spec_t* stream_spec )
+{
+    if ( !stream_spec ) {
+	return;
+    }
+
+    free( stream_spec );
+}
+
+void
+freebob_print_connection_info( freebob_connection_info_t* connection_info )
+{
+    if ( !connection_info ) {
+	fprintf( stderr, "connection_info==NULL\n" );
+	return;
+    }
+
+    printf( "Direction:              %d (%s)\n\n", connection_info->direction,
+            connection_info->direction? "playback" : "capture" );
+
+    puts( "Connection Info" );
+    puts( "===============\n" );
+
+    printf("Number of connections:  %d\n\n",
+           connection_info->nb_connections );
+
+    for ( int i = 0; i < connection_info->nb_connections; ++i) {
+	freebob_connection_spec_t* connection_spec
+	    = connection_info->connections[i];
+
+
+	if ( connection_spec ) {
+	    printf( "  Connection %2d\n", i );
+	    printf( "  -------------\n" );
+	    printf( "    [%2d] Id:         %d\n", i, connection_spec->id );
+	    printf( "    [%2d] Port:       %d\n", i, connection_spec->port );
+	    printf( "    [%2d] Node:       %d\n", i, connection_spec->node );
+	    printf( "    [%2d] Plug:       %d\n", i, connection_spec->plug );
+	    printf( "    [%2d] Dimension:  %d\n", i, connection_spec->dimension );
+	    printf( "    [%2d] Samplerate: %d\n", i, connection_spec->samplerate );
+            printf( "    [%2d] IsoChannel: %d\n", i, connection_spec->iso_channel );
+            printf( "    [%2d] IsMaster:   %d\n", i, connection_spec->is_master );
+
+	    if ( connection_info->connections[i]->stream_info ) {
+		printf("    [%2d] Number of stream infos: %d\n\n",
+		       i, connection_spec->stream_info->nb_streams );
+
+		printf("    StreamId  Position Location Format Type DPort Name\n");
+		printf("    --------------------------------------------------\n");
+
+		for ( int j = 0;
+		      j < connection_spec->stream_info->nb_streams;
+		      ++j )
+		{
+		    freebob_stream_spec_t* stream_spec
+			= connection_spec->stream_info->streams[j];
+
+		    printf("    [%2d]:[%2d] "
+			   "0x%02x     0x%02x     0x%02x   0x%02x 0x%02x  %s\n",
+			   i, j,
+			   stream_spec->position,
+			   stream_spec->location,
+			   stream_spec->format,
+			   stream_spec->type,
+			   stream_spec->destination_port,
+			   stream_spec->name );
+		}
+	    }
+	}
+        printf( "\n" );
+    }
+
+    return;
+}
+
+void
+freebob_print_supported_stream_format_info( freebob_supported_stream_format_info_t* stream_info )
+{
+    if ( !stream_info ) {
+	fprintf( stderr, "stream_info==NULL\n" );
+	return;
+    }
+
+    printf( "Direction:              %d (%s)\n\n", stream_info->direction,
+            stream_info->direction? "playback" : "capture" );
+
+    printf( "Samplerate AudioChannels MidiChannels\n" );
+    printf( "-------------------------------------\n" );
+    for ( int i = 0; i < stream_info->nb_formats; ++i) {
+	freebob_supported_stream_format_spec_t* format_spec
+	    = stream_info->formats[i];
+
+	if ( format_spec ) {
+            printf( "%05d      %02d            %02d\n",
+                    format_spec->samplerate,
+                    format_spec->nb_audio_channels,
+                    format_spec->nb_midi_channels );
+        }
+    }
+
+    return;
+}
+
+/* debug function */
+void
+freebob_print_xml_description( freebob_handle_t freebob_handle,
+                             int node_id,
+                             enum freebob_direction direction )
+{
+    xmlDocPtr doc;
+    doc = freebob_handle->m_deviceManager->getXmlDescription();
+    if ( !doc ) {
+        debugFatal( "Could not get XML description\n" );
+        return;
+    }
+
+    xmlChar* xmlbuff;
+    int buffersize;
+    xmlDocDumpFormatMemory( doc, &xmlbuff, &buffersize, 1 );
+
+	printf("%s\n",(char *)xmlbuff);
+
+	xmlFree(xmlbuff);
+	xmlFree(doc);
+    return;
+}
+
+void freebob_sleep_after_avc_command( int time )
+{
+    AVCCommand::setSleepAfterAVCCommand( time );
+}
Index: branches/freebob-syt-experiments/src/debugmodule/debugmodule.h
===================================================================
--- branches/freebob-syt-experiments/src/debugmodule/debugmodule.h (revision 168)
+++ branches/freebob-syt-experiments/src/debugmodule/debugmodule.h (revision 168)
@@ -0,0 +1,174 @@
+/* debugmodule.h
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef DEBUGMODULE_H
+#define DEBUGMODULE_H
+
+#include "../fbtypes.h"
+
+#include <vector>
+#include <iostream>
+
+typedef short debug_level_t;
+
+#define debugFatal( format, args... )                               \
+                m_debugModule.print( DebugModule::eDL_Fatal,        \
+                                     __FILE__,                      \
+                                     __FUNCTION__,                  \
+                                     __LINE__,                      \
+                                     format,                        \
+                                     ##args )
+#define debugError( format, args... )                               \
+                m_debugModule.print( DebugModule::eDL_Error,        \
+                                     __FILE__,                      \
+                                     __FUNCTION__,                  \
+                                     __LINE__,                      \
+                                     format,                        \
+                                     ##args )
+#define debugWarning( format, args... )                             \
+                m_debugModule.print( DebugModule::eDL_Warning,      \
+                                     __FILE__,                      \
+                                     __FUNCTION__,                  \
+                                     __LINE__,                      \
+                                    format,                         \
+                                    ##args )
+
+#define debugFatalShort( format, args... )                          \
+                m_debugModule.printShort( DebugModule::eDL_Fatal,   \
+                                     format,                        \
+                                     ##args )
+#define debugErrorShort( format, args... )                          \
+                m_debugModule.printShort( DebugModule::eDL_Error,   \
+                                     format,                        \
+                                     ##args )
+#define debugWarningShort( format, args... )                        \
+                m_debugModule.printShort( DebugModule::eDL_Warning, \
+                                     format,                        \
+                                     ##args )
+
+#define DECLARE_DEBUG_MODULE static DebugModule m_debugModule
+#define IMPL_DEBUG_MODULE( ClassName, RegisterName, Level )        \
+                DebugModule ClassName::m_debugModule =             \
+                    DebugModule( #RegisterName, Level )
+
+#define DECLARE_GLOBAL_DEBUG_MODULE extern DebugModule m_debugModule
+#define IMPL_GLOBAL_DEBUG_MODULE( RegisterName, Level )            \
+                DebugModule m_debugModule =                        \
+		    DebugModule( #RegisterName, Level )
+
+#define setDebugLevel( Level )                                     \
+                m_debugModule.setLevel( Level )
+
+
+#ifdef DEBUG
+
+    #define debugOutput( level, format, args... )                  \
+                m_debugModule.print( level,                        \
+                                     __FILE__,                     \
+                                     __FUNCTION__,                 \
+                                     __LINE__,                     \
+                                     format,                       \
+                                     ##args )
+
+    #define debugOutputShort( level, format, args... )             \
+                m_debugModule.printShort( level,                   \
+                                     format,                       \
+                                     ##args )
+
+#else
+
+    #define debugOutput( level, format, args... )
+    #define debugOutputShort( level, format, args... )
+
+#endif
+
+unsigned char toAscii( unsigned char c );
+void quadlet2char( fb_quadlet_t quadlet, unsigned char* buff );
+void hexDump( unsigned char *data_start, unsigned int length );
+void hexDumpQuadlets( quadlet_t *data_start, unsigned int length );
+
+class DebugModule {
+public:
+    enum {
+        eDL_Fatal   = 0,
+        eDL_Error   = 1,
+        eDL_Warning = 2,
+        eDL_Normal  = 3,
+        eDL_Verbose = 4,
+    } EDebugLevel;
+
+    DebugModule( std::string name, debug_level_t level );
+    virtual ~DebugModule();
+
+    void printShort( debug_level_t level,
+                     const char* format,
+                     ... ) const;
+
+    void print( debug_level_t level,
+                const char*   file,
+                const char*   function,
+                unsigned int  line,
+                const char*   format,
+                ... ) const;
+
+    bool setLevel( debug_level_t level )
+        { m_level = level; return true; }
+    debug_level_t getLevel()
+        { return m_level; }
+    std::string getName()
+        { return m_name; }
+
+protected:
+    const char* getPreSequence( debug_level_t level ) const;
+    const char* getPostSequence( debug_level_t level ) const;
+
+private:
+    std::string   m_name;
+    debug_level_t m_level;
+};
+
+#define DEBUG_LEVEL_NORMAL  DebugModule::eDL_Normal
+#define DEBUG_LEVEL_VERBOSE DebugModule::eDL_Verbose
+
+
+class DebugModuleManager {
+public:
+    friend class DebugModule;
+
+    static DebugModuleManager* instance();
+    bool setMgrDebugLevel( std::string name, debug_level_t level );
+
+protected:
+    bool registerModule( DebugModule& debugModule );
+    bool unregisterModule( DebugModule& debugModule );
+
+private:
+    DebugModuleManager();
+    ~DebugModuleManager();
+
+    typedef std::vector< DebugModule* > DebugModuleVector;
+    typedef std::vector< DebugModule* >::iterator DebugModuleVectorIterator;
+
+
+    static DebugModuleManager* m_instance;
+    DebugModuleVector          m_debugModules;
+};
+
+#endif
Index: branches/freebob-syt-experiments/src/debugmodule/Makefile.am
===================================================================
--- branches/freebob-syt-experiments/src/debugmodule/Makefile.am (revision 125)
+++ branches/freebob-syt-experiments/src/debugmodule/Makefile.am (revision 125)
@@ -0,0 +1,30 @@
+# Makefile.am - Makefile template
+# Copyright (C) 2005 by Daniel Wagner.
+#
+# This file is part of FreeBob.
+#
+# FreeBob is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# FreeBob 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 General Public License
+# along with FreeBob; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+noinst_LTLIBRARIES = libdebugmodule.la
+
+
+libdebugmodule_la_SOURCES =		\
+		debugmodule.h	        \
+		debugmodule.cpp       	
+
+
+noinst_PROGRAMS = test_debugmodule
+test_debugmodule_SOURCES = test_debugmodule.cpp
+test_debugmodule_LDADD = libdebugmodule.la
+
+MAINTAINERCLEANFILES = Makefile.in
Index: branches/freebob-syt-experiments/src/debugmodule/test_debugmodule.cpp
===================================================================
--- branches/freebob-syt-experiments/src/debugmodule/test_debugmodule.cpp (revision 168)
+++ branches/freebob-syt-experiments/src/debugmodule/test_debugmodule.cpp (revision 168)
@@ -0,0 +1,78 @@
+#include "debugmodule.h"
+
+#include <iostream>
+
+using namespace std;
+
+class Test
+{
+public:
+    Test()
+        {}
+    ~Test()
+        {}
+
+    bool run() {
+        cout << "######################" << endl;
+        cout << "### Test arguments ###" << endl;
+        cout << "######################" << endl;
+        debugOutput( DEBUG_LEVEL_NORMAL, "arg0 = %d, arg1 = 0x%08x\n"
+                     , 1, 0xdeedbeef );
+        cout << endl << endl;
+
+
+        cout << "###################" << endl;
+        cout << "### Test levels ###" << endl;
+        cout << "###################" << endl;
+        for ( debug_level_t level = DEBUG_LEVEL_VERBOSE;
+              level >= 0;
+              --level )
+        {
+            DebugModuleManager::instance()->setMgrDebugLevel( "Test", level );
+
+            cout << endl << "*** Debug Level = " << level << endl << endl;
+
+            debugFatal( "fatal text\n" );
+            debugError( "error text\n" );
+            debugWarning( "warning text\n" );
+            debugOutput( DEBUG_LEVEL_NORMAL, "normal output\n" );
+            debugOutput( DEBUG_LEVEL_VERBOSE,  "verbose output\n" );
+            debugFatalShort( "fatal short text\n" );
+            debugErrorShort( "error short text\n" );
+            debugWarningShort( "warning short text\n" );
+            debugOutputShort( DEBUG_LEVEL_NORMAL, "normal short output\n" );
+            debugOutputShort( DEBUG_LEVEL_VERBOSE,  "verbose short output\n" );
+        }
+        cout << endl << endl;
+
+        return true;
+    }
+
+    DECLARE_DEBUG_MODULE;
+};
+
+IMPL_DEBUG_MODULE( Test, Test, DEBUG_LEVEL_VERBOSE );
+
+DECLARE_GLOBAL_DEBUG_MODULE;
+IMPL_GLOBAL_DEBUG_MODULE( Test, DEBUG_LEVEL_VERBOSE );
+
+int main( int argc, char** argv )
+{
+    cout << "#################################" << endl;
+    cout << "### Test global debug module  ###" << endl;
+    cout << "#################################" << endl;
+    debugOutput( DEBUG_LEVEL_NORMAL, "foobar\n" );
+    cout << endl << endl;
+
+    Test test;
+    test.run();
+
+    return 0;
+}
+
+/*
+ * Local variables:
+ *  compile-command: "g++ -Wall -g -DDEBUG -o test test.cpp -L. -ldebugmodule"
+ * End:
+ */
+
Index: branches/freebob-syt-experiments/src/debugmodule/.cvsignore
===================================================================
--- branches/freebob-syt-experiments/src/debugmodule/.cvsignore (revision 134)
+++ branches/freebob-syt-experiments/src/debugmodule/.cvsignore (revision 134)
@@ -0,0 +1,8 @@
+.cvsignore
+Makefile
+Makefile.in
+.deps
+.libs
+*.lo
+*.la
+test_debugmodule
Index: branches/freebob-syt-experiments/src/debugmodule/debugmodule.cpp
===================================================================
--- branches/freebob-syt-experiments/src/debugmodule/debugmodule.cpp (revision 168)
+++ branches/freebob-syt-experiments/src/debugmodule/debugmodule.cpp (revision 168)
@@ -0,0 +1,302 @@
+/* debugmodule.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "debugmodule.h"
+
+#include <stdarg.h>
+#include <netinet/in.h>
+
+#include <iostream>
+
+using namespace std;
+
+struct ColorEntry  {
+    const char* preSequence;
+    const char* postSequence;
+};
+
+ColorEntry colorTable[] = {
+    { "\033[31mFatal",   "\033[0m" },
+    { "\033[31mError",   "\033[0m" },
+    { "\033[31mWarning", "\033[0m" },
+    { "Debug",           ""        },
+};
+
+
+DebugModule::DebugModule( std::string name,  debug_level_t level )
+    : m_name( name )
+    , m_level( level )
+{
+    if ( !DebugModuleManager::instance()->registerModule( *this ) ) {
+        cerr << "Could not register DebugModule (" << name
+             << ") at DebugModuleManager"
+             << endl;
+    }
+}
+
+DebugModule::~DebugModule()
+{
+    if ( !DebugModuleManager::instance()->unregisterModule( *this ) ) {
+        cerr << "Could not unregister DebugModule at DebugModuleManager"
+             << endl;
+    }
+}
+
+void
+DebugModule::printShort( debug_level_t level,
+                         const char* format,
+                         ... ) const
+{
+    if ( level > m_level ) {
+        return;
+    }
+
+    va_list arg;
+
+    va_start( arg, format );
+    if ( printf( "%s: ", getPreSequence( level ) ) < 0 ) {
+        cerr << "Could not create debug string with printf" << endl;
+        return;
+    }
+    if ( vprintf( format, arg ) < 0 ) {
+        cerr << "Could not create debug string with printf" << endl;
+        return;
+    }
+    if ( printf( "%s", getPostSequence( level ) ) < 0 ) {
+        cerr << "Could not create debug string with printf" << endl;
+        return;
+    }
+    va_end( arg );
+}
+
+void
+DebugModule::print( debug_level_t level,
+                    const char*   file,
+                    const char*   function,
+                    unsigned int  line,
+                    const char*   format,
+                    ... ) const
+{
+    if ( level > m_level ) {
+        return;
+    }
+
+    va_list arg;
+    va_start( arg, format );
+
+    if ( printf( "%s (%s)[%d] %s: ", getPreSequence( level ),
+                 file,  line,  function ) < 0 ) {
+        cerr << "Could not create debug string with printf" << endl;
+        return;
+    }
+    if ( vprintf( format, arg ) < 0 ) {
+        cerr << "Could not create debug string with printf" << endl;
+        return;
+    }
+    if ( printf( "%s", getPostSequence( level ) ) < 0 ) {
+        cerr << "Could not create debug string with printf" << endl;
+        return;
+    }
+    va_end( arg );}
+
+const char*
+DebugModule::getPreSequence( debug_level_t level ) const
+{
+    if ( ( level <= eDL_Normal ) && ( level >= eDL_Fatal ) ) {
+        return colorTable[level].preSequence;
+    }
+    return colorTable[eDL_Normal].preSequence;
+}
+
+const char*
+DebugModule::getPostSequence( debug_level_t level ) const
+{
+    if ( ( level <= eDL_Normal ) && ( level >= eDL_Fatal ) ) {
+        return colorTable[level].postSequence;
+    }
+    return colorTable[eDL_Normal].postSequence;
+}
+
+//--------------------------------------
+
+DebugModuleManager* DebugModuleManager::m_instance = 0;
+
+DebugModuleManager::DebugModuleManager()
+{
+}
+
+DebugModuleManager::~DebugModuleManager()
+{
+}
+
+DebugModuleManager*
+DebugModuleManager::instance()
+{
+    if ( !m_instance ) {
+        m_instance = new DebugModuleManager;
+        if ( !m_instance ) {
+            cerr << "DebugModuleManager::instance Failed to create "
+                 << "DebugModuleManager" << endl;
+        }
+    }
+    return m_instance;
+}
+
+bool
+DebugModuleManager::registerModule( DebugModule& debugModule )
+{
+    m_debugModules.push_back( &debugModule );
+    return true;
+}
+
+bool
+DebugModuleManager::unregisterModule( DebugModule& debugModule )
+{
+    for ( DebugModuleVectorIterator it = m_debugModules.begin();
+          it != m_debugModules.end();
+          ++it )
+    {
+        if ( *it == &debugModule ) {
+            m_debugModules.erase( it );
+            return true;
+        }
+    }
+
+    cerr << "DebugModuleManager::unregisterModule: Could not unregister "
+         << "DebugModule (" << debugModule.getName() << ")" << endl;
+    return false;
+}
+
+bool
+DebugModuleManager::setMgrDebugLevel( std::string name, debug_level_t level )
+{
+    for ( DebugModuleVectorIterator it = m_debugModules.begin();
+          it != m_debugModules.end();
+          ++it )
+    {
+        if ( (*it)->getName() == name ) {
+            return (*it)->setLevel( level );
+        }
+    }
+
+    cerr << "setDebugLevel: Did not find DebugModule ("
+         << name << ")" << endl;
+    return false;
+}
+
+//----------------------------------------
+
+unsigned char
+toAscii( unsigned char c )
+{
+    if ( ( c > 31 ) && ( c < 126) ) {
+        return c;
+    } else {
+        return '.';
+    }
+}
+
+/* converts a quadlet to a uchar * buffer
+ * not implemented optimally, but clear
+ */
+void
+quadlet2char( quadlet_t quadlet, unsigned char* buff )
+{
+    *(buff)   = (quadlet>>24)&0xFF;
+    *(buff+1) = (quadlet>>16)&0xFF;
+    *(buff+2) = (quadlet>> 8)&0xFF;
+    *(buff+3) = (quadlet)    &0xFF;
+}
+
+void
+hexDump( unsigned char *data_start, unsigned int length )
+{
+    unsigned int i=0;
+    unsigned int byte_pos;
+    unsigned int bytes_left;
+
+    if ( length <= 0 ) {
+        return;
+    }
+    if ( length >= 7 ) {
+        for ( i = 0; i < (length-7); i += 8 ) {
+            printf( "%04X: %02X %02X %02X %02X %02X %02X %02X %02X "
+                    "- [%c%c%c%c%c%c%c%c]\n",
+
+                    i,
+
+                    *(data_start+i+0),
+                    *(data_start+i+1),
+                    *(data_start+i+2),
+                    *(data_start+i+3),
+                    *(data_start+i+4),
+                    *(data_start+i+5),
+                    *(data_start+i+6),
+                    *(data_start+i+7),
+
+                    toAscii( *(data_start+i+0) ),
+                    toAscii( *(data_start+i+1) ),
+                    toAscii( *(data_start+i+2) ),
+                    toAscii( *(data_start+i+3) ),
+                    toAscii( *(data_start+i+4) ),
+                    toAscii( *(data_start+i+5) ),
+                    toAscii( *(data_start+i+6) ),
+                    toAscii( *(data_start+i+7) )
+                );
+        }
+    }
+    byte_pos = i;
+    bytes_left = length - byte_pos;
+
+    printf( "%04X:" ,i );
+    for ( i = byte_pos; i < length; i += 1 ) {
+        printf( " %02X", *(data_start+i) );
+    }
+    for ( i=0; i < 8-bytes_left; i+=1 ) {
+        printf( "   " );
+    }
+
+    printf( " - [" );
+    for ( i = byte_pos; i < length; i += 1) {
+        printf( "%c", toAscii(*(data_start+i)));
+    }
+    for ( i = 0; i < 8-bytes_left; i += 1) {
+        printf( " " );
+    }
+
+    printf( "]" );
+    printf( "\n" );
+}
+
+void
+hexDumpQuadlets( quadlet_t *data, unsigned int length )
+{
+    unsigned int i=0;
+
+    if ( length <= 0 ) {
+        return;
+    }
+    for (i = 0; i< length; i += 1) {
+        printf( "%02d %04X: %08X (%08X)"
+                "\n", i, i*4, data[i],ntohl(data[i]));
+    }
+}
+
+
Index: branches/freebob-syt-experiments/src/xmlparser.c
===================================================================
--- branches/freebob-syt-experiments/src/xmlparser.c (revision 153)
+++ branches/freebob-syt-experiments/src/xmlparser.c (revision 153)
@@ -0,0 +1,787 @@
+/* xmlparser.cpp
+ * Copyright (C) 2005,06 Pieter Palmers, Daniel Wagner
+ *
+ * This file is part of FreeBoB
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include "libfreebob/xmlparser.h"
+#include "libfreebob/freebob.h"
+
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#undef DEBUG
+#ifdef DEBUG
+#define debugPrint( format, args... ) printf( format, ##args )
+#else
+#define debugPrint( format, args... )
+#endif
+
+/* XML parsing functions
+ */
+freebob_stream_spec_t*
+freebob_xmlparse_stream( xmlDocPtr doc, xmlNodePtr cur )
+{
+    freebob_stream_spec_t *stream_spec;
+
+    // allocate memory
+    stream_spec = malloc( sizeof(freebob_stream_spec_t) );
+    if ( !stream_spec ) {
+	fprintf( stderr, "Could not allocate memory for stream_spec" );
+	return 0;
+    }
+
+#define StreamSpecParseNode( NodeName, Member )                     \
+	if ( !xmlStrcmp( cur->name, (const xmlChar*) NodeName ) ) {     \
+	    xmlChar* key =                                              \
+		xmlNodeListGetString( doc, cur->xmlChildrenNode, 1 );   \
+	    debugPrint( "\t\t"#NodeName": %s\n", key );                 \
+	    stream_spec->Member = strtol( (const char*) key,            \
+					  (char**) 0, 10 );             \
+	    xmlFree( key );                                             \
+	}
+
+    cur = cur->xmlChildrenNode;
+    while ( cur ) {
+        StreamSpecParseNode( "Position", position );
+        StreamSpecParseNode( "Location", location );
+        StreamSpecParseNode( "Format", format );
+        StreamSpecParseNode( "Type", type );
+        StreamSpecParseNode( "DestinationPort", destination_port );
+
+        if ( !xmlStrcmp( cur->name, (const xmlChar *) "Name" ) ) {
+            xmlChar* key =
+                xmlNodeListGetString( doc, cur->xmlChildrenNode, 1 );
+            debugPrint( "\t\tname: %s\n", key );
+            strncpy( stream_spec->name, (const char*) key,
+		     FREEBOB_MAX_NAME_LEN );
+            xmlFree( key );
+        }
+        cur = cur->next;
+    }
+#undef StreamSpecParseNode
+
+    return stream_spec;
+}
+
+freebob_stream_info_t *
+freebob_xmlparse_streams( xmlDocPtr doc, xmlNodePtr node )
+{
+    freebob_stream_info_t* stream_info;
+
+    // allocate memory
+    stream_info = malloc( sizeof(freebob_stream_info_t) );
+    if ( !stream_info ) {
+        fprintf( stderr, "Could not allocate memory for stream_info" );
+        return 0;
+    }
+
+    // count number of child streams
+    stream_info->nb_streams=0;
+    xmlNodePtr cur = node->xmlChildrenNode;
+    while (cur != NULL) {
+        if ( !xmlStrcmp( cur->name, (const xmlChar*) "Stream" ) ) {
+            stream_info->nb_streams++;
+        }
+        cur = cur->next;
+    }
+
+    if ( stream_info->nb_streams ) {
+        // allocate memory for the stream_spec pointer array
+        stream_info->streams =
+            (freebob_stream_spec_t**) calloc( stream_info->nb_streams,
+                                              sizeof(freebob_stream_spec_t*) );
+
+        if ( !stream_info->streams ) {
+            fprintf( stderr, "Could not allocate memory for stream specs" );
+            free( stream_info );
+            return 0;
+        }
+
+        // parse the child stream_specs
+        cur = node->xmlChildrenNode;
+        int i = 0;
+        while ( cur ) {
+            if ( !xmlStrcmp( cur->name, (const xmlChar*) "Stream" ) ) {
+                stream_info->streams[i] =
+                    freebob_xmlparse_stream( doc, cur );
+
+                if ( !stream_info->streams[i] ) {
+                    // invalid XML or memory problem, clean up.
+                    while ( --i ) {
+                        free( stream_info->streams[i] );
+                    }
+                    free( stream_info->streams );
+                    stream_info->streams = 0;
+                    free( stream_info );
+                    return 0;
+                }
+                i++;
+            }
+            cur = cur->next;
+        }
+    }
+    return stream_info;
+}
+
+
+
+
+freebob_connection_spec_t*
+freebob_xmlparse_connection( xmlDocPtr doc, xmlNodePtr cur )
+{
+#define ConnectionSpecParseNode( NodeName, Member )                  \
+         if ( !xmlStrcmp( cur->name, (const xmlChar*) NodeName ) ) {     \
+             xmlChar* key =                                              \
+                 xmlNodeListGetString( doc, cur->xmlChildrenNode, 1 );   \
+             debugPrint( "\t"#NodeName": %s\n",  key );                  \
+             connection_spec->Member = strtol( (const char*) key,        \
+					       (char**) 0, 10 );         \
+             xmlFree( key );                                             \
+         }
+
+    // allocate memory
+    freebob_connection_spec_t* connection_spec =
+        calloc( 1, sizeof(freebob_connection_spec_t) );
+    if ( !connection_spec ) {
+        fprintf( stderr, "Could not allocate memory for connection_spec" );
+        return 0;
+    }
+
+    cur = cur->xmlChildrenNode;
+    while ( cur ) {
+        ConnectionSpecParseNode( "Id", id );
+        ConnectionSpecParseNode( "Node", node );
+        ConnectionSpecParseNode( "Port", port );
+        ConnectionSpecParseNode( "Plug", plug );
+        ConnectionSpecParseNode( "Dimension", dimension );
+        ConnectionSpecParseNode( "Samplerate", samplerate );
+	ConnectionSpecParseNode( "IsoChannel", iso_channel );
+
+        if ( !xmlStrcmp( cur->name, (const xmlChar*) "Streams" ) ) {
+            connection_spec->stream_info
+                = freebob_xmlparse_streams( doc, cur );
+            if ( !connection_spec->stream_info ) {
+                free( connection_spec );
+                return 0;
+            }
+        }
+        cur = cur->next;
+    }
+#undef ConnectionSpecParseNode
+
+    return connection_spec;
+}
+
+freebob_supported_stream_format_spec_t*
+freebob_xmlparse_supported_stream_format_node(  xmlDocPtr doc, xmlNodePtr cur  )
+{
+#define FormatSpecParseNode( NodeName, Member )                          \
+         if ( !xmlStrcmp( cur->name, (const xmlChar*) NodeName ) ) {     \
+             xmlChar* key =                                              \
+                 xmlNodeListGetString( doc, cur->xmlChildrenNode, 1 );   \
+             debugPrint( "\t"#NodeName": %s\n",  key );                  \
+             format_spec->Member = strtol( (const char*) key,            \
+					       (char**) 0, 10 );         \
+             xmlFree( key );                                             \
+         }
+
+    // allocate memory
+    freebob_supported_stream_format_spec_t* format_spec =
+        calloc( 1, sizeof(freebob_supported_stream_format_spec_t) );
+    if ( !format_spec ) {
+        fprintf( stderr, "Could not allocate memory for format_spec" );
+        return 0;
+    }
+
+    cur = cur->xmlChildrenNode;
+    while ( cur ) {
+	FormatSpecParseNode( "Samplerate", samplerate );
+	FormatSpecParseNode( "AudioChannels", nb_audio_channels );
+	FormatSpecParseNode( "MidiChannels", nb_midi_channels );
+        cur = cur->next;
+    }
+#undef FormatSpecParseNode
+    
+    return format_spec;
+}
+
+freebob_connection_info_t*
+freebob_xmlparse_connectionset( xmlDocPtr doc, xmlNodePtr node )
+{
+    assert( node );
+
+    // allocate memory
+    freebob_connection_info_t* connection_info =
+        malloc( sizeof(freebob_connection_info_t) );
+    if ( !connection_info ) {
+        fprintf( stderr, "Could not allocate memory for connection_info" );
+        return 0;
+    }
+
+    // count number of child streams
+    connection_info->nb_connections = 0;
+    xmlNodePtr cur = node->xmlChildrenNode;
+    while ( cur ) {
+        if ( !xmlStrcmp( cur->name, (const xmlChar*) "Connection" ) ) {
+            connection_info->nb_connections =
+                connection_info->nb_connections + 1;
+            debugPrint( "nb_connections: %d\n",
+                        connection_info->nb_connections );
+        }
+
+        if ( !xmlStrcmp( cur->name, (const xmlChar*) "Direction" ) ) {
+            xmlChar* key =
+                xmlNodeListGetString( doc, cur->xmlChildrenNode, 1 );
+            debugPrint( "\tdirection: %s\n", key );
+            connection_info->direction = strtol( (const char*) key,
+						 (char**) 0, 10);
+            xmlFree( key );
+        }
+        cur = cur->next;
+    }
+
+    debugPrint( "ConnectionInfo contains %d connection_specs\n",
+		connection_info->nb_connections );
+
+    if ( connection_info->nb_connections ) {
+        // allocate memory for the connection_spec pointer array
+        connection_info->connections =
+            (freebob_connection_spec_t**)
+            calloc( connection_info->nb_connections,
+                    sizeof(freebob_connection_spec_t*) );
+
+        if ( !connection_info->connections ) {
+            fprintf( stderr,
+                     "Could not allocate memory for connection specs" );
+            free( connection_info );
+            return 0;
+        }
+
+        // parse the child stream_specs
+        cur = node->xmlChildrenNode;
+        int i = 0;
+        while ( cur ) {
+            if ( !xmlStrcmp( cur->name, (const xmlChar*) "Connection" ) ) {
+                connection_info->connections[i] =
+                    freebob_xmlparse_connection( doc, cur );
+
+                if ( !connection_info->connections[i] ) {
+                    // invalid XML or memory problem, clean up.
+                    while ( --i ) {
+                        freebob_free_connection_spec( connection_info->connections[i] );
+                    }
+                    free( connection_info->connections );
+                    connection_info->connections = 0;
+                    free( connection_info );
+                    return 0;
+                }
+                i++;
+            }
+            cur = cur->next;
+        }
+    }
+
+    return connection_info;
+}
+
+freebob_supported_stream_format_info_t*
+freebob_xmlparse_supported_stream_format( xmlDocPtr doc, xmlNodePtr node )
+{
+    assert( node );
+
+    // allocate memory
+    freebob_supported_stream_format_info_t* stream_info =
+        malloc( sizeof(freebob_supported_stream_format_info_t) );
+    if ( !stream_info ) {
+        fprintf( stderr, "Could not allocate memory for stream_info" );
+        return 0;
+    }
+
+    // count number of child streams
+    stream_info->nb_formats = 0;
+    xmlNodePtr cur = node->xmlChildrenNode;
+    while ( cur ) {
+        if ( !xmlStrcmp( cur->name, (const xmlChar*) "Format" ) ) {
+            stream_info->nb_formats += 1;
+            debugPrint( "\tnb_formats: %d\n",
+                        stream_info->nb_formats );
+        }
+
+        if ( !xmlStrcmp( cur->name, (const xmlChar*) "Direction" ) ) {
+            xmlChar* key =
+                xmlNodeListGetString( doc, cur->xmlChildrenNode, 1 );
+            debugPrint( "\tdirection: %s\n", key );
+            stream_info->direction = strtol( (const char*) key,
+						 (char**) 0, 10);
+            xmlFree( key );
+        }
+        cur = cur->next;
+    }
+
+    debugPrint( "StreamFormatInfo contains %d stream_format_specs\n",
+		stream_info->nb_formats );
+
+    if ( stream_info->nb_formats ) {
+        // allocate memory for the connection_spec pointer array
+        stream_info->formats =
+            (freebob_supported_stream_format_spec_t**)
+            calloc( stream_info->nb_formats,
+                    sizeof(freebob_supported_stream_format_spec_t*) );
+
+        if ( !stream_info->formats ) {
+            fprintf( stderr,
+                     "Could not allocate memory for stream format specs" );
+            free( stream_info );
+            return 0;
+        }
+
+        // parse the child stream_specs
+        cur = node->xmlChildrenNode;
+        int i = 0;
+        while ( cur ) {
+            if ( !xmlStrcmp( cur->name, (const xmlChar*) "Format" ) ) {
+                stream_info->formats[i] =
+                    freebob_xmlparse_supported_stream_format_node( doc, cur );
+
+                if ( !stream_info->formats[i] ) {
+                    // invalid XML or memory problem, clean up.
+                    while ( --i ) {
+                        freebob_free_supported_stream_format_spec( stream_info->formats[i] );
+                    }
+                    free( stream_info->formats );
+                    stream_info->formats = 0;
+                    free( stream_info );
+                    return 0;
+                }
+                i++;
+            }
+            cur = cur->next;
+        }
+    }
+
+    return stream_info;
+}
+
+
+xmlNodePtr
+freebob_xmlparse_get_connectionset_node( xmlDocPtr doc,
+                                         xmlNodePtr cur,
+                                         int direction )
+{
+    while ( cur ) {
+        if ( !xmlStrcmp( cur->name, (const xmlChar*) "ConnectionSet" ) ) {
+            xmlNodePtr cur2 = cur->xmlChildrenNode;
+            while ( cur2 ) {
+                if ( !xmlStrcmp( cur2->name, (const xmlChar*) "Direction" ) ) {
+                    xmlChar* key = xmlNodeListGetString( doc,
+                                                         cur2->xmlChildrenNode,
+                                                         1 );
+                    int tmp_direction = strtol( (const char*) key,
+						(char**) 0, 10 );
+                    xmlFree( key );
+                    if( tmp_direction == direction) {
+                        return cur;
+                    }
+                }
+                cur2 = cur2->next;
+            }
+        }
+        cur = cur->next;
+    }
+    return 0;
+}
+
+xmlNodePtr
+freebob_xmlparse_get_supported_stream_format_node( xmlDocPtr doc,
+						   xmlNodePtr cur,
+						   int direction )
+{
+    while ( cur ) {
+        if ( !xmlStrcmp( cur->name, (const xmlChar*) "StreamFormats" ) ) {
+            xmlNodePtr cur2 = cur->xmlChildrenNode;
+            while ( cur2 ) {
+                if ( !xmlStrcmp( cur2->name, (const xmlChar*) "Direction" ) ) {
+                    xmlChar* key = xmlNodeListGetString( doc,
+                                                         cur2->xmlChildrenNode,
+                                                         1 );
+                    int tmp_direction = strtol( (const char*) key,
+						(char**) 0, 10 );
+                    xmlFree( key );
+                    if( tmp_direction == direction) {
+                        return cur;
+                    }
+                }
+                cur2 = cur2->next;
+            }
+        }
+        cur = cur->next;
+    }
+    return 0;
+}
+
+xmlNodePtr
+freebob_xmlparse_get_connection_set_by_node_id( xmlDocPtr doc,
+                                                xmlNodePtr cur,
+                                                int nodeId )
+{
+    while ( cur ) {
+	if ( !xmlStrcmp( cur->name, (const xmlChar*) "Device" ) ) {
+	    xmlNodePtr cur2 = cur->xmlChildrenNode;
+	    while ( cur2 ) {
+                if ( !xmlStrcmp( cur2->name,
+                                 (const xmlChar*) "NodeId" ) )
+                {
+                    xmlChar* key = xmlNodeListGetString( doc,
+                                                         cur2->xmlChildrenNode,
+                                                         1 );
+                    int tmp_node_id = strtol( (const char*) key,
+                                              (char**) 0, 10 );
+                    xmlFree( key );
+
+                    if ( tmp_node_id == nodeId ) {
+                        xmlNodePtr cur3 = cur->xmlChildrenNode;
+                        while ( cur3 ) {
+                            if ( !xmlStrcmp( cur3->name,
+                                             (const xmlChar*) "ConnectionSet" ) )
+                            {
+                                return cur3;
+                            }
+                            cur3 = cur3->next;
+                        }
+                    }
+                }
+                cur2 = cur2->next;
+            }
+	}
+	cur = cur->next;
+    }
+
+    return 0;
+}
+
+xmlNodePtr
+freebob_xmlparse_get_supported_stream_format_set_by_node_id( xmlDocPtr doc, 
+							     xmlNodePtr cur, 
+							     int nodeId )
+{
+    while ( cur ) {
+	if ( !xmlStrcmp( cur->name, (const xmlChar*) "Device" ) ) {
+	    xmlNodePtr cur2 = cur->xmlChildrenNode;
+	    while ( cur2 ) {
+                if ( !xmlStrcmp( cur2->name,
+                                 (const xmlChar*) "NodeId" ) )
+                {
+                    xmlChar* key = xmlNodeListGetString( doc,
+                                                         cur2->xmlChildrenNode,
+                                                         1 );
+                    int tmp_node_id = strtol( (const char*) key,
+                                              (char**) 0, 10 );
+                    xmlFree( key );
+
+                    if ( tmp_node_id == nodeId ) {
+                        xmlNodePtr cur3 = cur->xmlChildrenNode;
+                        while ( cur3 ) {
+                            if ( !xmlStrcmp( cur3->name,
+                                             (const xmlChar*) "StreamFormats" ) )
+                            {
+                                return cur3;
+                            }
+                            cur3 = cur3->next;
+                        }
+                    }
+                }
+                cur2 = cur2->next;
+            }
+	}
+	cur = cur->next;
+    }
+
+    return 0;
+}
+
+xmlNodePtr
+freebob_xmlparse_get_connection_set_by_device( xmlDocPtr doc,
+					       xmlNodePtr cur,
+					       int device )
+{
+    int count=0;
+    while ( count < device ) {
+    	if(!cur) {
+	    return NULL;
+    	}
+    	
+    	if(!xmlStrcmp( cur->name, (const xmlChar*) "Device" )) {
+	    count++;
+    	}
+    	cur=cur->next;
+    }
+    
+    if ( !xmlStrcmp( cur->name, (const xmlChar*) "Device" ) ) {
+	xmlNodePtr cur3 = cur->xmlChildrenNode;
+	while ( cur3 ) {
+	    if ( !xmlStrcmp( cur3->name,
+			     (const xmlChar*) "ConnectionSet" ) )
+	    {
+		return cur3;
+	    }
+	    cur3 = cur3->next;
+	}
+    } else {
+	return NULL;
+    }
+    
+    return NULL;
+}
+
+// a side effect is that both old connection info's are freed, unless NULL is returned!
+freebob_connection_info_t*
+freebob_xmlparse_append_connectionset(freebob_connection_info_t* connection_info, freebob_connection_info_t* cinfo) 
+{
+    if(connection_info==NULL) return cinfo;
+    if(cinfo==NULL) return connection_info;
+    
+    if (connection_info->direction != cinfo->direction) {
+    	// direction mismatch
+    	return NULL;
+    }
+    
+    freebob_connection_info_t *tmpci=calloc(1,sizeof(freebob_connection_info_t));
+    if (!tmpci) {
+    	return NULL;
+    }
+    
+    tmpci->nb_connections=connection_info->nb_connections+cinfo->nb_connections;
+    tmpci->connections = calloc( tmpci->nb_connections, sizeof(freebob_connection_spec_t*));
+    
+    int i=0;
+    int c=0;
+    for(i=0;i<connection_info->nb_connections;i++) {
+    	tmpci->connections[c]=connection_info->connections[i]; // these are pointers
+    	c++;
+    }
+    for(i=0;i<cinfo->nb_connections;i++) {
+    	tmpci->connections[c]=cinfo->connections[i]; // these are pointers
+    	c++;
+    }
+    
+    free(connection_info->connections);
+    free(cinfo->connections);
+    
+    free(connection_info);
+    free(cinfo);
+    
+    connection_info=NULL;
+    cinfo=NULL;
+    
+    return tmpci;
+}
+
+// a side effect is that both old connection info's are freed, unless NULL is returned!
+freebob_supported_stream_format_info_t*
+freebob_xmlparse_append_stream_format(freebob_supported_stream_format_info_t* stream_info, 
+				      freebob_supported_stream_format_info_t* cinfo) 
+{
+    if ( !stream_info ) { 
+	return cinfo;
+    }
+    if ( !cinfo ) {
+	return stream_info;
+    }
+    
+    if ( stream_info->direction != cinfo->direction ) {
+    	return 0;
+    }
+    
+    freebob_supported_stream_format_info_t* tmpci =
+	calloc( 1, sizeof( freebob_supported_stream_format_info_t ) );
+    if ( !tmpci ) {
+    	return 0;
+    }
+    
+    tmpci->nb_formats = 
+	stream_info->nb_formats + cinfo->nb_formats;
+    tmpci->formats = 
+	calloc( tmpci->nb_formats, 
+		sizeof( freebob_supported_stream_format_spec_t* ) );
+    
+    int c = 0;
+    for( int i = 0; i < stream_info->nb_formats; i++, c++ ) {
+    	tmpci->formats[c] = stream_info->formats[i];
+    }
+    for ( int i = 0; i < cinfo->nb_formats; i++, c++ ) {
+    	tmpci->formats[c] = cinfo->formats[i];
+    }
+    
+    free( stream_info->formats );
+    free( cinfo->formats );
+    
+    free( stream_info );
+    free( cinfo );
+    
+    stream_info = 0;
+    cinfo = 0;
+    
+    return tmpci;
+}
+
+int 
+freebob_xmlparse_get_nb_devices( xmlDocPtr doc,
+                                 xmlNodePtr cur)
+{
+    int count=0;
+    while (cur != NULL) {
+	if ((!xmlStrcmp(cur->name, (const xmlChar *)"Device"))) {
+	    count++;
+	}
+	cur = cur->next;
+    }
+    return count;
+}
+
+freebob_connection_info_t*
+freebob_xmlparse_get_connection_info( xmlDocPtr doc,
+                                      int node_id,
+                                      int direction )
+{
+    xmlNodePtr base = xmlDocGetRootElement(doc);
+    xmlNodePtr cur;
+    
+    if ( !base ) {
+        fprintf( stderr, "empty document\n");
+        return 0;
+    }
+
+    if ( xmlStrcmp( base->name, (const xmlChar*) "FreeBobConnectionInfo") ) {
+        fprintf( stderr,
+                 "document of the wrong type, root node "
+                 "!= FreeBobConnectionInfo\n" );
+        return 0;
+    }
+
+    base = base->xmlChildrenNode;
+    if ( !base ) {
+        fprintf( stderr, "Root node has no children!\n" );
+        return 0;
+    }
+	
+    if( node_id > -1) {
+	cur = freebob_xmlparse_get_connection_set_by_node_id( doc, base, node_id );
+	if ( !cur ) {
+	    fprintf( stderr,
+		     "Could not get description for node id %d\n", node_id );
+	    return 0;
+	}
+	cur = freebob_xmlparse_get_connectionset_node( doc, cur, direction );
+	if ( !cur ) {
+	    fprintf( stderr,
+		     "Could not get a connection set for direction %d\n",
+		     direction );
+	    return 0;
+	}
+
+	freebob_connection_info_t* connection_info =
+	    freebob_xmlparse_connectionset( doc, cur );
+
+	return connection_info;
+    } else {
+	freebob_connection_info_t* connection_info=NULL;
+		
+	int device_nr=0;
+		
+	int nb_devices=freebob_xmlparse_get_nb_devices(doc, base);
+		
+	fprintf( stderr,
+		 "Nb devices %d\n",
+		 nb_devices );
+					
+	for(device_nr=0;device_nr<nb_devices;device_nr++) {
+		
+	    cur = freebob_xmlparse_get_connection_set_by_device( doc, base, device_nr );
+	    if ( !cur ) {
+		fprintf( stderr,
+			 "Could not get description for device %d\n", device_nr );
+		return 0;
+	    }
+			
+	    cur = freebob_xmlparse_get_connectionset_node( doc, cur, direction );
+	    if ( !cur ) {
+		fprintf( stderr,
+			 "Could not get a connection set for direction %d\n",
+			 direction );
+		return 0;
+	    }
+	
+	    freebob_connection_info_t* cinfo = freebob_xmlparse_connectionset( doc, cur );
+	    connection_info=freebob_xmlparse_append_connectionset(connection_info,cinfo);
+	}
+		
+	return connection_info;	
+    }
+}
+
+freebob_supported_stream_format_info_t*
+freebob_xmlparse_get_stream_formats( xmlDocPtr doc, 
+				     int node_id, 
+				     int direction )
+{
+    xmlNodePtr base = xmlDocGetRootElement(doc);
+    xmlNodePtr cur;
+    
+    if ( !base ) {
+        fprintf( stderr, "empty document\n");
+        return 0;
+    }
+
+    if ( xmlStrcmp( base->name, (const xmlChar*) "FreeBobConnectionInfo") ) {
+        fprintf( stderr,
+                 "document of the wrong type, root node "
+                 "!= FreeBobConnectionInfo\n" );
+        return 0;
+    }
+
+    base = base->xmlChildrenNode;
+    if ( !base ) {
+        fprintf( stderr, "Root node has no children!\n" );
+        return 0;
+    }
+
+    cur = freebob_xmlparse_get_supported_stream_format_set_by_node_id( doc, base, node_id );
+    if ( !cur ) {
+	fprintf( stderr,
+		 "Could not get description for node id %d\n", node_id );
+	return 0;
+    }
+    cur = freebob_xmlparse_get_supported_stream_format_node( doc, cur, direction );
+    if ( !cur ) {
+	fprintf( stderr,
+		 "Could not get a connection set for direction %d\n",
+		 direction );
+	return 0;
+    }
+    
+    freebob_supported_stream_format_info_t* stream_info =
+	freebob_xmlparse_supported_stream_format( doc, cur );
+    
+    return stream_info;    return 0;	
+}
Index: branches/freebob-syt-experiments/src/bebob_light/bebob_light_avplug.cpp
===================================================================
--- branches/freebob-syt-experiments/src/bebob_light/bebob_light_avplug.cpp (revision 188)
+++ branches/freebob-syt-experiments/src/bebob_light/bebob_light_avplug.cpp (revision 188)
@@ -0,0 +1,188 @@
+/* bebob_light_avplug.cpp
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "bebob_light_avplug.h"
+
+#include "libfreebobavc/avc_extended_plug_info.h"
+#include "libfreebobavc/avc_definitions.h"
+
+namespace BeBoB_Light {
+
+IMPL_DEBUG_MODULE( AvPlug, AvPlug, DEBUG_LEVEL_VERBOSE );
+
+AvPlug::AvPlug()
+    : m_plugType( 0xff )
+    , m_plugId( 0xff )
+    , m_subunitType( 0xff )
+    , m_subunitId( 0xff )
+    , m_direction( 0xff )
+    , m_nrOfChannels( 0 )
+    , m_samplingFrequency( 0xff )
+{
+}
+
+AvPlug::AvPlug( const AvPlug& rhs )
+    : m_plugType( rhs.m_plugType )
+    , m_plugId( rhs.m_plugId )
+    , m_subunitType( rhs.m_subunitType )
+    , m_subunitId( rhs.m_subunitType )
+    , m_direction( rhs.m_direction )
+    , m_name( rhs.m_name )
+    , m_nrOfChannels( rhs.m_nrOfChannels )
+    , m_samplingFrequency( rhs.m_samplingFrequency )
+    , m_clusterInfos( rhs.m_clusterInfos )
+{
+}
+
+AvPlug::~AvPlug()
+{
+}
+
+bool
+AvPlug::copyClusterInfo(ExtendedPlugInfoPlugChannelPositionSpecificData&
+                        channelPositionData )
+{
+    int index = 1;
+    for ( ExtendedPlugInfoPlugChannelPositionSpecificData::ClusterInfoVector::const_iterator it
+              = channelPositionData.m_clusterInfos.begin();
+          it != channelPositionData.m_clusterInfos.end();
+          ++it )
+    {
+        const ExtendedPlugInfoPlugChannelPositionSpecificData::ClusterInfo*
+            extPlugSpClusterInfo = &( *it );
+
+        ClusterInfo clusterInfo;
+        clusterInfo.m_nrOfChannels = extPlugSpClusterInfo->m_nrOfChannels;
+        clusterInfo.m_index = index;
+        index++;
+
+        for (  ExtendedPlugInfoPlugChannelPositionSpecificData::ChannelInfoVector::const_iterator cit
+                  = extPlugSpClusterInfo->m_channelInfos.begin();
+              cit != extPlugSpClusterInfo->m_channelInfos.end();
+              ++cit )
+        {
+            const ExtendedPlugInfoPlugChannelPositionSpecificData::ChannelInfo*
+                extPlugSpChannelInfo = &( *cit );
+
+            ChannelInfo channelInfo;
+            channelInfo.m_streamPosition =
+                extPlugSpChannelInfo->m_streamPosition;
+            channelInfo.m_location =
+                extPlugSpChannelInfo->m_location;
+
+            clusterInfo.m_channelInfos.push_back( channelInfo );
+        }
+        m_clusterInfos.push_back( clusterInfo );
+    }
+
+    return true;
+}
+
+void
+AvPlug::debugOutputClusterInfos( int debugLevel )
+{
+    for ( ClusterInfoVector::const_iterator it = m_clusterInfos.begin();
+          it != m_clusterInfos.end();
+          ++it )
+    {
+        const ClusterInfo* clusterInfo = &( *it );
+
+        debugOutput( debugLevel, "number of channels: %d\n",
+                     clusterInfo->m_nrOfChannels );
+
+        for ( ChannelInfoVector::const_iterator cit
+                  = clusterInfo->m_channelInfos.begin();
+              cit != clusterInfo->m_channelInfos.end();
+              ++cit )
+        {
+            const ChannelInfo* channelInfo = &( *cit );
+            debugOutput( debugLevel,
+                         "stream position: %d\n",
+                         channelInfo->m_streamPosition );
+            debugOutput( debugLevel,
+                         "location: %d\n",
+                         channelInfo->m_location );
+        }
+    }
+}
+
+AvPlug::ClusterInfo*
+AvPlug::getClusterInfoByIndex(int index)
+{
+    for ( AvPlug::ClusterInfoVector::iterator clit =
+              m_clusterInfos.begin();
+          clit != m_clusterInfos.end();
+          ++clit )
+    {
+        ClusterInfo* info = &*clit;
+        if ( info->m_index == index ) {
+            return info;
+        }
+    }
+    return 0;
+}
+
+int
+AvPlug::getNrOfStreams()
+{
+    int nrOfChannels = 0;
+    for ( ClusterInfoVector::const_iterator it = m_clusterInfos.begin();
+          it != m_clusterInfos.end();
+          ++it )
+    {
+        const ClusterInfo* clusterInfo = &( *it );
+        nrOfChannels += clusterInfo->m_nrOfChannels;
+    }
+    return nrOfChannels;
+}
+
+int
+AvPlug::getNrOfChannels()
+{
+    return m_nrOfChannels;
+}
+
+int
+AvPlug::getSampleRate()
+{
+    return convertESamplingFrequency( static_cast<ESamplingFrequency>( m_samplingFrequency ) );
+}
+
+////////////////////////////////////
+
+AvPlugCluster::AvPlugCluster()
+{
+}
+
+AvPlugCluster::~AvPlugCluster()
+{
+}
+
+////////////////////////////////////
+
+AvPlugConnection::AvPlugConnection()
+{
+}
+
+AvPlugConnection::~AvPlugConnection()
+{
+}
+
+}
Index: branches/freebob-syt-experiments/src/bebob_light/bebob_light_avdevicesubunit.cpp
===================================================================
--- branches/freebob-syt-experiments/src/bebob_light/bebob_light_avdevicesubunit.cpp (revision 188)
+++ branches/freebob-syt-experiments/src/bebob_light/bebob_light_avdevicesubunit.cpp (revision 188)
@@ -0,0 +1,101 @@
+/* bebob_light_avdevicesubunit.cpp
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "bebob_light/bebob_light_avdevicesubunit.h"
+#include "bebob_light/bebob_light_avdevice.h"
+#include "bebob_light/bebob_light_avplug.h"
+
+namespace BeBoB_Light {
+
+IMPL_DEBUG_MODULE( AvDeviceSubunit, AvDeviceSubunit, DEBUG_LEVEL_VERBOSE );
+
+////////////////////////////////////////////
+
+AvDeviceSubunit::AvDeviceSubunit( AvDevice* avDevice, subunit_type_t type, subunit_t id )
+    : m_avDevice( avDevice )
+    , m_sbType( type )
+    , m_sbId( id )
+{
+}
+
+AvDeviceSubunit::~AvDeviceSubunit()
+{
+    for ( AvPlugVector::iterator it = m_plugs.begin();
+          it != m_plugs.end();
+          ++it )
+    {
+        delete *it;
+    }
+}
+
+bool
+AvDeviceSubunit::addPlug( AvPlug& plug )
+{
+    m_plugs.push_back( &plug );
+    return true;
+}
+
+////////////////////////////////////////////
+
+AvDeviceSubunitAudio::AvDeviceSubunitAudio( AvDevice* avDevice, subunit_t id )
+    : AvDeviceSubunit( avDevice, AVCCommand::eST_Audio, id )
+{
+}
+
+AvDeviceSubunitAudio::~AvDeviceSubunitAudio()
+{
+}
+
+bool
+AvDeviceSubunitAudio::discover()
+{
+    return true;
+}
+
+const char*
+AvDeviceSubunitAudio::getName()
+{
+    return "AudioSubunit";
+}
+
+////////////////////////////////////////////
+
+AvDeviceSubunitMusic::AvDeviceSubunitMusic( AvDevice* avDevice, subunit_t id )
+    : AvDeviceSubunit( avDevice, AVCCommand::eST_Music, id )
+{
+}
+
+AvDeviceSubunitMusic::~AvDeviceSubunitMusic()
+{
+}
+
+bool
+AvDeviceSubunitMusic::discover()
+{
+    return true;
+}
+
+const char*
+AvDeviceSubunitMusic::getName()
+{
+    return "MusicSubunit";
+}
+
+}
Index: branches/freebob-syt-experiments/src/bebob_light/bebob_light_avplug.h
===================================================================
--- branches/freebob-syt-experiments/src/bebob_light/bebob_light_avplug.h (revision 188)
+++ branches/freebob-syt-experiments/src/bebob_light/bebob_light_avplug.h (revision 188)
@@ -0,0 +1,150 @@
+/* bebob_light_avplug.h
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef BEBOB_LIGHT_AVPLUG_H
+#define BEBOB_LIGHT_AVPLUG_H
+
+#include "debugmodule/debugmodule.h"
+#include "libfreebobavc/avc_definitions.h"
+
+#include <vector>
+
+class ExtendedPlugInfoPlugChannelPositionSpecificData;
+
+namespace BeBoB_Light {
+
+class AvPlugCluster;
+
+class AvPlug {
+public:
+    AvPlug();
+    AvPlug( const AvPlug& rhs );
+    virtual ~AvPlug();
+
+    plug_type_t    getPlugType()
+	{ return m_plugType; }
+    plug_id_t      getPlugId()
+	{ return m_plugId; }
+    subunit_type_t getSubunitType()
+	{ return m_subunitType; }
+    subunit_id_t   getSubunitId()
+	{ return m_subunitId; }
+    const char*    getName()
+	{ return m_name.c_str(); }
+    plug_direction_t getPlugDirection()
+	{ return m_direction; }
+    sampling_frequency_t getSamplingFrequency()
+	{ return m_samplingFrequency; }
+    int getSampleRate(); // 22050, 24000, 32000, ...
+    int getNrOfChannels();
+    int getNrOfStreams();
+
+    plug_type_t          m_plugType;
+    plug_id_t            m_plugId;
+    subunit_type_t       m_subunitType;
+    subunit_id_t         m_subunitId;
+    plug_direction_t     m_direction;
+    std::string          m_name;
+    nr_of_channels_t     m_nrOfChannels;
+    sampling_frequency_t m_samplingFrequency;
+
+
+    // ---
+    // Channel & Cluster Info
+    struct ChannelInfo {
+        stream_position_t          m_streamPosition;
+        stream_position_location_t m_location;
+	std::string                m_name;
+    };
+    typedef std::vector<ChannelInfo> ChannelInfoVector;
+
+    struct ClusterInfo {
+	int                      m_index;
+	port_type_t              m_portType;
+	std::string              m_name;
+
+        nr_of_channels_t         m_nrOfChannels;
+        ChannelInfoVector        m_channelInfos;
+	stream_format_t          m_streamFormat;
+    };
+    typedef std::vector<ClusterInfo> ClusterInfoVector;
+
+    ClusterInfoVector        m_clusterInfos;
+
+    // ---
+    // Stream Format
+    struct FormatInfo {
+        FormatInfo()
+            : m_samplingFrequency( eSF_DontCare )
+            , m_isSyncStream( false )
+            , m_audioChannels( 0 )
+            , m_midiChannels( 0 )
+            , m_index( 0xff )
+            {}
+	sampling_frequency_t  m_samplingFrequency;
+	bool                  m_isSyncStream;
+	number_of_channels_t  m_audioChannels;
+	number_of_channels_t  m_midiChannels;
+	byte_t                m_index;
+    };
+    typedef std::vector<FormatInfo> FormatInfoVector;
+
+    FormatInfoVector         m_formatInfos;
+    // ---
+
+    void debugOutputClusterInfos( int debugLevel );
+
+    bool copyClusterInfo(ExtendedPlugInfoPlugChannelPositionSpecificData&
+                         channelPositionData );
+
+    ClusterInfo* getClusterInfoByIndex(int index);
+    ClusterInfoVector& getClusterInfos()
+	{ return m_clusterInfos; }
+
+
+    DECLARE_DEBUG_MODULE;
+};
+
+typedef std::vector<AvPlug*> AvPlugVector;
+
+class AvPlugCluster {
+public:
+    AvPlugCluster();
+    virtual ~AvPlugCluster();
+
+    std::string  m_name;
+
+    AvPlugVector m_avPlugs;
+};
+
+class AvPlugConnection {
+public:
+    AvPlugConnection();
+    ~AvPlugConnection();
+
+    AvPlug* m_srcPlug;
+    AvPlug* m_destPlug;
+};
+
+typedef std::vector<AvPlugConnection*> AvPlugConnectionVector;
+
+}
+
+#endif
Index: branches/freebob-syt-experiments/src/bebob_light/bebob_light_avdevicesubunit.h
===================================================================
--- branches/freebob-syt-experiments/src/bebob_light/bebob_light_avdevicesubunit.h (revision 188)
+++ branches/freebob-syt-experiments/src/bebob_light/bebob_light_avdevicesubunit.h (revision 188)
@@ -0,0 +1,87 @@
+/* bebob_light_avdevicesubunit.h
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef BEBOB_LIGHT_AVDEVICESUBUNIT_H
+#define BEBOB_LIGHT_AVDEVICESUBUNIT_H
+
+#include "bebob_light/bebob_light_avplug.h"
+
+#include "debugmodule/debugmodule.h"
+#include "libfreebobavc/avc_definitions.h"
+#include "libfreebobavc/avc_generic.h"
+
+#include <vector>
+
+namespace BeBoB_Light {
+
+class AvDevice;
+
+class AvDeviceSubunit {
+ public:
+    AvDeviceSubunit( AvDevice* avDevice, subunit_type_t type, subunit_t id );
+    virtual ~AvDeviceSubunit();
+
+    virtual bool discover() = 0;
+    virtual const char* getName() = 0;
+
+    bool addPlug( AvPlug& plug );
+
+    subunit_t getSubunitId()
+	{ return m_sbId; }
+    subunit_type_t getSubunitType()
+	{ return m_sbType; }
+
+ protected:
+    AvDevice*      m_avDevice;
+    subunit_type_t m_sbType;
+    subunit_t      m_sbId;
+
+    AvPlugVector   m_plugs;
+
+    DECLARE_DEBUG_MODULE;
+};
+
+typedef std::vector<AvDeviceSubunit*> AvDeviceSubunitVector;
+
+/////////////////////////////
+
+class AvDeviceSubunitAudio: public AvDeviceSubunit {
+ public:
+    AvDeviceSubunitAudio( AvDevice* avDevice, subunit_t id );
+    virtual ~AvDeviceSubunitAudio();
+
+    virtual bool discover();
+    virtual const char* getName();
+};
+
+/////////////////////////////
+
+class AvDeviceSubunitMusic: public AvDeviceSubunit {
+ public:
+    AvDeviceSubunitMusic( AvDevice* avDevice, subunit_t id );
+    virtual ~AvDeviceSubunitMusic();
+
+    virtual bool discover();
+    virtual const char* getName();
+};
+
+}
+
+#endif
Index: branches/freebob-syt-experiments/src/bebob_light/bebob_light_avdevice.cpp
===================================================================
--- branches/freebob-syt-experiments/src/bebob_light/bebob_light_avdevice.cpp (revision 188)
+++ branches/freebob-syt-experiments/src/bebob_light/bebob_light_avdevice.cpp (revision 188)
@@ -0,0 +1,1676 @@
+/* bebob_light_avdevice.cpp
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "bebob_light/bebob_light_avdevice.h"
+#include "bebob_light/bebob_light_avdevicesubunit.h"
+
+#include "configrom.h"
+
+#include "libfreebobavc/avc_plug_info.h"
+#include "libfreebobavc/avc_extended_plug_info.h"
+#include "libfreebobavc/avc_subunit_info.h"
+#include "libfreebobavc/avc_extended_stream_format.h"
+#include "libfreebobavc/serialize.h"
+#include "libfreebobavc/ieee1394service.h"
+#include "libfreebobavc/avc_definitions.h"
+
+#include "debugmodule/debugmodule.h"
+
+#include <iostream>
+#include <stdint.h>
+
+namespace BeBoB_Light {
+
+using namespace std;
+
+IMPL_DEBUG_MODULE( AvDevice, AvDevice, DEBUG_LEVEL_VERBOSE );
+
+AvDevice::AvDevice( Ieee1394Service& ieee1394service,
+                    int nodeId,
+                    int verboseLevel )
+    : m_1394Service( &ieee1394service )
+    , m_nodeId( nodeId )
+    , m_verboseLevel( verboseLevel )
+{
+    if ( m_verboseLevel ) {
+        setDebugLevel( DEBUG_LEVEL_VERBOSE );
+    }
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Created BeBoB_Light::AvDevice "
+                 "(NodeID %d)\n", nodeId );
+
+    m_configRom = new ConfigRom( m_1394Service, m_nodeId );
+    m_configRom->initialize();
+}
+
+AvDevice::~AvDevice()
+{
+    delete m_configRom;
+    for ( AvDeviceSubunitVector::iterator it = m_subunits.begin();
+          it != m_subunits.end();
+          ++it )
+    {
+        delete *it;
+    }
+    for ( AvPlugConnectionVector::iterator it = m_plugConnections.begin();
+          it != m_plugConnections.end();
+          ++it )
+    {
+        delete *it;
+    }
+    for ( AvPlugVector::iterator it = m_isoInputPlugs.begin();
+          it != m_isoInputPlugs.end();
+          ++it )
+    {
+        delete *it;
+    }
+    for ( AvPlugVector::iterator it = m_isoOutputPlugs.begin();
+          it != m_isoOutputPlugs.end();
+          ++it )
+    {
+        delete *it;
+    }
+}
+
+bool
+AvDevice::discover()
+{
+    if ( !enumerateSubUnits() ) {
+        debugError( "Could not enumarate sub units\n" );
+        return false;
+    }
+
+    if ( !discoverStep1() ) {
+        debugError( "Discover step 1 failed\n" );
+        return false;
+    }
+    if ( !discoverStep2() ) {
+        debugError( "Discover step 2 failed\n" );
+        return false;
+    }
+    if ( !discoverStep3() ) {
+        debugError( "Discover step 3 failed\n" );
+        return false;
+    }
+    if ( !discoverStep4() ) {
+        debugError( "Discover step 4 failed\n" );
+        return false;
+    }
+    if ( !discoverStep5() ) {
+        debugError( "Discover step 5 failed\n" );
+        return false;
+    }
+    if ( !discoverStep6() ) {
+        debugError( "Discover step 6 failed\n" );
+        return false;
+    }
+    if ( !discoverStep7() ) {
+        debugError( "Discover step 7 failed\n" );
+        return false;
+    }
+    if ( !discoverStep8() ) {
+        debugError( "Discover step 8 failed\n" );
+        return false;
+    }
+    if ( !discoverStep9() ) {
+        debugError( "Discover step 9 failed\n" );
+        return false;
+    }
+    if ( !discoverStep10() ) {
+        debugError( "Discover step 10 failed\n" );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+AvDevice::discoverStep1()
+{
+    //////////////////////////////////////////////
+    // Step 1: Get number of available isochronous input
+    // and output plugs of unit
+
+    PlugInfoCmd plugInfoCmd( m_1394Service );
+    plugInfoCmd.setNodeId( m_nodeId );
+    plugInfoCmd.setCommandType( AVCCommand::eCT_Status );
+
+    if ( !plugInfoCmd.fire() ) {
+        debugError( "discover: plug info command failed (step 1)\n" );
+        return false;
+    }
+
+    for ( int plugId = 0; plugId < plugInfoCmd.m_serialBusIsochronousInputPlugs; ++plugId )
+    {
+        AvPlug* plug        = new AvPlug;
+        plug->m_plugId      = plugId;
+        plug->m_subunitType = PlugAddress::ePAM_Unit;
+        plug->m_direction   = PlugAddress::ePD_Input;
+        plug->m_name        = "IsoStreamInput";
+
+        m_isoInputPlugs.push_back( plug );
+    }
+
+    for ( int plugId = 0; plugId < plugInfoCmd.m_serialBusIsochronousOutputPlugs; ++plugId )
+    {
+        AvPlug* plug        = new AvPlug;
+        plug->m_plugId      = plugId;
+        plug->m_subunitType = PlugAddress::ePAM_Unit;
+        plug->m_direction   = PlugAddress::ePD_Output;
+        plug->m_name        = "IsoStreamOutput";
+
+        m_isoOutputPlugs.push_back( plug );
+    }
+
+    debugOutput( DEBUG_LEVEL_VERBOSE,
+                 "number of iso input plugs = %d, "
+                 "number of iso output plugs = %d\n",
+                 plugInfoCmd.m_serialBusIsochronousInputPlugs,
+                 plugInfoCmd.m_serialBusIsochronousOutputPlugs );
+
+    return true;
+}
+
+bool
+AvDevice::discoverStep2()
+{
+    //////////////////////////////////////////////
+    // Step 2: For each ISO input plug: get internal
+    // output connections (data sink) of the ISO input plug
+
+    for ( AvPlugVector::iterator it = m_isoInputPlugs.begin();
+          it != m_isoInputPlugs.end();
+          ++it )
+    {
+        AvPlug* isoInputPlug = *it;
+
+        ExtendedPlugInfoCmd extPlugInfoCmd( m_1394Service );
+        UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
+                                         isoInputPlug->getPlugId() );
+        extPlugInfoCmd.setPlugAddress( PlugAddress( PlugAddress::ePD_Input,
+                                                    PlugAddress::ePAM_Unit,
+                                                    unitPlugAddress ) );
+        extPlugInfoCmd.setNodeId( m_nodeId );
+        extPlugInfoCmd.setCommandType( AVCCommand::eCT_Status );
+        //extPlugInfoCmd.setVerbose( true );
+        ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+            ExtendedPlugInfoInfoType::eIT_PlugOutput );
+        extendedPlugInfoInfoType.initialize();
+        extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+
+        if ( !extPlugInfoCmd.fire() ) {
+            debugError( "discoverStep2: plug outputs command failed\n" );
+            return false;
+        }
+
+        ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+        if ( infoType
+             && infoType->m_plugOutput )
+        {
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "number of output plugs is %d for iso input "
+                         "plug %d\n",
+                         infoType->m_plugOutput->m_nrOfOutputPlugs,
+                         isoInputPlug->getPlugId() );
+
+            if ( infoType->m_plugOutput->m_nrOfOutputPlugs
+                 != infoType->m_plugOutput->m_outputPlugAddresses.size() )
+            {
+                debugError( "number of output plugs (%d) disagree with "
+                            "number of elements in plug address vector (%d)\n",
+                            infoType->m_plugOutput->m_nrOfOutputPlugs,
+                            infoType->m_plugOutput->m_outputPlugAddresses.size());
+            }
+            for ( unsigned int i = 0;
+                  i < infoType->m_plugOutput->m_outputPlugAddresses.size();
+                  ++i )
+            {
+                PlugAddressSpecificData* plugAddress
+                    = infoType->m_plugOutput->m_outputPlugAddresses[i];
+
+
+                UnitPlugSpecificDataPlugAddress* pUnitPlugAddress =
+                    dynamic_cast<UnitPlugSpecificDataPlugAddress*>
+                    ( plugAddress->m_plugAddressData );
+
+                if ( pUnitPlugAddress ) {
+                    debugOutput( DEBUG_LEVEL_VERBOSE,
+                                 "unit plug address is not handled\n" );
+                }
+
+                SubunitPlugSpecificDataPlugAddress* pSubunitPlugAddress =
+                    dynamic_cast<SubunitPlugSpecificDataPlugAddress*>
+                    ( plugAddress->m_plugAddressData );
+
+                if ( pSubunitPlugAddress ) {
+                    debugOutput( DEBUG_LEVEL_VERBOSE,
+                                 "output plug %d is owned by subunit_type %d, "
+                                 "subunit_id = %d\n",
+                                 pSubunitPlugAddress->m_plugId,
+                                 pSubunitPlugAddress->m_subunitType,
+                                 pSubunitPlugAddress->m_subunitId );
+
+                    if ( !discoverPlugConnection( *isoInputPlug,
+                                                  *pSubunitPlugAddress ) )
+                    {
+                        debugError( "Discovering of plug connection failed\n" );
+                        return false;
+                    }
+                }
+
+                FunctionBlockPlugSpecificDataPlugAddress*
+                    pFunctionBlockPlugAddress =
+                    dynamic_cast<FunctionBlockPlugSpecificDataPlugAddress*>
+                    ( plugAddress->m_plugAddressData );
+
+                if (  pFunctionBlockPlugAddress  ) {
+                    debugOutput( DEBUG_LEVEL_VERBOSE,
+                                 "function block address is not handled\n" );
+                }
+            }
+        } else {
+            debugError( "discoverStep2: no valid info type, output plug\n" );
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool
+AvDevice::discoverStep3()
+{
+    //////////////////////////////////////////////
+    // Step 3: For each ISO output plug: get internal
+    // intput connections (data source) of the ISO output plug
+
+    for ( AvPlugVector::iterator it = m_isoOutputPlugs.begin();
+          it != m_isoOutputPlugs.end();
+          ++it )
+    {
+        AvPlug* isoOutputPlug = *it;
+
+        ExtendedPlugInfoCmd extPlugInfoCmd( m_1394Service );
+        UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
+                                         isoOutputPlug->getPlugId() );
+        extPlugInfoCmd.setPlugAddress( PlugAddress( PlugAddress::ePD_Output,
+                                                    PlugAddress::ePAM_Unit,
+                                                    unitPlugAddress ) );
+        extPlugInfoCmd.setNodeId( m_nodeId );
+        extPlugInfoCmd.setCommandType( AVCCommand::eCT_Status );
+        //extPlugInfoCmd.setVerbose( true );
+        ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+            ExtendedPlugInfoInfoType::eIT_PlugInput );
+        extendedPlugInfoInfoType.initialize();
+        extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+
+        if ( !extPlugInfoCmd.fire() ) {
+            debugError( "discoverStep3: plug inputs command failed\n" );
+            return false;
+        }
+
+        ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+        if ( infoType
+             && infoType->m_plugInput )
+        {
+            PlugAddressSpecificData* plugAddress
+                = infoType->m_plugInput->m_plugAddress;
+
+
+            UnitPlugSpecificDataPlugAddress* pUnitPlugAddress =
+                dynamic_cast<UnitPlugSpecificDataPlugAddress*>
+                ( plugAddress->m_plugAddressData );
+
+            if ( pUnitPlugAddress ) {
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "unit plug address is not handled\n" );
+            }
+
+            SubunitPlugSpecificDataPlugAddress* pSubunitPlugAddress =
+                dynamic_cast<SubunitPlugSpecificDataPlugAddress*>
+                ( plugAddress->m_plugAddressData );
+
+            if ( pSubunitPlugAddress ) {
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "output plug %d is owned by subunit_type %d, "
+                             "subunit_id %d\n",
+                             pSubunitPlugAddress->m_plugId,
+                             pSubunitPlugAddress->m_subunitType,
+                             pSubunitPlugAddress->m_subunitId );
+
+                if ( !discoverPlugConnection( *isoOutputPlug, *pSubunitPlugAddress ) ) {
+                    debugError( "Discovering of plug connection failed\n" );
+                    return false;
+                }
+            }
+
+            FunctionBlockPlugSpecificDataPlugAddress*
+                pFunctionBlockPlugAddress =
+                dynamic_cast<FunctionBlockPlugSpecificDataPlugAddress*>
+                ( plugAddress->m_plugAddressData );
+
+            if (  pFunctionBlockPlugAddress  ) {
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "function block address is not handled\n" );
+            }
+        } else {
+            debugError( "discoverStep3: no valid info type, input plug\n" );
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool
+AvDevice::discoverStep4Plug( AvPlugVector& isoPlugs )
+{
+    //////////////////////////////////////////////
+    // Step 4: For all ISO plugs with valid internal connections:
+    // get type of data stream flowing through plug.
+    // Stream type of interest: iso stream & sync stream
+
+    for ( AvPlugVector::iterator it = isoPlugs.begin();
+          it != isoPlugs.end();
+          ++it )
+    {
+        AvPlug* isoPlug = *it;
+
+        AvPlugConnection* plugConnection = getPlugConnection( *isoPlug );
+        if ( !plugConnection ) {
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "plug %d has no valid connecton -> skip\n",
+                         isoPlug->getPlugId() );
+            continue;
+        }
+
+        ExtendedPlugInfoCmd extPlugInfoCmd( m_1394Service );
+        UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
+                                         isoPlug->getPlugId() );
+        PlugAddress::EPlugDirection direction =
+            static_cast<PlugAddress::EPlugDirection>( isoPlug->getPlugDirection() );
+        extPlugInfoCmd.setPlugAddress( PlugAddress( direction,
+                                                    PlugAddress::ePAM_Unit,
+                                                    unitPlugAddress ) );
+        extPlugInfoCmd.setNodeId( m_nodeId );
+        extPlugInfoCmd.setCommandType( AVCCommand::eCT_Status );
+        //extPlugInfoCmd.setVerbose( true );
+        ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+            ExtendedPlugInfoInfoType::eIT_PlugType );
+        extendedPlugInfoInfoType.initialize();
+        extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+
+        if ( !extPlugInfoCmd.fire() ) {
+            debugError( "discoverStep4Plug: plug type command failed\n" );
+            return false;
+        }
+
+        ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+        if ( infoType
+             && infoType->m_plugType )
+        {
+            plug_type_t plugType = infoType->m_plugType->m_plugType;
+
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "plug %d is of type %d (%s)\n",
+                         isoPlug->getPlugId(),
+                         plugType,
+                         extendedPlugInfoPlugTypeToString( plugType ) );
+
+            isoPlug->m_plugType = plugType;
+        }
+    }
+
+   return true;
+}
+
+bool
+AvDevice::discoverStep4()
+{
+    bool success;
+    success  = discoverStep4Plug( m_isoInputPlugs );
+    success &= discoverStep4Plug( m_isoOutputPlugs );
+
+    return success;
+}
+
+bool
+AvDevice::discoverStep5Plug( AvPlugVector& isoPlugs )
+{
+    //////////////////////////////////////////////
+    // Step 5: For all ISO plugs with valid internal connections:
+    // get data block size of the stream flowing through the plug
+
+    for ( AvPlugVector::iterator it = isoPlugs.begin();
+          it != isoPlugs.end();
+          ++it )
+    {
+        AvPlug* isoPlug = *it;
+
+        AvPlugConnection* plugConnection = getPlugConnection( *isoPlug );
+        if ( !plugConnection ) {
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "plug %d has no valid connecton -> skip\n",
+                         isoPlug->getPlugId() );
+            continue;
+        }
+
+        ExtendedPlugInfoCmd extPlugInfoCmd( m_1394Service );
+        UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
+                                         isoPlug->getPlugId() );
+        PlugAddress::EPlugDirection direction =
+            static_cast<PlugAddress::EPlugDirection>( isoPlug->getPlugDirection() );
+        extPlugInfoCmd.setPlugAddress( PlugAddress( direction,
+                                                    PlugAddress::ePAM_Unit,
+                                                    unitPlugAddress ) );
+        extPlugInfoCmd.setNodeId( m_nodeId );
+        extPlugInfoCmd.setCommandType( AVCCommand::eCT_Status );
+        //extPlugInfoCmd.setVerbose( true );
+        ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+            ExtendedPlugInfoInfoType::eIT_NoOfChannels );
+        extendedPlugInfoInfoType.initialize();
+        extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+
+        if ( !extPlugInfoCmd.fire() ) {
+            debugError( "discoverStep5Plug: number of channels command failed\n" );
+            return false;
+        }
+
+        ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+        if ( infoType
+             && infoType->m_plugNrOfChns )
+        {
+            nr_of_channels_t nrOfChannels
+                = infoType->m_plugNrOfChns->m_nrOfChannels;
+
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "plug %d has %d channels\n",
+                         isoPlug->getPlugId(),
+                         nrOfChannels );
+
+            isoPlug->m_nrOfChannels = nrOfChannels;
+        }
+    }
+
+    return true;
+}
+
+
+bool
+AvDevice::discoverStep5()
+{
+    bool success;
+    success  = discoverStep5Plug( m_isoInputPlugs );
+    success &= discoverStep5Plug( m_isoOutputPlugs );
+
+    return success;
+}
+
+bool
+AvDevice::discoverStep6Plug( AvPlugVector& isoPlugs )
+{
+    //////////////////////////////////////////////
+    // Step 6: For all ISO plugs with valid internal connections:
+    // get position of channels within data block
+
+    for ( AvPlugVector::iterator it = isoPlugs.begin();
+          it != isoPlugs.end();
+          ++it )
+    {
+        AvPlug* isoPlug = *it;
+
+        AvPlugConnection* plugConnection = getPlugConnection( *isoPlug );
+        if ( !plugConnection ) {
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "plug %d has no valid connecton -> skip\n",
+                         isoPlug->getPlugId() );
+            continue;
+        }
+
+        ExtendedPlugInfoCmd extPlugInfoCmd( m_1394Service );
+        UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
+                                         isoPlug->getPlugId() );
+        PlugAddress::EPlugDirection direction =
+            static_cast<PlugAddress::EPlugDirection>( isoPlug->getPlugDirection() );
+        extPlugInfoCmd.setPlugAddress( PlugAddress( direction,
+                                                    PlugAddress::ePAM_Unit,
+                                                    unitPlugAddress ) );
+        extPlugInfoCmd.setNodeId( m_nodeId );
+        extPlugInfoCmd.setCommandType( AVCCommand::eCT_Status );
+        //extPlugInfoCmd.setVerbose( true );
+        ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+            ExtendedPlugInfoInfoType::eIT_ChannelPosition );
+        extendedPlugInfoInfoType.initialize();
+        extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+
+        if ( !extPlugInfoCmd.fire() ) {
+            debugError( "discoverStep6Plug: channels position command failed\n" );
+            return false;
+        }
+
+        ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+        if ( infoType
+             && infoType->m_plugChannelPosition )
+        {
+            if ( !isoPlug->copyClusterInfo(
+                     *( infoType->m_plugChannelPosition ) ) )
+            {
+                debugError( "discoverStep6Plug: Could not copy channel position "
+                            "information\n" );
+                return false;
+            }
+
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "plug %d: channel position information "
+                         "retrieved\n",
+                         isoPlug->getPlugId() );
+
+            isoPlug->debugOutputClusterInfos( DEBUG_LEVEL_VERBOSE );
+        }
+    }
+
+    return true;
+}
+
+bool
+AvDevice::discoverStep6()
+{
+    bool success;
+    success  = discoverStep6Plug( m_isoInputPlugs );
+    success &= discoverStep6Plug( m_isoOutputPlugs );
+
+    return success;
+}
+
+bool
+AvDevice::discoverStep7Plug( AvPlugVector& isoPlugs )
+{
+    //////////////////////////////////////////////
+    // Step 7: For all ISO plugs with valid internal connections:
+    // get hardware name of channel
+
+    for ( AvPlugVector::iterator it = isoPlugs.begin();
+          it != isoPlugs.end();
+          ++it )
+    {
+        AvPlug* isoPlug = *it;
+
+        AvPlugConnection* plugConnection = getPlugConnection( *isoPlug );
+        if ( !plugConnection ) {
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "plug %d has no valid connecton -> skip\n",
+                         isoPlug->getPlugId() );
+            continue;
+        }
+
+        for ( AvPlug::ClusterInfoVector::iterator clit =
+                  isoPlug->m_clusterInfos.begin();
+              clit != isoPlug->m_clusterInfos.end();
+              ++clit )
+        {
+            AvPlug::ClusterInfo* clitInfo = &*clit;
+
+            for ( AvPlug::ChannelInfoVector::iterator pit =
+                      clitInfo->m_channelInfos.begin();
+                  pit != clitInfo->m_channelInfos.end();
+                  ++pit )
+            {
+                AvPlug::ChannelInfo* channelInfo = &*pit;
+
+                ExtendedPlugInfoCmd extPlugInfoCmd( m_1394Service );
+                UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
+                                                 isoPlug->getPlugId() );
+                PlugAddress::EPlugDirection direction =
+                    static_cast<PlugAddress::EPlugDirection>( isoPlug->getPlugDirection() );
+                extPlugInfoCmd.setPlugAddress( PlugAddress( direction,
+                                                            PlugAddress::ePAM_Unit,
+                                                            unitPlugAddress ) );
+                extPlugInfoCmd.setNodeId( m_nodeId );
+                extPlugInfoCmd.setCommandType( AVCCommand::eCT_Status );
+                //extPlugInfoCmd.setVerbose( true );
+                ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+                    ExtendedPlugInfoInfoType::eIT_ChannelName );
+                extendedPlugInfoInfoType.initialize();
+                extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+
+                ExtendedPlugInfoInfoType* infoType =
+                    extPlugInfoCmd.getInfoType();
+                if ( infoType ) {
+                    infoType->m_plugChannelName->m_streamPosition =
+                        channelInfo->m_streamPosition;
+                }
+                if ( !extPlugInfoCmd.fire() ) {
+                    debugError( "discoverStep7: channel name command failed\n" );
+                    return false;
+                }
+                infoType = extPlugInfoCmd.getInfoType();
+                if ( infoType
+                     && infoType->m_plugChannelName )
+                {
+                    debugOutput( DEBUG_LEVEL_VERBOSE,
+                                 "plug %d stream "
+                                 "position %d: channel name = %s\n",
+                                 isoPlug->getPlugId(),
+                                 channelInfo->m_streamPosition,
+                                 infoType->m_plugChannelName->m_plugChannelName.c_str() );
+                    channelInfo->m_name =
+                        infoType->m_plugChannelName->m_plugChannelName;
+                }
+
+            }
+        }
+    }
+
+    return true;
+}
+bool
+AvDevice::discoverStep7()
+{
+    bool success;
+    success  = discoverStep7Plug( m_isoInputPlugs );
+    success &= discoverStep7Plug( m_isoOutputPlugs );
+
+    return success;
+}
+
+bool
+AvDevice::discoverStep8Plug( AvPlugVector& isoPlugs )
+{
+    //////////////////////////////////////////////
+    // Step 8: For all ISO plugs with valid internal connections:
+    // get logical input and output streams provided by the device
+
+    for ( AvPlugVector::iterator it = isoPlugs.begin();
+          it != isoPlugs.end();
+          ++it )
+    {
+        AvPlug* isoPlug = *it;
+
+        AvPlugConnection* plugConnection = getPlugConnection( *isoPlug );
+        if ( !plugConnection ) {
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "%s plug %d has no valid connecton -> skip\n",
+                         isoPlug->getName(),
+                         isoPlug->getPlugId() );
+            continue;
+        }
+
+        if ( isoPlug->getPlugType()
+             == ExtendedPlugInfoPlugTypeSpecificData::eEPIPT_Sync )
+        {
+            // If the plug is of type sync it is either a normal 2 channel
+            // stream (not compound stream) or it is a compound stream
+            // with exactly one cluster. This depends on the
+            // extended stream format command version which is used.
+            // We are not interested in this plug so we skip it.
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "%s plug %d is of type sync -> skip\n",
+                         isoPlug->getName(),
+                         isoPlug->getPlugId() );
+            continue;
+        }
+
+        for ( AvPlug::ClusterInfoVector::iterator clit =
+                  isoPlug->m_clusterInfos.begin();
+              clit != isoPlug->m_clusterInfos.end();
+              ++clit )
+        {
+            AvPlug::ClusterInfo* clusterInfo = &*clit;
+
+            ExtendedPlugInfoCmd extPlugInfoCmd( m_1394Service );
+            UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
+                                             isoPlug->getPlugId() );
+            PlugAddress::EPlugDirection direction =
+                static_cast<PlugAddress::EPlugDirection>( isoPlug->getPlugDirection() );
+            extPlugInfoCmd.setPlugAddress( PlugAddress( direction,
+                                                        PlugAddress::ePAM_Unit,
+                                                        unitPlugAddress ) );
+            extPlugInfoCmd.setNodeId( m_nodeId );
+            extPlugInfoCmd.setCommandType( AVCCommand::eCT_Status );
+            //extPlugInfoCmd.setVerbose( true );
+            ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+                ExtendedPlugInfoInfoType::eIT_ClusterInfo );
+            extendedPlugInfoInfoType.initialize();
+            extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+
+            extPlugInfoCmd.getInfoType()->m_plugClusterInfo->m_clusterIndex =
+                clusterInfo->m_index;
+
+            if ( !extPlugInfoCmd.fire() ) {
+                debugError( "discoverStep8Plug: cluster info command failed\n" );
+                return false;
+            }
+
+            ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+            if ( infoType
+                 && infoType->m_plugClusterInfo )
+            {
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "%s plug %d: cluster index = %d, "
+                             "portType %s, cluster name = %s\n",
+                             isoPlug->getName(),
+                             isoPlug->getPlugId(),
+                             infoType->m_plugClusterInfo->m_clusterIndex,
+                             extendedPlugInfoClusterInfoPortTypeToString(
+                                 infoType->m_plugClusterInfo->m_portType ),
+                             infoType->m_plugClusterInfo->m_clusterName.c_str() );
+
+                clusterInfo->m_portType = infoType->m_plugClusterInfo->m_portType;
+                clusterInfo->m_name = infoType->m_plugClusterInfo->m_clusterName;
+            }
+        }
+    }
+
+    return true;
+}
+
+bool
+AvDevice::discoverStep8()
+{
+    bool success;
+    success  = discoverStep8Plug( m_isoInputPlugs );
+    success &= discoverStep8Plug( m_isoOutputPlugs );
+
+    return success;
+}
+
+bool
+AvDevice::discoverStep9Plug( AvPlugVector& isoPlugs )
+{
+    //////////////////////////////////////////////
+    // Step 9: For all ISO plugs with valid internal connections:
+    // get current stream format
+
+    for ( AvPlugVector::iterator it = isoPlugs.begin();
+          it != isoPlugs.end();
+          ++it )
+    {
+        AvPlug* isoPlug = *it;
+
+        AvPlugConnection* plugConnection = getPlugConnection( *isoPlug );
+        if ( !plugConnection ) {
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "%s plug %d has no valid connecton -> skip\n",
+                         isoPlug->getName(),
+                         isoPlug->getPlugId() );
+            continue;
+        }
+
+        ExtendedStreamFormatCmd extStreamFormatCmd( m_1394Service );
+        UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
+                                         isoPlug->getPlugId() );
+        PlugAddress::EPlugDirection direction =
+            static_cast<PlugAddress::EPlugDirection>( isoPlug->getPlugDirection() );
+        extStreamFormatCmd.setPlugAddress( PlugAddress( direction,
+                                                        PlugAddress::ePAM_Unit,
+                                                        unitPlugAddress ) );
+
+        extStreamFormatCmd.setNodeId( m_nodeId );
+        extStreamFormatCmd.setCommandType( AVCCommand::eCT_Status );
+        //extStreamFormatCmd.setVerbose( true );
+
+        if ( !extStreamFormatCmd.fire() ) {
+            debugError( "discoverStep9Plug: stream format command failed\n" );
+            return false;
+        }
+
+        FormatInformation* formatInfo =
+            extStreamFormatCmd.getFormatInformation();
+        FormatInformationStreamsCompound* compoundStream
+            = dynamic_cast< FormatInformationStreamsCompound* > (
+                formatInfo->m_streams );
+        if ( compoundStream ) {
+            isoPlug->m_samplingFrequency =
+                compoundStream->m_samplingFrequency;
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "discoverStep9Plug: %s plug %d uses "
+                         "sampling frequency %d\n",
+                         isoPlug->getName(),
+                         isoPlug->getPlugId(),
+                         isoPlug->m_samplingFrequency );
+
+            for ( int i = 1;
+                  i <= compoundStream->m_numberOfStreamFormatInfos;
+                  ++i )
+            {
+                AvPlug::ClusterInfo* clusterInfo =
+                    isoPlug->getClusterInfoByIndex( i );
+
+                if ( !clusterInfo ) {
+                    debugError( "discoverStep9Plug: No matching cluster info found "
+                                "for index %d\n",  i );
+                    return false;
+                }
+                StreamFormatInfo* streamFormatInfo =
+                    compoundStream->m_streamFormatInfos[ i - 1 ];
+
+                int nrOfChannels = clusterInfo->m_nrOfChannels;
+                if ( streamFormatInfo->m_streamFormat ==
+                     FormatInformation::eFHL2_AM824_MIDI_CONFORMANT )
+                {
+                    // 8 logical midi channels fit into 1 channel
+                    nrOfChannels = ( ( nrOfChannels + 7 ) / 8 );
+                }
+                // sanity checks
+                if (  nrOfChannels !=
+                     streamFormatInfo->m_numberOfChannels )
+                {
+                    debugError( "discoverStep9Plug: Number of channels "
+                                "mismatch: %s plug %d discovering reported "
+                                "%d channels for cluster '%s', while stream format "
+                                "reported %d\n",
+                                isoPlug->getName(),
+                                isoPlug->getPlugId(),
+                                nrOfChannels,
+                                clusterInfo->m_name.c_str(),
+                                streamFormatInfo->m_numberOfChannels);
+                    return false;
+                }
+                clusterInfo->m_streamFormat = streamFormatInfo->m_streamFormat;
+
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "%s plug %d cluster info %d ('%s'): stream format %d\n",
+                             isoPlug->getName(),
+                             isoPlug->getPlugId(),
+                             i,
+                             clusterInfo->m_name.c_str(),
+                             clusterInfo->m_streamFormat );
+            }
+        }
+
+        FormatInformationStreamsSync* syncStream
+            = dynamic_cast< FormatInformationStreamsSync* > (
+                formatInfo->m_streams );
+        if ( syncStream ) {
+            isoPlug->m_samplingFrequency =
+                syncStream->m_samplingFrequency;
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "%s plug %d is sync stream with sampling frequency %d\n",
+                             isoPlug->getName(),
+                             isoPlug->getPlugId(),
+                             isoPlug->m_samplingFrequency );
+        }
+
+        if ( !compoundStream && !syncStream ) {
+            debugError( "discoverStep9Plug: Unsupported stream format\n" );
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool
+AvDevice::discoverStep9()
+{
+    bool success;
+    success  = discoverStep9Plug( m_isoInputPlugs );
+    success &= discoverStep9Plug( m_isoOutputPlugs );
+
+    return success;
+}
+
+bool
+AvDevice::discoverStep10Plug( AvPlugVector& isoPlugs )
+{
+   for ( AvPlugVector::iterator it = isoPlugs.begin();
+          it != isoPlugs.end();
+          ++it )
+    {
+        AvPlug* isoPlug = *it;
+        ExtendedStreamFormatCmd extStreamFormatCmd( m_1394Service,
+                                                    ExtendedStreamFormatCmd::eSF_ExtendedStreamFormatInformationCommandList);
+        UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
+                                         isoPlug->getPlugId() );
+        PlugAddress::EPlugDirection direction =
+            static_cast<PlugAddress::EPlugDirection>( isoPlug->getPlugDirection() );
+        extStreamFormatCmd.setPlugAddress( PlugAddress( direction,
+                                                        PlugAddress::ePAM_Unit,
+                                                        unitPlugAddress ) );
+
+        extStreamFormatCmd.setNodeId( m_nodeId );
+        //extStreamFormatCmd.setVerbose( true );
+
+        int i = 0;
+        bool cmdSuccess = false;
+
+        do {
+            extStreamFormatCmd.setIndexInStreamFormat( i );
+            extStreamFormatCmd.setCommandType( AVCCommand::eCT_Status );
+            cmdSuccess = extStreamFormatCmd.fire();
+            if ( cmdSuccess
+                 && ( extStreamFormatCmd.getResponse() == AVCCommand::eR_Implemented ) )
+            {
+                AvPlug::FormatInfo formatInfo;
+                formatInfo.m_index = i;
+
+                FormatInformationStreamsSync* syncStream
+                    = dynamic_cast< FormatInformationStreamsSync* >
+                    ( extStreamFormatCmd.getFormatInformation()->m_streams );
+                if ( syncStream ) {
+                    formatInfo.m_samplingFrequency =
+                        syncStream->m_samplingFrequency;
+                    formatInfo.m_isSyncStream = true ;
+                }
+
+                FormatInformationStreamsCompound* compoundStream
+                    = dynamic_cast< FormatInformationStreamsCompound* >
+                    ( extStreamFormatCmd.getFormatInformation()->m_streams );
+                if ( compoundStream ) {
+                    formatInfo.m_samplingFrequency =
+                        compoundStream->m_samplingFrequency;
+                    formatInfo.m_isSyncStream = false;
+                    for ( int j = 0;
+                          j < compoundStream->m_numberOfStreamFormatInfos;
+                          ++j )
+                    {
+                        switch ( compoundStream->m_streamFormatInfos[j]->m_streamFormat ) {
+                        case AVC1394_STREAM_FORMAT_AM824_MULTI_BIT_LINEAR_AUDIO_RAW:
+                            formatInfo.m_audioChannels +=
+                                compoundStream->m_streamFormatInfos[j]->m_numberOfChannels;
+                            break;
+                        case AVC1394_STREAM_FORMAT_AM824_MIDI_CONFORMANT:
+                            formatInfo.m_midiChannels +=
+                                compoundStream->m_streamFormatInfos[j]->m_numberOfChannels;
+                            break;
+                        default:
+                            debugWarning( "discoverStep10Plug: unknown stream "
+                                          "format for channel (%d)\n", j );
+                        }
+                    }
+                }
+
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "[%s:%d] formatInfo[%d].m_samplingFrequency = %d\n",
+                             isoPlug->getName(), isoPlug->getPlugId(),
+                             i, formatInfo.m_samplingFrequency );
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "[%s:%d] formatInfo[%d].m_isSyncStream = %d\n",
+                             isoPlug->getName(), isoPlug->getPlugId(),
+                             i, formatInfo.m_isSyncStream );
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "[%s:%d] formatInfo[%d].m_audioChannels = %d\n",
+                             isoPlug->getName(), isoPlug->getPlugId(),
+                             i, formatInfo.m_audioChannels );
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "[%s:%d] formatInfo[%d].m_midiChannels = %d\n",
+                             isoPlug->getName(), isoPlug->getPlugId(),
+                             i, formatInfo.m_midiChannels );
+
+                isoPlug->m_formatInfos.push_back( formatInfo );
+            }
+
+            ++i;
+        } while ( cmdSuccess && ( extStreamFormatCmd.getResponse()
+                                  == ExtendedStreamFormatCmd::eR_Implemented ) );
+    }
+
+   return true;
+}
+
+
+bool
+AvDevice::discoverStep10()
+{
+    //////////////////////////////////////////////
+    // Step 10: For all ISO plugs: get all stream
+    // supported formats
+
+    bool success;
+
+    success  = discoverStep10Plug( m_isoInputPlugs );
+    success &= discoverStep10Plug( m_isoOutputPlugs );
+
+    return success;
+}
+
+bool
+AvDevice::discoverPlugConnection( AvPlug& srcPlug,
+                                  SubunitPlugSpecificDataPlugAddress& subunitPlugAddress )
+{
+    AvDeviceSubunit* subunit = getSubunit( subunitPlugAddress.m_subunitType,
+                                           subunitPlugAddress.m_subunitId );
+
+    if ( subunit ) {
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "%s plug %d has a valid connection to plug %d of "
+                     "%s subunit %d \n",
+                     srcPlug.getName(),
+                     srcPlug.getPlugId(),
+                     subunitPlugAddress.m_plugId,
+                     subunit->getName(),
+                     subunit->getSubunitId() );
+
+        AvPlug* destPlug        = new AvPlug;
+        destPlug->m_plugId      = subunitPlugAddress.m_plugId;
+        destPlug->m_subunitType = subunitPlugAddress.m_subunitType;
+        destPlug->m_subunitId   = subunitPlugAddress.m_subunitId;
+
+        if ( !subunit->addPlug( *destPlug ) ) {
+            debugError( "Could not add plug %d to subunit %d\n",
+                        destPlug->getPlugId(), subunit->getSubunitId() );
+            return false;
+        }
+
+        AvPlugConnection* plugConnection = new AvPlugConnection;
+        plugConnection->m_srcPlug = &srcPlug;
+        plugConnection->m_destPlug = destPlug;
+        m_plugConnections.push_back( plugConnection );
+
+        return true;
+    } else {
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "found plug address points to unhandled  "
+                     "subunit -> ignored\n" );
+    }
+
+    return true;
+}
+
+bool
+AvDevice::enumerateSubUnits()
+{
+    SubUnitInfoCmd subUnitInfoCmd( m_1394Service );
+    //subUnitInfoCmd.setVerbose( 1 );
+    subUnitInfoCmd.setCommandType( AVCCommand::eCT_Status );
+
+    // BeBob has always exactly one audio and one music subunit. This
+    // means is fits into the first page of the SubUnitInfo command.
+    // So there is no need to do more than needed
+
+    subUnitInfoCmd.m_page = 0;
+    subUnitInfoCmd.setNodeId( m_nodeId );
+    if ( !subUnitInfoCmd.fire() ) {
+        debugError( "Subunit info command failed\n" );
+    }
+
+    for ( int i = 0; i < subUnitInfoCmd.getNrOfValidEntries(); ++i ) {
+        subunit_type_t subunit_type
+            = subUnitInfoCmd.m_table[i].m_subunit_type;
+
+        unsigned int subunitId = getNrOfSubunits( subunit_type );
+
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "subunit_id = %2d, subunit_type = %2d (%s)\n",
+                     subunitId,
+                     subunit_type,
+                     subunitTypeToString( subunit_type ) );
+
+        AvDeviceSubunit* subunit = 0;
+        switch( subunit_type ) {
+        case AVCCommand::eST_Audio:
+            subunit = new AvDeviceSubunitAudio( this, subunitId );
+            if ( !subunit ) {
+                debugFatal( "Could not allocate AvDeviceSubunitAudio\n" );
+                return false;
+            }
+            break;
+        case AVCCommand::eST_Music:
+            subunit = new AvDeviceSubunitMusic( this, subunitId );
+            if ( !subunit ) {
+                debugFatal( "Could not allocate AvDeviceSubunitMusic\n" );
+                return false;
+            }
+            break;
+        default:
+            debugOutput( DEBUG_LEVEL_NORMAL,
+                         "Unsupported subunit found, subunit_type = %d (%s)\n",
+                         subunit_type,
+                         subunitTypeToString( subunit_type ) );
+
+        }
+
+        m_subunits.push_back( subunit );
+    }
+
+    return true;
+}
+
+
+AvDeviceSubunit*
+AvDevice::getSubunit( subunit_type_t subunitType,
+                      subunit_id_t subunitId ) const
+{
+    for ( AvDeviceSubunitVector::const_iterator it = m_subunits.begin();
+          it != m_subunits.end();
+          ++it )
+    {
+        AvDeviceSubunit* subunit = *it;
+        if ( ( subunitType == subunit->getSubunitType() )
+             && ( subunitId == subunit->getSubunitId() ) )
+        {
+            return subunit;
+        }
+    }
+
+    return 0;
+}
+
+
+unsigned int
+AvDevice::getNrOfSubunits( subunit_type_t subunitType ) const
+{
+    unsigned int nrOfSubunits = 0;
+
+    for ( AvDeviceSubunitVector::const_iterator it = m_subunits.begin();
+          it != m_subunits.end();
+          ++it )
+    {
+        AvDeviceSubunit* subunit = *it;
+        if ( subunitType == subunit->getSubunitType() ) {
+            nrOfSubunits++;
+        }
+    }
+
+    return nrOfSubunits;
+}
+
+AvPlugConnection*
+AvDevice::getPlugConnection( AvPlug& srcPlug ) const
+{
+    for ( AvPlugConnectionVector::const_iterator it
+              = m_plugConnections.begin();
+          it != m_plugConnections.end();
+          ++it )
+    {
+        AvPlugConnection* plugConnection = *it;
+        if ( plugConnection->m_srcPlug == &srcPlug ) {
+            return plugConnection;
+        }
+    }
+
+    return 0;
+}
+
+AvPlug*
+AvDevice::getPlugById( AvPlugVector& plugs, int id )
+{
+    for ( AvPlugVector::iterator it = plugs.begin();
+          it != plugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+        if ( id == plug->getPlugId() ) {
+            return plug;
+        }
+    }
+
+    return 0;
+}
+
+bool
+AvDevice::addXmlDescriptionPlug( AvPlug& plug,
+                                 xmlNodePtr connectionSet )
+{
+    char* result;
+
+    int direction;
+    switch ( plug.getPlugDirection() ) {
+        case 0:
+            direction = FREEBOB_PLAYBACK;
+            break;
+        case 1:
+            direction = FREEBOB_CAPTURE;
+            break;
+    default:
+        debugError( "plug direction invalid (%d)\n",
+                    plug.getPlugDirection() );
+        return false;
+    }
+
+    asprintf( &result, "%d",  direction );
+    if ( !xmlNewChild( connectionSet,
+                       0,
+                       BAD_CAST "Direction",
+                       BAD_CAST result ) )
+    {
+        debugError( "Couldn't create 'Direction' node\n" );
+        return false;
+    }
+
+    xmlNodePtr connection = xmlNewChild( connectionSet, 0,
+                                         BAD_CAST "Connection", 0 );
+    if ( !connection ) {
+        debugError( "Couldn't create 'Connection' node for "
+                    "direction %d\n", plug.getPlugDirection() );
+        return false;
+    }
+
+    asprintf( &result, "%08x%08x",
+              ( quadlet_t )( m_configRom->getGuid() >> 32 ),
+              ( quadlet_t )( m_configRom->getGuid() & 0xfffffff ) );
+    if ( !xmlNewChild( connection,  0,
+                       BAD_CAST "GUID",  BAD_CAST result ) ) {
+        debugError( "Couldn't create 'GUID' node\n" );
+        return false;
+    }
+
+    asprintf( &result, "%d", m_1394Service->getPort() );
+    if ( !xmlNewChild( connection,  0,
+                       BAD_CAST "Port",  BAD_CAST result ) ) {
+        debugError( "Couldn't create 'Port' node\n" );
+        return false;
+    }
+
+    asprintf( &result, "%d",  m_nodeId);
+    if ( !xmlNewChild( connection,  0,
+                       BAD_CAST "Node",  BAD_CAST result ) ) {
+        debugError( "Couldn't create 'Node' node\n" );
+        return false;
+    }
+
+    asprintf( &result, "%d",  plug.getNrOfChannels() );
+    if ( !xmlNewChild( connection,  0,
+                       BAD_CAST "Dimension",  BAD_CAST result ) ) {
+        debugError( "Couldn't create 'Dimension' node\n" );
+        return false;
+    }
+
+    asprintf( &result, "%d",  plug.getSampleRate() );
+    if ( !xmlNewChild( connection,  0,
+                       BAD_CAST "Samplerate",  BAD_CAST result ) ) {
+        debugError( "Couldn't create 'Samplerate' node\n" );
+        return false;
+    }
+
+    if ( !xmlNewChild( connection,  0,
+                       BAD_CAST "IsoChannel", BAD_CAST "-1" ) )
+    {
+        debugError( "Couldn't create 'IsoChannel' node\n" );
+        return false;
+    }
+
+    xmlNodePtr streams = xmlNewChild( connection,  0,
+                                      BAD_CAST "Streams",  0 );
+    if ( !streams ) {
+        debugError( "Couldn't create 'Streams' node for "
+                    "direction %d\n", plug.getPlugDirection() );
+        return false;
+    }
+
+    AvPlug::ClusterInfoVector& clusterInfos = plug.getClusterInfos();
+    for ( AvPlug::ClusterInfoVector::const_iterator it = clusterInfos.begin();
+          it != clusterInfos.end();
+          ++it )
+    {
+        const AvPlug::ClusterInfo* clusterInfo = &( *it );
+
+        AvPlug::ChannelInfoVector channelInfos = clusterInfo->m_channelInfos;
+        for ( AvPlug::ChannelInfoVector::const_iterator it = channelInfos.begin();
+              it != channelInfos.end();
+              ++it )
+        {
+            const AvPlug::ChannelInfo* channelInfo = &( *it );
+
+            xmlNodePtr stream = xmlNewChild( streams,  0,
+                                             BAD_CAST "Stream",  0 );
+            if ( !stream ) {
+                debugError( "Coulnd't create 'Stream' node" );
+                return false;
+            }
+
+            // \todo: iec61883 backend expects indexing starting from 0
+            // but bebob reports it starting from 1. Decide where
+            // and how to handle this
+            asprintf( &result, "%d", channelInfo->m_streamPosition - 1 );
+            if ( !xmlNewChild( stream,  0,
+                               BAD_CAST "Position",  BAD_CAST result ) )
+            {
+                debugError( "Couldn't create 'Position' node" );
+                return false;
+            }
+
+            asprintf( &result, "%d", channelInfo->m_location );
+            if ( !xmlNewChild( stream,  0,
+                               BAD_CAST "Location",  BAD_CAST result ) )
+            {
+                debugError( "Couldn't create 'Location' node" );
+                return false;
+            }
+
+            asprintf( &result, "%d", clusterInfo->m_streamFormat );
+            if ( !xmlNewChild( stream,  0,
+                               BAD_CAST "Format",  BAD_CAST result ) )
+            {
+                debugError( "Couldn't create 'Format' node" );
+                return false;
+            }
+
+            asprintf( &result, "%d", clusterInfo->m_portType );
+            if ( !xmlNewChild( stream,  0,
+                               BAD_CAST "Type",  BAD_CAST result ) )
+            {
+                debugError( "Couldn't create 'Type' node" );
+                return false;
+            }
+
+            // \todo XXX: What do to do with DestinationPort value??
+            asprintf( &result, "%d", 0 );
+            if ( !xmlNewChild( stream,  0,
+                               BAD_CAST "DestinationPort",  BAD_CAST result ) )
+            {
+                debugError( "Couldn't create 'DestinationPort' node" );
+                return false;
+            }
+
+            if ( !xmlNewChild( stream,  0,
+                               BAD_CAST "Name",
+                               BAD_CAST channelInfo->m_name.c_str() ) )
+            {
+                debugError( "Couldn't create 'Name' node" );
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+bool
+AvDevice::addXmlDescriptionStreamFormats( AvPlug& plug,
+                                          xmlNodePtr streamFormatNode )
+{
+    int direction;
+    switch ( plug.getPlugDirection() ) {
+        case 0:
+            direction = FREEBOB_PLAYBACK;
+            break;
+        case 1:
+            direction = FREEBOB_CAPTURE;
+            break;
+    default:
+        debugError( "addXmlDescriptionStreamFormats: plug direction invalid (%d)\n",
+                    plug.getPlugDirection() );
+        return false;
+    }
+
+    char* result;
+    asprintf( &result, "%d",  direction );
+    if ( !xmlNewChild( streamFormatNode,
+                       0,
+                       BAD_CAST "Direction",
+                       BAD_CAST result ) )
+    {
+        debugError( "addXmlDescriptionStreamFormats: Could not  create 'Direction' node\n" );
+        return false;
+    }
+
+    for ( AvPlug::FormatInfoVector::iterator it =
+              plug.m_formatInfos.begin();
+          it != plug.m_formatInfos.end();
+          ++it )
+    {
+        AvPlug::FormatInfo formatInfo = *it;
+        xmlNodePtr formatNode = xmlNewChild( streamFormatNode, 0,
+                                             BAD_CAST "Format", 0 );
+        if ( !formatNode ) {
+            debugError( "addXmlDescriptionStreamFormats: Could not create 'Format' node\n" );
+            return false;
+        }
+
+        asprintf( &result, "%d",
+                  convertESamplingFrequency( static_cast<ESamplingFrequency>( formatInfo.m_samplingFrequency ) ) );
+        if ( !xmlNewChild( formatNode,  0,
+                           BAD_CAST "Samplerate",  BAD_CAST result ) )
+        {
+            debugError( "Couldn't create 'Samplerate' node\n" );
+            return false;
+        }
+
+        asprintf( &result, "%d",  formatInfo.m_audioChannels );
+        if ( !xmlNewChild( formatNode,  0,
+                           BAD_CAST "AudioChannels",  BAD_CAST result ) )
+        {
+            debugError( "Couldn't create 'AudioChannels' node\n" );
+            return false;
+        }
+
+        asprintf( &result, "%d",  formatInfo.m_midiChannels );
+        if ( !xmlNewChild( formatNode,  0,
+                           BAD_CAST "MidiChannels",  BAD_CAST result ) )
+        {
+            debugError( "Couldn't create 'MidiChannels' node\n" );
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool
+AvDevice::addXmlDescription( xmlNodePtr deviceNode )
+{
+    // connection set
+    //  direction
+    //  connection
+    //    id
+    //    port
+    //    node
+    //    plug
+    //    dimension
+    //    samplerate
+    //    streams
+    //      stream
+
+
+    ///////////
+    // get plugs
+
+    AvPlug* inputPlug = getPlugById( m_isoInputPlugs, 0 );
+    if ( !inputPlug ) {
+        debugError( "addXmlDescription: No iso input plug found with id %d\n" );
+        return false;
+    }
+    AvPlug* outputPlug = getPlugById( m_isoOutputPlugs, 0 );
+    if ( !outputPlug ) {
+        debugError( "addXmlDescription: No iso output plug found with id %d\n" );
+        return false;
+    }
+
+    ///////////
+    // add connection set output
+
+    xmlNodePtr connectionSet = xmlNewChild( deviceNode, 0,
+                                            BAD_CAST "ConnectionSet", 0 );
+    if ( !connectionSet ) {
+        debugError( "addXmlDescription:: Could not create 'ConnnectionSet' node for "
+                    "direction 1 (playback)\n" );
+        return false;
+    }
+
+    if ( !addXmlDescriptionPlug( *inputPlug, connectionSet ) ) {
+        debugError( "addXmlDescription: Could not add iso input plug 0 to XML description\n" );
+        return false;
+    }
+
+    // add connection set input
+
+    connectionSet = xmlNewChild( deviceNode, 0,
+                                 BAD_CAST "ConnectionSet", 0 );
+    if ( !connectionSet ) {
+        debugError( "addXmlDescription: Couldn't create 'ConnectionSet' node for "
+                    "direction 0 (recorder)\n" );
+        return false;
+    }
+
+    if ( !addXmlDescriptionPlug( *outputPlug, connectionSet ) ) {
+        debugError( "addXmlDescription: Could not add iso output plug 0 to XML description\n" );
+        return false;
+    }
+
+    ////////////
+    // add stream format
+
+    xmlNodePtr streamFormatNode = xmlNewChild( deviceNode, 0,
+                                               BAD_CAST "StreamFormats", 0 );
+    if ( !streamFormatNode ) {
+        debugError( "addXmlDescription: Could not create 'StreamFormats' node\n" );
+        return false;
+    }
+
+    if ( !addXmlDescriptionStreamFormats( *inputPlug, streamFormatNode ) ) {
+        debugError( "addXmlDescription:: Could not add stream format info\n" );
+        return false;
+    }
+
+    streamFormatNode= xmlNewChild( deviceNode, 0,
+                                 BAD_CAST "StreamFormats", 0 );
+    if ( !streamFormatNode ) {
+        debugError( "addXmlDescription: Could not create 'StreamFormat' node\n" );
+        return false;
+    }
+
+    if ( !addXmlDescriptionStreamFormats( *outputPlug, streamFormatNode ) ) {
+        debugError( "addXmlDescription:: Could not add stream format info\n" );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+AvDevice::setSamplingFrequencyPlug( AvPlug& plug,
+                                    PlugAddress::EPlugDirection direction,
+                                    ESamplingFrequency samplingFrequency )
+{
+    ExtendedStreamFormatCmd extStreamFormatCmd( m_1394Service,
+                                                ExtendedStreamFormatCmd::eSF_ExtendedStreamFormatInformationCommandList );
+    UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
+                                     plug.getPlugId() );
+    extStreamFormatCmd.setPlugAddress( PlugAddress( direction,
+                                                    PlugAddress::ePAM_Unit,
+                                                    unitPlugAddress ) );
+
+    extStreamFormatCmd.setNodeId( m_nodeId );
+    extStreamFormatCmd.setCommandType( AVCCommand::eCT_Status );
+    //extStreamFormatCmd.setVerbose( true );
+
+    int i = 0;
+    bool cmdSuccess = false;
+    bool correctFormatFound = false;
+
+    do {
+        extStreamFormatCmd.setIndexInStreamFormat( i );
+        extStreamFormatCmd.setCommandType( AVCCommand::eCT_Status );
+
+        cmdSuccess = extStreamFormatCmd.fire();
+        if ( cmdSuccess
+             && ( extStreamFormatCmd.getResponse() == AVCCommand::eR_Implemented ) )
+        {
+            ESamplingFrequency foundFreq = eSF_DontCare;
+
+            FormatInformation* formatInfo =
+                extStreamFormatCmd.getFormatInformation();
+            FormatInformationStreamsCompound* compoundStream
+                = dynamic_cast< FormatInformationStreamsCompound* > (
+                    formatInfo->m_streams );
+            if ( compoundStream ) {
+                foundFreq = static_cast<ESamplingFrequency>( compoundStream->m_samplingFrequency );
+            }
+
+            FormatInformationStreamsSync* syncStream
+                = dynamic_cast< FormatInformationStreamsSync* > (
+                    formatInfo->m_streams );
+            if ( syncStream ) {
+                foundFreq = static_cast<ESamplingFrequency>( compoundStream->m_samplingFrequency );
+            }
+
+            if (  foundFreq == samplingFrequency )
+            {
+                correctFormatFound = true;
+                break;
+            }
+        }
+
+        ++i;
+    } while ( cmdSuccess && ( extStreamFormatCmd.getResponse()
+                              == ExtendedStreamFormatCmd::eR_Implemented ) );
+
+    if ( !cmdSuccess ) {
+        debugError( "setSampleRatePlug: Failed to retrieve format info\n" );
+        return false;
+    }
+
+    if ( !correctFormatFound ) {
+        debugError( "setSampleRatePlug: %s plug %d does not support sample rate %d\n",
+                    plug.getName(),
+                    plug.getPlugId(),
+                    convertESamplingFrequency( samplingFrequency ) );
+        return false;
+    }
+
+    extStreamFormatCmd.setSubFunction(
+        ExtendedStreamFormatCmd::eSF_ExtendedStreamFormatInformationCommand );
+    extStreamFormatCmd.setCommandType( AVCCommand::eCT_Control );
+
+    if ( !extStreamFormatCmd.fire() ) {
+        debugError( "setSampleRate: Could not set sample rate %d "
+                    "to %s plug %d\n",
+                    convertESamplingFrequency( samplingFrequency ),
+                    plug.getName(),
+                    plug.getPlugId() );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+AvDevice::setSamplingFrequency( ESamplingFrequency samplingFrequency )
+{
+    AvPlug* plug = getPlugById( m_isoInputPlugs, 0 );
+    if ( !plug ) {
+        debugError( "setSampleRate: Could not retrieve iso input plug 0\n" );
+        return false;
+    }
+
+    if ( !setSamplingFrequencyPlug( *plug, PlugAddress::ePD_Input, samplingFrequency ) ) {
+        debugError( "setSampleRate: Setting sample rate failed\n" );
+        return false;
+    }
+
+    plug = getPlugById( m_isoOutputPlugs, 0 );
+    if ( !plug ) {
+        debugError( "setSampleRate: Could not retrieve iso output plug 0\n" );
+        return false;
+    }
+
+    if ( !setSamplingFrequencyPlug( *plug, PlugAddress::ePD_Output, samplingFrequency ) ) {
+        debugError( "setSampleRate: Setting sample rate failed\n" );
+        return false;
+    }
+
+    debugOutput( DEBUG_LEVEL_VERBOSE,
+                 "setSampleRate: Set sample rate to %d\n",  convertESamplingFrequency( samplingFrequency ) );
+    return true;
+}
+
+ConfigRom&
+AvDevice::getConfigRom() const
+{
+    return *m_configRom;
+}
+
+void
+AvDevice::showDevice() const
+{
+    printf( "showDevice: not implemented\n" );
+}
+
+}
Index: branches/freebob-syt-experiments/src/bebob_light/bebob_light_avdevice.h
===================================================================
--- branches/freebob-syt-experiments/src/bebob_light/bebob_light_avdevice.h (revision 188)
+++ branches/freebob-syt-experiments/src/bebob_light/bebob_light_avdevice.h (revision 188)
@@ -0,0 +1,116 @@
+/* bebob_light_avdevice.h
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef BEBOB_LIGHT_AVDEVICE_H
+#define BEBOB_LIGHT_AVDEVICE_H
+
+#include "debugmodule/debugmodule.h"
+#include "libfreebobavc/avc_definitions.h"
+#include "libfreebobavc/avc_extended_cmd_generic.h"
+#include "libfreebob/xmlparser.h"
+
+#include "bebob_light/bebob_light_avplug.h"
+#include "bebob_light/bebob_light_avdevicesubunit.h"
+
+#include "iavdevice.h"
+
+class ConfigRom;
+class Ieee1394Service;
+class SubunitPlugSpecificDataPlugAddress;
+
+namespace BeBoB_Light {
+
+class AvDevice : public IAvDevice {
+public:
+    friend class AvDeviceSubunitAudio;
+    friend class AvDeviceSubunitMusic;
+
+    // takes ownership of config rom
+    AvDevice( Ieee1394Service& ieee1394service,
+              int nodeId,
+	      int verboseLevel );
+    virtual ~AvDevice();
+
+    virtual bool discover();
+    virtual ConfigRom& getConfigRom() const;
+    virtual bool addXmlDescription( xmlNodePtr deviceNode );
+    virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency );
+    virtual void showDevice() const;
+
+protected:
+    bool discoverStep1();
+    bool discoverStep2();
+    bool discoverStep3();
+    bool discoverStep4();
+    bool discoverStep4Plug( AvPlugVector& isoPlugs );
+    bool discoverStep5();
+    bool discoverStep5Plug( AvPlugVector& isoPlugs );
+    bool discoverStep6();
+    bool discoverStep6Plug( AvPlugVector& isoPlugs );
+    bool discoverStep7();
+    bool discoverStep7Plug( AvPlugVector& isoPlugs );
+    bool discoverStep8();
+    bool discoverStep8Plug( AvPlugVector& isoPlugs );
+    bool discoverStep9();
+    bool discoverStep9Plug( AvPlugVector& isoPlugs );
+    bool discoverStep10();
+    bool discoverStep10Plug( AvPlugVector& isoPlugs );
+
+    bool discoverPlugConnection( AvPlug& srcPlug,
+                                 SubunitPlugSpecificDataPlugAddress& subunitPlugAddress );
+
+    bool enumerateSubUnits();
+
+    AvDeviceSubunit* getSubunit( subunit_type_t subunitType,
+                                 subunit_id_t subunitId ) const;
+
+    unsigned int getNrOfSubunits( subunit_type_t subunitType ) const;
+    AvPlugConnection* getPlugConnection( AvPlug& srcPlug ) const;
+
+
+    AvPlug* getPlugById( AvPlugVector& plugs, int id );
+    bool addXmlDescriptionPlug( AvPlug& plug, xmlNodePtr conectionSet );
+    bool addXmlDescriptionStreamFormats( AvPlug& plug, xmlNodePtr streamFormats );
+
+    bool setSamplingFrequencyPlug( AvPlug& plug,
+                                   PlugAddress::EPlugDirection direction,
+                                   ESamplingFrequency samplingFrequency );
+protected:
+    Ieee1394Service* m_1394Service;
+    ConfigRom*       m_configRom;
+    int              m_nodeId;
+    int              m_verboseLevel;
+
+    AvPlugVector           m_isoInputPlugs;
+    AvPlugVector           m_isoOutputPlugs;
+
+    AvPlugConnectionVector m_plugConnections;
+
+    AvDeviceSubunitVector  m_subunits;
+
+    nr_of_plugs_t m_serialBusIsochronousInputPlugs;
+    nr_of_plugs_t m_serialBusIsochronousOutputPlugs;
+
+    DECLARE_DEBUG_MODULE;
+};
+
+}
+
+#endif
Index: branches/freebob-syt-experiments/src/fbtypes.h
===================================================================
--- branches/freebob-syt-experiments/src/fbtypes.h (revision 125)
+++ branches/freebob-syt-experiments/src/fbtypes.h (revision 125)
@@ -0,0 +1,38 @@
+/* fbtypes.h
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+ 
+#ifndef FBTYPES_H
+#define FBTYPES_H
+ 
+#include <libraw1394/raw1394.h>
+ 
+typedef quadlet_t   fb_quadlet_t;
+typedef byte_t      fb_byte_t;
+typedef octlet_t    fb_octlet_t;
+typedef nodeid_t    fb_nodeid_t;
+typedef nodeaddr_t  fb_nodeaddr_t;
+
+class DeviceManager;
+
+struct freebob_handle {
+    DeviceManager*   m_deviceManager;
+};
+
+#endif
Index: branches/freebob-syt-experiments/src/configrom.cpp
===================================================================
--- branches/freebob-syt-experiments/src/configrom.cpp (revision 185)
+++ branches/freebob-syt-experiments/src/configrom.cpp (revision 185)
@@ -0,0 +1,355 @@
+/* configrom.cpp
+ * Copyright (C) 2005 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "configrom.h"
+#include "libfreebobavc/ieee1394service.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include <iostream>
+
+using namespace std;
+
+IMPL_DEBUG_MODULE( ConfigRom, ConfigRom, DEBUG_LEVEL_NORMAL );
+
+static int busRead( struct csr1212_csr* csr,
+                    u_int64_t addr,
+                    u_int16_t length,
+                    void* buffer,
+                    void* private_data );
+
+static int getMaxRom( u_int32_t* bus_info_data,
+                      void* private_data );
+
+static struct csr1212_bus_ops configrom_csr1212_ops = {
+    busRead,
+    0,
+    0,
+    getMaxRom
+};
+
+struct config_csr_info {
+    Ieee1394Service* service;
+    fb_nodeid_t      nodeId;
+};
+
+//-------------------------------------------------------------
+
+ConfigRom::ConfigRom( Ieee1394Service* ieee1394service, fb_nodeid_t nodeId )
+    : m_1394Service( ieee1394service )
+    , m_nodeId( nodeId )
+    , m_avcDevice( false )
+    , m_guid( 0 )
+    , m_vendorName( "" )
+    , m_modelName( "" )
+    , m_vendorNameKv( 0 )
+    , m_modelNameKv( 0 )
+    , m_csr( 0 )
+{
+}
+
+ConfigRom::~ConfigRom()
+{
+}
+
+bool
+ConfigRom::initialize()
+{
+     struct config_csr_info csr_info;
+     csr_info.service = m_1394Service;
+     csr_info.nodeId = 0xffc0 | m_nodeId;
+
+     m_csr = csr1212_create_csr( &configrom_csr1212_ops,
+                                 5 * sizeof(fb_quadlet_t),   // XXX Why 5 ?!?
+                                 &csr_info );
+    if (!m_csr || csr1212_parse_csr( m_csr ) != CSR1212_SUCCESS) {
+        debugError( "Could not parse config rom" );
+        if (m_csr) {
+            csr1212_destroy_csr(m_csr);
+            m_csr = 0;
+        }
+        return false;
+    }
+
+    processRootDirectory(m_csr);
+
+    if ( m_vendorNameKv ) {
+        int len = ( m_vendorNameKv->value.leaf.len - 2) * sizeof( quadlet_t );
+        char* buf = new char[len+2];
+        memcpy( buf,
+                ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_vendorNameKv ),
+                len );
+
+	while ((buf + len - 1) == '\0') {
+            len--;
+        }
+        // \todo XXX seems a bit strage to do this but the nodemgr.c code does
+        // it. try to figure out why this is needed (or not)
+	buf[len++] = ' ';
+	buf[len] = '\0';
+
+
+        debugOutput( DEBUG_LEVEL_VERBOSE, "Vendor name: '%s'\n", buf );
+        m_vendorName = buf;
+        delete[] buf;
+    }
+    if ( m_modelNameKv ) {
+        int len = ( m_modelNameKv->value.leaf.len - 2) * sizeof( quadlet_t );
+        char* buf = new char[len+2];
+        memcpy( buf,
+                ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_modelNameKv ),
+                len );
+	while ((buf + len - 1) == '\0') {
+            len--;
+        }
+        // \todo XXX for edirol fa-66 it seems somehow broken. see above
+        // todo as well.
+	buf[len++] = ' ';
+	buf[len] = '\0';
+
+        debugOutput( DEBUG_LEVEL_VERBOSE, "Model name: '%s'\n", buf);
+        m_modelName = buf;
+        delete[] buf;
+    }
+
+    m_guid = ((u_int64_t)CSR1212_BE32_TO_CPU(m_csr->bus_info_data[3]) << 32)
+             | CSR1212_BE32_TO_CPU(m_csr->bus_info_data[4]);
+
+    if ( m_vendorNameKv ) {
+        csr1212_release_keyval( m_vendorNameKv );
+        m_vendorNameKv = 0;
+    }
+    if ( m_modelNameKv ) {
+        csr1212_release_keyval( m_modelNameKv );
+        m_modelNameKv = 0;
+    }
+    if ( m_csr ) {
+        csr1212_destroy_csr(m_csr);
+        m_csr = 0;
+    }
+    return true;
+}
+
+const bool
+ConfigRom::isAvcDevice() const
+{
+    return m_avcDevice;
+}
+
+// XXX This might work only for the M-Audio Audiophile
+// but can easily extended.
+#define VENDOR_ID_MAUDIO    0x00000d6c
+#define MODEL_ID_MAUDIO_BOOTLOADER 0x00010060
+
+const bool
+ConfigRom::isBootloader() const
+{
+    if ( ( m_vendorId == VENDOR_ID_MAUDIO )
+         && ( m_modelId == MODEL_ID_MAUDIO_BOOTLOADER ) )
+    {
+        return true;
+    }
+    return false;
+}
+
+static int
+busRead( struct csr1212_csr* csr,
+         u_int64_t addr,
+         u_int16_t length,
+         void* buffer,
+         void* private_data )
+{
+    struct config_csr_info* csr_info = (struct config_csr_info*) private_data;
+
+    if ( csr_info->service->read( csr_info->nodeId,
+                                  addr,
+                                  length,
+                                  ( quadlet_t* )buffer) )
+    {
+        cerr << "ConfigRom: Read failed" << endl;
+        return -1;
+    }
+
+    return 0;
+}
+
+static int
+getMaxRom( u_int32_t* bus_info_data,
+           void* /*private_data*/)
+{
+    return (CSR1212_BE32_TO_CPU( bus_info_data[2] ) >> 8) & 0x3;
+}
+
+
+void
+ConfigRom::processUnitDirectory( struct csr1212_csr* csr,
+                                 struct csr1212_keyval* ud_kv,
+                                 unsigned int *id )
+{
+    struct csr1212_dentry *dentry;
+    struct csr1212_keyval *kv;
+    unsigned int last_key_id = 0;
+    unsigned int specifier_id = 0;
+
+    debugOutput( DEBUG_LEVEL_VERBOSE, "process unit directory:\n" );
+    csr1212_for_each_dir_entry(csr, kv, ud_kv, dentry) {
+	switch (kv->key.id) {
+	    case CSR1212_KV_ID_VENDOR:
+		if (kv->key.type == CSR1212_KV_TYPE_IMMEDIATE) {
+                    debugOutput( DEBUG_LEVEL_VERBOSE,
+                                 "\tvendor_id = 0x%08x\n",
+                                 kv->value.immediate);
+                    m_vendorId = kv->value.immediate;
+		}
+		break;
+
+	    case CSR1212_KV_ID_MODEL:
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "\tmodel_id = 0x%08x\n",
+                             kv->value.immediate);
+                m_modelId = kv->value.immediate;
+		break;
+
+	    case CSR1212_KV_ID_SPECIFIER_ID:
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "\tspecifier_id = 0x%08x\n",
+                             kv->value.immediate);
+                specifier_id = kv->value.immediate;
+		break;
+
+	    case CSR1212_KV_ID_VERSION:
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "\tversion = 0x%08x\n",
+                             kv->value.immediate);
+                if ( specifier_id == 0x0000a02d ) // XXX
+                {
+                    if ( kv->value.immediate == 0x10001 ) {
+                        m_avcDevice = true;
+                    }
+                }
+		break;
+
+	    case CSR1212_KV_ID_DESCRIPTOR:
+		if (kv->key.type == CSR1212_KV_TYPE_LEAF &&
+		    CSR1212_DESCRIPTOR_LEAF_TYPE(kv) == 0 &&
+		    CSR1212_DESCRIPTOR_LEAF_SPECIFIER_ID(kv) == 0 &&
+		    CSR1212_TEXTUAL_DESCRIPTOR_LEAF_WIDTH(kv) == 0 &&
+		    CSR1212_TEXTUAL_DESCRIPTOR_LEAF_CHAR_SET(kv) == 0 &&
+		    CSR1212_TEXTUAL_DESCRIPTOR_LEAF_LANGUAGE(kv) == 0)
+		{
+		    switch (last_key_id) {
+			case CSR1212_KV_ID_VENDOR:
+			    csr1212_keep_keyval(kv);
+                            m_vendorNameKv = kv;
+			    break;
+
+			case CSR1212_KV_ID_MODEL:
+                            m_modelNameKv = kv;
+			    csr1212_keep_keyval(kv);
+			    break;
+
+		    }
+		} /* else if (kv->key.type == CSR1212_KV_TYPE_DIRECTORY) ... */
+		break;
+
+	    case CSR1212_KV_ID_DEPENDENT_INFO:
+		if (kv->key.type == CSR1212_KV_TYPE_DIRECTORY) {
+		    /* This should really be done in SBP2 as this is
+		     * doing SBP2 specific parsing. */
+		    processUnitDirectory(csr, kv, id);
+		}
+
+		break;
+
+	    default:
+		break;
+	}
+	last_key_id = kv->key.id;
+    }
+}
+
+void
+ConfigRom::processRootDirectory(struct csr1212_csr* csr)
+{
+    unsigned int ud_id = 0;
+    struct csr1212_dentry *dentry;
+    struct csr1212_keyval *kv;
+    unsigned int last_key_id = 0;
+
+    csr1212_for_each_dir_entry(csr, kv, csr->root_kv, dentry) {
+	switch (kv->key.id) {
+	    case CSR1212_KV_ID_VENDOR:
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "vendor id = 0x%08x\n", kv->value.immediate);
+		break;
+
+	    case CSR1212_KV_ID_NODE_CAPABILITIES:
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "capabilities = 0x%08x\n", kv->value.immediate);
+		break;
+
+	    case CSR1212_KV_ID_UNIT:
+		processUnitDirectory(csr, kv, &ud_id);
+		break;
+
+	    case CSR1212_KV_ID_DESCRIPTOR:
+		if (last_key_id == CSR1212_KV_ID_VENDOR) {
+		    if (kv->key.type == CSR1212_KV_TYPE_LEAF &&
+			CSR1212_DESCRIPTOR_LEAF_TYPE(kv) == 0 &&
+			CSR1212_DESCRIPTOR_LEAF_SPECIFIER_ID(kv) == 0 &&
+			CSR1212_TEXTUAL_DESCRIPTOR_LEAF_WIDTH(kv) == 0 &&
+			CSR1212_TEXTUAL_DESCRIPTOR_LEAF_CHAR_SET(kv) == 0 &&
+			CSR1212_TEXTUAL_DESCRIPTOR_LEAF_LANGUAGE(kv) == 0)
+                    {
+                        m_vendorNameKv = kv;
+			csr1212_keep_keyval(kv);
+		    }
+		}
+		break;
+	}
+	last_key_id = kv->key.id;
+    }
+
+}
+
+const fb_nodeid_t
+ConfigRom::getNodeId() const
+{
+    return m_nodeId;
+}
+
+const fb_octlet_t
+ConfigRom::getGuid() const
+{
+    return m_guid;
+}
+
+const std::string
+ConfigRom::getModelName() const
+{
+    return m_modelName;
+}
+
+const std::string
+ConfigRom::getVendorName() const
+{
+    return m_vendorName;
+}
Index: branches/freebob-syt-experiments/src/libfreebobstreaming/messagebuffer.c
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobstreaming/messagebuffer.c (revision 185)
+++ branches/freebob-syt-experiments/src/libfreebobstreaming/messagebuffer.c (revision 185)
@@ -0,0 +1,159 @@
+/* 
+ *  Copied from the jackd source tree, adapted for freebob
+ *  Modifications for FreeBoB by Pieter Palmers
+ *
+ */
+
+/*
+ * messagebuffer.c -- realtime-safe message handling for jackd.
+ *
+ *  This interface is included in libjack so backend drivers can use
+ *  it, *not* for external client processes.  It implements the
+ *  VERBOSE() and MESSAGE() macros in a realtime-safe manner.
+ */
+
+/*
+ *  Copyright (C) 2004 Rui Nuno Capela, Steve Harris
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2.1 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program 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 Lesser General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program; if not, write to the Free Software 
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include <unistd.h>
+#include <string.h>
+#include <pthread.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "messagebuffer.h"
+// #include "atomicity.h"
+
+/* MB_NEXT() relies on the fact that MB_BUFFERS is a power of two */
+#define MB_BUFFERS	128
+#define MB_NEXT(index) ((index+1) & (MB_BUFFERS-1))
+#define MB_BUFFERSIZE	256		/* message length limit */
+
+static char mb_buffers[MB_BUFFERS][MB_BUFFERSIZE];
+static volatile unsigned int mb_initialized = 0;
+static volatile unsigned int mb_inbuffer = 0;
+static volatile unsigned int mb_outbuffer = 0;
+// static volatile _Atomic_word mb_overruns = 0;
+static volatile unsigned int mb_overruns = 0;
+static pthread_t mb_writer_thread;
+static pthread_mutex_t mb_write_lock;
+static pthread_cond_t mb_ready_cond;
+
+static void
+mb_flush()
+{
+	/* called WITHOUT the mb_write_lock */
+	while (mb_outbuffer != mb_inbuffer) {
+		fputs(mb_buffers[mb_outbuffer], stderr);
+		mb_outbuffer = MB_NEXT(mb_outbuffer);
+	}
+}
+
+static void *
+mb_thread_func(void *arg)
+{
+	/* The mutex is only to eliminate collisions between multiple
+	 * writer threads and protect the condition variable. */
+	pthread_mutex_lock(&mb_write_lock);
+
+	while (mb_initialized) {
+		pthread_cond_wait(&mb_ready_cond, &mb_write_lock);
+
+		/* releasing the mutex reduces contention */
+		pthread_mutex_unlock(&mb_write_lock);
+		mb_flush();
+		pthread_mutex_lock(&mb_write_lock);
+	}
+
+	pthread_mutex_unlock(&mb_write_lock);
+
+	return NULL;
+}
+
+void 
+freebob_messagebuffer_init ()
+{
+	if (mb_initialized)
+		return;
+
+	pthread_mutex_init(&mb_write_lock, NULL);
+	pthread_cond_init(&mb_ready_cond, NULL);
+
+	mb_overruns = 0;
+	mb_initialized = 1;
+
+	if (pthread_create(&mb_writer_thread, NULL, &mb_thread_func, NULL) != 0)
+		mb_initialized = 0;
+}
+
+void 
+freebob_messagebuffer_exit ()
+{
+	if (!mb_initialized)
+		return;
+
+	pthread_mutex_lock(&mb_write_lock);
+	mb_initialized = 0;
+	pthread_cond_signal(&mb_ready_cond);
+	pthread_mutex_unlock(&mb_write_lock);
+
+	pthread_join(mb_writer_thread, NULL);
+	mb_flush();
+
+	if (mb_overruns)
+		fprintf(stderr, "WARNING: %d message buffer overruns!\n",
+			mb_overruns);
+	else
+		fprintf(stderr, "no message buffer overruns\n");
+
+	pthread_mutex_destroy(&mb_write_lock);
+	pthread_cond_destroy(&mb_ready_cond);
+}
+
+
+void 
+freebob_messagebuffer_add (const char *fmt, ...)
+{
+	char msg[MB_BUFFERSIZE];
+	va_list ap;
+
+	/* format the message first, to reduce lock contention */
+	va_start(ap, fmt);
+	vsnprintf(msg, MB_BUFFERSIZE, fmt, ap);
+	va_end(ap);
+
+	if (!mb_initialized) {
+		/* Unable to print message with realtime safety.
+		 * Complain and print it anyway. */
+		fprintf(stderr, "ERROR: messagebuffer not initialized: %s",
+			msg);
+		return;
+	}
+
+	if (pthread_mutex_trylock(&mb_write_lock) == 0) {
+		strncpy(mb_buffers[mb_inbuffer], msg, MB_BUFFERSIZE);
+		mb_inbuffer = MB_NEXT(mb_inbuffer);
+		pthread_cond_signal(&mb_ready_cond);
+		pthread_mutex_unlock(&mb_write_lock);
+	} else {			/* lock collision */
+// 		atomic_add(&mb_overruns, 1);
+		// FIXME: atomicity
+		mb_overruns++; // skip the atomicness for now
+	}
+}
Index: branches/freebob-syt-experiments/src/libfreebobstreaming/ringbuffer.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobstreaming/ringbuffer.h (revision 185)
+++ branches/freebob-syt-experiments/src/libfreebobstreaming/ringbuffer.h (revision 185)
@@ -0,0 +1,241 @@
+/*
+  Copied from the jackd sources
+  function names changed in order to avoid naming problems when using this in
+  a jackd backend.
+  
+  Modifications for FreeBoB by Pieter Palmers
+    
+    Copyright (C) 2000 Paul Davis
+    Copyright (C) 2003 Rohan Drape
+    
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 2.1 of the License, or
+    (at your option) any later version.
+    
+    This program 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 Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program; if not, write to the Free Software 
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef _RINGBUFFER_H
+#define _RINGBUFFER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+
+/** @file ringbuffer.h
+ *
+ * A set of library functions to make lock-free ringbuffers available
+ * to JACK clients.  The `capture_client.c' (in the example_clients
+ * directory) is a fully functioning user of this API.
+ *
+ * The key attribute of a ringbuffer is that it can be safely accessed
+ * by two threads simultaneously -- one reading from the buffer and
+ * the other writing to it -- without using any synchronization or
+ * mutual exclusion primitives.  For this to work correctly, there can
+ * only be a single reader and a single writer thread.  Their
+ * identities cannot be interchanged.
+ */
+
+typedef struct  
+{
+  char  *buf;
+  size_t len;
+} 
+freebob_ringbuffer_data_t ;
+
+typedef struct
+{
+  char		 *buf;
+  volatile size_t write_ptr;
+  volatile size_t read_ptr;
+  size_t	  size;
+  size_t	  size_mask;
+  int		  mlocked;
+} 
+freebob_ringbuffer_t ;
+
+/**
+ * Allocates a ringbuffer data structure of a specified size. The
+ * caller must arrange for a call to freebob_ringbuffer_free() to release
+ * the memory associated with the ringbuffer.
+ *
+ * @param sz the ringbuffer size in bytes.
+ *
+ * @return a pointer to a new freebob_ringbuffer_t, if successful; NULL
+ * otherwise.
+ */
+freebob_ringbuffer_t *freebob_ringbuffer_create(size_t sz);
+
+/**
+ * Frees the ringbuffer data structure allocated by an earlier call to
+ * freebob_ringbuffer_create().
+ *
+ * @param rb a pointer to the ringbuffer structure.
+ */
+void freebob_ringbuffer_free(freebob_ringbuffer_t *rb);
+
+/**
+ * Fill a data structure with a description of the current readable
+ * data held in the ringbuffer.  This description is returned in a two
+ * element array of freebob_ringbuffer_data_t.  Two elements are needed
+ * because the data to be read may be split across the end of the
+ * ringbuffer.
+ *
+ * The first element will always contain a valid @a len field, which
+ * may be zero or greater.  If the @a len field is non-zero, then data
+ * can be read in a contiguous fashion using the address given in the
+ * corresponding @a buf field.
+ *
+ * If the second element has a non-zero @a len field, then a second
+ * contiguous stretch of data can be read from the address given in
+ * its corresponding @a buf field.
+ *
+ * @param rb a pointer to the ringbuffer structure.
+ * @param vec a pointer to a 2 element array of freebob_ringbuffer_data_t.
+ *
+ */
+void freebob_ringbuffer_get_read_vector(const freebob_ringbuffer_t *rb,
+				     freebob_ringbuffer_data_t *vec);
+
+/**
+ * Fill a data structure with a description of the current writable
+ * space in the ringbuffer.  The description is returned in a two
+ * element array of freebob_ringbuffer_data_t.  Two elements are needed
+ * because the space available for writing may be split across the end
+ * of the ringbuffer.
+ *
+ * The first element will always contain a valid @a len field, which
+ * may be zero or greater.  If the @a len field is non-zero, then data
+ * can be written in a contiguous fashion using the address given in
+ * the corresponding @a buf field.
+ *
+ * If the second element has a non-zero @a len field, then a second
+ * contiguous stretch of data can be written to the address given in
+ * the corresponding @a buf field.
+ *
+ * @param rb a pointer to the ringbuffer structure.
+ * @param vec a pointer to a 2 element array of freebob_ringbuffer_data_t.
+ */
+void freebob_ringbuffer_get_write_vector(const freebob_ringbuffer_t *rb,
+				      freebob_ringbuffer_data_t *vec);
+
+/**
+ * Read data from the ringbuffer.
+ *
+ * @param rb a pointer to the ringbuffer structure.
+ * @param dest a pointer to a buffer where data read from the
+ * ringbuffer will go.
+ * @param cnt the number of bytes to read.
+ *
+ * @return the number of bytes read, which may range from 0 to cnt.
+ */
+size_t freebob_ringbuffer_read(freebob_ringbuffer_t *rb, char *dest, size_t cnt);
+
+/**
+ * Read data from the ringbuffer. Opposed to freebob_ringbuffer_read()
+ * this function does not move the read pointer. Thus it's
+ * a convenient way to inspect data in the ringbuffer in a
+ * continous fashion. The price is that the data is copied
+ * into a user provided buffer. For "raw" non-copy inspection
+ * of the data in the ringbuffer use freebob_ringbuffer_get_read_vector().
+ *
+ * @param rb a pointer to the ringbuffer structure.
+ * @param dest a pointer to a buffer where data read from the
+ * ringbuffer will go.
+ * @param cnt the number of bytes to read.
+ *
+ * @return the number of bytes read, which may range from 0 to cnt.
+ */
+size_t freebob_ringbuffer_peek(freebob_ringbuffer_t *rb, char *dest, size_t cnt);
+
+/**
+ * Advance the read pointer.
+ *
+ * After data have been read from the ringbuffer using the pointers
+ * returned by freebob_ringbuffer_get_read_vector(), use this function to
+ * advance the buffer pointers, making that space available for future
+ * write operations.
+ *
+ * @param rb a pointer to the ringbuffer structure.
+ * @param cnt the number of bytes read.
+ */
+void freebob_ringbuffer_read_advance(freebob_ringbuffer_t *rb, size_t cnt);
+
+/**
+ * Return the number of bytes available for reading.
+ *
+ * @param rb a pointer to the ringbuffer structure.
+ *
+ * @return the number of bytes available to read.
+ */
+size_t freebob_ringbuffer_read_space(const freebob_ringbuffer_t *rb);
+
+/**
+ * Lock a ringbuffer data block into memory.
+ *
+ * Uses the mlock() system call.  This is not a realtime operation.
+ *
+ * @param rb a pointer to the ringbuffer structure.
+ */
+int freebob_ringbuffer_mlock(freebob_ringbuffer_t *rb);
+
+/**
+ * Reset the read and write pointers, making an empty buffer.
+ *
+ * This is not thread safe.
+ *
+ * @param rb a pointer to the ringbuffer structure.
+ */
+void freebob_ringbuffer_reset(freebob_ringbuffer_t *rb);
+
+/**
+ * Write data into the ringbuffer.
+ *
+ * @param rb a pointer to the ringbuffer structure.
+ * @param src a pointer to the data to be written to the ringbuffer.
+ * @param cnt the number of bytes to write.
+ *
+ * @return the number of bytes write, which may range from 0 to cnt
+ */
+size_t freebob_ringbuffer_write(freebob_ringbuffer_t *rb, const char *src,
+			     size_t cnt);
+
+/**
+ * Advance the write pointer.
+ *
+ * After data have been written the ringbuffer using the pointers
+ * returned by freebob_ringbuffer_get_write_vector(), use this function
+ * to advance the buffer pointer, making the data available for future
+ * read operations.
+ *
+ * @param rb a pointer to the ringbuffer structure.
+ * @param cnt the number of bytes written.
+ */
+void freebob_ringbuffer_write_advance(freebob_ringbuffer_t *rb, size_t cnt);
+
+/**
+ * Return the number of bytes available for writing.
+ *
+ * @param rb a pointer to the ringbuffer structure.
+ *
+ * @return the amount of free space (in bytes) available for writing.
+ */
+size_t freebob_ringbuffer_write_space(const freebob_ringbuffer_t *rb);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Index: branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_debug.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_debug.h (revision 185)
+++ branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_debug.h (revision 185)
@@ -0,0 +1,122 @@
+/*
+ *   FreeBob Streaming API
+ *   FreeBob = Firewire (pro-)audio for linux
+ *
+ *   http://freebob.sf.net
+ *
+ *   Copyright (C) 2005 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program 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 General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/* 
+ * Debug and statistics helper
+ *
+ */ 
+
+#ifndef __FREEBOB_DEBUG_H__
+#define __FREEBOB_DEBUG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "libfreebob/freebob_streaming.h"
+
+#include <libgen.h>
+#include <netinet/in.h>
+#include <sys/time.h>
+#include "messagebuffer.h"
+
+unsigned long getCurrentUTime();
+
+static unsigned long debugGetCurrentUTime() {
+	struct timeval now;
+	gettimeofday(&now, NULL);
+	return now.tv_sec*1000000+now.tv_usec;
+}
+
+// debug print control flags
+#define DEBUG_LEVEL_BUFFERS           	(1<<0)
+#define DEBUG_LEVEL_HANDLERS			(1<<1)
+#define DEBUG_LEVEL_HANDLERS_LOWLEVEL	(1<<2)
+#define DEBUG_LEVEL_XRUN_RECOVERY     	(1<<4)
+#define DEBUG_LEVEL_WAIT     			(1<<5)
+
+#define DEBUG_LEVEL_RUN_CYCLE         	(1<<8)
+
+#define DEBUG_LEVEL_PACKETCOUNTER		(1<<16)
+#define DEBUG_LEVEL_STARTUP				(1<<17)
+#define DEBUG_LEVEL_THREADS				(1<<18)
+#define DEBUG_LEVEL_STREAMS				(1<<19)
+
+#ifdef DEBUG
+//#if 0
+	#define printMessage(format, args...) freebob_messagebuffer_add( "FREEBOB MSG: %s:%d (%s): " format, basename(__FILE__), __LINE__, __FUNCTION__, ##args )
+	#define printError(format, args...) freebob_messagebuffer_add( "FREEBOB ERR: %s:%d (%s): " format,  basename(__FILE__), __LINE__, __FUNCTION__, ##args )
+	
+//	#define printEnter() freebob_messagebuffer_add( "FREEBOB ENTERS: %s (%s)\n", __FUNCTION__,  __FILE__)
+//	#define printExit() freebob_messagebuffer_add( "FREEBOB EXITS: %s (%s)\n", __FUNCTION__,  __FILE__)
+	#define printEnter() 
+	#define printExit() 
+	
+	#define debugError(format, args...) freebob_messagebuffer_add( stderr, "FREEBOB ERR: %s:%d (%s): " format,  basename(__FILE__), __LINE__, __FUNCTION__, ##args )
+	#define debugPrint(Level, format, args...) if(DEBUG_LEVEL & (Level))  freebob_messagebuffer_add("DEBUG %s:%d (%s): "  format, basename(__FILE__), __LINE__, __FUNCTION__, ##args );
+	
+	#define debugPrintShort(Level, format, args...) if(DEBUG_LEVEL & (Level))  freebob_messagebuffer_add( format,##args );
+	#define debugPrintWithTimeStamp(Level, format, args...) if(DEBUG_LEVEL & (Level)) freebob_messagebuffer_add( "%16lu: "format, debugGetCurrentUTime(),##args );
+	#define SEGFAULT int *test=NULL;	*test=1;
+
+	// default debug level
+	// #define DEBUG_LEVEL 0
+	// #define DEBUG_LEVEL (DEBUG_LEVEL_BUFFERS | DEBUG_LEVEL_RUN_CYCLE | (DEBUG_LEVEL_XRUN_RECOVERY)| DEBUG_LEVEL_STARTUP | DEBUG_LEVEL_WAIT | DEBUG_LEVEL_PACKETCOUNTER)
+	//#define DEBUG_LEVEL (DEBUG_LEVEL_BUFFERS | DEBUG_LEVEL_RUN_CYCLE | (DEBUG_LEVEL_XRUN_RECOVERY)| DEBUG_LEVEL_STARTUP )
+	//#define DEBUG_LEVEL (DEBUG_LEVEL_RUN_CYCLE | (DEBUG_LEVEL_XRUN_RECOVERY)| DEBUG_LEVEL_STARTUP | DEBUG_LEVEL_PACKETCOUNTER| DEBUG_LEVEL_WAIT)
+	#define DEBUG_LEVEL (  	\
+			  	0 * DEBUG_LEVEL_BUFFERS | \
+				0 * DEBUG_LEVEL_HANDLERS | \
+			       	0 * DEBUG_LEVEL_HANDLERS_LOWLEVEL | \
+				1 * DEBUG_LEVEL_XRUN_RECOVERY | \
+				0 * DEBUG_LEVEL_WAIT | \
+				0 * DEBUG_LEVEL_RUN_CYCLE | \
+				1 * DEBUG_LEVEL_PACKETCOUNTER | \
+				1 * DEBUG_LEVEL_STARTUP | \
+				0 * DEBUG_LEVEL_THREADS | \
+				0 * DEBUG_LEVEL_STREAMS \
+			    )
+
+	//#define DEBUG_LEVEL (DEBUG_LEVEL_XRUN_RECOVERY | DEBUG_LEVEL_STARTUP | DEBUG_LEVEL_PACKETCOUNTER)
+
+
+#else
+	#define DEBUG_LEVEL
+	
+	#define printMessage(format, args...) freebob_messagebuffer_add( "FREEBOB MSG: " format, ##args )
+	#define printError(format, args...)   freebob_messagebuffer_add( "FREEBOB ERR: " format, ##args )
+	
+	#define printEnter() 
+	#define printExit() 
+	
+	#define debugError(format, args...) 
+	#define debugPrint(Level, format, args...) 
+	#define debugPrintShort(Level, format, args...)	
+	#define debugPrintWithTimeStamp(Level, format, args...)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Index: branches/freebob-syt-experiments/src/libfreebobstreaming/cip.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobstreaming/cip.h (revision 190)
+++ branches/freebob-syt-experiments/src/libfreebobstreaming/cip.h (revision 190)
@@ -0,0 +1,143 @@
+#ifndef _IEC61883_CIP_PRIVATE_H
+#define _IEC61883_CIP_PRIVATE_H
+
+#include <libraw1394/raw1394.h>
+#include <endian.h>
+
+#define IEC61883_FMT_DV 0x00
+#define IEC61883_FMT_AMDTP 0x10
+#define IEC61883_FMT_MPEG2 0x20
+
+#define CIP_TRANSFER_DELAY 9000
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+
+struct iec61883_packet {
+	/* First quadlet */
+	unsigned int dbs      : 8;
+	unsigned int eoh0     : 2;
+	unsigned int sid      : 6;
+
+	unsigned int dbc      : 8;
+	unsigned int fn       : 2;
+	unsigned int qpc      : 3;
+	unsigned int sph      : 1;
+	unsigned int reserved : 2;
+
+	/* Second quadlet */
+	unsigned int fdf      : 8;
+	unsigned int eoh1     : 2;
+	unsigned int fmt      : 6;
+
+	unsigned int syt      : 16;
+
+	unsigned char data[0];
+};
+
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
+
+struct iec61883_packet {
+	/* First quadlet */
+	unsigned int sid      : 6;
+	unsigned int eoh0     : 2;
+	unsigned int dbs      : 8;
+
+	unsigned int reserved : 2;
+	unsigned int sph      : 1;
+	unsigned int qpc      : 3;
+	unsigned int fn       : 2;
+	unsigned int dbc      : 8;
+
+	/* Second quadlet */
+	unsigned int fmt      : 6;
+	unsigned int eoh1     : 2;
+	unsigned int fdf      : 8;
+
+	unsigned int syt      : 16;
+
+	unsigned char data[0];
+};
+
+#else
+
+#error Unknown bitfield type
+
+#endif
+
+/*
+ * The TAG value is present in the isochronous header (first quadlet). It
+ * provides a high level label for the format of data carried by the
+ * isochronous packet.
+ */
+
+#define IEC61883_TAG_WITHOUT_CIP 0 /* CIP header NOT included */
+#define IEC61883_TAG_WITH_CIP    1 /* CIP header included. */
+#define IEC61883_TAG_RESERVED1   2 /* Reserved */
+#define IEC61883_TAG_RESERVED2   3 /* Reserved */
+
+#define IEC61883_FDF_NODATA   0xFF
+		
+/* AM824 format definitions. */
+#define IEC61883_FDF_AM824 0x00
+#define IEC61883_FDF_AM824_CONTROLLED 0x04
+#define IEC61883_FDF_SFC_MASK 0x03
+
+#define IEC61883_AM824_LABEL              0x40
+#define IEC61883_AM824_LABEL_RAW_24BITS   0x40
+#define IEC61883_AM824_LABEL_RAW_20BITS   0x41
+#define IEC61883_AM824_LABEL_RAW_16BITS   0x42
+#define IEC61883_AM824_LABEL_RAW_RESERVED 0x43
+
+#define IEC61883_AM824_VBL_24BITS   0x0
+#define IEC61883_AM824_VBL_20BITS   0x1
+#define IEC61883_AM824_VBL_16BITS   0x2
+#define IEC61883_AM824_VBL_RESERVED 0x3
+
+/* IEC-60958 format definitions. */
+#define IEC60958_LABEL   0x0
+#define IEC60958_PAC_B   0x3 /* Preamble Code 'B': Start of channel 1, at
+			      * the start of a data block. */
+#define IEC60958_PAC_RSV 0x2 /* Preamble Code 'RESERVED' */
+#define IEC60958_PAC_M   0x1 /* Preamble Code 'M': Start of channel 1 that
+			      *	is not at the start of a data block. */
+#define IEC60958_PAC_W   0x0 /* Preamble Code 'W': start of channel 2. */
+#define IEC60958_DATA_VALID   0 /* When cleared means data is valid. */
+#define IEC60958_DATA_INVALID 1 /* When set means data is not suitable for an ADC. */
+
+struct iec61883_fraction {
+	int integer;
+	int numerator;
+	int denominator;
+};
+
+struct iec61883_cip {
+	struct iec61883_fraction cycle_offset;
+	struct iec61883_fraction ticks_per_syt_offset;
+	struct iec61883_fraction ready_samples;
+	struct iec61883_fraction samples_per_cycle;
+	int dbc, dbs;
+	int cycle_count;
+	int cycle_count2;
+	int mode;
+	int syt_interval;
+	int dimension;
+	int rate;
+	int fdf;
+	int format;
+};
+
+void
+iec61883_cip_init(struct iec61883_cip *cip, int format, int fdf,
+		int rate, int dbs, int syt_interval);
+void 
+iec61883_cip_set_transmission_mode(struct iec61883_cip *ptz, int mode);
+
+int 
+iec61883_cip_get_max_packet_size(struct iec61883_cip *ptz);
+
+int
+iec61883_cip_fill_header(raw1394handle_t handle, struct iec61883_cip *cip,
+		struct iec61883_packet *packet);
+
+
+#endif
Index: branches/freebob-syt-experiments/src/libfreebobstreaming/messagebuffer.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobstreaming/messagebuffer.h (revision 185)
+++ branches/freebob-syt-experiments/src/libfreebobstreaming/messagebuffer.h (revision 185)
@@ -0,0 +1,43 @@
+/* 
+ * Modifications for FreeBoB by Pieter Palmers
+ 	Copied from the jackd sources
+	function names changed in order to avoid naming problems when using this in
+	a jackd backend.
+ */
+ 
+/*
+ * messagebuffer.h -- realtime-safe message interface for jackd.
+ *
+ *  This function is included in libjack so backend drivers can use
+ *  it, *not* for external client processes.  The VERBOSE() and
+ *  MESSAGE() macros are realtime-safe.
+ */
+
+/*
+ *  Copyright (C) 2004 Rui Nuno Capela, Steve Harris
+ *  
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2.1 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program 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 Lesser General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program; if not, write to the Free Software 
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __freebob_messagebuffer_h__
+#define __freebob_messagebuffer_h__
+
+void freebob_messagebuffer_init();
+void freebob_messagebuffer_exit();
+
+void freebob_messagebuffer_add(const char *fmt, ...);
+
+#endif /* __freebob_messagebuffer_h__ */
Index: branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_connections.c
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_connections.c (revision 194)
+++ branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_connections.c (revision 194)
@@ -0,0 +1,350 @@
+/*
+ *   FreeBob Streaming API
+ *   FreeBob = Firewire (pro-)audio for linux
+ *
+ *   http://freebob.sf.net
+ *
+ *   Copyright (C) 2005 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program 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 General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * 
+ *
+ */
+
+/* freebob_connections.c
+ *
+ * Connection handling
+ *
+ */
+#include <libraw1394/raw1394.h>
+#include <libiec61883/iec61883.h>
+
+#include "libfreebob/freebob_streaming.h"
+#include "freebob_streaming_private.h"
+#include "freebob_connections.h"
+#include "freebob_debug.h"
+
+raw1394handle_t freebob_open_raw1394 (int port)
+{
+	raw1394handle_t raw1394_handle;
+	int ret;
+	int stale_port_info;
+  
+	/* open the connection to libraw1394 */
+	raw1394_handle = raw1394_new_handle ();
+	if (!raw1394_handle) {
+		if (errno == 0) {
+			printError("This version of libraw1394 is "
+				    "incompatible with your kernel\n");
+		} else {
+			printError("Could not create libraw1394 "
+				    "handle: %s\n", strerror (errno));
+		}
+
+		return NULL;
+	}
+  
+	/* set the port we'll be using */
+	stale_port_info = 1;
+	do {
+		ret = raw1394_get_port_info (raw1394_handle, NULL, 0);
+		if (ret <= port) {
+			printError("IEEE394 port %d is not available\n", port);
+			raw1394_destroy_handle (raw1394_handle);
+			return NULL;
+		}
+  
+		ret = raw1394_set_port (raw1394_handle, port);
+		if (ret == -1) {
+			if (errno != ESTALE) {
+				printError("Couldn't use IEEE394 port %d: %s\n",
+					    port, strerror (errno));
+				raw1394_destroy_handle (raw1394_handle);
+				return NULL;
+			}
+		}
+		else {
+			stale_port_info = 0;
+		}
+	} while (stale_port_info);
+  
+	return raw1394_handle;
+}
+
+int freebob_streaming_reset_connection(freebob_device_t * dev, freebob_connection_t *connection) {
+	int s=0;
+	int err=0;
+	
+	assert(dev);
+	assert(connection);
+	
+	printEnter();
+	
+	for (s=0;s<connection->nb_streams;s++) {
+		err=freebob_streaming_reset_stream(dev,&connection->streams[s]);
+		if(err) {
+			printError("Could not reset stream %d",s);
+			break;
+		}
+		
+	}
+	
+	// reset the event buffer, discard all content
+	freebob_ringbuffer_reset(connection->event_buffer);
+	
+	// reset the timestamp buffer, discard all content
+	freebob_ringbuffer_reset(connection->timestamp_buffer);
+	
+	// reset the event counter
+	connection->status.events=0;
+	
+	// reset the boundary counter
+	connection->status.frames_left = 0;
+	
+	// reset the counters
+	connection->status.xruns = 0;
+	connection->status.packets=0;	
+
+#ifdef DEBUG
+	connection->status.total_packets_prev=0;
+#endif
+
+	connection->status.dropped=0;
+
+	// make sure the connection is polled next time
+	if(connection->pfd) { // this can be called before everything is init'ed
+		connection->pfd->events=POLLIN;
+	}
+
+	printExit();
+	
+	return 0;
+	
+}
+
+int freebob_streaming_init_connection(freebob_device_t * dev, freebob_connection_t *connection) {
+	int err=0;
+	int s=0;
+	
+	connection->status.frames_left=0;
+	
+	connection->parent=dev;
+		
+	// create raw1394 handles
+	connection->raw_handle=freebob_open_raw1394(connection->spec.port);
+	if (!connection->raw_handle) {
+		printError("Could not get raw1394 handle\n");
+		return -ENOMEM;
+	}
+	raw1394_set_userdata(connection->raw_handle, (void *)connection);
+	
+	connection->iso.speed = RAW1394_ISO_SPEED_400;
+	
+	connection->iso.bandwidth=-1;
+	connection->iso.startcycle=-1;
+	
+	// allocate the event ringbuffer
+	if( !(connection->event_buffer=freebob_ringbuffer_create(
+			(connection->spec.dimension * dev->options.nb_buffers * dev->options.period_size) * sizeof(quadlet_t)))) {
+		printError("Could not allocate memory event ringbuffer");
+		return -ENOMEM;
+			
+	}
+	// allocate the temporary cluster buffer
+	if( !(connection->cluster_buffer=(char *)calloc(connection->spec.dimension,sizeof(quadlet_t)))) {
+		printError("Could not allocate temporary cluster buffer");
+		freebob_ringbuffer_free(connection->event_buffer);
+		return -ENOMEM;
+	}
+	
+	// allocate the timestamp buffer
+	if( !(connection->timestamp_buffer=freebob_ringbuffer_create(TIMESTAMP_BUFFER_SIZE * sizeof(freebob_timestamp_t)))) {
+		printError("Could not allocate timestamp ringbuffer");
+		freebob_ringbuffer_free(connection->event_buffer);
+		free(connection->cluster_buffer);
+		return -ENOMEM;
+	}
+	
+	connection->total_delay=0;
+	
+	/*
+	 * init the streams this connection is composed of
+	 */
+	assert(connection->spec.stream_info);
+	connection->nb_streams=connection->spec.stream_info->nb_streams;
+	
+	connection->streams=calloc(connection->nb_streams, sizeof(freebob_stream_t));
+	
+	if(!connection->streams) {
+		printError("Could not allocate memory for streams");
+		free(connection->cluster_buffer);
+		freebob_ringbuffer_free(connection->event_buffer);
+		return -ENOMEM;
+	}
+		
+	err=0;
+	for (s=0;s<connection->nb_streams;s++) {
+		err=freebob_streaming_init_stream(dev,&connection->streams[s],connection->spec.stream_info->streams[s]);
+		if(err) {
+			printError("Could not init stream %d",s);
+			break;
+		}
+		
+		// set the stream parent relation
+		connection->streams[s].parent=connection;
+		
+		// register the stream in the stream list used for reading out
+		if(connection->spec.direction==FREEBOB_CAPTURE) {
+			freebob_streaming_register_capture_stream(dev, &connection->streams[s]);
+		} else {
+			freebob_streaming_register_playback_stream(dev, &connection->streams[s]);
+		}
+	}	
+	if (err) {
+		debugPrint(DEBUG_LEVEL_STARTUP,"  Cleaning up streams...\n");
+		while(s--) { // TODO: check if this counts correctly
+			debugPrint(DEBUG_LEVEL_STARTUP,"  Cleaning up stream %d...\n",s);
+			freebob_streaming_cleanup_stream(dev, &connection->streams[s]);
+		}
+		
+		free(connection->streams);
+		free(connection->cluster_buffer);
+		freebob_ringbuffer_free(connection->event_buffer);
+		freebob_ringbuffer_free(connection->timestamp_buffer);
+		
+		return err;		
+	}
+	
+	// FIXME: a flaw of the current approach is that a spec->stream_info isn't a valid pointer 
+	connection->spec.stream_info=NULL;
+	
+	// put the connection into a know state
+	freebob_streaming_reset_connection(dev, connection);
+
+	return 0;
+}
+
+int freebob_streaming_cleanup_connection(freebob_device_t * dev, freebob_connection_t *connection) {
+
+	unsigned int s;
+	
+	for (s=0;s<connection->nb_streams;s++) {
+		debugPrint(DEBUG_LEVEL_STARTUP,"  Cleaning up stream %d...\n",s);
+		freebob_streaming_cleanup_stream(dev, &connection->streams[s]);
+	}
+	
+	free(connection->streams);
+	free(connection->cluster_buffer);
+	freebob_ringbuffer_free(connection->event_buffer);
+	freebob_ringbuffer_free(connection->timestamp_buffer);
+	
+	raw1394_destroy_handle(connection->raw_handle);
+/*
+	assert(connection->status.packet_info_table);
+	free(connection->status.packet_info_table);
+	connection->status.packet_info_table=NULL;
+*/
+	
+	return 0;
+	
+}
+
+/**
+ * Initializes a stream_t based upon an stream_info_t 
+ */
+int freebob_streaming_init_stream(freebob_device_t* dev, freebob_stream_t *dst, freebob_stream_spec_t *src) {
+	assert(dev);
+	assert(dst);
+	assert(src);
+	
+	memcpy(&dst->spec,src,sizeof(freebob_stream_spec_t));
+	
+	// allocate the ringbuffer
+	// the lock free ringbuffer needs one extra frame 
+	// it can only be filled to size-1 bytes
+
+	// keep the ringbuffer aligned by adding sizeof(sample_t) bytes instead of just 1
+	int buffer_size_frames=dev->options.nb_buffers*dev->options.period_size+1;
+	dst->buffer=freebob_ringbuffer_create(buffer_size_frames*sizeof(freebob_sample_t));
+	
+	
+	// initialize the decoder stuff to use the per-stream read functions
+	dst->buffer_type=freebob_buffer_type_per_stream;
+	dst->user_buffer=NULL;
+	
+	// create any data structures for the decode buffers
+	freebob_streaming_set_stream_buffer(dev, dst, NULL, freebob_buffer_type_per_stream);
+	
+	// no other init needed
+	return 0;
+	
+}
+
+/**
+  * destroys a stream_t 
+  */
+void freebob_streaming_cleanup_stream(freebob_device_t* dev, freebob_stream_t *dst) {
+	assert(dev);
+	assert(dst);
+	assert(dst->user_buffer);
+	
+	freebob_streaming_free_stream_buffer(dev, dst);
+		
+	freebob_ringbuffer_free(dst->buffer);
+	return;
+	
+}
+
+/**
+  * puts a stream into a known state
+  */
+int freebob_streaming_reset_stream(freebob_device_t* dev, freebob_stream_t *dst) {
+	assert(dev);
+	assert(dst);
+	
+	freebob_ringbuffer_reset(dst->buffer);
+	return 0;
+}
+
+
+int freebob_streaming_prefill_stream(freebob_device_t* dev, freebob_stream_t *stream) {
+	assert(stream);
+	int towrite=0;
+	int written=0;
+	char *buffer=NULL;
+			
+	switch(stream->spec.format) {
+		case IEC61883_STREAM_TYPE_MBLA:
+			towrite=dev->options.period_size*dev->options.nb_buffers*sizeof(freebob_sample_t);
+			
+			// calloc clears the allocated memory
+			buffer=calloc(1,towrite);
+			written=freebob_ringbuffer_write(stream->buffer,(char *)buffer,towrite);
+			free(buffer);
+			
+			if(written != towrite) {
+				printError("Could not prefill the buffer. Written (%d/%d) of (%d/%d) bytes/frames\n",
+					written,written/sizeof(freebob_sample_t),towrite,towrite/sizeof(freebob_sample_t));
+				return -1;
+			}
+		break;
+		case IEC61883_STREAM_TYPE_MIDI: // no prefill nescessary
+		case IEC61883_STREAM_TYPE_SPDIF: // unsupported
+		default:
+		break;
+	}
+	return 0;
+}
Index: branches/freebob-syt-experiments/src/libfreebobstreaming/thread.c
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobstreaming/thread.c (revision 185)
+++ branches/freebob-syt-experiments/src/libfreebobstreaming/thread.c (revision 185)
@@ -0,0 +1,220 @@
+/*
+
+  Modifications for FreeBoB by Pieter Palmers
+  
+  Capabilities code removed
+  
+  Copied from the jackd sources
+  function names changed in order to avoid naming problems when using this in
+  a jackd backend.
+  
+  Copyright (C) 2004 Paul Davis
+  
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  This program 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 Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+  Thread creation function including workarounds for real-time scheduling
+  behaviour on different glibc versions.
+
+*/
+
+#include <config.h>
+
+//#define DEBUG
+#include "freebob_debug.h"
+#include "libfreebob/freebob_streaming.h"
+
+//#include <jack/jack.h>
+#include <thread.h>
+//#include <jack/internal.h>
+
+#include <pthread.h>
+#include <sched.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+// #include "local.h"
+
+#ifdef FREEBOB_USE_MACH_THREADS
+#include <sysdeps/pThreadUtilities.h>
+#endif
+
+static inline void
+log_result (char *msg, int res)
+{
+	char outbuf[500];
+	snprintf(outbuf, sizeof(outbuf),
+		 "freebob_create_thread: error %d %s: %s",
+		 res, msg, strerror(res));
+	printMessage("%s",outbuf);
+}
+
+static void*
+freebob_thread_proxy (void* varg)
+{
+	freebob_thread_arg_t* arg = (freebob_thread_arg_t*) varg;
+	void* (*work)(void*);
+	void* warg;
+// 	freebob_device_t* dev = arg->device;
+
+	if (arg->realtime) {
+		freebob_acquire_real_time_scheduling (pthread_self(), arg->priority);
+	}
+
+	warg = arg->arg;
+	work = arg->work_function;
+
+	free (arg);
+	
+	return work (warg);
+}
+
+int
+freebob_streaming_create_thread (freebob_device_t* dev,
+			   pthread_t* thread,
+			   int priority,
+			   int realtime,
+			   void*(*start_routine)(void*),
+			   void* arg)
+{
+#ifndef FREEBOB_USE_MACH_THREADS
+	pthread_attr_t attr;
+	freebob_thread_arg_t* thread_args;
+#endif /* !FREEBOB_USE_MACH_THREADS */
+
+	int result = 0;
+
+	if (!realtime) {
+		result = pthread_create (thread, 0, start_routine, arg);
+		if (result) {
+			log_result("creating thread with default parameters",
+				   result);
+		}
+		return result;
+	}
+
+	/* realtime thread. this disgusting mess is a reflection of
+	 * the 2nd-class nature of RT programming under POSIX in
+	 * general and Linux in particular.
+	 */
+
+#ifndef FREEBOB_USE_MACH_THREADS
+
+	pthread_attr_init(&attr);
+	result = pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
+	if (result) {
+		log_result("requesting explicit scheduling", result);
+		return result;
+	}
+	result = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
+	if (result) {
+		log_result("requesting joinable thread creation", result);
+		return result;
+	}
+	result = pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
+	if (result) {
+		log_result("requesting system scheduling scope", result);
+		return result;
+	}
+
+	thread_args = (freebob_thread_arg_t *) malloc (sizeof (freebob_thread_arg_t));
+
+	thread_args->device = dev;
+	thread_args->work_function = start_routine;
+	thread_args->arg = arg;
+	thread_args->realtime = 1;
+	thread_args->priority = priority;
+
+	result = pthread_create (thread, &attr, freebob_thread_proxy, thread_args);
+	if (result) {
+		log_result ("creating realtime thread", result);
+		return result;
+	}
+
+#else /* FREEBOB_USE_MACH_THREADS */
+
+	result = pthread_create (thread, 0, start_routine, arg);
+	if (result) {
+		log_result ("creating realtime thread", result);
+		return result;
+	}
+
+	/* time constraint thread */
+	setThreadToPriority (*thread, 96, TRUE, 10000000);
+	
+#endif /* FREEBOB_USE_MACH_THREADS */
+
+	return 0;
+}
+
+#if FREEBOB_USE_MACH_THREADS 
+
+int
+freebob_drop_real_time_scheduling (pthread_t thread)
+{
+	setThreadToPriority(thread, 31, FALSE, 10000000);
+	return 0;       
+}
+
+int
+freebob_acquire_real_time_scheduling (pthread_t thread, int priority)
+	//priority is unused
+{
+	setThreadToPriority(thread, 96, TRUE, 10000000);
+	return 0;
+}
+
+#else /* !FREEBOB_USE_MACH_THREADS */
+
+int
+freebob_drop_real_time_scheduling (pthread_t thread)
+{
+	struct sched_param rtparam;
+	int x;
+	
+	memset (&rtparam, 0, sizeof (rtparam));
+	rtparam.sched_priority = 0;
+
+	if ((x = pthread_setschedparam (thread, SCHED_OTHER, &rtparam)) != 0) {
+		printError ("cannot switch to normal scheduling priority(%s)\n",
+			    strerror (errno));
+		return -1;
+	}
+        return 0;
+}
+
+int
+freebob_acquire_real_time_scheduling (pthread_t thread, int priority)
+{
+	struct sched_param rtparam;
+	int x;
+	
+	memset (&rtparam, 0, sizeof (rtparam));
+	rtparam.sched_priority = priority;
+	
+	if ((x = pthread_setschedparam (thread, SCHED_FIFO, &rtparam)) != 0) {
+		printError ("cannot use real-time scheduling (FIFO at priority %d) "
+			    "[for thread %d, from thread %d] (%d: %s)", 
+			    rtparam.sched_priority, 
+			    (int)thread, (int)pthread_self(),
+			    x, strerror (x));
+		return -1;
+	}
+
+        return 0;
+}
+
+#endif /* FREEBOB_USE_MACH_THREADS */
+
Index: branches/freebob-syt-experiments/src/libfreebobstreaming/Makefile.am
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobstreaming/Makefile.am (revision 192)
+++ branches/freebob-syt-experiments/src/libfreebobstreaming/Makefile.am (revision 192)
@@ -0,0 +1,31 @@
+# Makefile.am - Makefile template
+# Copyright (C) 2006 by Pieter Palmers.
+# Copyright (C) 2005 by Daniel Wagner.
+#
+# This file is part of FreeBob.
+#
+# FreeBob is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# FreeBob 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 General Public License
+# along with FreeBob; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+noinst_LTLIBRARIES = libfreebobstreaming.la
+
+libfreebobstreaming_la_SOURCES =  			\
+	cip.c freebob_streaming.c messagebuffer.c \
+	freebob_connections.c ringbuffer.c thread.c \
+	cip.h freebob_connections.h messagebuffer.h \
+	ringbuffer.h freebob_streaming_private.h freebob_debug.h thread.h
+
+INCLUDES = $(LIBRAW1394_CFLAGS) $(LIBIEC61883_CFLAGS) -I$(top_srcdir)/src \
+	-I$(top_srcdir)
+libfreebobstreaming_la_LIBADD  = $(LIBRAW1394_LIBS) $(LIBIEC61883_LIBS) $(LIBAVC_LIBS)
+
+MAINTAINERCLEANFILES = Makefile.in
Index: branches/freebob-syt-experiments/src/libfreebobstreaming/ringbuffer.c
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobstreaming/ringbuffer.c (revision 159)
+++ branches/freebob-syt-experiments/src/libfreebobstreaming/ringbuffer.c (revision 159)
@@ -0,0 +1,366 @@
+/*
+  Modifications for FreeBoB by Pieter Palmers
+    
+  Copied from the jackd sources
+  function names changed in order to avoid naming problems when using this in
+  a jackd backend.
+  
+  Copyright (C) 2000 Paul Davis
+  Copyright (C) 2003 Rohan Drape
+    
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+    
+  This program 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 Lesser General Public License for more details.
+    
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software 
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    
+  ISO/POSIX C version of Paul Davis's lock free ringbuffer C++ code.
+  This is safe for the case of one read thread and one write thread.
+*/
+
+//#include <config.h>
+
+#include <stdlib.h>
+#include <string.h>
+#ifdef USE_MLOCK
+#include <sys/mman.h>
+#endif /* USE_MLOCK */
+#include "ringbuffer.h"
+
+/* Create a new ringbuffer to hold at least `sz' bytes of data. The
+   actual buffer size is rounded up to the next power of two.  */
+
+freebob_ringbuffer_t *
+freebob_ringbuffer_create (size_t sz)
+{
+  int power_of_two;
+  freebob_ringbuffer_t *rb;
+
+  rb = malloc (sizeof (freebob_ringbuffer_t));
+
+  for (power_of_two = 1; 1 << power_of_two < sz; power_of_two++);
+
+  rb->size = 1 << power_of_two;
+  rb->size_mask = rb->size;
+  rb->size_mask -= 1;
+  rb->write_ptr = 0;
+  rb->read_ptr = 0;
+  rb->buf = malloc (rb->size);
+  rb->mlocked = 0;
+
+  return rb;
+}
+
+/* Free all data associated with the ringbuffer `rb'. */
+
+void
+freebob_ringbuffer_free (freebob_ringbuffer_t * rb)
+{
+#ifdef USE_MLOCK
+  if (rb->mlocked) {
+    munlock (rb->buf, rb->size);
+  }
+#endif /* USE_MLOCK */
+  free (rb->buf);
+}
+
+/* Lock the data block of `rb' using the system call 'mlock'.  */
+
+int
+freebob_ringbuffer_mlock (freebob_ringbuffer_t * rb)
+{
+#ifdef USE_MLOCK
+  if (mlock (rb->buf, rb->size)) {
+    return -1;
+  }
+#endif /* USE_MLOCK */
+  rb->mlocked = 1;
+  return 0;
+}
+
+/* Reset the read and write pointers to zero. This is not thread
+   safe. */
+
+void
+freebob_ringbuffer_reset (freebob_ringbuffer_t * rb)
+{
+  rb->read_ptr = 0;
+  rb->write_ptr = 0;
+}
+
+/* Return the number of bytes available for reading.  This is the
+   number of bytes in front of the read pointer and behind the write
+   pointer.  */
+
+size_t
+freebob_ringbuffer_read_space (const freebob_ringbuffer_t * rb)
+{
+  size_t w, r;
+
+  w = rb->write_ptr;
+  r = rb->read_ptr;
+
+  if (w > r) {
+    return w - r;
+  } else {
+    return (w - r + rb->size) & rb->size_mask;
+  }
+}
+
+/* Return the number of bytes available for writing.  This is the
+   number of bytes in front of the write pointer and behind the read
+   pointer.  */
+
+size_t
+freebob_ringbuffer_write_space (const freebob_ringbuffer_t * rb)
+{
+  size_t w, r;
+
+  w = rb->write_ptr;
+  r = rb->read_ptr;
+
+  if (w > r) {
+    return ((r - w + rb->size) & rb->size_mask) - 1;
+  } else if (w < r) {
+    return (r - w) - 1;
+  } else {
+    return rb->size - 1;
+  }
+}
+
+/* The copying data reader.  Copy at most `cnt' bytes from `rb' to
+   `dest'.  Returns the actual number of bytes copied. */
+
+size_t
+freebob_ringbuffer_read (freebob_ringbuffer_t * rb, char *dest, size_t cnt)
+{
+  size_t free_cnt;
+  size_t cnt2;
+  size_t to_read;
+  size_t n1, n2;
+
+  if ((free_cnt = freebob_ringbuffer_read_space (rb)) == 0) {
+    return 0;
+  }
+
+  to_read = cnt > free_cnt ? free_cnt : cnt;
+
+  cnt2 = rb->read_ptr + to_read;
+
+  if (cnt2 > rb->size) {
+    n1 = rb->size - rb->read_ptr;
+    n2 = cnt2 & rb->size_mask;
+  } else {
+    n1 = to_read;
+    n2 = 0;
+  }
+
+  memcpy (dest, &(rb->buf[rb->read_ptr]), n1);
+  rb->read_ptr += n1;
+  rb->read_ptr &= rb->size_mask;
+
+  if (n2) {
+    memcpy (dest + n1, &(rb->buf[rb->read_ptr]), n2);
+    rb->read_ptr += n2;
+    rb->read_ptr &= rb->size_mask;
+  }
+
+  return to_read;
+}
+
+/* The copying data reader w/o read pointer advance.  Copy at most 
+   `cnt' bytes from `rb' to `dest'.  Returns the actual number of bytes 
+copied. */
+
+size_t
+freebob_ringbuffer_peek (freebob_ringbuffer_t * rb, char *dest, size_t cnt)
+{
+  size_t free_cnt;
+  size_t cnt2;
+  size_t to_read;
+  size_t n1, n2;
+  size_t tmp_read_ptr;
+
+  tmp_read_ptr = rb->read_ptr;
+
+  if ((free_cnt = freebob_ringbuffer_read_space (rb)) == 0) {
+    return 0;
+  }
+
+  to_read = cnt > free_cnt ? free_cnt : cnt;
+
+  cnt2 = tmp_read_ptr + to_read;
+
+  if (cnt2 > rb->size) {
+    n1 = rb->size - tmp_read_ptr;
+    n2 = cnt2 & rb->size_mask;
+  } else {
+    n1 = to_read;
+    n2 = 0;
+  }
+
+  memcpy (dest, &(rb->buf[tmp_read_ptr]), n1);
+  tmp_read_ptr += n1;
+  tmp_read_ptr &= rb->size_mask;
+
+  if (n2) {
+    memcpy (dest + n1, &(rb->buf[tmp_read_ptr]), n2);
+    tmp_read_ptr += n2;
+    tmp_read_ptr &= rb->size_mask;
+  }
+
+  return to_read;
+}
+
+
+/* The copying data writer.  Copy at most `cnt' bytes to `rb' from
+   `src'.  Returns the actual number of bytes copied. */
+
+size_t
+freebob_ringbuffer_write (freebob_ringbuffer_t * rb, const char *src, size_t cnt)
+{
+  size_t free_cnt;
+  size_t cnt2;
+  size_t to_write;
+  size_t n1, n2;
+
+  if ((free_cnt = freebob_ringbuffer_write_space (rb)) == 0) {
+    return 0;
+  }
+
+  to_write = cnt > free_cnt ? free_cnt : cnt;
+
+  cnt2 = rb->write_ptr + to_write;
+
+  if (cnt2 > rb->size) {
+    n1 = rb->size - rb->write_ptr;
+    n2 = cnt2 & rb->size_mask;
+  } else {
+    n1 = to_write;
+    n2 = 0;
+  }
+
+  memcpy (&(rb->buf[rb->write_ptr]), src, n1);
+  rb->write_ptr += n1;
+  rb->write_ptr &= rb->size_mask;
+
+  if (n2) {
+    memcpy (&(rb->buf[rb->write_ptr]), src + n1, n2);
+    rb->write_ptr += n2;
+    rb->write_ptr &= rb->size_mask;
+  }
+
+  return to_write;
+}
+
+/* Advance the read pointer `cnt' places. */
+
+void
+freebob_ringbuffer_read_advance (freebob_ringbuffer_t * rb, size_t cnt)
+{
+  rb->read_ptr += cnt;
+  rb->read_ptr &= rb->size_mask;
+}
+
+/* Advance the write pointer `cnt' places. */
+
+void
+freebob_ringbuffer_write_advance (freebob_ringbuffer_t * rb, size_t cnt)
+{
+  rb->write_ptr += cnt;
+  rb->write_ptr &= rb->size_mask;
+}
+
+/* The non-copying data reader.  `vec' is an array of two places.  Set
+   the values at `vec' to hold the current readable data at `rb'.  If
+   the readable data is in one segment the second segment has zero
+   length.  */
+
+void
+freebob_ringbuffer_get_read_vector (const freebob_ringbuffer_t * rb,
+				 freebob_ringbuffer_data_t * vec)
+{
+  size_t free_cnt;
+  size_t cnt2;
+  size_t w, r;
+
+  w = rb->write_ptr;
+  r = rb->read_ptr;
+
+  if (w > r) {
+    free_cnt = w - r;
+  } else {
+    free_cnt = (w - r + rb->size) & rb->size_mask;
+  }
+
+  cnt2 = r + free_cnt;
+
+  if (cnt2 > rb->size) {
+
+    /* Two part vector: the rest of the buffer after the current write
+       ptr, plus some from the start of the buffer. */
+
+    vec[0].buf = &(rb->buf[r]);
+    vec[0].len = rb->size - r;
+    vec[1].buf = rb->buf;
+    vec[1].len = cnt2 & rb->size_mask;
+
+  } else {
+
+    /* Single part vector: just the rest of the buffer */
+
+    vec[0].buf = &(rb->buf[r]);
+    vec[0].len = free_cnt;
+    vec[1].len = 0;
+  }
+}
+
+/* The non-copying data writer.  `vec' is an array of two places.  Set
+   the values at `vec' to hold the current writeable data at `rb'.  If
+   the writeable data is in one segment the second segment has zero
+   length.  */
+
+void
+freebob_ringbuffer_get_write_vector (const freebob_ringbuffer_t * rb,
+				  freebob_ringbuffer_data_t * vec)
+{
+  size_t free_cnt;
+  size_t cnt2;
+  size_t w, r;
+
+  w = rb->write_ptr;
+  r = rb->read_ptr;
+
+  if (w > r) {
+    free_cnt = ((r - w + rb->size) & rb->size_mask) - 1;
+  } else if (w < r) {
+    free_cnt = (r - w) - 1;
+  } else {
+    free_cnt = rb->size - 1;
+  }
+
+  cnt2 = w + free_cnt;
+
+  if (cnt2 > rb->size) {
+
+    /* Two part vector: the rest of the buffer after the current write
+       ptr, plus some from the start of the buffer. */
+
+    vec[0].buf = &(rb->buf[w]);
+    vec[0].len = rb->size - w;
+    vec[1].buf = rb->buf;
+    vec[1].len = cnt2 & rb->size_mask;
+  } else {
+    vec[0].buf = &(rb->buf[w]);
+    vec[0].len = free_cnt;
+    vec[1].len = 0;
+  }
+}
Index: branches/freebob-syt-experiments/src/libfreebobstreaming/cip.c
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobstreaming/cip.c (revision 190)
+++ branches/freebob-syt-experiments/src/libfreebobstreaming/cip.c (revision 190)
@@ -0,0 +1,207 @@
+/*
+ * libiec61883 - Linux IEEE 1394 streaming media library.
+ * Copyright (C) 2004 Kristian Hogsberg, Dan Dennedy, and Dan Maas.
+ * This file written by Kristian Hogsberg.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <libiec61883/iec61883.h>
+#include "cip.h"
+
+#include <netinet/in.h>
+
+
+/* Integer fractional math.  When we transmit a 44k1Hz signal we must
+ * send 5 41/80 samples per isochronous cycle, as these occur 8000
+ * times a second.  Of course, we must send an integral number of
+ * samples in a packet, so we use the integer math to alternate
+ * between sending 5 and 6 samples per packet.
+ */
+
+static void
+fraction_init(struct iec61883_fraction *f, int numerator, int denominator)
+{
+  f->integer = numerator / denominator;
+  f->numerator = numerator % denominator;
+  f->denominator = denominator;
+}
+
+static __inline__ void
+fraction_add(struct iec61883_fraction *dst,
+	     struct iec61883_fraction *src1, struct iec61883_fraction *src2)
+{
+  /* assert: src1->denominator == src2->denominator */
+
+  int sum, denom;
+
+  /* We use these two local variables to allow gcc to optimize
+   * the division and the modulo into only one division. */
+
+  sum = src1->numerator + src2->numerator;
+  denom = src1->denominator;
+  dst->integer = src1->integer + src2->integer + sum / denom;
+  dst->numerator = sum % denom;
+  dst->denominator = denom;
+}
+
+static __inline__ void
+fraction_sub_int(struct iec61883_fraction *dst, struct iec61883_fraction *src, int integer)
+{
+  dst->integer = src->integer - integer;
+  dst->numerator = src->numerator;
+  dst->denominator = src->denominator;
+}
+
+static __inline__ int
+fraction_floor(struct iec61883_fraction *frac)
+{
+  return frac->integer;
+}
+
+static __inline__ int
+fraction_ceil(struct iec61883_fraction *frac)
+{
+  return frac->integer + (frac->numerator > 0 ? 1 : 0);
+}
+
+void
+iec61883_cip_init(struct iec61883_cip *ptz, int format, int fdf,
+		int rate, int dbs, int syt_interval)
+{
+  const int transfer_delay = CIP_TRANSFER_DELAY;
+
+  ptz->rate = rate;
+  ptz->cycle_count = transfer_delay / 3072;
+  ptz->cycle_count2 = 0;
+  ptz->format = format;
+  ptz->fdf = fdf;
+  ptz->mode = IEC61883_MODE_BLOCKING_EMPTY;
+  ptz->dbs = dbs;
+  ptz->dbc = 0;
+  ptz->syt_interval = syt_interval;
+
+  fraction_init(&ptz->samples_per_cycle, ptz->rate, 8000);
+  fraction_init(&ptz->ready_samples, 0, 8000);
+
+  /* The ticks_per_syt_offset is initialized to the number of
+   * ticks between syt_interval events.  The number of ticks per
+   * second is 24.576e6, so the number of ticks between
+   * syt_interval events is 24.576e6 * syt_interval / rate.
+   */
+  fraction_init(&ptz->ticks_per_syt_offset,
+		24576000 * ptz->syt_interval, ptz->rate);
+  fraction_init(&ptz->cycle_offset,
+		(transfer_delay % 3072) * ptz->rate, ptz->rate);
+}
+
+void 
+iec61883_cip_set_transmission_mode(struct iec61883_cip *ptz, int mode)
+{
+  ptz->mode = mode;
+}
+
+int 
+iec61883_cip_get_max_packet_size(struct iec61883_cip *ptz)
+{
+  int max_nevents;
+
+  if (ptz->mode == IEC61883_MODE_BLOCKING_EMPTY || ptz->mode == IEC61883_MODE_BLOCKING_NODATA)
+    max_nevents = ptz->syt_interval;
+  else
+    max_nevents = fraction_ceil(&ptz->samples_per_cycle);
+ 
+  return max_nevents * ptz->dbs * 4 + 8;
+}
+
+
+int
+iec61883_cip_fill_header(raw1394handle_t handle, struct iec61883_cip *ptz,
+		struct iec61883_packet *packet)
+{
+  struct iec61883_fraction next;
+  int nevents, nevents_dbc, syt_index, syt;
+
+  fraction_add(&next, &ptz->ready_samples, &ptz->samples_per_cycle);
+  if (ptz->mode == IEC61883_MODE_BLOCKING_EMPTY ||
+      ptz->mode == IEC61883_MODE_BLOCKING_NODATA) {
+    if (fraction_floor(&next) >= ptz->syt_interval)
+      nevents = ptz->syt_interval;
+    else
+      nevents = 0;
+  }
+  else
+    nevents = fraction_floor(&next);
+
+  if (ptz->mode == IEC61883_MODE_BLOCKING_NODATA) {
+    /* The DBC is incremented even with NO_DATA packets. */
+    nevents_dbc = ptz->syt_interval;
+  }
+  else {
+    nevents_dbc = nevents;
+  }
+
+  /* Now that we know how many events to put in the packet, update the
+   * fraction ready_samples. */
+  fraction_sub_int(&ptz->ready_samples, &next, nevents);
+
+  /* Calculate synchronization timestamp (syt). First we
+   * determine syt_index, that is, the index in the packet of
+   * the sample for which the timestamp is valid. */
+  syt_index = (ptz->syt_interval - ptz->dbc) & (ptz->syt_interval - 1);
+  if (syt_index < nevents) {
+    syt = ((ptz->cycle_count << 12) | fraction_floor(&ptz->cycle_offset)) & 0xffff;
+    fraction_add(&ptz->cycle_offset, &ptz->cycle_offset,
+		 &ptz->ticks_per_syt_offset);
+
+    /* This next addition should be modulo 8000 (0x1f40),
+     * but we only use the lower 4 bits of cycle_count, so
+     * we don't need the modulo. */
+    ptz->cycle_count += ptz->cycle_offset.integer / 3072;
+    ptz->cycle_offset.integer %= 3072;
+  }
+  else
+    syt = 0xffff;
+
+  packet->eoh0 = 0;
+
+  /* Our node ID can change after a bus reset, so it is best to fetch
+   * our node ID for each packet. */
+  packet->sid = raw1394_get_local_id( handle ) & 0x3f;
+
+  packet->dbs = ptz->dbs;
+  packet->fn = 0;
+  packet->qpc = 0;
+  packet->sph = 0;
+  packet->reserved = 0;
+  packet->dbc = ptz->dbc;
+  packet->eoh1 = 2;
+  packet->fmt = ptz->format;
+
+  if ( nevents == 0 && ptz->mode == IEC61883_MODE_BLOCKING_NODATA ) {
+    /* FDF code for packets containing dummy data. */
+    packet->fdf = IEC61883_FDF_NODATA;
+  }
+  else {
+    /* FDF code for non-blocking mode and for blocking mode with empty packets. */
+    packet->fdf = ptz->fdf;
+  }
+  
+  packet->syt = htons(syt);
+
+  ptz->dbc += nevents_dbc;
+
+  return nevents;
+}
Index: branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_connections.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_connections.h (revision 194)
+++ branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_connections.h (revision 194)
@@ -0,0 +1,276 @@
+/*
+ *   FreeBob Streaming API
+ *   FreeBob = Firewire (pro-)audio for linux
+ *
+ *   http://freebob.sf.net
+ *
+ *   Copyright (C) 2005 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program 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 General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * 
+ *
+ */
+
+/* freebob_connections.h
+ *
+ * Connection handling
+ *
+ */
+#ifndef __FREEBOB_CONNECTIONS_H__
+#define __FREEBOB_CONNECTIONS_H__
+
+#include "cip.h"
+
+#include "libfreebob/freebob.h"
+#include "ringbuffer.h"
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define TIMESTAMP_BUFFER_SIZE 512
+
+/*
+ * ISO/AM824 packet structures
+ */
+#if __BYTE_ORDER == __BIG_ENDIAN
+
+struct iso_packet_header {
+	unsigned int data_length : 16;
+	unsigned int tag         : 2;
+	unsigned int channel     : 6;
+	unsigned int tcode       : 4;
+	unsigned int sy          : 4;
+};
+
+
+typedef struct packet_info packet_info_t;
+struct packet_info {
+	/* The first part of this structure is a copy of the CIP header 
+	 * This can be memcpy'd from the packet itself.
+	 */
+	/* First quadlet */
+	unsigned int dbs      : 8;
+	unsigned int eoh0     : 2;
+	unsigned int sid      : 6;
+
+	unsigned int dbc      : 8;
+	unsigned int fn       : 2;
+	unsigned int qpc      : 3;
+	unsigned int sph      : 1;
+	unsigned int reserved : 2;
+
+	/* Second quadlet */
+	unsigned int fdf      : 8;
+	unsigned int eoh1     : 2;
+	unsigned int fmt      : 6;
+
+	unsigned int syt      : 16;
+
+	/* the second part is some extra info */
+	unsigned int nevents;
+	unsigned int length;
+};
+
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
+
+struct iso_packet_header {
+	unsigned int data_length : 16;
+	unsigned int channel     : 6;
+	unsigned int tag         : 2;
+	unsigned int sy          : 4;
+	unsigned int tcode       : 4;
+};
+
+typedef struct packet_info packet_info_t;
+struct packet_info {
+	/* The first part of this structure is a copy of the CIP header 
+	 * This can be memcpy'd from the packet itself.
+	 */
+	/* First quadlet */
+	unsigned int sid      : 6;
+	unsigned int eoh0     : 2;
+	unsigned int dbs      : 8;
+
+	unsigned int reserved : 2;
+	unsigned int sph      : 1;
+	unsigned int qpc      : 3;
+	unsigned int fn       : 2;
+	unsigned int dbc      : 8;
+
+	/* Second quadlet */
+	unsigned int fmt      : 6;
+	unsigned int eoh1     : 2;
+	unsigned int fdf      : 8;
+
+	unsigned int syt      : 16;
+
+	/* the second part is some extra info */
+	unsigned int nevents;
+	unsigned int length;
+};
+
+
+#else
+
+#error Unknown bitfield type
+
+#endif
+typedef struct _freebob_timestamp freebob_timestamp_t;
+
+/**
+ * Timestamp structure
+ */
+struct _freebob_timestamp {
+	unsigned int syt;
+	unsigned int cycle;
+};
+
+/*
+ * Connection definition
+ */
+
+typedef struct _freebob_iso_status {
+	int buffers;
+	int prebuffers;
+	int irq_interval;
+	int startcycle;
+	enum raw1394_iso_dma_recv_mode receive_mode;
+
+	int iso_channel;
+	int do_disconnect;
+	int bandwidth;
+
+	int packets_per_period;
+	int max_packet_size; // tailored to result in optimal IRQ timing
+	int packet_size; // expected packet size
+	
+	int hostplug;
+	
+	enum raw1394_iso_speed speed;
+} freebob_iso_status_t;
+
+typedef struct _freebob_connection_status {
+	int packets;
+	int events;
+	int total_events;
+
+	int frames_left;
+
+	int iso_channel;
+	
+	int xruns;
+		
+	struct iec61883_cip cip;
+	
+	int dropped;
+	
+	
+#ifdef DEBUG
+	int fdf;
+	int total_packets_prev;
+	int last_cycle;	
+#endif
+
+	int packet_info_table_size;
+	packet_info_t *packet_info_table;
+	
+	struct _freebob_connection_status *master;
+
+	freebob_timestamp_t last_timestamp;	
+	
+} freebob_connection_status_t;
+
+typedef struct _freebob_stream freebob_stream_t;
+typedef struct _freebob_connection freebob_connection_t;
+
+struct _freebob_connection {
+	freebob_device_t *parent;
+	
+	freebob_connection_spec_t spec;
+// 	freebob_stream_info_t stream_info;
+	freebob_connection_status_t status;
+	freebob_iso_status_t iso;
+	
+	/* pointer to the pollfd structure for this connection */
+	struct pollfd *pfd;
+	
+	/*
+	 * The streams this connection is composed of
+	 */
+	int nb_streams;
+ 	freebob_stream_t *streams;
+	
+	/*
+	 * This is the buffer to decode/encode from samples from/to events
+	 */
+	freebob_ringbuffer_t * event_buffer;
+	char * cluster_buffer;
+	
+	raw1394handle_t raw_handle;
+		
+	
+	/*
+	 * This is the info needed for time stamp processing
+	 */
+
+	unsigned int total_delay; // = transfer delay + processing delay
+	freebob_ringbuffer_t *timestamp_buffer;
+	
+};
+
+/** 
+ * Stream definition
+ */
+
+struct _freebob_stream {
+	freebob_stream_spec_t        spec;
+	
+	freebob_ringbuffer_t *buffer;
+	freebob_connection_t *parent;
+	
+	freebob_streaming_buffer_type buffer_type;
+	char *user_buffer;
+	unsigned int user_buffer_position;
+	int midi_counter;
+};
+
+/* Initializes a stream_t based upon an stream_info_t */
+int freebob_streaming_init_stream(freebob_device_t* dev, freebob_stream_t *dst, freebob_stream_spec_t *src);
+
+/* prefills a stream when the format needs it */
+int freebob_streaming_prefill_stream(freebob_device_t* dev, freebob_stream_t *stream);
+
+/* destroys a stream_t */
+void freebob_streaming_cleanup_stream(freebob_device_t* dev, freebob_stream_t *dst);
+
+/* put a stream into a known state */
+int freebob_streaming_reset_stream(freebob_device_t* dev, freebob_stream_t *dst);
+
+int freebob_streaming_init_connection(freebob_device_t * dev, freebob_connection_t *connection);
+int freebob_streaming_cleanup_connection(freebob_device_t * dev, freebob_connection_t *connection);
+int freebob_streaming_reset_connection(freebob_device_t * dev, freebob_connection_t *connection);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Index: branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_streaming_private.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_streaming_private.h (revision 185)
+++ branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_streaming_private.h (revision 185)
@@ -0,0 +1,251 @@
+/*
+ *   FreeBob Streaming API
+ *   FreeBob = Firewire (pro-)audio for linux
+ *
+ *   http://freebob.sf.net
+ *
+ *   Copyright (C) 2005 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program 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 General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * 
+ *
+ */
+
+/* freebob_streaming_private.h
+ *
+ * Private stuff related to the freebob streaming API
+ *
+ */
+ 
+#ifndef __FREEBOB_STREAMING_PRIVATE_H__
+#define __FREEBOB_STREAMING_PRIVATE_H__
+
+#ifndef DEBUG
+//#define DEBUG
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define AMDTP_MAX_PACKET_SIZE 2048
+
+#define IEC61883_STREAM_TYPE_MIDI   0x0D
+#define IEC61883_STREAM_TYPE_SPDIF  0x00
+#define IEC61883_STREAM_TYPE_MBLA   0x06
+
+#define IEC61883_AM824_LABEL_MASK 			0xFF000000
+#define IEC61883_AM824_GET_LABEL(x) 		(((x) & 0xFF000000) >> 24)
+#define IEC61883_AM824_SET_LABEL(x,y) 		((x) | ((y)<<24))
+
+#define IEC61883_AM824_LABEL_MIDI_NO_DATA 	0x80 
+#define IEC61883_AM824_LABEL_MIDI_1X      	0x81 
+#define IEC61883_AM824_LABEL_MIDI_2X      	0x82
+#define IEC61883_AM824_LABEL_MIDI_3X      	0x83
+
+#define SAMPLE_MAX_24BIT  8388608.0f
+
+#include <libfreebob/freebob.h>
+#include <libraw1394/raw1394.h>
+#include <libiec61883/iec61883.h>
+#include <pthread.h>
+#include <linux/types.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <poll.h>
+#include <sys/time.h>
+#include <netinet/in.h>
+#include <endian.h>
+
+#include <pthread.h>
+#include <semaphore.h>
+
+#include <assert.h>
+
+#include "ringbuffer.h"
+#include "freebob_connections.h"
+
+#define FALSE 0
+#define TRUE 1
+
+/*
+#define DBC_MASK 0xFF
+#define DBC_SHIFT 16
+
+#define FREEBOB_STREAMING_EXTRACT_DBC(xx) ((xx & (DBC_MASK << DBC_SHIFT))>>DBC_SHIFT)
+#define FREEBOB_STREAMING_REMOVE_DBC(xx) (xx & ~(DBC_MASK << DBC_SHIFT))
+#define FREEBOB_STREAMING_INSERT_DBC(xx,yy) (yy | (((yy%8) & DBC_MASK) << DBC_SHIFT))
+*/
+
+/**
+ * Structure to keep track of the packetizer thread status
+ */
+ 
+typedef struct _freebob_packetizer_status freebob_packetizer_status_t;
+struct _freebob_packetizer_status {
+	sem_t transfer_boundary;
+	sem_t transfer_ack;
+	int retval;
+	int status;
+	int run;
+	
+	int realtime;
+	int priority;
+	
+	pthread_t transfer_thread;
+
+};
+
+/**
+ * Device structure
+ */
+
+struct _freebob_device
+{	
+
+	freebob_device_info_t device_info;
+	freebob_handle_t fb_handle;
+	
+	freebob_options_t options;
+
+	int xrun_detected;
+	int xrun_count;
+	
+	/* packet transfer thread */
+	freebob_packetizer_status_t packetizer;
+
+	/* watchdog thread */
+	int watchdog_check;
+	pthread_t watchdog_thread;
+	
+	/* ISO connections */
+	freebob_connection_t *sync_master_connection;
+	
+	int nb_connections;
+	int nb_connections_playback;
+	int nb_connections_capture;
+	freebob_connection_t *connections;
+	
+	int nb_capture_streams;
+	freebob_stream_t **capture_streams;
+	int nb_playback_streams;
+	freebob_stream_t **playback_streams;
+	
+	/*
+	 * Sync'ed streams are streams that count when determining the period boundary
+	 * 
+	 */
+	int nb_synced_capture_streams;
+	freebob_stream_t **synced_capture_streams;
+	int nb_synced_playback_streams;
+	freebob_stream_t **synced_playback_streams;
+
+	/*
+	 * the fd map for polling
+	 */
+	int                  nfds;
+	struct pollfd        *pfds;
+	freebob_connection_t **fdmap;
+	
+}; 
+
+
+int freebob_streaming_prefill_playback_streams(freebob_device_t *dev);
+
+int freebob_streaming_stop_iso(freebob_device_t *dev);
+int freebob_streaming_start_iso(freebob_device_t *dev);
+
+int freebob_streaming_set_stream_buffer(freebob_device_t *dev,  freebob_stream_t *dst, char *b, freebob_streaming_buffer_type t);
+void freebob_streaming_free_stream_buffer(freebob_device_t* dev, freebob_stream_t *dst);
+
+/**
+ * Registers the stream in the stream list
+ */
+void freebob_streaming_register_capture_stream(freebob_device_t *dev, freebob_stream_t *stream);
+void freebob_streaming_register_playback_stream(freebob_device_t *dev, freebob_stream_t *stream);
+
+/**
+ * Thread related
+ */
+			   
+int freebob_streaming_start_thread(freebob_device_t *dev);
+int freebob_streaming_stop_thread(freebob_device_t *dev);
+			   
+void * freebob_iso_packet_iterator(void *arg);
+
+void *freebob_streaming_watchdog_thread (void *arg);
+int freebob_streaming_start_watchdog (freebob_device_t *dev);
+void freebob_streaming_stop_watchdog (freebob_device_t *dev);
+
+void freebob_streaming_print_bufferfill(freebob_device_t *dev);
+
+
+/**
+ * freebob_encode_stream_to_events
+ *
+ * Encodes events from a buffer to AM824 events, according to a specific stream specification.
+ *	
+ * This will read nsamples samples from the stream ringbuffer, and encode them into events conform
+ * the stream specification.
+ *
+ * NOTE: the buffer has to be big enough
+ * 
+ *  connection    : The connection the stream belongs to
+ *	stream        : Contains the stream structure
+ *  events        : Pointer to a buffer that will hold the encoded events
+ *  nsamples      : The number of samples to encode
+ *  dbc           : Data Block Counter, needed for mux of midi streams
+ */
+/* are static inline now
+int 
+freebob_encode_stream_to_events(freebob_connection_t *connection,
+								freebob_stream_t *stream, 
+								quadlet_t* events, 
+								unsigned int nsamples,
+								unsigned int dbc
+								);
+*/
+/**
+ * freebob_decode_events_to_stream
+ *
+ * Decodes events from a buffer of AM824 events, to samples of the correct type in a stream structure.
+ * Skips events marked as empty.
+ *	
+ * This will decode nframes at maximum.
+ *
+ *  connection    : The connection the stream belongs to
+ *	stream        : Contains the stream structure
+ *  events        : Pointer to a buffer that holds the encoded events
+ *  nsamples      : The number of samples available
+ *  dbc           : Data Block Counter, needed for demux of midi streams
+ */
+/* are static inline now
+
+int 
+freebob_decode_events_to_stream(freebob_connection_t *connection,
+								freebob_stream_t *stream, 
+								quadlet_t* events, 
+								unsigned int nsamples,
+								unsigned int dbc
+								);
+*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Index: branches/freebob-syt-experiments/src/libfreebobstreaming/thread.h
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobstreaming/thread.h (revision 185)
+++ branches/freebob-syt-experiments/src/libfreebobstreaming/thread.h (revision 185)
@@ -0,0 +1,100 @@
+/*
+	Modifications for FreeBoB by Pieter Palmers
+	
+	Copied from the jackd sources
+	function names changed in order to avoid naming problems when using this in
+	a jackd backend.
+	
+    Copyright (C) 2004 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 2.1 of the License, or
+    (at your option) any later version.
+
+    This program 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 Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef __freebob_thread_h__
+#define __freebob_thread_h__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <pthread.h>
+
+typedef struct _freebob_thread_arg {
+	freebob_device_t* device;
+	void* (*work_function)(void*);
+	int priority;
+	int realtime;
+	void* arg;
+	pid_t cap_pid;
+} freebob_thread_arg_t;
+
+/** @file thread.h
+ *
+ * Library functions to standardize thread creation for JACK and its
+ * clients.  These interfaces hide some system variations in the
+ * handling of realtime scheduling and associated privileges.
+ */
+
+/**
+ * Attempt to enable realtime scheduling for a thread.  On some
+ * systems that may require special privileges.
+ *
+ * @param thread POSIX thread ID.
+ * @param priority requested thread priority.
+ *
+ * @returns 0, if successful; EPERM, if the calling process lacks
+ * required realtime privileges; otherwise some other error number.
+ */
+int freebob_acquire_real_time_scheduling (pthread_t thread, int priority);
+
+/**
+ * Create a thread for JACK or one of its clients.  The thread is
+ * created executing @a start_routine with @a arg as its sole
+ * argument.
+ *
+ * @param client the JACK client for whom the thread is being created. May be
+ * NULL if the client is being created within the JACK server.
+ * @param thread place to return POSIX thread ID.
+ * @param priority thread priority, if realtime.
+ * @param realtime true for the thread to use realtime scheduling.  On
+ * some systems that may require special privileges.
+ * @param start_routine function the thread calls when it starts.
+ * @param arg parameter passed to the @a start_routine.
+ *
+ * @returns 0, if successful; otherwise some error number.
+ */
+int freebob_streaming_create_thread (freebob_device_t* dev,
+			       pthread_t *thread,
+			       int priority,
+			       int realtime,	/* boolean */
+			       void *(*start_routine)(void*),
+			       void *arg);
+
+/**
+ * Drop realtime scheduling for a thread.
+ *
+ * @param thread POSIX thread ID.
+ *
+ * @returns 0, if successful; otherwise an error number.
+ */
+int freebob_drop_real_time_scheduling (pthread_t thread);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __freebob_thread_h__ */
Index: branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_streaming.c
===================================================================
--- branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_streaming.c (revision 194)
+++ branches/freebob-syt-experiments/src/libfreebobstreaming/freebob_streaming.c (revision 194)
@@ -0,0 +1,3115 @@
+/* $Id$ */
+
+/*
+ *   FreeBob Streaming API
+ *   FreeBob = Firewire (pro-)audio for linux
+ *
+ *   http://freebob.sf.net
+ *
+ *   Copyright (C) 2005 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+ *
+ *   This program is free software {} you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation {} either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program 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 General Public License
+ *   along with this program {} if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * 
+ *
+ */
+
+/* freebob_streaming.c
+ *
+ * Implementation of the FreeBob Streaming API
+ *
+ */
+
+#include "libfreebob/freebob_streaming.h"
+#include "freebob_streaming_private.h"
+#include "freebob_connections.h"
+#include "freebob_debug.h"
+#include "thread.h"
+#include "messagebuffer.h"
+
+#include <signal.h>
+#include <unistd.h>
+
+/**
+ * Callbacks
+ */
+
+static enum raw1394_iso_disposition 
+iso_slave_receive_handler(raw1394handle_t handle, unsigned char *data, 
+        unsigned int length, unsigned char channel,
+        unsigned char tag, unsigned char sy, unsigned int cycle, 
+        unsigned int dropped);
+        
+static enum raw1394_iso_disposition 
+iso_master_receive_handler(raw1394handle_t handle, unsigned char *data, 
+        unsigned int length, unsigned char channel,
+        unsigned char tag, unsigned char sy, unsigned int cycle, 
+        unsigned int dropped);
+        
+static enum raw1394_iso_disposition 
+iso_slave_transmit_handler(raw1394handle_t handle,
+		unsigned char *data, unsigned int *length,
+		unsigned char *tag, unsigned char *sy,
+		int cycle, unsigned int dropped);
+		
+static enum raw1394_iso_disposition 
+iso_master_transmit_handler(raw1394handle_t handle,
+		unsigned char *data, unsigned int *length,
+		unsigned char *tag, unsigned char *sy,
+		int cycle, unsigned int dropped);
+			
+static int freebob_am824_recv(char *data, 
+							  int nevents, unsigned int offset, unsigned int dbc,
+							  freebob_connection_t *connection);
+
+static int freebob_am824_xmit(char *data, 
+							  int nevents, unsigned int offset, unsigned int dbc,
+							  freebob_connection_t *connection);
+			       
+
+freebob_device_t *freebob_streaming_init (freebob_device_info_t *device_info, freebob_options_t options) {
+	int i;
+	int c;
+	int err=0;
+	freebob_device_t* dev=NULL;
+	
+	freebob_messagebuffer_init();
+		
+	assert(device_info);
+	
+	printMessage("FreeBob Streaming Device Init\n");
+	printMessage(" Using FreeBob lib version %s\n",freebob_get_version());
+	printMessage(" Device information:\n");
+	
+	printMessage(" Device options:\n");
+	/* driver related setup */
+	printMessage("  Port                     : %d\n",options.port);
+	printMessage("  Device Node Id           : %d\n",options.node_id);
+	printMessage("  Samplerate               : %d\n",options.sample_rate);
+	printMessage("  Period Size              : %d\n",options.period_size);
+	printMessage("  Nb Buffers               : %d\n",options.nb_buffers);
+	printMessage("  Directions               : %X\n",options.directions);
+	
+	// initialize the freebob_device
+	// allocate memory
+	dev=calloc(1,sizeof(freebob_device_t));
+	
+	if(!dev) {
+		printError("FREEBOB: cannot allocate memory for dev structure!\n");
+		return NULL;
+	}
+	
+	// clear the device structure
+	memset(dev,0,sizeof(freebob_device_t));
+	
+	// copy the arguments to the device structure
+	memcpy(&dev->device_info, device_info, sizeof(freebob_device_info_t));
+	memcpy(&dev->options, &options, sizeof(freebob_options_t));
+	
+	// read in the device specification
+	
+	/* load the connections*/
+	/* 
+	 * This info should be provided by the Freebob CML application
+	 *
+	 */
+	freebob_connection_info_t *libfreebob_capture_connections=NULL;
+	freebob_connection_info_t *libfreebob_playback_connections=NULL;
+
+	dev->fb_handle = freebob_new_handle(options.port);
+	if (!dev->fb_handle) {
+		free(dev);
+		printError("FREEBOB: cannot create libfreebob handle\n");
+		return NULL;
+	}
+
+	if (freebob_discover_devices(dev->fb_handle, 0)!=0) {
+		freebob_destroy_handle(dev->fb_handle);
+		free(dev);
+		printError("FREEBOB: device discovering failed\n");
+		return NULL;
+	}
+
+	/* Try and set the samplerate
+ 	 * This should be done after device discovery
+	 * but before reading the bus description as the device capabilities can change
+	 */
+
+	if(options.node_id > -1) {
+	    if (! freebob_set_samplerate(dev->fb_handle, options.node_id, options.sample_rate)) {
+		freebob_destroy_handle(dev->fb_handle);
+		free(dev);
+		printError("FREEBOB: Failed to set samplerate...\n");
+		return NULL;
+	    }
+
+	} else {
+	    int devices_on_bus = freebob_get_nb_devices_on_bus(dev->fb_handle);
+	    debugPrint(DEBUG_LEVEL_STARTUP,"port = %d, devices_on_bus = %d\n", options.port, devices_on_bus);
+			
+	    for(i=0;i<devices_on_bus;i++) {
+		int node_id=freebob_get_device_node_id(dev->fb_handle, i);
+		debugPrint(DEBUG_LEVEL_STARTUP,"set samplerate for device = %d, node = %d\n", i, node_id);
+				
+		if (! freebob_set_samplerate(dev->fb_handle, node_id, options.sample_rate)) {
+			freebob_destroy_handle(dev->fb_handle);
+			free(dev);
+			printError("FREEBOB: Failed to set samplerate...\n");
+			return NULL;
+		}
+	    }
+
+	}
+
+	/* Read the connection specification
+ 	 */
+ 
+	if(!(options.directions & FREEBOB_IGNORE_CAPTURE)) {
+		libfreebob_capture_connections=freebob_get_connection_info(dev->fb_handle, options.node_id, 0);
+	}
+
+	if(!(options.directions & FREEBOB_IGNORE_PLAYBACK)) {
+		libfreebob_playback_connections=freebob_get_connection_info(dev->fb_handle, options.node_id, 1);
+	}
+ 
+
+	if (libfreebob_capture_connections) {
+		dev->nb_connections_capture=libfreebob_capture_connections->nb_connections;
+		// FIXME:
+		//dev->nb_connections_capture=0;
+	} else {
+		dev->nb_connections_capture=0;
+	}	
+	
+	if (libfreebob_playback_connections) {
+		dev->nb_connections_playback=libfreebob_playback_connections->nb_connections;
+		// FIXME:
+// 		dev->nb_connections_playback=0;
+	} else {
+		dev->nb_connections_playback=0;
+	}
+	// FIXME: temporary disable the playback
+// 	dev->nb_connections_playback=0;
+	
+	dev->nb_connections=dev->nb_connections_playback+dev->nb_connections_capture;
+	/* see if there are any connections */
+	if (!dev->nb_connections) {
+		printError("No connections specified, bailing out\n");
+		if(libfreebob_capture_connections) { free(libfreebob_capture_connections); libfreebob_capture_connections=NULL; }
+		if(libfreebob_playback_connections) { free(libfreebob_playback_connections); libfreebob_playback_connections=NULL; }
+		freebob_destroy_handle(dev->fb_handle);
+		free(dev);
+		
+		return NULL;
+	}
+	
+	dev->connections=calloc(dev->nb_connections_playback+dev->nb_connections_capture, sizeof(freebob_connection_t));
+	
+	
+	for (c=0;c<dev->nb_connections_capture;c++) {
+		memcpy(&dev->connections[c].spec, libfreebob_capture_connections->connections[c], sizeof(freebob_connection_spec_t));
+		dev->connections[c].spec.direction=FREEBOB_CAPTURE;
+	}
+	for (c=0;c<dev->nb_connections_playback;c++) {
+		memcpy(&dev->connections[c+dev->nb_connections_capture].spec, libfreebob_playback_connections->connections[c], sizeof(freebob_connection_spec_t));
+		dev->connections[c+dev->nb_connections_capture].spec.direction=FREEBOB_PLAYBACK;
+	}
+	
+	/* Figure out a master connection.
+	 * Either it is given in the spec libfreebob
+	 * Or it is the first connection defined (capture connections first)
+	 */
+	int master_found=FALSE;
+	
+	for (c=0;c<dev->nb_connections_capture+dev->nb_connections_playback;c++) {
+		if (dev->connections[c].spec.is_master==TRUE) {
+			master_found=TRUE;
+			if(dev->options.sample_rate<0) {
+				dev->options.sample_rate=dev->connections[c].spec.samplerate;
+			}
+			break;
+		}
+	}
+	
+	if((!master_found) && (dev->nb_connections_capture+dev->nb_connections_playback > 0)) {
+		dev->connections[0].spec.is_master=TRUE;
+		if(dev->options.sample_rate<0) {
+			dev->options.sample_rate=dev->connections[0].spec.samplerate;
+		}
+	}
+
+	// initialize all connections
+	for(i=0; i < dev->nb_connections; i++) {
+		freebob_connection_t *connection= &(dev->connections[i]);
+		if ((err=freebob_streaming_init_connection(dev, connection))<0) {
+			printError("FREEBOB: failed to init connection %d\n",i);
+			break;
+		}
+	}
+	
+	if(libfreebob_capture_connections) { freebob_free_connection_info(libfreebob_capture_connections); libfreebob_capture_connections=NULL; }
+	if(libfreebob_playback_connections) { freebob_free_connection_info(libfreebob_playback_connections); libfreebob_playback_connections=NULL; }
+	
+	// prepare the FD map	
+	// the FD map is not stricly nescessary due to dev->fdmap[i]=dev->connections[i];
+	// but makes things flexible at the moment
+	
+	assert(dev->nb_connections==dev->nb_connections_capture+dev->nb_connections_playback);
+	
+	dev->nfds   = dev->nb_connections;
+	dev->pfds   = malloc (sizeof (struct pollfd) * dev->nfds);
+	dev->fdmap  = malloc (sizeof (freebob_connection_t *) * dev->nfds); // holds the connection idx of this fd
+	
+	for(i=0; i < dev->nb_connections; i++) {
+		freebob_connection_t *connection= &(dev->connections[i]);
+		dev->fdmap[i]=connection;
+		dev->pfds[i].fd = raw1394_get_fd (connection->raw_handle);
+		dev->pfds[i].events = POLLIN;
+		connection->pfd=&dev->pfds[i];
+	}
+	
+	// check for errors
+	if(err) {
+		debugPrint(DEBUG_LEVEL_STARTUP, "Cleaning up connections\n");
+		
+		// the connection that failed doesn't have to be cleaned
+		i-=1;
+		
+		for(; i >= 0; i--) {
+			freebob_connection_t *connection= &(dev->connections[i]);
+			debugPrint(DEBUG_LEVEL_STARTUP, "Cleaning up connection %d\n",i);
+			if ((freebob_streaming_cleanup_connection(dev, connection))<0) {
+				printError( "Failed to clean connection %d\n",i);
+			}
+		}
+		free(dev->pfds);
+		free(dev->fdmap);
+		free(dev->connections);
+		free(dev);
+		return NULL;
+	}
+	
+	freebob_destroy_handle(dev->fb_handle);
+	
+	return dev;
+
+}
+
+void freebob_streaming_finish(freebob_device_t *dev) {
+	debugPrint(DEBUG_LEVEL_STARTUP,"Cleaning up connections\n");
+	unsigned int i;
+	int err=0;
+	
+	// cleanup all connections
+	for(i=0; i < dev->nb_connections; i++) {
+		freebob_connection_t *connection= &(dev->connections[i]);
+		if ((err=freebob_streaming_cleanup_connection(dev, connection))<0) {
+			printError("Failed to cleanup connection %d\n",i);
+			return;
+		}
+	}
+	
+	// free stream structures
+	if(dev->capture_streams) {
+		free(dev->capture_streams);
+	}
+	if(dev->playback_streams) {
+		free(dev->playback_streams);
+	}
+	if(dev->synced_capture_streams) {
+		free(dev->synced_capture_streams);
+	}
+	if(dev->synced_playback_streams) {
+		free(dev->synced_playback_streams);
+	}
+	
+	// cleanup data structures
+	free(dev->pfds);
+	free(dev->fdmap);
+	free(dev->connections);
+	free(dev);
+	
+	freebob_messagebuffer_exit();
+	
+	return;
+}
+
+int freebob_streaming_get_nb_capture_streams(freebob_device_t *dev) {
+	return dev->nb_capture_streams;
+}
+
+int freebob_streaming_get_nb_playback_streams(freebob_device_t *dev) {
+	return dev->nb_playback_streams;
+}
+
+int freebob_streaming_get_capture_stream_name(freebob_device_t *dev, int i, char* buffer, size_t buffersize) {
+	freebob_stream_t *stream;
+	if(i<dev->nb_capture_streams) {
+		stream=*(dev->capture_streams+i);
+		return snprintf (buffer, buffersize, "%s_%d_%d_%d_%s",
+						"cap", (int) stream->parent->spec.port, stream->parent->spec.node & 0x3F, stream->parent->spec.plug, stream->spec.name);		
+	} else {
+		return -1;
+	}
+}
+
+int freebob_streaming_get_playback_stream_name(freebob_device_t *dev, int i, char* buffer, size_t buffersize) {
+	freebob_stream_t *stream;
+	if(i<dev->nb_playback_streams) {
+		stream=*(dev->playback_streams+i);
+		return snprintf (buffer, buffersize, "%s_%d_%d_%d_%s",
+						"pbk", (int) stream->parent->spec.port, stream->parent->spec.node & 0x3F, stream->parent->spec.plug, stream->spec.name);		
+	} else {
+		return -1;
+	}
+}
+
+freebob_streaming_stream_type freebob_streaming_get_capture_stream_type(freebob_device_t *dev, int i) {
+	freebob_stream_t *stream;
+	if(i<dev->nb_capture_streams) {
+		stream=*(dev->capture_streams+i);
+		switch (stream->spec.format) {
+		case IEC61883_STREAM_TYPE_MBLA:
+			return freebob_stream_type_audio;
+		case IEC61883_STREAM_TYPE_MIDI:
+			return freebob_stream_type_midi;
+		case IEC61883_STREAM_TYPE_SPDIF:
+		default:
+			return freebob_stream_type_unknown;
+		}
+	} else {
+		return freebob_stream_type_invalid;
+	}
+}
+
+freebob_streaming_stream_type freebob_streaming_get_playback_stream_type(freebob_device_t *dev, int i) {
+	freebob_stream_t *stream;
+	if(i<dev->nb_playback_streams) {
+		stream=*(dev->playback_streams+i);
+		switch (stream->spec.format) {
+		case IEC61883_STREAM_TYPE_MBLA:
+			return freebob_stream_type_audio;
+		case IEC61883_STREAM_TYPE_MIDI:
+			return freebob_stream_type_midi;
+		case IEC61883_STREAM_TYPE_SPDIF:
+		default:
+			return freebob_stream_type_unknown;
+		}
+	} else {
+		return freebob_stream_type_invalid;
+	}
+}
+
+int freebob_streaming_set_stream_buffer(freebob_device_t *dev,  freebob_stream_t *dst, char *b, freebob_streaming_buffer_type t) {
+	assert(dst);
+	
+	// free the preallocated buffer first
+	freebob_streaming_free_stream_buffer(dev,dst);
+	
+	switch (t) {
+		case freebob_buffer_type_per_stream:
+			dst->user_buffer=calloc(dev->options.period_size,sizeof(freebob_sample_t));
+			dst->buffer_type=freebob_buffer_type_per_stream;
+			break;
+		
+		case freebob_buffer_type_uint24:
+			if(b) {
+				dst->buffer_type=t;
+				dst->user_buffer=b;
+			} else {
+				// allocate a default type
+				dst->buffer_type=freebob_buffer_type_per_stream;
+				dst->user_buffer=calloc(dev->options.period_size,sizeof(freebob_sample_t));
+				return -1;
+			}
+			break;
+			
+		case freebob_buffer_type_float:
+			if(b) {
+				dst->buffer_type=t;
+				dst->user_buffer=b;
+			} else {
+				// allocate a default type
+				dst->buffer_type=freebob_buffer_type_per_stream;
+				dst->user_buffer=calloc(dev->options.period_size,sizeof(freebob_sample_t));
+				return -1;
+			}
+			break;
+		
+		default:
+			// allocate a default type
+			dst->buffer_type=freebob_buffer_type_per_stream;
+			dst->user_buffer=calloc(dev->options.period_size,sizeof(freebob_sample_t));
+			return -1;
+			
+	}
+	return 0;
+}
+
+void freebob_streaming_free_stream_buffer(freebob_device_t* dev, freebob_stream_t *dst)
+{
+	
+	if((dst->buffer_type==freebob_buffer_type_per_stream) && (dst->user_buffer)) {
+		free(dst->user_buffer);
+		dst->user_buffer=NULL;
+	}
+}
+
+
+int freebob_streaming_set_capture_stream_buffer(freebob_device_t *dev, int i, char *buff,  freebob_streaming_buffer_type t) {
+	
+	freebob_stream_t *stream;
+	if(i<dev->nb_capture_streams) {
+		stream=*(dev->capture_streams+i);
+		assert(stream);
+		return freebob_streaming_set_stream_buffer(dev,  stream, buff, t);
+		
+	} else {
+		return -1;
+	}
+	
+}
+
+int freebob_streaming_set_playback_stream_buffer(freebob_device_t *dev, int i, char *buff,  freebob_streaming_buffer_type t) {
+	freebob_stream_t *stream;
+	if(i<dev->nb_playback_streams) {
+		
+		stream=*(dev->playback_streams+i);
+		
+		assert(stream);
+		return freebob_streaming_set_stream_buffer(dev, stream, buff, t);
+		
+	} else {
+		return -1;
+	}
+}
+
+int freebob_streaming_start_thread(freebob_device_t *dev) {
+	int err;
+	// start the packetizer thread
+	// init the packetizer thread communication semaphores
+	if((err=sem_init(&dev->packetizer.transfer_boundary, 0, 0))) {
+		printError( "Cannot init packet transfer semaphore\n");
+		return err;
+	} else {
+		debugPrint(DEBUG_LEVEL_STARTUP,"FREEBOB: successfull init of packet transfer semaphore\n");
+	}
+	
+	dev->packetizer.priority=dev->options.packetizer_priority;
+	dev->packetizer.realtime=dev->options.realtime;
+	
+	// start watchdog
+	if (dev->packetizer.realtime) {
+ 		freebob_streaming_start_watchdog(dev);
+	}
+	
+	// start packetizer thread
+	dev->packetizer.run=1;
+	
+	if (freebob_streaming_create_thread(dev, &dev->packetizer.transfer_thread, dev->packetizer.priority, dev->packetizer.realtime, freebob_iso_packet_iterator, (void *)dev)) {
+		printError("FREEBOB: cannot create packet transfer thread");
+		return -1;
+	} else {
+		debugPrint(DEBUG_LEVEL_STARTUP,"Created packet transfer thread\n");
+	}
+	return 0;
+}
+
+int freebob_streaming_stop_thread(freebob_device_t *dev) {
+	void *status;
+	
+	debugPrint(DEBUG_LEVEL_STARTUP," Stopping packetizer thread...\n");
+	dev->packetizer.run=0;
+	
+	
+	//sem_post(&dev->packetizer.transfer_ack);
+	
+	pthread_join(dev->packetizer.transfer_thread, &status);
+	
+	// stop watchdog
+	if (dev->packetizer.realtime) {
+ 		freebob_streaming_stop_watchdog(dev);
+	}
+	
+	// cleanup semaphores
+	sem_destroy(&dev->packetizer.transfer_boundary);
+
+	return 0;
+}
+
+
+int freebob_streaming_start(freebob_device_t *dev) {
+	int err;
+	int i;
+	
+	for(i=0; i < dev->nb_connections; i++) {
+		err=0;
+		freebob_connection_t *connection= &(dev->connections[i]);
+
+		int fdf, syt_interval;
+
+		int samplerate=dev->options.sample_rate;
+
+		switch (samplerate) {
+		case 32000:
+			syt_interval = 8;
+			fdf = IEC61883_FDF_SFC_32KHZ;
+			break;
+		case 44100:
+			syt_interval = 8;
+			fdf = IEC61883_FDF_SFC_44K1HZ;
+			break;
+		default:
+		case 48000:
+			syt_interval = 8;
+			fdf = IEC61883_FDF_SFC_48KHZ;
+			break;
+		case 88200:
+			syt_interval = 16;
+			fdf = IEC61883_FDF_SFC_88K2HZ;
+			break;
+		case 96000:
+			syt_interval = 16;
+			fdf = IEC61883_FDF_SFC_96KHZ;
+			break;
+		case 176400:
+			syt_interval = 32;
+			fdf = IEC61883_FDF_SFC_176K4HZ;
+			break;
+		case 192000:
+			syt_interval = 32;
+			fdf = IEC61883_FDF_SFC_192KHZ;
+			break;
+		}
+		
+		if(dev->options.period_size < syt_interval) {
+			printError("Period size (%d) too small! Samplerate %d requires period >= %d\n",
+			           dev->options.period_size, samplerate, syt_interval);
+			return -1;
+		}
+		connection->iso.packets_per_period = dev->options.period_size/syt_interval;
+
+		//connection->plug=0;
+		connection->iso.hostplug=-1;
+		
+		// create the CCM PTP connection
+		connection->iso.do_disconnect=0;
+
+		// start receiving
+		switch (connection->spec.direction) {
+		case FREEBOB_CAPTURE:
+		
+			debugPrint(DEBUG_LEVEL_STARTUP," creating capture connections...\n");
+			if (connection->spec.iso_channel < 0) { 
+				// we need to make the connection ourself
+				debugPrint(DEBUG_LEVEL_STARTUP, "Executing CMP procedure...\n");
+				
+				connection->iso.iso_channel = iec61883_cmp_connect(
+					connection->raw_handle, 
+					connection->spec.node | 0xffc0, 
+					&connection->spec.plug,
+					raw1394_get_local_id (connection->raw_handle), 
+					&connection->iso.hostplug, 
+					&connection->iso.bandwidth);
+					
+				connection->iso.do_disconnect=1;
+				
+			} else {
+				connection->iso.iso_channel=connection->spec.iso_channel;
+			}
+			
+			if (connection->spec.is_master) { //master connection
+				dev->sync_master_connection=connection;
+				connection->status.master=NULL;
+				
+			}
+
+			// setup the optimal parameters for the raw1394 ISO buffering
+			connection->iso.packets_per_period=dev->options.period_size/syt_interval;
+			// hardware interrupts occur when one DMA block is full, and the size of one DMA
+			// block = PAGE_SIZE. Setting the max_packet_size makes sure that the HW irq 
+			// occurs at a period boundary (optimal CPU use)
+			// note: try and use 2 interrupts per period for better latency.
+			connection->iso.max_packet_size=getpagesize() / connection->iso.packets_per_period * 2;
+			connection->iso.irq_interval=connection->iso.packets_per_period/2;
+
+			connection->iso.packet_size=4 * (2 + syt_interval * connection->spec.dimension);
+
+			if (connection->iso.max_packet_size < connection->iso.packet_size) {
+				connection->iso.max_packet_size=connection->iso.packet_size;
+			}
+
+			/* the receive buffer size doesn't matter for the latency,
+			   but it has a minimal value in order for libraw to operate correctly (300) */
+			connection->iso.buffers=400;
+
+			// this is a hack
+			if(dev->options.period_size < 128) {
+				connection->iso.receive_mode=RAW1394_DMA_PACKET_PER_BUFFER;
+			} else {
+				connection->iso.receive_mode=RAW1394_DMA_BUFFERFILL;
+			}
+
+		break;
+		case FREEBOB_PLAYBACK:
+			debugPrint(DEBUG_LEVEL_STARTUP," creating playback connections...\n");
+		
+			if (connection->spec.iso_channel < 0) { // we need to make the connection ourself
+				debugPrint(DEBUG_LEVEL_STARTUP, "Executing CMP procedure...\n");
+				connection->iso.iso_channel = iec61883_cmp_connect(
+				connection->raw_handle, 
+				raw1394_get_local_id (connection->raw_handle), 
+				&connection->iso.hostplug, 
+				connection->spec.node | 0xffc0, 
+				&connection->spec.plug, 
+				&connection->iso.bandwidth);
+				
+				connection->iso.do_disconnect=1;
+			} else {
+				connection->iso.iso_channel=connection->spec.iso_channel;
+			}
+
+			if (connection->spec.is_master) { // master connection
+				dev->sync_master_connection=connection;
+				connection->status.master=NULL;
+			}
+
+			iec61883_cip_init (
+				&connection->status.cip, 
+				IEC61883_FMT_AMDTP, 
+				fdf,
+				samplerate, 
+				connection->spec.dimension, 
+				syt_interval);
+				
+			iec61883_cip_set_transmission_mode (
+				&connection->status.cip, 
+				IEC61883_MODE_BLOCKING_EMPTY);
+
+
+			// setup the optimal parameters for the raw1394 ISO buffering
+			connection->iso.packets_per_period=dev->options.period_size/syt_interval;
+			// hardware interrupts occur when one DMA block is full, and the size of one DMA
+			// block = PAGE_SIZE. Setting the max_packet_size makes sure that the HW irq is 
+			// occurs at a period boundary (optimal CPU use)
+			// note: try and use 2 interrupts per period for better latency.
+			connection->iso.max_packet_size=getpagesize() / connection->iso.packets_per_period * 2;
+			connection->iso.irq_interval=connection->iso.packets_per_period / 2;
+
+			connection->iso.packet_size=4 * (2 + syt_interval * connection->spec.dimension);
+
+			if (connection->iso.max_packet_size < connection->iso.packet_size) {
+				connection->iso.max_packet_size=connection->iso.packet_size;
+			}
+
+			/* the transmit buffer size should be as low as possible for latency. 
+			*/
+			connection->iso.buffers=connection->iso.packets_per_period;
+			if (connection->iso.buffers<10) connection->iso.buffers=10;
+
+		break;
+		}
+		
+		if(connection->iso.iso_channel<0) {
+			printError("Could not do CMP for connection %d\n",i);
+			i-=1;
+			while(i>=0) {
+				connection= &(dev->connections[i]);
+		
+				if (connection->iso.do_disconnect) {
+					// destroy the CCM PTP connection
+					switch (connection->spec.direction) {
+					case FREEBOB_CAPTURE:
+						iec61883_cmp_disconnect(
+							connection->raw_handle, 
+							connection->spec.node | 0xffc0, 
+							connection->spec.plug, 
+							raw1394_get_local_id (connection->raw_handle), 
+							connection->iso.hostplug, 
+							connection->iso.iso_channel, 
+							connection->iso.bandwidth);
+						
+					break;
+					case FREEBOB_PLAYBACK:
+						iec61883_cmp_disconnect(
+							connection->raw_handle, 
+							raw1394_get_local_id (connection->raw_handle), 
+							connection->iso.hostplug, 
+							connection->spec.node | 0xffc0, 
+							connection->spec.plug, 
+							connection->iso.iso_channel, 
+							connection->iso.bandwidth);
+			
+					break;
+					}
+				}
+				i--;
+			}
+			return -1;
+		}
+	}
+	
+	/* update the sync master pointer for all connections */
+	debugPrint(DEBUG_LEVEL_STARTUP,"Connection summary:\n");
+	int sync_masters_present=0;
+	
+	for(i=0; i < dev->nb_connections; i++) {
+		err=0;
+		
+		freebob_connection_t *connection= &(dev->connections[i]);
+		
+		if (connection->spec.direction == FREEBOB_CAPTURE) {
+			debugPrint(DEBUG_LEVEL_STARTUP,"  Capture : from node %02X.%02d to node %02X.%02d on channel %02d  {%p} ",
+				connection->spec.node & ~0xffc0, connection->spec.plug,
+				raw1394_get_local_id (connection->raw_handle) & ~0xffc0, connection->iso.hostplug,
+				connection->iso.iso_channel, connection);
+		} else if (connection->spec.direction == FREEBOB_PLAYBACK) {
+			
+			debugPrint(DEBUG_LEVEL_STARTUP,"  Playback: from node %02X.%02d to node %02X.%02d on channel %02d  {%p} ",
+				raw1394_get_local_id (connection->raw_handle) & ~0xffc0, connection->iso.hostplug,
+				connection->spec.node & ~0xffc0, connection->spec.plug,
+				connection->iso.iso_channel, connection);
+		}
+		
+		if (connection->spec.is_master) {
+			sync_masters_present++;
+			
+			debugPrintShort(DEBUG_LEVEL_STARTUP," [MASTER]");	
+		} else {
+			assert(dev->sync_master_connection);
+			connection->status.master=&dev->sync_master_connection->status;
+			
+			debugPrintShort(DEBUG_LEVEL_STARTUP," [SLAVE]");
+		}
+		debugPrintShort(DEBUG_LEVEL_STARTUP,"\n");
+	}
+	
+	if (sync_masters_present == 0) {
+		printError("FREEBOB: no sync master connection present!\n");
+		// TODO: cleanup
+		//freebob_streaming_stop(driver);
+		return -1;
+	} else if (sync_masters_present > 1) {
+		printError("FREEBOB: too many sync master connections present! (%d)\n",sync_masters_present);
+		// TODO: cleanup
+		//freebob_streaming_stop(driver);
+		return -1;
+	}
+	
+	// put nb_periods*period_size of null frames into the playback buffers
+	if((err=freebob_streaming_prefill_playback_streams(dev))<0) {
+		printError("Could not prefill playback streams.\n");
+		return err;
+	}
+		
+	// we should transfer nb_buffers-1 periods of playback from the stream buffers to the event buffer
+	for (i=0;i<dev->options.nb_buffers;i++) {
+		freebob_streaming_transfer_playback_buffers(dev);
+	}
+
+	freebob_streaming_print_bufferfill(dev);
+		
+	debugPrint(DEBUG_LEVEL_STARTUP,"Armed...\n");
+	
+	freebob_streaming_start_thread(dev);
+
+	return 0;
+
+}
+
+int freebob_streaming_stop(freebob_device_t *dev) {
+	unsigned int i;
+	
+
+	freebob_streaming_stop_thread(dev);
+	
+	// stop ISO xmit/receive
+	for(i=0; i < dev->nb_connections; i++) {
+		freebob_connection_t *connection= &(dev->connections[i]);
+
+		if (connection->iso.do_disconnect) {
+			// destroy the CCM PTP connection
+			switch (connection->spec.direction) {
+			case FREEBOB_CAPTURE:
+				iec61883_cmp_disconnect(
+					connection->raw_handle, 
+					connection->spec.node | 0xffc0, 
+					connection->spec.plug, 
+					raw1394_get_local_id (connection->raw_handle), 
+					connection->iso.hostplug, 
+					connection->iso.iso_channel, 
+					connection->iso.bandwidth);
+				
+			break;
+			case FREEBOB_PLAYBACK:
+				iec61883_cmp_disconnect(
+					connection->raw_handle, 
+					raw1394_get_local_id (connection->raw_handle), 
+					connection->iso.hostplug, 
+					connection->spec.node | 0xffc0, 
+					connection->spec.plug, 
+					connection->iso.iso_channel, 
+					connection->iso.bandwidth);
+	
+			break;
+			}
+		}
+		
+	}
+	return 0;
+}
+
+void freebob_streaming_print_bufferfill(freebob_device_t *dev) {
+	int i=0;
+	for(i=0; i < dev->nb_connections; i++) {
+		freebob_connection_t *connection= &(dev->connections[i]);
+		debugPrint(DEBUG_LEVEL_XRUN_RECOVERY, "%i: %d\n",i,freebob_ringbuffer_read_space(connection->event_buffer));
+	}
+	
+}
+
+int freebob_streaming_prefill_playback_streams(freebob_device_t *dev) {
+	int i;
+	int err=0;
+	
+	for(i=0; i < dev->nb_playback_streams; i++) {
+		freebob_stream_t *stream;
+
+		
+		stream=*(dev->playback_streams+i);
+		
+		assert(stream);
+		err=freebob_streaming_prefill_stream(dev, stream);
+		if (err) {
+			printError("Could not prefill stream %d\n",i);
+			return -1;
+		}
+	}
+	return 0;
+	
+}
+
+int freebob_streaming_reset_playback_streams(freebob_device_t *dev) {
+	int i;
+	int err=0;
+	
+	for(i=0; i < dev->nb_playback_streams; i++) {
+		freebob_stream_t *stream;
+
+		stream=*(dev->playback_streams+i);
+		
+		assert(stream);
+		err=freebob_streaming_reset_stream(dev, stream);
+		if (err) {
+			printError("Could not reset stream %d\n",i);
+			return -1;
+		}
+	}
+	return 0;
+	
+}
+
+int freebob_streaming_reset(freebob_device_t *dev) {
+	/* 
+	 * Reset means:
+	 * 1) Stopping the packetizer thread
+	 * 2) Bringing all buffers & connections into a know state
+	 *    - Clear all capture buffers
+	 *    - Put nb_periods*period_size of null frames into the playback buffers
+	 * 3) Restarting the packetizer thread
+	 */
+
+	unsigned long i;
+	int err;
+	assert(dev);
+
+	debugPrint(DEBUG_LEVEL_XRUN_RECOVERY, "Resetting streams...\n");
+	
+	if((err=freebob_streaming_stop_thread(dev))<0) {
+		printError("Could not stop packetizer thread.\n");
+		return err;
+	}
+
+	//freebob_streaming_stop_iso(dev);
+
+	// check if the packetizer is stopped
+	assert(!dev->packetizer.run);
+	
+	// reset all connections
+	for(i=0; i < dev->nb_connections; i++) {
+		freebob_connection_t *connection= &(dev->connections[i]);
+		freebob_streaming_reset_connection(dev,connection);
+	}
+	
+	// put nb_periods*period_size of null frames into the playback buffers
+	if((err=freebob_streaming_prefill_playback_streams(dev))<0) {
+		printError("Could not prefill playback streams.\n");
+		return err;
+	}
+	
+	// we should transfer nb_buffers-1 periods of playback from the stream buffers to the event buffer
+	for (i=0;i<dev->options.nb_buffers;i++) {
+ 		freebob_streaming_transfer_playback_buffers(dev);
+	}
+			
+	// clear the xrun flag
+	dev->xrun_detected=FALSE;
+	
+	//freebob_streaming_start_iso(dev);
+	freebob_streaming_print_bufferfill(dev);
+	
+	if((err=freebob_streaming_start_thread(dev))<0) {
+		printError("Could not start packetizer thread.\n");
+		return err;
+	}
+	
+	
+	return 0;
+}
+
+int freebob_streaming_xrun_recovery(freebob_device_t *dev) {
+	freebob_streaming_reset(dev);
+	dev->xrun_count++;
+	
+	return 0;
+}
+
+int freebob_streaming_wait(freebob_device_t *dev) {
+	int ret;
+
+	// Wait for packetizer thread to signal a period completion
+	sem_wait(&dev->packetizer.transfer_boundary);
+	
+	// acknowledge the reception of the period
+	//sem_post(&dev->packetizer.transfer_ack);
+	
+	if(dev->xrun_detected) {
+		// notify the driver of the underrun and the delay
+		ret = (-1) * freebob_streaming_xrun_recovery(dev);
+	} else {
+		ret=dev->options.period_size;
+	}
+	
+	return ret;
+}
+
+int freebob_streaming_transfer_capture_buffers(freebob_device_t *dev) {
+	int i;
+	int xrun;
+	unsigned int offset=0;
+	
+	freebob_ringbuffer_data_t vec[2];
+	// transfer the received events into the stream buffers
+	for (i=0;i<dev->nb_connections_capture;i++) {
+		freebob_connection_t *connection= &(dev->connections[i]); // capture connections are first in the array
+		assert(connection);
+		
+		debugPrint(DEBUG_LEVEL_WAIT, "R: > %d\n",freebob_ringbuffer_read_space(connection->event_buffer));
+			
+			// we received one period of frames on each connection
+			// this is period_size*dimension of events
+
+		int events2read=dev->options.period_size*connection->spec.dimension;
+		int bytes2read=events2read*sizeof(quadlet_t);
+			
+			// TODO: implement dbc for midi
+		int dbc=0;
+			
+			/* 	read events2read bytes from the ringbuffer 
+		*  first see if it can be done in one read. 
+		*  if so, ok. 
+		*  otherwise read up to a multiple of clusters directly from the buffer
+		*  then do the buffer wrap around using ringbuffer_read
+		*  then read the remaining data directly from the buffer in a third pass 
+		*  Make sure that we cannot end up on a non-cluster aligned position!
+			*/
+		int cluster_size=connection->spec.dimension*sizeof(quadlet_t);
+// 		unsigned int frames2read=events2read/connection->spec.dimension;
+			
+		while(bytes2read>0) {
+			unsigned int framesread=(dev->options.period_size*cluster_size-bytes2read)/cluster_size;
+			offset=framesread;
+// 			offset=0;
+			
+			int bytesread=0;
+						
+			freebob_ringbuffer_get_read_vector(connection->event_buffer, vec);
+				
+			if(vec[0].len==0) { // this indicates an empty event buffer
+				printError("Event buffer underrun on capture connection %d\n",i);
+				break;
+			}
+				
+				/* if we don't take care we will get stuck in an infinite loop
+			* because we align to a cluster boundary later
+			* the remaining nb of bytes in one read operation can be smaller than one cluster
+			* this can happen because the ringbuffer size is always a power of 2
+				*/
+			if(vec[0].len<cluster_size) {
+					// use the ringbuffer function to read one cluster (handles wrap around)
+				freebob_ringbuffer_read(connection->event_buffer,connection->cluster_buffer,cluster_size);
+					
+				// decode the temporary buffer
+				debugPrint(DEBUG_LEVEL_WAIT, "R: %5d [%5d %5d] %5d %5d\n",bytes2read,vec[0].len,vec[1].len,1, offset);
+					
+				xrun = freebob_am824_recv(connection->cluster_buffer, 1, offset, dbc, connection);
+					
+				if(xrun<0) {
+						// xrun detected
+					printError("Frame buffer overrun on capture connection %d\n",i);
+					break;
+				}
+					
+					// we advanced one cluster_size
+				bytes2read-=cluster_size;
+					
+			} else { // 
+				
+				if(bytes2read>vec[0].len) {
+						// align to a cluster boundary
+					bytesread=vec[0].len-(vec[0].len%cluster_size);
+				} else {
+					bytesread=bytes2read;
+				}
+					
+				debugPrint(DEBUG_LEVEL_WAIT, "R: %5d [%5d %5d] %5d %5d\n",bytes2read,vec[0].len,vec[1].len,bytesread, offset);
+					
+				xrun = freebob_am824_recv(vec[0].buf, bytesread/sizeof(quadlet_t)/connection->spec.dimension, offset, dbc, connection);
+					
+				if(xrun<0) {
+						// xrun detected
+					printError("Frame buffer overrun on capture connection %d\n",i);
+					break;
+				}
+	
+				freebob_ringbuffer_read_advance(connection->event_buffer, bytesread);
+				bytes2read -= bytesread;
+			}
+				
+				// the bytes2read should always be cluster aligned
+			assert(bytes2read%cluster_size==0);
+			debugPrint(DEBUG_LEVEL_WAIT, "R: < %d\n",freebob_ringbuffer_read_space(connection->event_buffer));
+				
+		}
+
+	}
+	return 0;
+}
+
+int freebob_streaming_transfer_playback_buffers(freebob_device_t *dev) {
+	int i;
+	int xrun;
+	unsigned int offset=0;
+	
+	freebob_ringbuffer_data_t vec[2];
+	// transfer the output stream buffers content to the event buffers
+	for (i=dev->nb_connections_capture;i<dev->nb_connections_capture+dev->nb_connections_playback;i++) {
+		freebob_connection_t *connection= &(dev->connections[i]);
+		assert(connection);
+		debugPrint(DEBUG_LEVEL_WAIT, "W: < %d\n",freebob_ringbuffer_write_space(connection->event_buffer));
+			
+			// we received one period of frames on each connection
+			// this is period_size*dimension of events
+
+		int events2write=dev->options.period_size*connection->spec.dimension;
+		int bytes2write=events2write*sizeof(quadlet_t);
+			
+			// TODO: implement dbc for midi
+		int dbc=0;
+			
+		/* 	write events2write bytes to the ringbuffer 
+		*  first see if it can be done in one read. 
+		*  if so, ok. 
+		*  otherwise write up to a multiple of clusters directly to the buffer
+		*  then do the buffer wrap around using ringbuffer_write
+		*  then write the remaining data directly to the buffer in a third pass 
+		*  Make sure that we cannot end up on a non-cluster aligned position!
+		*/
+		int cluster_size=connection->spec.dimension*sizeof(quadlet_t);
+// 		unsigned int frames2write=events2write/connection->spec.dimension;
+			
+		while(bytes2write>0) {
+			int byteswritten=0;
+			
+			unsigned int frameswritten=(dev->options.period_size*cluster_size-bytes2write)/cluster_size;
+			offset=frameswritten;
+// 			offset=0;
+			
+			freebob_ringbuffer_get_write_vector(connection->event_buffer, vec);
+				
+			if(vec[0].len==0) { // this indicates a full event buffer
+				printError("Event buffer overrun on playback connection %d\n",i);
+				break;
+			}
+				
+			/* if we don't take care we will get stuck in an infinite loop
+			* because we align to a cluster boundary later
+			* the remaining nb of bytes in one write operation can be smaller than one cluster
+			* this can happen because the ringbuffer size is always a power of 2
+			*/
+			if(vec[0].len<cluster_size) {
+				
+				// encode to the temporary buffer
+				debugPrint(DEBUG_LEVEL_WAIT, "W: %d [%d %d] %d\n",bytes2write,vec[0].len,vec[1].len,1);
+					
+				xrun = freebob_am824_xmit(connection->cluster_buffer, 1, offset, dbc, connection);
+				
+				if(xrun<0) {
+						// xrun detected
+					printError("Frame buffer underrun on playback connection %d\n",i);
+					break;
+				}
+					
+				// use the ringbuffer function to write one cluster (handles wrap around)
+				freebob_ringbuffer_write(connection->event_buffer,connection->cluster_buffer,cluster_size);
+					
+				// we advanced one cluster_size
+				bytes2write-=cluster_size;
+					
+			} else { // 
+				
+				if(bytes2write>vec[0].len) {
+					// align to a cluster boundary
+					byteswritten=vec[0].len-(vec[0].len%cluster_size);
+				} else {
+					byteswritten=bytes2write;
+				}
+					
+				debugPrint(DEBUG_LEVEL_WAIT, "W: %d [%d %d] %d\n",bytes2write,vec[0].len,vec[1].len,byteswritten);
+					
+				xrun = freebob_am824_xmit(vec[0].buf, byteswritten/sizeof(quadlet_t)/connection->spec.dimension, offset, dbc, connection);
+					
+				if(xrun<0) {
+						// xrun detected
+					printError("Frame buffer underrun on playback connection %d\n",i);
+					break;
+				}
+	
+				freebob_ringbuffer_write_advance(connection->event_buffer, byteswritten);
+				bytes2write -= byteswritten;
+			}
+				
+			// the bytes2write should always be cluster aligned
+			assert(bytes2write%cluster_size==0);
+				
+		}
+
+		debugPrint(DEBUG_LEVEL_WAIT, "W: > %d\n",freebob_ringbuffer_write_space(connection->event_buffer));
+	}
+	
+	
+	return 0;
+}
+
+int freebob_streaming_transfer_buffers(freebob_device_t *dev) {
+	int err=0;
+	
+	err=freebob_streaming_transfer_capture_buffers(dev);
+	if (err) return err;
+	
+	err=freebob_streaming_transfer_playback_buffers(dev);
+	return err;
+	
+}
+
+
+int freebob_streaming_write(freebob_device_t *dev, int i, freebob_sample_t *buffer, int nsamples) {
+	int retval;
+	
+	freebob_stream_t *stream;
+	assert(i<dev->nb_playback_streams);
+	
+	stream=*(dev->playback_streams+i);
+	assert(stream);
+	
+	retval=freebob_ringbuffer_write(stream->buffer,(char *)buffer,nsamples*sizeof(freebob_sample_t))/sizeof(freebob_sample_t);
+		
+	return retval;
+}
+
+int freebob_streaming_read(freebob_device_t *dev, int i, freebob_sample_t *buffer, int nsamples) {
+	// this has one ringbuffer too many, but that will be solved shortly
+	int retval=0;
+
+	freebob_stream_t *stream;
+	assert(i<dev->nb_capture_streams);
+	
+	stream=*(dev->capture_streams+i);
+	assert(stream);
+	
+	// now read from the stream ringbuffer
+	retval=freebob_ringbuffer_read(stream->buffer, (char *)buffer, nsamples*sizeof(freebob_sample_t))/sizeof(freebob_sample_t);	
+
+// 	fprintf(stderr,"rb read1 [%02d: %08p %08p %08X, %d, %d]\n",stream->spec.position, stream, stream->buffer, *buffer, nsamples, retval);
+	
+	return retval;
+}
+
+pthread_t freebob_streaming_get_packetizer_thread(freebob_device_t *dev) {
+	return dev->packetizer.transfer_thread;
+}
+
+/* --------------------- *
+ * PRIVATE STUFF         *
+ * --------------------- */
+ 
+ 
+unsigned int freebob_streaming_register_generic_stream(freebob_stream_t *stream, freebob_stream_t ***oldset, unsigned int set_size) {
+	int i;
+	int found=0;
+	unsigned int new_set_size;
+	
+	freebob_stream_t **new_streams=calloc(set_size+1,sizeof(freebob_stream_t *));
+	freebob_stream_t **set=*oldset;
+	
+	for (i=0;i<set_size;i++) {
+		*(new_streams+i)=*(set+i);
+		if(*(set+i)==stream) {
+			printError("FREEBOB: stream already registered\n");
+			found=1;
+		}
+	}
+	if (!found) {
+		*(new_streams+set_size)=stream;
+		new_set_size=set_size+1;
+		
+		free(*oldset);
+		*oldset=new_streams; 
+	} else {
+		free(new_streams);
+		new_set_size=set_size;
+	}
+	return new_set_size;
+	
+}
+
+void freebob_streaming_register_capture_stream(freebob_device_t *dev, freebob_stream_t *stream) {
+	dev->nb_capture_streams=
+		freebob_streaming_register_generic_stream(
+			stream, 
+			&dev->capture_streams, 
+			dev->nb_capture_streams);
+	if (stream->spec.format==IEC61883_STREAM_TYPE_MBLA) {
+		dev->nb_synced_capture_streams=
+			freebob_streaming_register_generic_stream(
+				stream, 
+				&dev->synced_capture_streams, 
+				dev->nb_synced_capture_streams);
+	}
+}
+
+void freebob_streaming_register_playback_stream(freebob_device_t *dev, freebob_stream_t *stream) {
+	dev->nb_playback_streams=
+		freebob_streaming_register_generic_stream(
+			stream, 
+			&dev->playback_streams, 
+			dev->nb_playback_streams);
+	if (stream->spec.format==IEC61883_STREAM_TYPE_MBLA) {
+		dev->nb_synced_playback_streams=
+			freebob_streaming_register_generic_stream(
+				stream, 
+				&dev->synced_playback_streams, 
+				dev->nb_synced_playback_streams);
+	}
+}
+
+static inline int
+freebob_streaming_period_complete (freebob_device_t *dev) {
+	unsigned long i;
+	//unsigned int period_boundary_bytes=dev->options.period_size*sizeof(freebob_sample_t);
+	
+	assert(dev);
+	
+	for(i=0; i < dev->nb_connections; i++) {
+		freebob_connection_t *connection= &(dev->connections[i]);
+		if (connection->status.frames_left > 0) {
+			return FALSE;
+		}
+	}
+	return TRUE;
+	
+#if 0	
+	for(i=0; i < dev->nb_synced_capture_streams; i++) {
+		assert(dev->synced_capture_streams);
+		assert(dev->synced_capture_streams[i]);
+		
+		/* We check if there is more than one period of samples in the buffer.
+		 * if not the period isn't complete yet.
+		 */
+		if (freebob_ringbuffer_read_space(dev->synced_capture_streams[i]->buffer) < period_boundary_bytes) {
+			return FALSE; 
+		}
+	}
+	
+	for(i=0; i < dev->nb_synced_playback_streams; i++) {
+		assert(dev->synced_playback_streams);
+		assert(dev->synced_playback_streams[i]);
+		//FIXME: check this!
+		/* We check if there is still one period of samples in the output buffer.
+		 * if so, the period isn't complete yet.
+		 */
+		if (freebob_ringbuffer_read_space(dev->synced_playback_streams[i]->buffer) > period_boundary_bytes) {
+			return FALSE;
+		}
+	}
+	return TRUE;
+#endif
+}
+
+static inline void
+freebob_streaming_period_reset (freebob_device_t *dev) {
+// 	unsigned long i;
+	//unsigned int period_boundary_bytes=dev->options.period_size*sizeof(freebob_sample_t);
+	unsigned long i;
+	//unsigned int period_boundary_bytes=dev->options.period_size*sizeof(freebob_sample_t);
+	printEnter();
+	assert(dev);
+	
+	for(i=0; i < dev->nb_connections; i++) {
+		freebob_connection_t *connection= &(dev->connections[i]);
+		connection->status.frames_left+=dev->options.period_size;
+		// enable poll
+		connection->pfd->events=POLLIN;
+	}
+	printExit();
+	return;
+}
+
+static inline int
+freebob_streaming_xrun_detected_on_connection (freebob_device_t *dev, freebob_connection_t *connection) {
+	assert((connection));
+	if (connection->status.xruns>0) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static inline int
+freebob_streaming_xrun_detected (freebob_device_t *dev, freebob_connection_t **connections, int nb_connections) {
+	int i;
+	
+	for(i=0; i < nb_connections; i++) {
+		assert((connections[i]));
+
+		if (freebob_streaming_xrun_detected_on_connection (dev, connections[i])) {
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+int freebob_streaming_start_iso_connection(freebob_device_t *dev, freebob_connection_t *connection) {
+	int err;
+
+	err=0;
+	if (connection->spec.direction == FREEBOB_CAPTURE) {
+		connection->status.packets=0;	
+		connection->status.dropped=0;		
+		if (connection->spec.is_master) { //master connection
+
+			debugPrint(DEBUG_LEVEL_STARTUP, 
+				"Init ISO master receive handler on channel %d...\n",
+				connection->iso.iso_channel);
+
+			debugPrint(DEBUG_LEVEL_STARTUP, 
+				"   (%s, BUFFERS=%d, PACKET_SIZE=%d, PACKET_MAX=%d, IRQ=%d, %d PKT/PERIOD)...\n",
+				(connection->iso.receive_mode==RAW1394_DMA_PACKET_PER_BUFFER ? "PACKET_PER_BUFFER" : "BUFFERFILL"),
+				connection->iso.buffers, 
+				connection->iso.packet_size,
+				connection->iso.max_packet_size,
+				connection->iso.irq_interval,
+				connection->iso.packets_per_period);
+
+			raw1394_iso_recv_init(
+					connection->raw_handle, 
+					iso_master_receive_handler, 
+					connection->iso.buffers,
+					connection->iso.max_packet_size, 
+					connection->iso.iso_channel, 
+ 					connection->iso.receive_mode, // RAW1394_DMA_BUFFERFILL, 
+					connection->iso.irq_interval);
+
+		} else {
+			//slave receive connection
+			debugPrint(DEBUG_LEVEL_STARTUP, 
+				"Init ISO slave receive handler on channel %d...\n",
+				connection->iso.iso_channel);
+
+			debugPrint(DEBUG_LEVEL_STARTUP, 
+				"   (%s, BUFFERS=%d, PACKET_SIZE=%d, PACKET_MAX=%d, IRQ=%d, %d PKT/PERIOD)...\n",
+				(connection->iso.receive_mode==RAW1394_DMA_PACKET_PER_BUFFER ? "PACKET_PER_BUFFER" : "BUFFERFILL"),				connection->iso.buffers, 
+				connection->iso.packet_size,
+				connection->iso.max_packet_size,
+				connection->iso.irq_interval,
+				connection->iso.packets_per_period);
+
+			raw1394_iso_recv_init(	
+					connection->raw_handle, 
+					iso_slave_receive_handler, 
+					connection->iso.buffers,
+					connection->iso.max_packet_size, 
+					connection->iso.iso_channel, 
+ 					connection->iso.receive_mode, // RAW1394_DMA_BUFFERFILL, 
+					connection->iso.irq_interval);
+		}
+		
+		debugPrint(DEBUG_LEVEL_STARTUP, 
+			"Start ISO receive for connection on channel %d at cycle %d...\n",
+			  connection->iso.iso_channel, connection->iso.startcycle);
+			
+		err = raw1394_iso_recv_start(
+				connection->raw_handle, 
+		connection->iso.startcycle, 
+		-1,//IEC61883_TAG_WITH_CIP, 
+		0);
+
+		if (err) {
+			printError("FREEBOB: couldn't start receiving: %s\n",
+					   strerror (errno));
+				// TODO: cleanup
+			return err;
+		}					
+		
+	} else if (connection->spec.direction == FREEBOB_PLAYBACK) {
+		
+		if (connection->spec.is_master) { // master connection
+			debugPrint(DEBUG_LEVEL_STARTUP, 
+				"Init ISO master transmit handler on channel %d...\n",
+				connection->iso.iso_channel);
+
+			debugPrint(DEBUG_LEVEL_STARTUP, 
+				"   (BUFFERS=%d, PACKET_SIZE=%d, PACKET_MAX=%d, IRQ=%d, %d PKT/PERIOD)...\n",
+				connection->iso.buffers, 
+				connection->iso.packet_size,
+				connection->iso.max_packet_size,
+				connection->iso.irq_interval,
+				connection->iso.packets_per_period);
+
+				
+			raw1394_iso_xmit_init(
+					connection->raw_handle, 
+					iso_master_transmit_handler, 
+					connection->iso.buffers,
+					connection->iso.max_packet_size, 
+					connection->iso.iso_channel, 
+					RAW1394_ISO_SPEED_400, 
+					connection->iso.irq_interval);			
+		} else {
+			
+			debugPrint(DEBUG_LEVEL_STARTUP, 
+				"Init ISO slave transmit handler on channel %d...\n",
+				connection->iso.iso_channel);
+
+			debugPrint(DEBUG_LEVEL_STARTUP, 
+				"   (BUFFERS=%d, PACKET_SIZE=%d, PACKET_MAX=%d, IRQ=%d, %d PKT/PERIOD)...\n",
+				connection->iso.buffers, 
+				connection->iso.packet_size,
+				connection->iso.max_packet_size,
+				connection->iso.irq_interval,
+				connection->iso.packets_per_period);
+
+			raw1394_iso_xmit_init(
+					connection->raw_handle, 
+					iso_slave_transmit_handler, 
+					connection->iso.buffers,
+					connection->iso.max_packet_size, 
+					connection->iso.iso_channel, 
+					RAW1394_ISO_SPEED_400, 
+					connection->iso.irq_interval);	
+
+		}
+	
+		debugPrint(DEBUG_LEVEL_STARTUP, 
+			"Start ISO transmit for connection on channel %d at cycle %d\n",
+			connection->iso.iso_channel, connection->iso.startcycle);
+			
+		err=raw1394_iso_xmit_start(
+			connection->raw_handle, 
+			connection->iso.startcycle, 
+			connection->iso.prebuffers);
+
+		if (err) {
+			printError("FREEBOB: couldn't start transmitting: %s\n",
+					   strerror (errno));
+				// TODO: cleanup
+			return err;
+		}
+	}
+	return 0;
+}
+
+int freebob_streaming_stop_iso_connection(freebob_device_t *dev, freebob_connection_t *connection) {
+	
+	debugPrintWithTimeStamp(DEBUG_LEVEL_STARTUP, "Stop connection on channel %d ...\n", connection->iso.iso_channel);
+	if (connection->spec.direction == FREEBOB_CAPTURE) {
+		raw1394_iso_recv_flush(connection->raw_handle);
+	} else {
+		raw1394_iso_xmit_sync(connection->raw_handle);
+	}
+		
+	raw1394_iso_stop(connection->raw_handle);
+	
+	debugPrint(DEBUG_LEVEL_STARTUP, "Shutdown connection on channel %d ...\n", connection->iso.iso_channel);
+		
+	raw1394_iso_shutdown(connection->raw_handle);
+	
+	return 0;
+}
+
+int freebob_streaming_wait_for_sync_stream(freebob_device_t *dev, freebob_connection_t *connection) {
+	int err;
+	
+	debugPrint(DEBUG_LEVEL_STARTUP, "Waiting for the sync stream...\n");
+	
+	// start the sync master connection
+	
+	connection->iso.startcycle=-1; // don't care when we start this
+	connection->status.events=0;
+	
+	freebob_streaming_start_iso_connection(dev,connection);
+	
+	// wait until something is received/sent on the connection
+	while(connection->status.events==0) {
+		err=0;
+			
+		// get a packet on the sync master connection
+		err=raw1394_loop_iterate(connection->raw_handle);
+			
+		if (err == -1) {
+			printError("Possible raw1394 error: %s on sync master connection: %d\n",
+					   strerror (errno),connection->spec.id);
+		}
+	}
+	
+	freebob_streaming_stop_iso_connection(dev,connection);
+	
+	// reset the connection
+	freebob_streaming_reset_connection(dev, connection);
+	
+	// FIXME: only works for sync on receive stream because we don't prefill.
+	// ?FIXED?
+	if(connection->spec.direction==1) { // playback
+		int i;
+
+		if((err=freebob_streaming_reset_playback_streams(dev))<0) {
+			printError("Could not reset playback streams.\n");
+			return err;
+		}
+
+		// put nb_periods*period_size of null frames into the playback buffers
+		if((err=freebob_streaming_prefill_playback_streams(dev))<0) {
+			printError("Could not prefill playback streams.\n");
+			return err;
+		}
+			
+		// we should transfer nb_buffers periods of playback from the stream buffers to the event buffer
+		for (i=0;i<dev->options.nb_buffers;i++) {
+			freebob_streaming_transfer_playback_buffers(dev);
+		}
+	}	
+
+	debugPrint(DEBUG_LEVEL_STARTUP, "  stream is running.\n");
+
+	return 0;
+}
+
+int freebob_streaming_start_iso(freebob_device_t *dev) {
+	freebob_connection_t *connection=NULL;
+	unsigned int c;
+// 	int err;
+
+	// when starting the thread, we should wait with iterating the slave connections
+	// until the master connection has processed some samples, because the devices
+	// tend to start with a stream of no-data packets, leading to xruns on slave
+	// transmit, leading to multiple restarts of the thread, which doesn't work correctly (yet)
+/*	debugPrint(DEBUG_LEVEL_STARTUP, "Waiting for the sync master...\n");
+	
+	
+	connection=dev->sync_master_connection;
+	
+	// start the sync master connection
+	
+	connection->iso.startcycle=-1; // don't care when we start this
+	connection->status.events=0;
+	
+	freebob_streaming_start_iso_connection(dev,connection);*/
+	
+	// wait until something is received/sent on the connection
+// 	while(connection->status.events==0) {
+// 		err=0;
+// 		
+// 		// get a packet on the sync master connection
+// 		err=raw1394_loop_iterate(connection->raw_handle);
+// 		
+// 		if (err == -1) {
+// 			printError("Possible raw1394 error: %s on sync master connection: %d\n",
+// 					   strerror (errno),connection->spec.id);
+// 		}
+// 	}
+	
+#define NB_CYCLES_TO_SKIP 100
+
+	// get the last timestamp & calculate the start times for the connections
+	// start ISO xmit/receive
+	
+	// we introduce some delay to let the freebob devices start streaming.
+	usleep(2000);
+	freebob_streaming_wait_for_sync_stream(dev, dev->sync_master_connection);
+	
+	for(c=0; c < dev->nb_connections; c++) {
+		connection= &(dev->connections[c]);
+		
+// 		if(connection != dev->sync_master_connection) {
+			
+			connection->iso.startcycle=(dev->sync_master_connection->status.last_timestamp.cycle+NB_CYCLES_TO_SKIP)%8000;
+			
+// 			connection->iso.startcycle=0;
+			
+			freebob_streaming_start_iso_connection(dev, connection);
+// 		}	
+	}	
+	
+	return 0;
+}
+
+int freebob_streaming_stop_iso(freebob_device_t *dev) {
+	unsigned int c;
+	// stop ISO xmit/receive
+	for(c=0; c < dev->nb_connections; c++) {
+		freebob_connection_t *connection= &(dev->connections[c]);
+
+		freebob_streaming_stop_iso_connection(dev,connection);
+	}
+	return 0;
+}
+
+/*
+ * The thread responsible for packet iteration
+ */
+
+void * freebob_iso_packet_iterator(void *arg)
+{
+
+	freebob_device_t * dev=(freebob_device_t *) arg;
+	int err;
+// 	int cycle=0;
+	int underrun_detected=0;
+	
+	int notdone=TRUE;
+	
+	freebob_connection_t *connection=NULL;
+	
+	assert(dev);
+	assert(dev->sync_master_connection);
+	assert(dev->connections);
+	
+	debugPrint(DEBUG_LEVEL_STARTUP, "Entering packetizer thread...\n");
+	
+ 	freebob_streaming_start_iso(dev);
+
+	freebob_streaming_print_bufferfill(dev);
+	// start xmit/receive
+	debugPrint(DEBUG_LEVEL_STARTUP, "Go Go Go!!!\n");
+	
+#define POLL_BASED	
+#ifdef POLL_BASED 
+	while (dev->packetizer.run && !underrun_detected) {
+		
+		freebob_streaming_period_reset(dev);
+		
+		dev->watchdog_check = 1;
+		
+		notdone=TRUE;
+		
+		while(notdone) {
+			
+			err = poll (dev->pfds, dev->nfds, -1);
+			
+			if (err == -1) {
+				if (errno == EINTR) {
+					continue;
+				}
+				printError("poll error: %s\n", strerror (errno));
+				dev->packetizer.status = -2;
+				dev->packetizer.retval = 0;
+				notdone=FALSE;
+				break;
+			}
+			
+			int i=0;
+		
+			for (i = 0; i < dev->nfds; i++) {
+				if (dev->pfds[i].revents & POLLERR) {
+					printError ("error on fd for %d\n",i);
+				}
+
+				if (dev->pfds[i].revents & POLLHUP) {
+					printError ("hangup on fd for %d\n",i);
+				}
+				
+				if(dev->pfds[i].revents & (POLLIN)) {
+					// FIXME: this can segfault 
+					connection=dev->fdmap[i];
+					
+					assert(connection);
+					
+					err = raw1394_loop_iterate (connection->raw_handle);
+					
+					// detect underruns on the connection
+					if (freebob_streaming_xrun_detected_on_connection(dev,connection)) {
+						printError("Xrun on connection %d\n", connection->spec.id);
+						underrun_detected=TRUE;
+						break; // we can exit as the underrun handler will flush the buffers anyway
+					}
+				
+					if (err == -1) {
+						printError ("possible raw1394 error: %s\n", strerror (errno));
+						dev->packetizer.status = -2;
+						dev->packetizer.retval = 0;
+						notdone=FALSE;
+						break;
+					}
+				}
+
+				
+
+			}
+
+			notdone=(!freebob_streaming_period_complete(dev) && !underrun_detected && (dev->packetizer.run)) && notdone;
+		}
+		
+		if(underrun_detected) {
+			dev->xrun_detected=TRUE;
+		}
+
+#else
+	while (dev->packetizer.run && !underrun_detected) {
+		
+		freebob_streaming_period_reset(dev);
+			
+		dev->watchdog_check = 1;
+			
+		notdone=TRUE;
+			
+		while(notdone) {
+				
+			err=0;
+			
+			// this makes sure the sync_master finishes before the others finish
+			connection=dev->sync_master_connection;
+			if (connection->status.frames_left > 0) {
+				// process a packet on the sync master connection
+				err=raw1394_loop_iterate(connection->raw_handle);
+				
+				if (err == -1) {
+					printError("Possible raw1394 error: %s on sync master connection: %d\n",
+							strerror (errno),connection->spec.id);
+						
+					dev->packetizer.status = -2;
+					dev->packetizer.retval = 0;
+					notdone=FALSE;
+					break;
+				}
+				
+				// detect underruns on the sync master connection
+				if (freebob_streaming_xrun_detected(dev,&connection,1)) {
+					printError("Xrun on sync master connection %d\n", connection->spec.id);
+					underrun_detected=TRUE;
+					break; // we can exit as the underrun handler will flush the buffers anyway
+				}
+			}
+				
+			
+			// now iterate on the slave connections
+			int c;
+			for(c=0; c<dev->nb_connections; c++) {
+
+				connection = &(dev->connections[c]);
+				
+				if ((connection == dev->sync_master_connection))
+						continue;
+				
+				err=raw1394_loop_iterate(connection->raw_handle);
+				
+				if (err == -1) {
+					printError("Possible raw1394 error: %s on connection: %d\n",
+							strerror (errno),connection->spec.id);
+					dev->packetizer.status = -2;
+					dev->packetizer.retval = 0;
+					notdone=FALSE;
+				}
+				
+				// detect underruns
+				if (freebob_streaming_xrun_detected(dev,&connection,1)) {
+					printError("Xrun on slave connection %d\n", connection->spec.id);
+					underrun_detected=TRUE;
+					break; // we can exit as the underrun handler will flush the buffers anyway
+				}
+			}
+				
+			notdone=(!freebob_streaming_period_complete(dev) && !underrun_detected && (dev->packetizer.run)) && notdone;
+		}
+		
+		if(underrun_detected) {
+			dev->xrun_detected=TRUE;
+		}
+	
+#endif
+		// notify the waiting thread
+#ifdef DEBUG
+		debugPrint(DEBUG_LEVEL_HANDLERS, "Post semaphore ");
+		int c;
+		for(c=0; c<dev->nb_connections; c++) {
+			connection = &(dev->connections[c]);
+			debugPrintShort(DEBUG_LEVEL_HANDLERS,"[%d: %d]",c,connection->status.frames_left);
+		}
+		debugPrintShort(DEBUG_LEVEL_HANDLERS,"\n");
+#endif
+
+		sem_post(&dev->packetizer.transfer_boundary);
+
+#ifdef DEBUG
+		if((dev->sync_master_connection->status.packets - dev->sync_master_connection->status.total_packets_prev) > 1024*2) {
+			unsigned int i;
+			debugPrintShort(DEBUG_LEVEL_PACKETCOUNTER,"\r -> ");
+			
+			for(i=0; i < dev->nb_connections; i++) {
+				freebob_connection_t *connection= &(dev->connections[i]);
+				assert(connection);
+				
+				debugPrintShort(DEBUG_LEVEL_PACKETCOUNTER,"[%s, %02d, %10d, %04d, %4d, (R: %04d)]", 
+					(connection->spec.direction==FREEBOB_CAPTURE ? "C" : "P"),
+					connection->status.fdf,
+					connection->status.packets,
+					connection->status.last_cycle,
+					connection->status.dropped,
+					freebob_ringbuffer_read_space(connection->event_buffer)/(sizeof(quadlet_t)*connection->spec.dimension)
+				   );
+			}
+	
+			debugPrintShort(DEBUG_LEVEL_PACKETCOUNTER," XRUNS (%2d)",dev->xrun_count);	
+			fflush (stderr);
+			
+			dev->sync_master_connection->status.total_packets_prev=dev->sync_master_connection->status.packets;
+		}
+
+#endif
+
+	}
+	
+ 	freebob_streaming_stop_iso(dev);
+	
+	debugPrint(DEBUG_LEVEL_STARTUP, "Exiting packetizer thread...\n");
+	
+	
+	pthread_exit (0);	
+}
+
+void freebob_streaming_append_master_timestamp(freebob_device_t *dev, freebob_timestamp_t *t) {
+	int c;
+// 	int retval;
+	freebob_connection_t *connection;
+	
+	assert(dev);
+	
+	for(c=0; c<dev->nb_connections; c++) {
+
+		connection = &(dev->connections[c]);
+		
+		// skip the sync master
+		if ((connection == dev->sync_master_connection))
+			continue;
+		
+		// write the timestamp
+
+/*		retval=freebob_ringbuffer_write(connection->timestamp_buffer,(char *)t,sizeof(freebob_timestamp_t));
+		
+		if(retval!=sizeof(unsigned int)) {
+			printError("Timestamp buffer overrun on connection %d!\n",c);
+		}
+*/		
+	}
+}
+
+inline int freebob_streaming_decode_midi(freebob_connection_t *connection,
+								  quadlet_t* events, 
+								  unsigned int nsamples,
+								  unsigned int dbc
+								 ) {
+	quadlet_t *target_event;
+	
+	assert (connection);
+	assert (events);
+
+	freebob_stream_t *stream;
+	
+	unsigned int j=0;
+	unsigned int s=0;
+	int written=0;
+	quadlet_t *buffer;
+	
+	for (s=0;s<connection->nb_streams;s++) {
+		stream=&connection->streams[s];
+		
+		assert (stream);
+		assert (stream->spec.position < connection->spec.dimension);
+		assert(stream->user_buffer);
+		
+		if (stream->spec.format == IEC61883_STREAM_TYPE_MIDI) {
+			/* idea:
+			spec says: current_midi_port=(dbc+j)%8;
+			=> if we start at (dbc+stream->location-1)%8 [due to location_min=1], 
+			we'll start at the right event for the midi port.
+			=> if we increment j with 8, we stay at the right event.
+			*/
+			buffer=((quadlet_t *)(stream->user_buffer));
+			written=0;
+			
+ 			for(j = (dbc & 0x07)+stream->spec.location-1; j < nsamples; j += 8) {
+				target_event=(quadlet_t *)(events + ((j * connection->spec.dimension) + stream->spec.position));
+				quadlet_t sample_int=ntohl(*target_event);
+  				if(IEC61883_AM824_GET_LABEL(sample_int) != IEC61883_AM824_LABEL_MIDI_NO_DATA) {
+					*(buffer)=(sample_int >> 16);
+					buffer++;
+					written++;
+ 				}
+			}
+			
+			int written_to_rb=freebob_ringbuffer_write(stream->buffer, (char *)(stream->user_buffer), written*sizeof(quadlet_t))/sizeof(quadlet_t);
+			if(written_to_rb<written) {
+				printMessage("MIDI OUT bytes lost (%d/%d)",written_to_rb,written);
+			}
+		}
+	}
+	return 0;
+	
+}
+
+/*
+ * according to the MIDI over 1394 spec, we are only allowed to send a maximum of one midi byte every 320usec
+ * therefore we can only send one byte on 1 out of 3 iso cycles (=325usec)
+ */
+
+inline int freebob_streaming_encode_midi(freebob_connection_t *connection,
+								quadlet_t* events, 
+								unsigned int nsamples,
+								unsigned int dbc
+								) {
+	quadlet_t *target_event;
+	
+	assert (connection);
+	assert (events);
+
+	freebob_stream_t *stream;
+
+	unsigned int j=0;
+	unsigned int s=0;
+	int read=0;
+	quadlet_t *buffer;
+	
+	for (s=0;s<connection->nb_streams;s++) {
+		stream=&connection->streams[s];
+
+		assert (stream);
+		assert (stream->spec.position < connection->spec.dimension);
+		assert(stream->user_buffer);
+
+		if (stream->spec.format == IEC61883_STREAM_TYPE_MIDI) {
+			// first prefill the buffer with NO_DATA's on all time muxed channels
+			for(j=0; (j < nsamples); j++) {
+				target_event=(quadlet_t *)(events + ((j * connection->spec.dimension) + stream->spec.position));
+				
+				*target_event=htonl(IEC61883_AM824_SET_LABEL(0,IEC61883_AM824_LABEL_MIDI_NO_DATA));
+
+			}
+			
+			/* idea:
+				spec says: current_midi_port=(dbc+j)%8;
+				=> if we start at (dbc+stream->location-1)%8 [due to location_min=1], 
+				we'll start at the right event for the midi port.
+				=> if we increment j with 8, we stay at the right event.
+			*/
+			
+			if(stream->midi_counter<=0) { // we can send a byte
+				read=freebob_ringbuffer_read(stream->buffer, (char *)(stream->user_buffer), 1*sizeof(quadlet_t))/sizeof(quadlet_t);
+				if(read) {
+// 					j = (dbc%8)+stream->spec.location-1; 
+					j = (dbc & 0x07)+stream->spec.location-1; 
+					target_event=(quadlet_t *)(events + ((j * connection->spec.dimension) + stream->spec.position));
+					buffer=((quadlet_t *)(stream->user_buffer));
+				
+					*target_event=htonl(IEC61883_AM824_SET_LABEL((*buffer)<<16,IEC61883_AM824_LABEL_MIDI_1X));
+					stream->midi_counter=3; // only if we send a byte, we reset the counter
+				}
+			} else {
+				stream->midi_counter--;
+			}
+		}
+	}
+	return 0;
+
+}
+
+
+/**
+ * ISO send/receive callback handlers
+ */
+
+static enum raw1394_iso_disposition 
+iso_master_receive_handler(raw1394handle_t handle, unsigned char *data, 
+        unsigned int length, unsigned char channel,
+        unsigned char tag, unsigned char sy, unsigned int cycle, 
+        unsigned int dropped)
+{
+	enum raw1394_iso_disposition retval=RAW1394_ISO_OK;
+
+	freebob_connection_t *connection=(freebob_connection_t *) raw1394_get_userdata (handle);
+	assert(connection);
+	
+	struct iec61883_packet *packet = (struct iec61883_packet *) data;
+	assert(packet);
+	
+	// FIXME: dropped packets are very bad when transmitting and the other side is sync'ing on that!
+	connection->status.dropped+=dropped;
+
+#ifdef DEBUG	
+	connection->status.last_cycle=cycle;
+#endif
+
+	if((packet->fmt == 0x10) && (packet->fdf != 0xFF) && (packet->dbs>0) && (length>=2*sizeof(quadlet_t))) {
+		unsigned int nevents=((length / sizeof (quadlet_t)) - 2)/packet->dbs;
+		
+		// add the data payload to the ringbuffer
+
+		assert(connection->spec.dimension == packet->dbs);
+		
+		if (freebob_ringbuffer_write(
+				connection->event_buffer,(char *)(data+8),
+				nevents*sizeof(quadlet_t)*connection->spec.dimension) < 
+				nevents*sizeof(quadlet_t)*connection->spec.dimension) 
+		{
+			printError("MASTER RCV: Buffer overrun!\n"); 
+			connection->status.xruns++;
+			retval=RAW1394_ISO_DEFER;
+		} else {
+			retval=RAW1394_ISO_OK;
+			// we cannot offload midi encoding due to the need for a dbc value
+			freebob_streaming_decode_midi(connection,(quadlet_t *)(data+8), nevents, packet->dbc);
+		}
+		
+		// keep the frame counter
+		connection->status.frames_left -= nevents;
+		
+		// keep track of the total amount of events received
+		connection->status.events+=nevents;
+
+#ifdef DEBUG	
+		connection->status.fdf=packet->fdf;
+#endif
+		
+	} else {
+		// discard packet
+		// can be important for sync though
+	}
+
+	// one packet received
+	connection->status.packets++;
+
+	if(packet->dbs) {
+		unsigned int nevents=((length / sizeof (quadlet_t)) - 2)/packet->dbs;
+		debugPrintWithTimeStamp(DEBUG_LEVEL_HANDLERS_LOWLEVEL, 
+			"MASTER RCV: %08d, CH = %d, FDF = %X. SYT = %6d, DBS = %3d, DBC = %3d, FMT = %3d, LEN = %4d (%2d), DROPPED = %4d, info->packets=%4d, events=%4d, %d, %d\n", 
+			cycle, 
+			channel, packet->fdf,packet->syt,packet->dbs,packet->dbc,packet->fmt, length,
+			((length / sizeof (quadlet_t)) - 2)/packet->dbs, dropped, 
+			connection->status.packets, connection->status.events, connection->status.frames_left, 
+			nevents);
+	}	
+
+	if((connection->status.frames_left<=0)) {
+		connection->pfd->events=0;
+		return RAW1394_ISO_DEFER;
+	}
+
+	return retval;
+}
+
+
+static enum raw1394_iso_disposition 
+		iso_slave_receive_handler(raw1394handle_t handle, unsigned char *data, 
+								  unsigned int length, unsigned char channel,
+								  unsigned char tag, unsigned char sy, unsigned int cycle, 
+								  unsigned int dropped)
+{
+	enum raw1394_iso_disposition retval=RAW1394_ISO_OK;
+	/* slave receive is easy if you assume that the connections are synced
+	Synced connections have matched data rates, so just receiving and 
+	calling the rcv handler would suffice in this case. As the connection 
+	is externally matched to the master connection, the buffer fill will be ok.
+	*/
+	/* TODO: implement correct SYT behaviour */
+	 	
+	freebob_connection_t *connection=(freebob_connection_t *) raw1394_get_userdata (handle);
+	assert(connection);
+	
+	struct iec61883_packet *packet = (struct iec61883_packet *) data;
+	assert(packet);
+	
+	// FIXME: dropped packets are very bad when transmitting and the other side is sync'ing on that!
+	//connection->status.packets+=dropped;
+	connection->status.dropped+=dropped;
+
+#ifdef DEBUG	
+	connection->status.last_cycle=cycle;
+#endif
+
+	if((packet->fmt == 0x10) && (packet->fdf != 0xFF) && (packet->dbs>0) && (length>=2*sizeof(quadlet_t))) {
+		unsigned int nevents=((length / sizeof (quadlet_t)) - 2)/packet->dbs;
+
+#ifdef DEBUG	
+		connection->status.fdf=packet->fdf;
+#endif
+		
+		// add the data payload to the ringbuffer
+
+		assert(connection->spec.dimension == packet->dbs);
+
+		if (freebob_ringbuffer_write(
+				  	connection->event_buffer,(char *)(data+8),
+					nevents*sizeof(quadlet_t)*connection->spec.dimension) < 
+			nevents*sizeof(quadlet_t)*connection->spec.dimension) 
+		{
+			printError("SLAVE RCV: Buffer overrun!\n");
+			connection->status.xruns++;
+			retval=RAW1394_ISO_DEFER;
+		} else {
+			retval=RAW1394_ISO_OK;
+			// we cannot offload midi encoding due to the need for a dbc value
+			freebob_streaming_decode_midi(connection,(quadlet_t *)(data+8), nevents, packet->dbc);
+		}
+
+		connection->status.frames_left-=nevents;
+		
+		// keep track of the total amount of events received
+		connection->status.events+=nevents;
+	} else {
+		// discard packet
+		// can be important for sync though
+	}
+
+	// one packet received
+	connection->status.packets++;
+	
+	if(packet->dbs) {
+		debugPrintWithTimeStamp(DEBUG_LEVEL_HANDLERS_LOWLEVEL, 
+			"SLAVE RCV: CH = %d, FDF = %X. SYT = %6d, DBS = %3d, DBC = %3d, FMT = %3d, LEN = %4d (%2d), DROPPED = %6d\n", 
+			channel, packet->fdf,
+			packet->syt,
+			packet->dbs,
+			packet->dbc,
+			packet->fmt, 
+			length,
+			((length / sizeof (quadlet_t)) - 2)/packet->dbs, dropped);
+	}
+		
+		
+	if((connection->status.frames_left<=0)) {
+		connection->pfd->events=0;
+		return RAW1394_ISO_DEFER;
+	}
+
+	return retval;
+}
+
+/**
+ * The master transmit handler.
+ *
+ * This is the most difficult, because we have to generate timing information ourselves.
+ *
+ */
+
+/*
+ Includes code from libiec61883
+ */
+static enum raw1394_iso_disposition 
+iso_master_transmit_handler(raw1394handle_t handle,
+		unsigned char *data, unsigned int *length,
+		unsigned char *tag, unsigned char *sy,
+		int cycle, unsigned int dropped)
+{
+	freebob_connection_t *connection=(freebob_connection_t *) raw1394_get_userdata (handle);
+	assert(connection);
+	
+	struct iec61883_packet *packet = (struct iec61883_packet *) data;
+	assert(packet);
+	assert(length);
+	assert(tag);
+	assert(sy);	
+	
+	// construct the packet cip
+	int nevents = iec61883_cip_fill_header (handle, &connection->status.cip, packet);
+	int nsamples=0;
+	int bytes_read;
+	
+#ifdef DEBUG	
+	connection->status.last_cycle=cycle;
+
+	if(packet->fdf != 0xFF) {
+		connection->status.fdf=packet->fdf;
+	}
+#endif
+
+	enum raw1394_iso_disposition retval = RAW1394_ISO_OK;
+
+
+
+	if (nevents > 0) {
+		nsamples = nevents;
+	}
+	else {
+		if (connection->status.cip.mode == IEC61883_MODE_BLOCKING_EMPTY) {
+			nsamples = 0;
+		}
+		else {
+			nsamples = connection->status.cip.syt_interval;
+		}
+	}
+	
+	// dropped packets are very bad when transmitting and the other side is sync'ing on that!
+	connection->status.dropped += dropped;
+		
+	if (nsamples > 0) {
+
+		assert(connection->spec.dimension == packet->dbs);
+
+		if ((bytes_read=freebob_ringbuffer_read(connection->event_buffer,(char *)(data+8),nsamples*sizeof(quadlet_t)*connection->spec.dimension)) < 
+				   nsamples*sizeof(quadlet_t)*connection->spec.dimension) 
+		{
+			printError("MASTER XMT: Buffer underrun! (%d / %d) (%d / %d )\n",
+					   bytes_read,nsamples*sizeof(quadlet_t)*connection->spec.dimension,
+					   freebob_ringbuffer_read_space(connection->event_buffer),0);
+			connection->status.xruns++;
+			retval=RAW1394_ISO_DEFER;
+			nsamples=0;
+		} else {
+			retval=RAW1394_ISO_OK;
+			// we cannot offload midi encoding due to the need for a dbc value
+			freebob_streaming_encode_midi(connection,(quadlet_t *)(data+8), nevents, packet->dbc);
+		}
+	}
+	
+	*length = nsamples * connection->spec.dimension * sizeof (quadlet_t) + 8;
+	*tag = IEC61883_TAG_WITH_CIP;
+	*sy = 0;
+	
+	// keep track of the total amount of events transmitted
+	connection->status.events+=nsamples;
+	
+	connection->status.frames_left-=nsamples;
+		
+	// one packet transmitted
+	connection->status.packets++;
+
+	if(packet->dbs) {
+		debugPrintWithTimeStamp(DEBUG_LEVEL_HANDLERS_LOWLEVEL, 
+								"MASTER XMT: %08d, CH = %d, FDF = %X. SYT = %6d, DBS = %3d, DBC = %3d, FMT = %3d, LEN = %4d (%2d), DROPPED = %4d, info->packets=%4d, events=%4d, %d, %d %d\n", cycle, 
+								connection->iso.iso_channel,  packet->fdf,packet->syt,packet->dbs,packet->dbc,packet->fmt, *length,((*length / sizeof (quadlet_t)) - 2)/packet->dbs, dropped, 
+								connection->status.packets, connection->status.events, connection->status.frames_left, 
+								nevents, nsamples);
+	}
+
+	if((connection->status.frames_left<=0)) {
+		connection->pfd->events=0;
+		return RAW1394_ISO_DEFER;
+	}
+
+	return retval;
+
+}
+
+static enum raw1394_iso_disposition 
+		iso_slave_transmit_handler(raw1394handle_t handle,
+								   unsigned char *data, unsigned int *length,
+								   unsigned char *tag, unsigned char *sy,
+								   int cycle, unsigned int dropped)
+{
+	freebob_connection_t *connection=(freebob_connection_t *) raw1394_get_userdata (handle);
+	assert(connection);
+	
+	struct iec61883_packet *packet = (struct iec61883_packet *) data;
+	assert(packet);
+	assert(length);
+	assert(tag);
+	assert(sy);	
+	
+	// construct the packet cip
+	struct iec61883_cip old_cip;
+	memcpy(&old_cip,&connection->status.cip,sizeof(struct iec61883_cip));
+	
+	int nevents = iec61883_cip_fill_header (handle, &connection->status.cip, packet);
+	int nsamples=0;
+	int bytes_read;
+
+#ifdef DEBUG	
+	connection->status.last_cycle=cycle;
+
+	if(packet->fdf != 0xFF) {
+		connection->status.fdf=packet->fdf;
+	}
+#endif
+
+	enum raw1394_iso_disposition retval = RAW1394_ISO_OK;
+
+
+	if (nevents > 0) {
+		nsamples = nevents;
+	}
+	else {
+		if (connection->status.cip.mode == IEC61883_MODE_BLOCKING_EMPTY) {
+			nsamples = 0;
+		}
+		else {
+			nsamples = connection->status.cip.syt_interval;
+		}
+	}
+	
+	// dropped packets are very bad when transmitting and the other side is sync'ing on that!
+	//connection->status.packets+=dropped;
+	connection->status.dropped += dropped;
+		
+	if (nsamples > 0) {
+		int bytes_to_read=nsamples*sizeof(quadlet_t)*connection->spec.dimension;
+
+		assert(connection->spec.dimension == packet->dbs);
+
+		if ((bytes_read=freebob_ringbuffer_read(connection->event_buffer,(char *)(data+8),bytes_to_read)) < 
+			bytes_to_read) 
+		{
+			/* there is no more data in the ringbuffer */
+			
+			/* If there are already more than on period
+			* of frames transfered to the XMIT buffer, there is no xrun.
+			* 
+			*/
+			if(connection->status.frames_left<=0) {
+				// we stop processing this untill the next period boundary
+				// that's when new data is ready
+				
+				connection->pfd->events=0;
+				
+				// reset the cip to the old value
+				memcpy(&connection->status.cip,&old_cip,sizeof(struct iec61883_cip));
+
+				// retry this packed 
+				retval=RAW1394_ISO_AGAIN;
+				nsamples=0;
+			} else {
+				printError("SLAVE XMT : Buffer underrun! %d (%d / %d) (%d / %d )\n",
+					   connection->status.frames_left, bytes_read,bytes_to_read,
+					   freebob_ringbuffer_read_space(connection->event_buffer),0);
+				connection->status.xruns++;
+				retval=RAW1394_ISO_DEFER;
+				nsamples=0;
+ 			}
+		} else {
+			retval=RAW1394_ISO_OK;
+			// we cannot offload midi encoding due to the need for a dbc value
+			freebob_streaming_encode_midi(connection,(quadlet_t *)(data+8), nevents, packet->dbc);
+		}
+	}
+	
+	*length = nsamples * connection->spec.dimension * sizeof (quadlet_t) + 8;
+	*tag = IEC61883_TAG_WITH_CIP;
+	*sy = 0;
+	
+	// keep track of the total amount of events transmitted
+	connection->status.events+=nsamples;
+	
+	connection->status.frames_left-=nsamples;
+		
+	// one packet transmitted
+	connection->status.packets++;
+
+	if(packet->dbs) {
+		debugPrintWithTimeStamp(DEBUG_LEVEL_HANDLERS_LOWLEVEL, 
+								"SLAVE XMT : %08d, CH = %d, FDF = %X. SYT = %6d, DBS = %3d, DBC = %3d, FMT = %3d, LEN = %4d (%2d), DROPPED = %4d, info->packets=%4d, events=%4d, %d, %d %d\n", cycle, 
+								connection->iso.iso_channel,  packet->fdf,packet->syt,packet->dbs,packet->dbc,packet->fmt, *length,((*length / sizeof (quadlet_t)) - 2)/packet->dbs, dropped, 
+								connection->status.packets, connection->status.events, connection->status.frames_left, 
+								nevents, nsamples);
+	}
+
+	if((connection->status.frames_left<=0)) {
+		connection->pfd->events=0;
+		return RAW1394_ISO_DEFER;
+	}
+
+	return retval;
+
+}
+
+/*
+ * Decoders and encoders
+ */
+#ifdef ENABLE_SSE
+typedef float v4sf __attribute__ ((vector_size (16)));
+typedef int v4si __attribute__ ((vector_size (16)));
+typedef int v2si __attribute__ ((vector_size (8)));
+
+static inline int  
+freebob_decode_events_to_stream(freebob_connection_t *connection,
+								freebob_stream_t *stream, 
+								quadlet_t* events, 
+								unsigned int nsamples,
+								unsigned int dbc
+								) {
+	quadlet_t *target_event;
+	int do_ringbuffer_write=0;
+	
+	assert (stream);
+	assert (connection);
+	assert (events);
+	assert (stream->spec.position < connection->spec.dimension);
+		
+	freebob_sample_t *buffer=NULL;
+	float *floatbuff=NULL;
+
+	int dimension=connection->spec.dimension;
+	
+	static const float multiplier = 1.0f / (float)(0x7FFFFF);
+	static const float sse_multiplier[4] __attribute__((aligned(16))) = {
+		1.0f / (float)(0x7FFFFF),
+		1.0f / (float)(0x7FFFFF),
+		1.0f / (float)(0x7FFFFF),
+		1.0f / (float)(0x7FFFFF)
+	};
+	unsigned int tmp[4];
+
+	assert(stream->user_buffer);
+	
+	switch(stream->buffer_type) {
+		case freebob_buffer_type_per_stream:
+		default:
+			// use the preallocated buffer (at init time)
+			buffer=((freebob_sample_t *)(stream->user_buffer))+stream->user_buffer_position;
+			
+			do_ringbuffer_write=1;
+			break;
+				
+		case freebob_buffer_type_uint24:
+			buffer=((freebob_sample_t *)(stream->user_buffer))+stream->user_buffer_position;
+			
+			do_ringbuffer_write=0;
+			break;
+				
+		case freebob_buffer_type_float:
+			floatbuff=((float *)(stream->user_buffer))+stream->user_buffer_position;
+			
+			do_ringbuffer_write=0;
+			break;
+	}
+	
+	int j=0;
+	int written=0;
+	
+	if (stream->spec.format== IEC61883_STREAM_TYPE_MBLA) {
+		target_event=(quadlet_t *)(events + stream->spec.position);
+
+		// TODO: convert this into function pointer based
+		switch(stream->buffer_type) {
+			default:
+			case freebob_buffer_type_uint24:
+				for(j = 0; j < nsamples; j += 1) { // decode max nsamples
+					*(buffer)=(ntohl((*target_event) ) & 0x00FFFFFF);
+					buffer++;
+					target_event+=dimension;
+				}
+				break;
+			case freebob_buffer_type_float:
+				j=0;
+				if(nsamples>3) {
+					for(j = 0; j < nsamples-3; j += 4) {
+						tmp[0] = ntohl(*target_event);
+						target_event += dimension;
+						tmp[1] = ntohl(*target_event);
+						target_event += dimension;
+						tmp[2] = ntohl(*target_event);
+						target_event += dimension;
+						tmp[3] = ntohl(*target_event);
+						target_event += dimension;
+						asm("pslld $8, %[in2]\n\t" // sign extend 24th bit
+								"pslld $8, %[in1]\n\t"
+								"psrad $8, %[in2]\n\t"
+								"psrad $8, %[in1]\n\t"
+								"cvtpi2ps %[in2], %%xmm0\n\t"
+								"movlhps %%xmm0, %%xmm0\n\t"
+								"cvtpi2ps %[in1], %%xmm0\n\t"
+								"mulps %[ssemult], %%xmm0\n\t"
+								"movups %%xmm0, %[floatbuff]"
+							: [floatbuff] "=m" (*(v4sf*)floatbuff)
+							: [in1] "y" (*(v2si*)tmp),
+						[in2] "y" (*(v2si*)(tmp+2)),
+						[ssemult] "x" (*(v4sf*)sse_multiplier)
+							: "xmm0");
+						floatbuff += 4;
+					}
+				}
+				for(; j < nsamples; ++j) { // decode max nsamples
+					unsigned int v = ntohl(*target_event) & 0x00FFFFFF;
+					// sign-extend highest bit of 24-bit int
+					int tmp = (int)(v << 8) / 256;
+					*floatbuff = tmp * multiplier;
+
+					floatbuff++;
+					target_event += dimension;
+				}
+				asm volatile("emms");
+				
+				break;
+		}
+
+// 		fprintf(stderr,"rb write [%02d: %08p %08p]\n",stream->spec.position, stream, stream->buffer);
+	
+// 	fprintf(stderr,"rb write [%02d: %08p %08p %08X, %d, %d]\n",stream->spec.position, stream, stream->buffer, *buffer, nsamples, written);
+		if(do_ringbuffer_write) {
+			// reset the buffer pointer
+			buffer=((freebob_sample_t *)(stream->user_buffer))+stream->user_buffer_position;
+			written=freebob_ringbuffer_write(stream->buffer, (char *)(buffer), nsamples*sizeof(freebob_sample_t))/sizeof(freebob_sample_t);
+		} else {
+			written=nsamples;
+		}
+		
+// 	fprintf(stderr,"rb write1[%02d: %08p %08p %08X, %d, %d]\n",stream->spec.position, stream, stream->buffer, *buffer, nsamples, written);
+		
+		return written;
+	
+	} else if (stream->spec.format == IEC61883_STREAM_TYPE_MIDI) {
+		return nsamples; // for midi streams we always indicate a full write
+	
+	} else {//if (stream->spec.format == IEC61883_STREAM_TYPE_SPDIF) {
+		return nsamples; // for unsupported we always indicate a full read
+	
+	}
+	
+	return 0;
+
+
+}
+
+static inline int 
+freebob_encode_stream_to_events(freebob_connection_t *connection,
+								freebob_stream_t *stream,
+								quadlet_t* events,
+								unsigned int nsamples,
+								unsigned int dbc
+								) {
+	quadlet_t *target_event;
+	//freebob_sample_t buff[nsamples];
+	int do_ringbuffer_read=0;
+	
+	freebob_sample_t *buffer=NULL;
+	float *floatbuff=NULL;
+
+	const float multiplier = (float)(0x7FFFFF00);
+	static const float sse_multiplier[4] __attribute__((aligned(16))) = {
+		(float)(0x7FFFFF00),
+		(float)(0x7FFFFF00),
+		(float)(0x7FFFFF00),
+		(float)(0x7FFFFF00)
+	};
+
+	static const int sse_mask[4] __attribute__((aligned(16))) = {
+		0x40000000,  0x40000000,  0x40000000,  0x40000000
+	};
+
+	unsigned int out[4];	
+	
+	int dimension=connection->spec.dimension;
+	
+	unsigned int j=0;
+	unsigned int read=0;
+
+	assert (stream);
+	assert (connection);
+	assert (events);
+	assert (stream->spec.position < connection->spec.dimension);
+	
+	switch(stream->buffer_type) {
+		case freebob_buffer_type_per_stream:
+		default:
+//			assert(nsamples < dev->options.period_size);
+			// use the preallocated buffer (at init time)
+			buffer=((freebob_sample_t *)(stream->user_buffer))+stream->user_buffer_position;
+			
+			do_ringbuffer_read=1;
+			break;
+				
+		case freebob_buffer_type_uint24:
+			buffer=((freebob_sample_t *)(stream->user_buffer))+stream->user_buffer_position;
+			
+			do_ringbuffer_read=0;
+			break;
+				
+		case freebob_buffer_type_float:
+			floatbuff=((float *)(stream->user_buffer))+stream->user_buffer_position;
+			
+			do_ringbuffer_read=0;
+			break;
+	}
+	
+	
+	if(stream->spec.format == IEC61883_STREAM_TYPE_MBLA) { // MBLA
+		target_event=(quadlet_t *)(events + (stream->spec.position));
+		
+		if(do_ringbuffer_read) {
+			read=freebob_ringbuffer_read(stream->buffer, (char *)buffer, nsamples*sizeof(freebob_sample_t))/sizeof(freebob_sample_t);
+		} else {
+			read=nsamples;
+		}
+		
+		// TODO: convert this into function pointer based
+		switch(stream->buffer_type) {
+			default:
+			case freebob_buffer_type_uint24:
+				for(j = 0; j < read; j += 1) { // decode max nsamples
+					*target_event = htonl((*(buffer) & 0x00FFFFFF) | 0x40000000);
+					buffer++;
+					target_event+=dimension;
+					
+		//			fprintf(stderr,"[%03d, %02d: %08p %08X %08X]\n",j, stream->spec.position, target_event, *target_event, *buffer);
+
+				}
+				break;
+			case freebob_buffer_type_float:
+/*				for(j = 0; j < read; j += 1) { // decode max nsamples
+					// don't care for overflow
+					float v = *floatbuff * multiplier;  // v: -231 .. 231
+					unsigned int tmp = ((int)v);
+					*target_event = htonl((tmp >> 8) | 0x40000000);
+					
+					floatbuff++;
+					target_event += connection->spec.dimension;
+				}*/
+				j=0;
+				if(read>3) {
+					for (j = 0; j < read-3; j += 4) {
+						asm("movups %[floatbuff], %%xmm0\n\t"
+								"mulps %[ssemult], %%xmm0\n\t"
+								"cvttps2pi %%xmm0, %[out1]\n\t"
+								"movhlps %%xmm0, %%xmm0\n\t"
+								"psrld $8, %[out1]\n\t"
+								"cvttps2pi %%xmm0, %[out2]\n\t"
+								"por %[mmxmask], %[out1]\n\t"
+								"psrld $8, %[out2]\n\t"
+								"por %[mmxmask], %[out2]\n\t"
+							: [out1] "=&y" (*(v2si*)&out[0]),
+						[out2] "=&y" (*(v2si*)&out[2])
+							: [floatbuff] "m" (*(v4sf*)floatbuff),
+						[ssemult] "x" (*(v4sf*)sse_multiplier),
+						[mmxmask] "y" (*(v2si*)sse_mask)
+							: "xmm0");
+						floatbuff += 4;
+						*target_event = htonl(out[0]);
+						target_event += dimension;
+						*target_event = htonl(out[1]);
+						target_event += dimension;
+						*target_event = htonl(out[2]);
+						target_event += dimension;
+						*target_event = htonl(out[3]);
+						target_event += dimension;
+					}
+				}
+				for(; j < read; ++j) {
+				// don't care for overflow
+					float v = *floatbuff * multiplier;  // v: -231 .. 231
+					unsigned int tmp = (int)v;
+					*target_event = htonl((tmp >> 8) | 0x40000000);
+		
+					floatbuff++;
+					target_event += dimension;
+				}
+
+				asm volatile("emms");
+				break;
+		}
+		
+		/*		
+		for(j = 0; j < nsamples; j+=1) {
+			*target_event = htonl((*(buffer) & 0x00FFFFFF) | 0x40000000);
+			buffer++;
+			target_event+=connection->spec.dimension;
+		}
+		*/
+		
+		return read;
+		
+	} else if (stream->spec.format == IEC61883_STREAM_TYPE_MIDI) {
+		return nsamples; // for midi we always indicate a full read
+	
+	} else { //if (stream->spec.format == IEC61883_STREAM_TYPE_SPDIF) {
+		return nsamples; // for unsupported we always indicate a full read
+	
+	}
+	return 0;
+
+}
+
+#else
+
+static inline int  
+freebob_decode_events_to_stream(freebob_connection_t *connection,
+								freebob_stream_t *stream, 
+								quadlet_t* events, 
+								unsigned int nsamples,
+								unsigned int dbc
+								) {
+	quadlet_t *target_event;
+	int do_ringbuffer_write=0;
+	
+	assert (stream);
+	assert (connection);
+	assert (events);
+	assert (stream->spec.position < connection->spec.dimension);
+		
+	freebob_sample_t *buffer=NULL;
+	float *floatbuff=NULL;
+
+	const float multiplier = 1.0f / (float)(0x7FFFFF);
+	
+	int dimension=connection->spec.dimension;
+	
+	assert(stream->user_buffer);
+	
+	switch(stream->buffer_type) {
+		case freebob_buffer_type_per_stream:
+		default:
+//			assert(nsamples < dev->options.period_size);
+			
+			// use the preallocated buffer (at init time)
+			buffer=((freebob_sample_t *)(stream->user_buffer))+stream->user_buffer_position;
+			
+			do_ringbuffer_write=1;
+			break;
+				
+		case freebob_buffer_type_uint24:
+			buffer=((freebob_sample_t *)(stream->user_buffer))+stream->user_buffer_position;
+			
+			do_ringbuffer_write=0;
+			break;
+				
+		case freebob_buffer_type_float:
+			floatbuff=((float *)(stream->user_buffer))+stream->user_buffer_position;
+			
+			do_ringbuffer_write=0;
+			break;
+	}
+	
+	int j=0;
+	int written=0;
+	
+	if (stream->spec.format== IEC61883_STREAM_TYPE_MBLA) {
+		target_event=(quadlet_t *)(events + stream->spec.position);
+
+		// TODO: convert this into function pointer based
+		switch(stream->buffer_type) {
+			default:
+			case freebob_buffer_type_uint24:
+				for(j = 0; j < nsamples; j += 1) { // decode max nsamples
+					*(buffer)=(ntohl((*target_event) ) & 0x00FFFFFF);
+		//			fprintf(stderr,"[%03d, %02d: %08p %08X %08X]\n",j, stream->spec.position, target_event, *target_event, *buffer);
+					buffer++;
+					target_event+=dimension;
+				}
+				break;
+			case freebob_buffer_type_float:
+				for(j = 0; j < nsamples; j += 1) { // decode max nsamples		
+
+					unsigned int v = ntohl(*target_event) & 0x00FFFFFF;
+					// sign-extend highest bit of 24-bit int
+					int tmp = (int)(v << 8) / 256;
+		
+					*floatbuff = tmp * multiplier;
+				
+					floatbuff++;
+					target_event+=dimension;
+				}
+				break;
+		}
+
+// 		fprintf(stderr,"rb write [%02d: %08p %08p]\n",stream->spec.position, stream, stream->buffer);
+	
+// 	fprintf(stderr,"rb write [%02d: %08p %08p %08X, %d, %d]\n",stream->spec.position, stream, stream->buffer, *buffer, nsamples, written);
+		if(do_ringbuffer_write) {
+			// reset the buffer pointer
+			buffer=((freebob_sample_t *)(stream->user_buffer))+stream->user_buffer_position;
+			written=freebob_ringbuffer_write(stream->buffer, (char *)(buffer), nsamples*sizeof(freebob_sample_t))/sizeof(freebob_sample_t);
+		} else {
+			written=nsamples;
+		}
+		
+// 	fprintf(stderr,"rb write1[%02d: %08p %08p %08X, %d, %d]\n",stream->spec.position, stream, stream->buffer, *buffer, nsamples, written);
+		
+		return written;
+	
+	} else if (stream->spec.format == IEC61883_STREAM_TYPE_MIDI) {
+		return nsamples; // for midi streams we always indicate a full write
+	
+	} else {//if (stream->spec.format == IEC61883_STREAM_TYPE_SPDIF) {
+		return nsamples; // for unsupported we always indicate a full read
+	
+	}
+	
+	return 0;
+
+
+}
+
+static inline int 
+freebob_encode_stream_to_events(freebob_connection_t *connection,
+								freebob_stream_t *stream,
+								quadlet_t* events,
+								unsigned int nsamples,
+								unsigned int dbc
+								) {
+	quadlet_t *target_event;
+	//freebob_sample_t buff[nsamples];
+	int do_ringbuffer_read=0;
+	
+	freebob_sample_t *buffer=NULL;
+	float *floatbuff=NULL;
+
+	const float multiplier = (float)(0x7FFFFF00);
+	int dimension=connection->spec.dimension;
+	
+	unsigned int j=0;
+	unsigned int read=0;
+
+	assert (stream);
+	assert (connection);
+	assert (events);
+	assert (stream->spec.position < connection->spec.dimension);
+	
+	switch(stream->buffer_type) {
+		case freebob_buffer_type_per_stream:
+		default:
+//			assert(nsamples < dev->options.period_size);
+			// use the preallocated buffer (at init time)
+			buffer=((freebob_sample_t *)(stream->user_buffer))+stream->user_buffer_position;
+			
+			do_ringbuffer_read=1;
+			break;
+				
+		case freebob_buffer_type_uint24:
+			buffer=((freebob_sample_t *)(stream->user_buffer))+stream->user_buffer_position;
+			
+			do_ringbuffer_read=0;
+			break;
+				
+		case freebob_buffer_type_float:
+			floatbuff=((float *)(stream->user_buffer))+stream->user_buffer_position;
+			
+			do_ringbuffer_read=0;
+			break;
+	}
+	
+	
+	if(stream->spec.format == IEC61883_STREAM_TYPE_MBLA) { // MBLA
+		target_event=(quadlet_t *)(events + (stream->spec.position));
+		
+		if(do_ringbuffer_read) {
+			read=freebob_ringbuffer_read(stream->buffer, (char *)buffer, nsamples*sizeof(freebob_sample_t))/sizeof(freebob_sample_t);
+		} else {
+			read=nsamples;
+		}
+		
+		// TODO: convert this into function pointer based
+		switch(stream->buffer_type) {
+			default:
+			case freebob_buffer_type_uint24:
+				for(j = 0; j < read; j += 1) { // decode max nsamples
+					*target_event = htonl((*(buffer) & 0x00FFFFFF) | 0x40000000);
+					buffer++;
+					target_event+=dimension;
+					
+		//			fprintf(stderr,"[%03d, %02d: %08p %08X %08X]\n",j, stream->spec.position, target_event, *target_event, *buffer);
+
+				}
+				break;
+			case freebob_buffer_type_float:
+				for(j = 0; j < read; j += 1) { // decode max nsamples
+					// don't care for overflow
+					float v = *floatbuff * multiplier;  // v: -231 .. 231
+					unsigned int tmp = ((int)v);
+					*target_event = htonl((tmp >> 8) | 0x40000000);
+					
+					floatbuff++;
+					target_event += dimension;
+				}
+				break;
+		}
+		
+		/*		
+		for(j = 0; j < nsamples; j+=1) {
+			*target_event = htonl((*(buffer) & 0x00FFFFFF) | 0x40000000);
+			buffer++;
+			target_event+=connection->spec.dimension;
+		}
+		*/
+		
+		return read;
+		
+	} else if (stream->spec.format == IEC61883_STREAM_TYPE_MIDI) {
+		return nsamples; // for midi we always indicate a full read
+	
+	} else { //if (stream->spec.format == IEC61883_STREAM_TYPE_SPDIF) {
+		return nsamples; // for unsupported we always indicate a full read
+	
+	}
+	return 0;
+
+}
+#endif
+
+/* 
+ * write received events to the stream ringbuffers.
+ */
+
+int freebob_am824_recv(char *data, 
+					   int nevents, unsigned int offset, unsigned int dbc,
+			       freebob_connection_t *connection)
+{
+	int xrun=0;
+	unsigned int i=0;
+	
+	for(i = 0; i < connection->nb_streams; i++) {
+		freebob_stream_t *stream = &(connection->streams[i]);
+		size_t written=0;
+		
+		assert(stream);
+		
+		stream->user_buffer_position=offset;
+		
+		debugPrintShort(DEBUG_LEVEL_HANDLERS,"[%d: %d ",i,freebob_ringbuffer_write_space(stream->buffer));
+		written = freebob_decode_events_to_stream(
+			connection,
+			stream,
+			(quadlet_t *)data,
+			nevents,
+			dbc
+			);
+
+		if (written < nevents) {
+			xrun++;
+		}
+		
+		debugPrintShort(DEBUG_LEVEL_HANDLERS, "%d %d]",written,freebob_ringbuffer_write_space(stream->buffer));
+	}
+	
+// 	connection->status.frames_left-=nevents;
+		
+	debugPrintShort(DEBUG_LEVEL_HANDLERS, "\n");
+	
+	return xrun;
+}
+
+/* 
+ * get xmit events from ringbuffer
+ */
+
+int freebob_am824_xmit(	char *data, 
+						int nevents, unsigned int offset, unsigned int dbc, 
+						freebob_connection_t *connection)
+{
+	int xrun=0;
+	unsigned int i=0;
+	
+	for(i = 0; i < connection->nb_streams; i++) {
+		freebob_stream_t *stream = &(connection->streams[i]);
+		size_t read=0;
+		
+		assert(stream);
+		debugPrintShort(DEBUG_LEVEL_HANDLERS, "[%d: %d ",i,freebob_ringbuffer_read_space(stream->buffer));
+		
+		stream->user_buffer_position=offset;
+		
+		read = freebob_encode_stream_to_events(
+			connection,
+			stream,
+			(quadlet_t *)data,
+			nevents,
+			dbc
+			);
+		
+		debugPrintShort(DEBUG_LEVEL_HANDLERS, "%d %d]",read,freebob_ringbuffer_read_space(stream->buffer));
+
+		if (read < nevents) {
+			xrun++;
+		}
+		
+	}
+	debugPrintShort(DEBUG_LEVEL_HANDLERS, "\n");
+	
+// 	connection->status.frames_left-=nevents;
+	
+	return xrun;
+}
+
+void *freebob_streaming_watchdog_thread (void *arg)
+{
+	freebob_device_t *dev = (freebob_device_t *) arg;
+
+	dev->watchdog_check = 0;
+
+	while (1) {
+		sleep (2);
+		if (dev->watchdog_check == 0) {
+
+			printError("watchdog: timeout");
+
+			/* kill our process group, try to get a dump */
+			kill (-getpgrp(), SIGABRT);
+			/*NOTREACHED*/
+			exit (1);
+		}
+		dev->watchdog_check = 0;
+	}
+}
+
+int freebob_streaming_start_watchdog (freebob_device_t *dev)
+{
+	int watchdog_priority = dev->packetizer.priority + 10;
+	int max_priority = sched_get_priority_max (SCHED_FIFO);
+
+	debugPrint(DEBUG_LEVEL_STARTUP, "Starting Watchdog...\n");
+	
+	if ((max_priority != -1) &&
+			(max_priority < watchdog_priority))
+		watchdog_priority = max_priority;
+	
+	if (freebob_streaming_create_thread (dev, &dev->watchdog_thread, watchdog_priority,
+		TRUE, freebob_streaming_watchdog_thread, dev)) {
+			printError ("cannot start watchdog thread");
+			return -1;
+		}
+
+	return 0;
+}
+
+void freebob_streaming_stop_watchdog (freebob_device_t *dev)
+{
+	debugPrint(DEBUG_LEVEL_STARTUP, "Stopping Watchdog...\n");
+	
+	pthread_cancel (dev->watchdog_thread);
+	pthread_join (dev->watchdog_thread, NULL);
+}
Index: branches/freebob-syt-experiments/src/configrom.h
===================================================================
--- branches/freebob-syt-experiments/src/configrom.h (revision 185)
+++ branches/freebob-syt-experiments/src/configrom.h (revision 185)
@@ -0,0 +1,75 @@
+/* configrom.h
+ * Copyright (C) 2005,06 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef CONFIGROM_H
+#define CONFIGROM_H
+
+#include "fbtypes.h"
+#include "csr1212.h"
+
+#include "debugmodule/debugmodule.h"
+
+#include <string>
+
+class Ieee1394Service;
+
+class ConfigRom {
+ public:
+    ConfigRom( Ieee1394Service* ieee1394service, fb_nodeid_t nodeId );
+    virtual ~ConfigRom();
+
+    bool initialize();
+
+    const bool isAvcDevice() const;
+    const bool isBootloader() const;
+    const fb_nodeid_t getNodeId() const;
+    const fb_octlet_t getGuid() const;
+    const std::string getModelName() const;
+    const std::string getVendorName() const;
+
+
+ protected:
+    void processUnitDirectory( struct csr1212_csr*    csr,
+                               struct csr1212_keyval* ud_kv,
+                               unsigned int*          id );
+
+    void processRootDirectory( struct csr1212_csr* csr );
+
+    Ieee1394Service* m_1394Service;
+    fb_nodeid_t      m_nodeId;
+    bool             m_avcDevice;
+    fb_octlet_t      m_guid;
+    std::string      m_vendorName;
+    std::string      m_modelName;
+    unsigned int     m_vendorId;
+    unsigned int     m_modelId;
+
+    /* only used during parsing */
+    struct csr1212_keyval* m_vendorNameKv;
+    struct csr1212_keyval* m_modelNameKv;
+    struct csr1212_csr*    m_csr;
+
+private:
+    ConfigRom( const ConfigRom& );
+
+    DECLARE_DEBUG_MODULE;
+};
+
+#endif /* CONFIGROM_H */
Index: branches/freebob-syt-experiments/src/bebob/bebob_functionblock.h
===================================================================
--- branches/freebob-syt-experiments/src/bebob/bebob_functionblock.h (revision 187)
+++ branches/freebob-syt-experiments/src/bebob/bebob_functionblock.h (revision 187)
@@ -0,0 +1,172 @@
+/* bebob_functionblock.h
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef BEBOB_FUNCTION_BLOCK_H
+#define BEBOB_FUNCTION_BLOCK_H
+
+#include "bebob/bebob_avplug.h"
+
+#include "libfreebobavc/avc_definitions.h"
+#include "debugmodule/debugmodule.h"
+
+namespace BeBoB {
+
+class AvDeviceSubunit;
+
+class FunctionBlock {
+public:
+    enum EFunctionBlockType {
+        eFBT_AllFunctinBlockType    = 0xff,
+        eFBT_AudioSubunitSelector   = 0x80,
+        eFBT_AudioSubunitFeature    = 0x81,
+        eFBT_AudioSubunitProcessing = 0x82,
+        eFBT_AudioSubunitCodec      = 0x83,
+    };
+
+    enum ESpecialPurpose {
+        eSP_InputGain,
+        eSP_OutputVolume,
+        eSP_NoSpecialPurpose
+    };
+
+    FunctionBlock( AvDeviceSubunit& subunit,
+		   function_block_type_t type,
+                   function_block_id_t id,
+                   ESpecialPurpose purpose,
+                   no_of_input_plugs_t nrOfInputPlugs,
+                   no_of_output_plugs_t nrOfOutputPlugs,
+                   bool verbose );
+    FunctionBlock( const FunctionBlock& rhs );
+    virtual ~FunctionBlock();
+
+    virtual bool discover();
+    virtual bool discoverConnections();
+
+    virtual const char* getName() = 0;
+
+protected:
+    bool discoverPlugs( AvPlug::EAvPlugDirection plugDirection,
+                        plug_id_t plugMaxId );
+
+protected:
+    AvDeviceSubunit*      m_subunit;
+    function_block_type_t m_type;
+    function_block_id_t   m_id;
+    ESpecialPurpose       m_purpose;
+    no_of_input_plugs_t   m_nrOfInputPlugs;
+    no_of_output_plugs_t  m_nrOfOutputPlugs;
+    bool m_verbose;
+
+    AvPlugVector m_plugs;
+
+    DECLARE_DEBUG_MODULE;
+};
+
+typedef std::vector<FunctionBlock*> FunctionBlockVector;
+
+/////////////////////////////////////
+/////////////////////////////////////
+
+class FunctionBlockSelector: public FunctionBlock
+{
+public:
+    FunctionBlockSelector(AvDeviceSubunit& subunit,
+                          function_block_id_t id,
+                          ESpecialPurpose purpose,
+                          no_of_input_plugs_t nrOfInputPlugs,
+                          no_of_output_plugs_t nrOfOutputPlugs,
+                          bool verbose);
+    FunctionBlockSelector( const FunctionBlockSelector& rhs );
+    virtual ~FunctionBlockSelector();
+
+    virtual const char* getName();
+};
+
+/////////////////////////////////////
+
+class FunctionBlockFeature: public FunctionBlock
+{
+public:
+    FunctionBlockFeature(AvDeviceSubunit& subunit,
+                         function_block_id_t id,
+                         ESpecialPurpose purpose,
+                         no_of_input_plugs_t nrOfInputPlugs,
+                         no_of_output_plugs_t nrOfOutputPlugs,
+                         bool verbose);
+    FunctionBlockFeature( const FunctionBlockFeature& rhs );
+    virtual ~FunctionBlockFeature();
+
+    virtual const char* getName();
+};
+
+/////////////////////////////////////
+
+class FunctionBlockEnhancedMixer: public FunctionBlock
+{
+public:
+    FunctionBlockEnhancedMixer( AvDeviceSubunit& subunit,
+                                function_block_id_t id,
+                                ESpecialPurpose purpose,
+                                no_of_input_plugs_t nrOfInputPlugs,
+                                no_of_output_plugs_t nrOfOutputPlugs,
+                                bool verbose );
+    FunctionBlockEnhancedMixer( const FunctionBlockEnhancedMixer& rhs );
+    virtual ~FunctionBlockEnhancedMixer();
+
+    virtual const char* getName();
+};
+
+/////////////////////////////////////
+
+class FunctionBlockProcessing: public FunctionBlock
+{
+public:
+    FunctionBlockProcessing( AvDeviceSubunit& subunit,
+                             function_block_id_t id,
+                             ESpecialPurpose purpose,
+                             no_of_input_plugs_t nrOfInputPlugs,
+                             no_of_output_plugs_t nrOfOutputPlugs,
+                             bool verbose );
+    FunctionBlockProcessing( const FunctionBlockProcessing& rhs );
+    virtual ~FunctionBlockProcessing();
+
+    virtual const char* getName();
+};
+
+/////////////////////////////////////
+
+class FunctionBlockCodec: public FunctionBlock
+{
+public:
+    FunctionBlockCodec(AvDeviceSubunit& subunit,
+                       function_block_id_t id,
+                       ESpecialPurpose purpose,
+                       no_of_input_plugs_t nrOfInputPlugs,
+                       no_of_output_plugs_t nrOfOutputPlugs,
+                       bool verbose);
+    FunctionBlockCodec( const FunctionBlockCodec& rhs );
+    virtual ~FunctionBlockCodec();
+
+    virtual const char* getName();
+};
+
+}
+
+#endif
Index: branches/freebob-syt-experiments/src/bebob/bebob_avdevice.cpp
===================================================================
--- branches/freebob-syt-experiments/src/bebob/bebob_avdevice.cpp (revision 187)
+++ branches/freebob-syt-experiments/src/bebob/bebob_avdevice.cpp (revision 187)
@@ -0,0 +1,793 @@
+/* bebob_avdevice.cpp
+ * Copyright (C) 2005,06 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "bebob/bebob_avdevice.h"
+#include "bebob/bebob_avdevice_subunit.h"
+#include "configrom.h"
+
+#include "libfreebobavc/avc_plug_info.h"
+#include "libfreebobavc/avc_extended_plug_info.h"
+#include "libfreebobavc/avc_subunit_info.h"
+#include "libfreebobavc/avc_extended_stream_format.h"
+#include "libfreebobavc/serialize.h"
+#include "libfreebobavc/ieee1394service.h"
+#include "libfreebobavc/avc_definitions.h"
+
+#include "debugmodule/debugmodule.h"
+
+#include <iostream>
+
+namespace BeBoB {
+
+IMPL_DEBUG_MODULE( AvDevice, AvDevice, DEBUG_LEVEL_NORMAL );
+
+AvDevice::AvDevice( Ieee1394Service& ieee1394service,
+                    int nodeId,
+                    int verboseLevel )
+    :  m_1394Service( &ieee1394service )
+    , m_nodeId( nodeId )
+    , m_verboseLevel( verboseLevel )
+    , m_plugManager( verboseLevel )
+{
+    if ( m_verboseLevel ) {
+        setDebugLevel( DEBUG_LEVEL_VERBOSE );
+    }
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Created BeBoB::AvDevice (NodeID %d)\n",
+                 nodeId );
+
+    m_configRom = new ConfigRom( m_1394Service, m_nodeId );
+    m_configRom->initialize();
+}
+
+AvDevice::~AvDevice()
+{
+    delete m_configRom;
+    for ( AvDeviceSubunitVector::iterator it = m_subunits.begin();
+          it != m_subunits.end();
+          ++it )
+    {
+        delete *it;
+    }
+    for ( AvPlugConnectionVector::iterator it = m_plugConnections.begin();
+          it != m_plugConnections.end();
+          ++it )
+    {
+        delete *it;
+    }
+    for ( AvPlugVector::iterator it = m_pcrPlugs.begin();
+          it != m_pcrPlugs.end();
+          ++it )
+    {
+        delete *it;
+    }
+    for ( AvPlugVector::iterator it = m_externalPlugs.begin();
+          it != m_externalPlugs.end();
+          ++it )
+    {
+        delete *it;
+    }
+}
+
+ConfigRom&
+AvDevice::getConfigRom() const
+{
+    return *m_configRom;
+}
+
+bool
+AvDevice::discover()
+{
+    if ( !enumerateSubUnits() ) {
+        debugError( "Could not enumarate sub units\n" );
+        return false;
+    }
+
+    if ( !discoverPlugs() ) {
+        debugError( "Detecting plugs failed\n" );
+        return false;
+    }
+
+    if ( !discoverPlugConnections() ) {
+        debugError( "Detecting plug connections failed\n" );
+        return false;
+    }
+
+    if ( !discoverSubUnitsPlugConnections() ) {
+        debugError( "Detecting plug connnection failed\n" );
+        return false;
+    }
+
+    if ( !discoverSyncModes() ) {
+        debugError( "Detecting sync modes failed\n" );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+AvDevice::discoverPlugs()
+{
+    //////////////////////////////////////////////
+    // Get number of available isochronous input
+    // and output plugs of unit
+
+    PlugInfoCmd plugInfoCmd( m_1394Service );
+    plugInfoCmd.setNodeId( m_nodeId );
+    plugInfoCmd.setCommandType( AVCCommand::eCT_Status );
+    plugInfoCmd.setVerbose( m_verboseLevel );
+
+    if ( !plugInfoCmd.fire() ) {
+        debugError( "plug info command failed\n" );
+        return false;
+    }
+
+    debugOutput( DEBUG_LEVEL_NORMAL, "number of iso input plugs = %d\n",
+                 plugInfoCmd.m_serialBusIsochronousInputPlugs );
+    debugOutput( DEBUG_LEVEL_NORMAL, "number of iso output plugs = %d\n",
+                 plugInfoCmd.m_serialBusIsochronousOutputPlugs );
+    debugOutput( DEBUG_LEVEL_NORMAL, "number of external input plugs = %d\n",
+                 plugInfoCmd.m_externalInputPlugs );
+    debugOutput( DEBUG_LEVEL_NORMAL, "number of external output plugs = %d\n",
+                 plugInfoCmd.m_externalOutputPlugs );
+
+    if ( !discoverPlugsPCR( AvPlug::eAPD_Input,
+                            plugInfoCmd.m_serialBusIsochronousInputPlugs ) )
+    {
+        debugError( "pcr input plug discovering failed\n" );
+        return false;
+    }
+
+    if ( !discoverPlugsPCR( AvPlug::eAPD_Output,
+                            plugInfoCmd.m_serialBusIsochronousOutputPlugs ) )
+    {
+        debugError( "pcr output plug discovering failed\n" );
+        return false;
+    }
+
+    if ( !discoverPlugsExternal( AvPlug::eAPD_Input,
+                                 plugInfoCmd.m_externalInputPlugs ) )
+    {
+        debugError( "external input plug discovering failed\n" );
+        return false;
+    }
+
+    if ( !discoverPlugsExternal( AvPlug::eAPD_Output,
+                                 plugInfoCmd.m_externalOutputPlugs ) )
+    {
+        debugError( "external output plug discovering failed\n" );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+AvDevice::discoverPlugsPCR( AvPlug::EAvPlugDirection plugDirection,
+                            plug_id_t plugMaxId )
+{
+    for ( int plugId = 0;
+          plugId < plugMaxId;
+          ++plugId )
+    {
+        AvPlug* plug  = new AvPlug( *m_1394Service,
+                                    m_nodeId,
+                                    m_plugManager,
+                                    AVCCommand::eST_Unit,
+                                    0xff,
+                                    0xff,
+                                    0xff,
+                                    AvPlug::eAPA_PCR,
+                                    plugDirection,
+                                    plugId,
+                                    m_verboseLevel );
+        if ( !plug || !plug->discover() ) {
+            debugError( "plug discovering failed\n" );
+            delete plug;
+            return false;
+        }
+
+        debugOutput( DEBUG_LEVEL_NORMAL, "plug '%s' found\n",
+                     plug->getName() );
+        m_pcrPlugs.push_back( plug );
+    }
+
+    return true;
+}
+
+bool
+AvDevice::discoverPlugsExternal( AvPlug::EAvPlugDirection plugDirection,
+                                 plug_id_t plugMaxId )
+{
+    for ( int plugId = 0;
+          plugId < plugMaxId;
+          ++plugId )
+    {
+        AvPlug* plug  = new AvPlug( *m_1394Service,
+                                    m_nodeId,
+                                    m_plugManager,
+                                    AVCCommand::eST_Unit,
+                                    0xff,
+                                    0xff,
+                                    0xff,
+                                    AvPlug::eAPA_ExternalPlug,
+                                    plugDirection,
+                                    plugId,
+                                    m_verboseLevel );
+        if ( !plug || !plug->discover() ) {
+            debugError( "plug discovering failed\n" );
+            return false;
+        }
+
+        debugOutput( DEBUG_LEVEL_NORMAL, "plug '%s' found\n",
+                     plug->getName() );
+        m_externalPlugs.push_back( plug );
+    }
+
+    return true;
+}
+
+bool
+AvDevice::discoverPlugConnections()
+{
+    for ( AvPlugVector::iterator it = m_pcrPlugs.begin();
+          it != m_pcrPlugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+        if ( !plug->discoverConnections() ) {
+            debugError( "Could not discover plug connections\n" );
+            return false;
+        }
+    }
+    for ( AvPlugVector::iterator it = m_externalPlugs.begin();
+          it != m_externalPlugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+        if ( !plug->discoverConnections() ) {
+            debugError( "Could not discover plug connections\n" );
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool
+AvDevice::discoverSubUnitsPlugConnections()
+{
+    for ( AvDeviceSubunitVector::iterator it = m_subunits.begin();
+          it != m_subunits.end();
+          ++it )
+    {
+        AvDeviceSubunit* subunit = *it;
+        if ( !subunit->discoverConnections() ) {
+            debugError( "Subunit '%s'  plug connections failed\n",
+                        subunit->getName() );
+            return false;
+        }
+    }
+    return true;
+}
+
+bool
+AvDevice::discoverSyncModes()
+{
+    // Following possible sync plugs exists:
+    // - Music subunit sync output plug = internal sync (CSP)
+    // - Unit input plug 0 = SYT match
+    // - Unit input plut 1 = Sync stream
+    //
+    // If last sync mode is reported it is mostelikely not
+    // implemented *sic*
+    //
+    // Following sync sources are device specific:
+    // - All unit external input plugs which have a
+    //   sync information (WS, SPDIF, ...)
+
+    // First we have to find the sync input and output plug
+    // in the music subunit.
+
+    // Note PCR input means 1394bus-to-device where as
+    // MSU input means subunit-to-device
+
+    AvPlugVector syncPCRInputPlugs = getPlugsByType( m_pcrPlugs,
+                                                     AvPlug::eAPD_Input,
+                                                     AvPlug::eAPT_Sync );
+    if ( !syncPCRInputPlugs.size() ) {
+        debugWarning( "No PCR sync input plug found\n" );
+    }
+
+    AvPlugVector syncPCROutputPlugs = getPlugsByType( m_pcrPlugs,
+                                                      AvPlug::eAPD_Output,
+                                                      AvPlug::eAPT_Sync );
+    if ( !syncPCROutputPlugs.size() ) {
+        debugWarning( "No PCR sync output plug found\n" );
+    }
+
+    AvPlugVector isoPCRInputPlugs = getPlugsByType( m_pcrPlugs,
+                                                    AvPlug::eAPD_Input,
+                                                    AvPlug::eAPT_IsoStream );
+    if ( !isoPCRInputPlugs.size() ) {
+        debugWarning( "No PCR iso input plug found\n" );
+
+    }
+
+    AvPlugVector isoPCROutputPlugs = getPlugsByType( m_pcrPlugs,
+                                                    AvPlug::eAPD_Output,
+                                                    AvPlug::eAPT_IsoStream );
+    if ( !isoPCROutputPlugs.size() ) {
+        debugWarning( "No PCR iso output plug found\n" );
+
+    }
+
+    AvPlugVector digitalPCRInputPlugs = getPlugsByType( m_externalPlugs,
+                                                    AvPlug::eAPD_Input,
+                                                    AvPlug::eAPT_Digital );
+
+    AvPlugVector syncMSUInputPlugs = m_plugManager.getPlugsByType(
+        AVCCommand::eST_Music,
+        0,
+        0xff,
+        0xff,
+        AvPlug::eAPA_SubunitPlug,
+        AvPlug::eAPD_Input,
+        AvPlug::eAPT_Sync );
+    if ( !syncMSUInputPlugs.size() ) {
+        debugWarning( "No sync input plug for MSU subunit found\n" );
+    }
+
+    AvPlugVector syncMSUOutputPlugs = m_plugManager.getPlugsByType(
+        AVCCommand::eST_Music,
+        0,
+        0xff,
+        0xff,
+        AvPlug::eAPA_SubunitPlug,
+        AvPlug::eAPD_Output,
+        AvPlug::eAPT_Sync );
+    if ( !syncMSUOutputPlugs.size() ) {
+        debugWarning( "No sync output plug for MSU subunit found\n" );
+    }
+
+    debugOutput( DEBUG_LEVEL_VERBOSE, "PCR Sync Input Plugs:\n" );
+    showAvPlugs( syncPCRInputPlugs );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "PCR Sync Output Plugs:\n" );
+    showAvPlugs( syncPCROutputPlugs );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "PCR Iso Input Plugs:\n" );
+    showAvPlugs( isoPCRInputPlugs );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "PCR Iso Output Plugs:\n" );
+    showAvPlugs( isoPCROutputPlugs );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "PCR digital Input Plugs:\n" );
+    showAvPlugs( digitalPCRInputPlugs );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "MSU Sync Input Plugs:\n" );
+    showAvPlugs( syncMSUInputPlugs );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "MSU Sync Output Plugs:\n" );
+    showAvPlugs( syncMSUOutputPlugs );
+
+    // Check all possible PCR input to MSU input connections
+    // -> sync stream input
+    checkSyncConnections( syncPCRInputPlugs, syncMSUInputPlugs );
+
+    // Check all possible MSU output to PCR output connections
+    // -> sync stream output
+    checkSyncConnections( syncMSUOutputPlugs,  syncPCROutputPlugs );
+
+    // Check all PCR iso input to MSU input connections
+    // -> SYT match
+    checkSyncConnections( isoPCRInputPlugs, syncMSUInputPlugs );
+
+    // Check all MSU sync output to MSU input connections
+    // -> CSP
+    checkSyncConnections( syncMSUOutputPlugs, syncMSUInputPlugs );
+
+    // Check all external PCR digital input to MSU input connections
+    // -> SPDIF/ADAT sync
+    checkSyncConnections( digitalPCRInputPlugs, syncMSUInputPlugs );
+
+
+    // Currently active connection signal sourqce cmd, command type
+    // status, source unknown, destination MSU sync input plug
+
+    for ( AvPlugVector::const_iterator it = syncMSUInputPlugs.begin();
+          it != syncMSUInputPlugs.end();
+          ++it )
+    {
+        AvPlug* msuPlug = *it;
+        for ( AvPlugVector::const_iterator jt =
+                  msuPlug->getInputConnections().begin();
+              jt != msuPlug->getInputConnections().end();
+              ++jt )
+        {
+            AvPlug* plug = *jt;
+            plug = plug; // disable compiler warning in release mode
+                         // will be optimized away
+            debugOutput( DEBUG_LEVEL_NORMAL,
+                         "Active Sync Connection: '%s' -> '%s'\n",
+                         msuPlug->getName(),
+                         plug->getName() );
+        }
+    }
+
+    return true;
+}
+
+bool
+AvDevice::enumerateSubUnits()
+{
+    SubUnitInfoCmd subUnitInfoCmd( m_1394Service );
+    //subUnitInfoCmd.setVerbose( 1 );
+    subUnitInfoCmd.setCommandType( AVCCommand::eCT_Status );
+
+    // BeBob has always exactly one audio and one music subunit. This
+    // means is fits into the first page of the SubUnitInfo command.
+    // So there is no need to do more than needed
+
+    subUnitInfoCmd.m_page = 0;
+    subUnitInfoCmd.setNodeId( m_nodeId );
+    subUnitInfoCmd.setVerbose( m_verboseLevel );
+    if ( !subUnitInfoCmd.fire() ) {
+        debugError( "Subunit info command failed\n" );
+    }
+
+    for ( int i = 0; i < subUnitInfoCmd.getNrOfValidEntries(); ++i ) {
+        subunit_type_t subunit_type
+            = subUnitInfoCmd.m_table[i].m_subunit_type;
+
+        unsigned int subunitId = getNrOfSubunits( subunit_type );
+
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "subunit_id = %2d, subunit_type = %2d (%s)\n",
+                     subunitId,
+                     subunit_type,
+                     subunitTypeToString( subunit_type ) );
+
+        AvDeviceSubunit* subunit = 0;
+        switch( subunit_type ) {
+        case AVCCommand::eST_Audio:
+            subunit = new AvDeviceSubunitAudio( *this, subunitId,
+                                                m_verboseLevel );
+            if ( !subunit ) {
+                debugFatal( "Could not allocate AvDeviceSubunitAudio\n" );
+                return false;
+            }
+            break;
+        case AVCCommand::eST_Music:
+            subunit = new AvDeviceSubunitMusic( *this, subunitId,
+                                                m_verboseLevel );
+            if ( !subunit ) {
+                debugFatal( "Could not allocate AvDeviceSubunitMusic\n" );
+                return false;
+            }
+            break;
+        default:
+            debugOutput( DEBUG_LEVEL_NORMAL,
+                         "Unsupported subunit found, subunit_type = %d (%s)\n",
+                         subunit_type,
+                         subunitTypeToString( subunit_type ) );
+            continue;
+
+        }
+
+        if ( !subunit->discover() ) {
+            debugError( "enumerateSubUnits: Could not discover "
+                        "subunit_id = %2d, subunit_type = %2d (%s)\n",
+                        subunitId,
+                        subunit_type,
+                        subunitTypeToString( subunit_type ) );
+            delete subunit;
+            return false;
+        }
+        m_subunits.push_back( subunit );
+    }
+
+    return true;
+}
+
+
+AvDeviceSubunit*
+AvDevice::getSubunit( subunit_type_t subunitType,
+                      subunit_id_t subunitId ) const
+{
+    for ( AvDeviceSubunitVector::const_iterator it = m_subunits.begin();
+          it != m_subunits.end();
+          ++it )
+    {
+        AvDeviceSubunit* subunit = *it;
+        if ( ( subunitType == subunit->getSubunitType() )
+             && ( subunitId == subunit->getSubunitId() ) )
+        {
+            return subunit;
+        }
+    }
+
+    return 0;
+}
+
+
+unsigned int
+AvDevice::getNrOfSubunits( subunit_type_t subunitType ) const
+{
+    unsigned int nrOfSubunits = 0;
+
+    for ( AvDeviceSubunitVector::const_iterator it = m_subunits.begin();
+          it != m_subunits.end();
+          ++it )
+    {
+        AvDeviceSubunit* subunit = *it;
+        if ( subunitType == subunit->getSubunitType() ) {
+            nrOfSubunits++;
+        }
+    }
+
+    return nrOfSubunits;
+}
+
+AvPlugConnection*
+AvDevice::getPlugConnection( AvPlug& srcPlug ) const
+{
+    for ( AvPlugConnectionVector::const_iterator it
+              = m_plugConnections.begin();
+          it != m_plugConnections.end();
+          ++it )
+    {
+        AvPlugConnection* plugConnection = *it;
+        if ( &( plugConnection->getSrcPlug() ) == &srcPlug ) {
+            return plugConnection;
+        }
+    }
+
+    return 0;
+}
+
+AvPlug*
+AvDevice::getPlugById( AvPlugVector& plugs,
+                       AvPlug::EAvPlugDirection plugDirection,
+                       int id )
+{
+    for ( AvPlugVector::iterator it = plugs.begin();
+          it != plugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+        if ( ( id == plug->getPlugId() )
+             && ( plugDirection == plug->getPlugDirection() ) )
+        {
+            return plug;
+        }
+    }
+
+    return 0;
+}
+
+AvPlugVector
+AvDevice::getPlugsByType( AvPlugVector& plugs,
+                          AvPlug::EAvPlugDirection plugDirection,
+                          AvPlug::EAvPlugType type)
+{
+    AvPlugVector plugVector;
+    for ( AvPlugVector::iterator it = plugs.begin();
+          it != plugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+        if ( ( type == plug->getPlugType() )
+             && ( plugDirection == plug->getPlugDirection() ) )
+        {
+            plugVector.push_back( plug );
+        }
+    }
+
+    return plugVector;
+}
+
+AvPlug*
+AvDevice::getSyncPlug( int maxPlugId, AvPlug::EAvPlugDirection )
+{
+    return 0;
+}
+
+bool
+AvDevice::setSamplingFrequency( ESamplingFrequency samplingFrequency )
+{
+
+    AvPlug* plug = getPlugById( m_pcrPlugs, AvPlug::eAPD_Input, 0 );
+    if ( !plug ) {
+        debugError( "setSampleRate: Could not retrieve iso input plug 0\n" );
+        return false;
+    }
+
+    if ( !setSamplingFrequencyPlug( *plug,
+                                    AvPlug::eAPD_Input,
+                                    samplingFrequency ) )
+    {
+        debugError( "setSampleRate: Setting sample rate failed\n" );
+        return false;
+    }
+
+    plug = getPlugById( m_pcrPlugs, AvPlug::eAPD_Output,  0 );
+    if ( !plug ) {
+        debugError( "setSampleRate: Could not retrieve iso output plug 0\n" );
+        return false;
+    }
+
+    if ( !setSamplingFrequencyPlug( *plug,
+                                    AvPlug::eAPD_Output,
+                                    samplingFrequency ) )
+    {
+        debugError( "setSampleRate: Setting sample rate failed\n" );
+        return false;
+    }
+
+
+    debugOutput( DEBUG_LEVEL_VERBOSE,
+                 "setSampleRate: Set sample rate to %d\n",
+                 convertESamplingFrequency( samplingFrequency ) );
+    return true;
+}
+
+bool
+AvDevice::setSamplingFrequencyPlug( AvPlug& plug,
+                                    AvPlug::EAvPlugDirection direction,
+                                    ESamplingFrequency samplingFrequency )
+{
+
+    ExtendedStreamFormatCmd extStreamFormatCmd(
+        m_1394Service,
+        ExtendedStreamFormatCmd::eSF_ExtendedStreamFormatInformationCommandList );
+    UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
+                                     plug.getPlugId() );
+
+    extStreamFormatCmd.setPlugAddress(
+        PlugAddress(
+            AvPlug::convertPlugDirection(direction ),
+            PlugAddress::ePAM_Unit,
+            unitPlugAddress ) );
+
+    extStreamFormatCmd.setNodeId( m_nodeId );
+    extStreamFormatCmd.setCommandType( AVCCommand::eCT_Status );
+
+    int i = 0;
+    bool cmdSuccess = false;
+    bool correctFormatFound = false;
+
+    do {
+        extStreamFormatCmd.setIndexInStreamFormat( i );
+        extStreamFormatCmd.setCommandType( AVCCommand::eCT_Status );
+        extStreamFormatCmd.setVerbose( m_verboseLevel );
+
+        cmdSuccess = extStreamFormatCmd.fire();
+
+        if ( cmdSuccess
+             && ( extStreamFormatCmd.getResponse() ==
+                  AVCCommand::eR_Implemented ) )
+        {
+            ESamplingFrequency foundFreq = eSF_DontCare;
+
+            FormatInformation* formatInfo =
+                extStreamFormatCmd.getFormatInformation();
+            FormatInformationStreamsCompound* compoundStream
+                = dynamic_cast< FormatInformationStreamsCompound* > (
+                    formatInfo->m_streams );
+            if ( compoundStream ) {
+                foundFreq =
+                    static_cast<ESamplingFrequency>(
+                        compoundStream->m_samplingFrequency );
+            }
+
+            FormatInformationStreamsSync* syncStream
+                = dynamic_cast< FormatInformationStreamsSync* > (
+                    formatInfo->m_streams );
+            if ( syncStream ) {
+                foundFreq =
+                    static_cast<ESamplingFrequency>(
+                        compoundStream->m_samplingFrequency );
+            }
+
+            if ( foundFreq == samplingFrequency )
+            {
+                correctFormatFound = true;
+                break;
+            }
+        }
+
+        ++i;
+    } while ( cmdSuccess
+              && ( extStreamFormatCmd.getResponse() ==
+                   ExtendedStreamFormatCmd::eR_Implemented )
+              && ( extStreamFormatCmd.getStatus() !=
+                   ExtendedStreamFormatCmd::eS_NotUsed ) );
+
+    if ( !cmdSuccess ) {
+        debugError( "setSampleRatePlug: Failed to retrieve format info\n" );
+        return false;
+    }
+
+    if ( !correctFormatFound ) {
+        debugError( "setSampleRatePlug: %s plug %d does not support "
+                    "sample rate %d\n",
+                    plug.getName(),
+                    plug.getPlugId(),
+                    convertESamplingFrequency( samplingFrequency ) );
+        return false;
+    }
+
+    extStreamFormatCmd.setSubFunction(
+        ExtendedStreamFormatCmd::eSF_ExtendedStreamFormatInformationCommand );
+    extStreamFormatCmd.setCommandType( AVCCommand::eCT_Control );
+    extStreamFormatCmd.setVerbose( m_verboseLevel );
+
+    if ( !extStreamFormatCmd.fire() ) {
+        debugError( "setSampleRate: Could not set sample rate %d "
+                    "to %s plug %d\n",
+                    convertESamplingFrequency( samplingFrequency ),
+                    plug.getName(),
+                    plug.getPlugId() );
+        return false;
+    }
+
+    return true;
+}
+
+void
+AvDevice::showDevice() const
+{
+    m_plugManager.showPlugs();
+}
+
+void
+AvDevice::showAvPlugs( AvPlugVector& plugs ) const
+{
+    int i = 0;
+    for ( AvPlugVector::const_iterator it = plugs.begin();
+          it != plugs.end();
+          ++it, ++i )
+    {
+        AvPlug* plug = *it;
+        debugOutput( DEBUG_LEVEL_VERBOSE, "Plug %d\n", i );
+        plug->showPlug();
+    }
+}
+
+bool
+AvDevice::checkSyncConnections( AvPlugVector& plhs, AvPlugVector& prhs )
+{
+    for ( AvPlugVector::iterator plIt = plhs.begin();
+          plIt != plhs.end();
+          ++plIt )
+    {
+        AvPlug* pl = *plIt;
+        for ( AvPlugVector::iterator prIt = prhs.begin();
+              prIt != prhs.end();
+              ++prIt )
+        {
+            AvPlug* pr = *prIt;
+            if ( pl->inquireConnnection( *pr ) ) {
+                debugOutput( DEBUG_LEVEL_NORMAL,
+                             "Sync connection '%s' -> '%s'\n",
+                             pl->getName(),
+                             pr->getName() );
+            }
+        }
+    }
+    return true;
+}
+
+}
Index: branches/freebob-syt-experiments/src/bebob/bebob_avdevice_xml.cpp
===================================================================
--- branches/freebob-syt-experiments/src/bebob/bebob_avdevice_xml.cpp (revision 187)
+++ branches/freebob-syt-experiments/src/bebob/bebob_avdevice_xml.cpp (revision 187)
@@ -0,0 +1,121 @@
+/* bebob_avdevice_xml.cpp
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+// AvDevice XML stuff
+
+#include "bebob/bebob_avdevice.h"
+#include "configrom.h"
+
+#include "libfreebobavc/ieee1394service.h"
+
+namespace BeBoB {
+
+bool
+AvDevice::addXmlDescription( xmlNodePtr deviceNode )
+{
+    // connection set
+    //  direction
+    //  connection
+    //    id
+    //    port
+    //    node
+    //    plug
+    //    dimension
+    //    samplerate
+    //    streams
+    //      stream
+
+
+    ///////////
+    // get plugs
+
+    AvPlug* inputPlug = getPlugById( m_pcrPlugs, AvPlug::eAPD_Input, 0 );
+    if ( !inputPlug ) {
+        debugError( "addXmlDescription: No iso input plug found with id 0\n" );
+        return false;
+    }
+    AvPlug* outputPlug = getPlugById( m_pcrPlugs, AvPlug::eAPD_Output, 0 );
+    if ( !outputPlug ) {
+        debugError( "addXmlDescription: No iso output plug found with id 0\n" );
+        return false;
+    }
+
+    ///////////
+    // add connection set output
+
+    xmlNodePtr connectionSet = xmlNewChild( deviceNode, 0,
+                                            BAD_CAST "ConnectionSet", 0 );
+    if ( !connectionSet ) {
+        debugError( "addXmlDescription:: Could not create 'ConnnectionSet' node for "
+                    "direction 1 (playback)\n" );
+        return false;
+    }
+
+    if ( !inputPlug->addXmlDescription( connectionSet ) ) {
+        debugError( "addXmlDescription: Could not add iso input plug 0 to XML description\n" );
+        return false;
+    }
+
+    // add connection set input
+
+    connectionSet = xmlNewChild( deviceNode, 0,
+                                 BAD_CAST "ConnectionSet", 0 );
+    if ( !connectionSet ) {
+        debugError( "addXmlDescription: Couldn't create 'ConnectionSet' node for "
+                    "direction 0 (recorder)\n" );
+        return false;
+    }
+
+    if ( !outputPlug->addXmlDescription( connectionSet ) ) {
+        debugError( "addXmlDescription: Could not add iso output plug 0 to XML description\n" );
+        return false;
+    }
+
+    ////////////
+    // add stream format
+
+    xmlNodePtr streamFormatNode = xmlNewChild( deviceNode, 0,
+                                               BAD_CAST "StreamFormats", 0 );
+    if ( !streamFormatNode ) {
+        debugError( "addXmlDescription: Could not create 'StreamFormats' node\n" );
+        return false;
+    }
+
+    if ( !inputPlug->addXmlDescriptionStreamFormats( streamFormatNode ) ) {
+        debugError( "addXmlDescription:: Could not add stream format info\n" );
+        return false;
+    }
+
+    streamFormatNode= xmlNewChild( deviceNode, 0,
+                                 BAD_CAST "StreamFormats", 0 );
+    if ( !streamFormatNode ) {
+        debugError( "addXmlDescription: Could not create 'StreamFormat' node\n" );
+        return false;
+    }
+
+    if ( !outputPlug->addXmlDescriptionStreamFormats( streamFormatNode ) ) {
+        debugError( "addXmlDescription:: Could not add stream format info\n" );
+        return false;
+    }
+
+    return true;
+}
+
+}
Index: branches/freebob-syt-experiments/src/bebob/bebob_avdevice.h
===================================================================
--- branches/freebob-syt-experiments/src/bebob/bebob_avdevice.h (revision 187)
+++ branches/freebob-syt-experiments/src/bebob/bebob_avdevice.h (revision 187)
@@ -0,0 +1,115 @@
+/* bebob_avdevice.h
+ * Copyright (C) 2005,06 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef BEBOB_AVDEVICE_H
+#define BEBOB_AVDEVICE_H
+
+#include <stdint.h>
+
+#include "debugmodule/debugmodule.h"
+#include "libfreebobavc/avc_definitions.h"
+#include "libfreebobavc/avc_extended_cmd_generic.h"
+#include "libfreebob/xmlparser.h"
+
+#include "bebob/bebob_avplug.h"
+#include "bebob/bebob_avdevice_subunit.h"
+
+#include "iavdevice.h"
+
+class ConfigRom;
+class Ieee1394Service;
+class SubunitPlugSpecificDataPlugAddress;
+
+namespace BeBoB {
+
+class AvDevice : public IAvDevice {
+public:
+    AvDevice( Ieee1394Service& ieee1394Service,
+              int nodeId,
+	      int verboseLevel );
+    virtual ~AvDevice();
+
+    virtual bool discover();
+    virtual ConfigRom& getConfigRom() const;
+    virtual bool addXmlDescription( xmlNodePtr deviceNode );
+    virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency );
+    virtual void showDevice() const;
+
+    Ieee1394Service* get1394Service()
+	{ return m_1394Service; }
+
+    AvPlugManager& getPlugManager()
+	{ return m_plugManager; }
+
+protected:
+    bool enumerateSubUnits();
+
+    bool discoverPlugs();
+    bool discoverPlugsPCR( AvPlug::EAvPlugDirection plugDirection,
+                           plug_id_t plugMaxId );
+    bool discoverPlugsExternal( AvPlug::EAvPlugDirection plugDirection,
+                                plug_id_t plugMaxId );
+    bool discoverPlugConnections();
+    bool discoverSyncModes();
+    bool discoverSubUnitsPlugConnections();
+
+    AvDeviceSubunit* getSubunit( subunit_type_t subunitType,
+                                 subunit_id_t subunitId ) const;
+
+    unsigned int getNrOfSubunits( subunit_type_t subunitType ) const;
+    AvPlugConnection* getPlugConnection( AvPlug& srcPlug ) const;
+
+    AvPlug* getSyncPlug( int maxPlugId, AvPlug::EAvPlugDirection );
+
+    AvPlug* getPlugById( AvPlugVector& plugs,
+                         AvPlug::EAvPlugDirection plugDireciton,
+                         int id );
+    AvPlugVector getPlugsByType( AvPlugVector& plugs,
+				 AvPlug::EAvPlugDirection plugDirection,
+				 AvPlug::EAvPlugType type);
+
+    bool setSamplingFrequencyPlug( AvPlug& plug,
+                                   AvPlug::EAvPlugDirection direction,
+                                   ESamplingFrequency samplingFrequency );
+
+    void showAvPlugs( AvPlugVector& plugs ) const;
+
+    bool checkSyncConnections( AvPlugVector& plhs, AvPlugVector& prhs );
+protected:
+    Ieee1394Service* m_1394Service;
+    ConfigRom*       m_configRom;
+    int              m_nodeId;
+    int              m_verboseLevel;
+
+    AvPlugVector     m_pcrPlugs;
+    AvPlugVector     m_externalPlugs;
+
+    AvPlugConnectionVector m_plugConnections;
+
+    AvDeviceSubunitVector  m_subunits;
+
+    AvPlugManager    m_plugManager;
+
+    DECLARE_DEBUG_MODULE;
+};
+
+}
+
+#endif
Index: branches/freebob-syt-experiments/src/bebob/bebob_avplug.cpp
===================================================================
--- branches/freebob-syt-experiments/src/bebob/bebob_avplug.cpp (revision 187)
+++ branches/freebob-syt-experiments/src/bebob/bebob_avplug.cpp (revision 187)
@@ -0,0 +1,1742 @@
+/* bebob_avplug.cpp
+ * Copyright (C) 2005,06 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "bebob/bebob_avplug.h"
+
+#include "libfreebobavc/ieee1394service.h"
+#include "libfreebobavc/serialize.h"
+
+namespace BeBoB {
+
+int AvPlug::m_globalIdCounter = 0;
+
+IMPL_DEBUG_MODULE( AvPlug, AvPlug, DEBUG_LEVEL_NORMAL );
+IMPL_DEBUG_MODULE( AvPlugManager, AvPlugManager, DEBUG_LEVEL_NORMAL );
+
+AvPlug::AvPlug( Ieee1394Service& ieee1394Service,
+                int nodeId,
+                AvPlugManager& plugManager,
+                AVCCommand::ESubunitType subunitType,
+                subunit_id_t subunitId,
+                function_block_type_t functionBlockType,
+                function_block_id_t functionBlockId,
+                EAvPlugAddressType plugAddressType,
+                EAvPlugDirection plugDirection,
+                plug_id_t plugId,
+                int verboseLevel )
+    : m_1394Service( &ieee1394Service )
+    , m_nodeId( nodeId )
+    , m_subunitType( subunitType )
+    , m_subunitId( subunitId )
+    , m_functionBlockType( functionBlockType )
+    , m_functionBlockId( functionBlockId )
+    , m_addressType( plugAddressType )
+    , m_direction( plugDirection )
+    , m_id( plugId )
+    , m_infoPlugType( eAPT_Unknown )
+    , m_nrOfChannels( 0 )
+    , m_plugManager( &plugManager )
+    , m_verboseLevel( verboseLevel )
+    , m_globalId( m_globalIdCounter++ )
+{
+    if ( m_verboseLevel ) {
+        setDebugLevel( DEBUG_LEVEL_VERBOSE );
+    }
+    debugOutput( DEBUG_LEVEL_VERBOSE,
+                 "nodeId = %d, subunitType = %d, "
+                 "subunitId = %d, functionBlockType = %d, "
+                 "functionBlockId = %d, addressType = %d, "
+                 "direction = %d, id = %d\n",
+                 m_nodeId,
+                 m_subunitType,
+                 m_subunitId,
+                 m_functionBlockType,
+                 m_functionBlockId,
+                 m_addressType,
+                 m_direction,
+                 m_id );
+}
+
+AvPlug::AvPlug( const AvPlug& rhs )
+    : m_1394Service( rhs.m_1394Service )
+    , m_nodeId( rhs.m_nodeId )
+    , m_subunitType( rhs.m_subunitType )
+    , m_subunitId( rhs.m_subunitId )
+    , m_functionBlockType( rhs.m_functionBlockType )
+    , m_functionBlockId( rhs.m_functionBlockId )
+    , m_addressType( rhs.m_addressType )
+    , m_direction( rhs.m_direction )
+    , m_id( rhs.m_id )
+    , m_infoPlugType( rhs.m_infoPlugType )
+    , m_nrOfChannels( rhs.m_nrOfChannels )
+    , m_name( rhs.m_name )
+    , m_clusterInfos( rhs.m_clusterInfos )
+    , m_formatInfos( rhs.m_formatInfos )
+    , m_plugManager( rhs.m_plugManager )
+    , m_verboseLevel( rhs.m_verboseLevel )
+{
+    if ( m_verboseLevel ) {
+        setDebugLevel( DEBUG_LEVEL_VERBOSE );
+    }
+}
+
+AvPlug::~AvPlug()
+{
+    m_plugManager->remPlug( *this );
+}
+
+bool
+AvPlug::discover()
+{
+    if ( !discoverPlugType() ) {
+        debugError( "discover: Could not discover plug type (%d,%d,%d,%d,%d)\n",
+                    m_nodeId, m_subunitType, m_subunitId, m_direction, m_id );
+        return false;
+    }
+
+    if ( !discoverName() ) {
+        debugError( "Could not discover name (%d,%d,%d,%d,%d)\n",
+                    m_nodeId, m_subunitType, m_subunitId, m_direction, m_id );
+        return false;
+    }
+
+    if ( !discoverNoOfChannels() ) {
+        debugError( "Could not discover number of channels "
+                    "(%d,%d,%d,%d,%d)\n",
+                    m_nodeId, m_subunitType, m_subunitId, m_direction, m_id );
+        return false;
+    }
+
+    if ( !discoverChannelPosition() ) {
+        debugError( "Could not discover channel positions "
+                    "(%d,%d,%d,%d,%d)\n",
+                    m_nodeId, m_subunitType, m_subunitId, m_direction, m_id );
+        return false;
+    }
+
+    if ( !discoverChannelName() ) {
+        debugError( "Could not discover channel name "
+                    "(%d,%d,%d,%d,%d)\n",
+                    m_nodeId, m_subunitType, m_subunitId, m_direction, m_id );
+        return false;
+    }
+
+    if ( !discoverClusterInfo() ) {
+        debugError( "Could not discover channel name "
+                    "(%d,%d,%d,%d,%d)\n",
+                    m_nodeId, m_subunitType, m_subunitId, m_direction, m_id );
+        return false;
+    }
+
+    if ( !discoverStreamFormat() ) {
+        debugError( "Could not discover stream format "
+                    "(%d,%d,%d,%d,%d)\n",
+                    m_nodeId, m_subunitType, m_subunitId, m_direction, m_id );
+        return false;
+    }
+
+    if ( !discoverSupportedStreamFormats() ) {
+        debugError( "Could not discover supported stream formats "
+                    "(%d,%d,%d,%d,%d)\n",
+                    m_nodeId, m_subunitType, m_subunitId, m_direction, m_id );
+        return false;
+    }
+
+    return m_plugManager->addPlug( *this );
+}
+
+bool
+AvPlug::discoverConnections()
+{
+    return discoverConnectionsInput() && discoverConnectionsOutput();
+}
+
+bool
+AvPlug::inquireConnnection( AvPlug& plug )
+{
+    SignalSourceCmd signalSourceCmd = setSrcPlugAddrToSignalCmd();
+    setDestPlugAddrToSignalCmd( signalSourceCmd, plug );
+    signalSourceCmd.setVerbose( m_verboseLevel );
+
+    if ( !signalSourceCmd.fire() ) {
+        debugError( "Could not inquire connection between '%s' and '%s'\n",
+                    getName(), plug.getName() );
+        return false;
+    }
+
+    if ( signalSourceCmd.getResponse() == AVCCommand::eR_Implemented ) {
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "Connection possible between '%s' and '%s'\n",
+                     getName(),  plug.getName() );
+        return true;
+    }
+    debugOutput( DEBUG_LEVEL_VERBOSE,
+                 "Connection not possible between '%s' and '%s'\n",
+                 getName(),  plug.getName() );
+    return false;
+}
+
+int
+AvPlug::getNrOfStreams() const
+{
+    int nrOfChannels = 0;
+    for ( ClusterInfoVector::const_iterator it = m_clusterInfos.begin();
+          it != m_clusterInfos.end();
+          ++it )
+    {
+        const ClusterInfo* clusterInfo = &( *it );
+        nrOfChannels += clusterInfo->m_nrOfChannels;
+    }
+    return nrOfChannels;
+}
+
+int
+AvPlug::getNrOfChannels() const
+{
+    return m_nrOfChannels;
+}
+
+int
+AvPlug::getSampleRate() const
+{
+    return convertESamplingFrequency( static_cast<ESamplingFrequency>( m_samplingFrequency ) );
+}
+
+bool
+AvPlug::discoverPlugType()
+{
+    ExtendedPlugInfoCmd extPlugInfoCmd = setPlugAddrToPlugInfoCmd();
+    ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+        ExtendedPlugInfoInfoType::eIT_PlugType );
+    extendedPlugInfoInfoType.initialize();
+    extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+    extPlugInfoCmd.setVerbose( m_verboseLevel );
+
+    if ( !extPlugInfoCmd.fire() ) {
+        debugError( "plug type command failed\n" );
+        return false;
+    }
+
+    m_infoPlugType = eAPT_Unknown;
+
+    if ( extPlugInfoCmd.getResponse() == AVCCommand::eR_Implemented ) {
+
+        ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+        if ( infoType
+             && infoType->m_plugType )
+        {
+            plug_type_t plugType = infoType->m_plugType->m_plugType;
+
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "plug %d is of type %d (%s)\n",
+                         m_id,
+                         plugType,
+                         extendedPlugInfoPlugTypeToString( plugType ) );
+            switch ( plugType ) {
+            case ExtendedPlugInfoPlugTypeSpecificData::eEPIPT_IsoStream:
+                m_infoPlugType = eAPT_IsoStream;
+                break;
+            case ExtendedPlugInfoPlugTypeSpecificData::eEPIPT_AsyncStream:
+                m_infoPlugType = eAPT_AsyncStream;
+                break;
+            case ExtendedPlugInfoPlugTypeSpecificData::eEPIPT_Midi:
+                m_infoPlugType = eAPT_Midi;
+                break;
+            case ExtendedPlugInfoPlugTypeSpecificData::eEPIPT_Sync:
+                m_infoPlugType = eAPT_Sync;
+                break;
+            case ExtendedPlugInfoPlugTypeSpecificData::eEPIPT_Analog:
+                m_infoPlugType = eAPT_Analog;
+                break;
+            case ExtendedPlugInfoPlugTypeSpecificData::eEPIPT_Digital:
+                m_infoPlugType = eAPT_Digital;
+                break;
+            default:
+                m_infoPlugType = eAPT_Unknown;
+
+            }
+        }
+    } else {
+        debugError( "Plug does not implement extended plug info plug "
+                    "type info command\n" );
+        return false;
+    }
+
+   return true;
+}
+
+bool
+AvPlug::discoverName()
+{
+    ExtendedPlugInfoCmd extPlugInfoCmd = setPlugAddrToPlugInfoCmd();
+    ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+        ExtendedPlugInfoInfoType::eIT_PlugName );
+    extendedPlugInfoInfoType.initialize();
+    extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+    extPlugInfoCmd.setVerbose( m_verboseLevel );
+
+    if ( !extPlugInfoCmd.fire() ) {
+        debugError( "name command failed\n" );
+        return false;
+    }
+
+    ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+    if ( infoType
+         && infoType->m_plugName )
+    {
+        std::string name =
+            infoType->m_plugName->m_name;
+
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "plug %d has name '%s'\n",
+                     m_id,
+                     name.c_str() );
+
+        m_name = name;
+    }
+    return true;
+}
+
+bool
+AvPlug::discoverNoOfChannels()
+{
+    ExtendedPlugInfoCmd extPlugInfoCmd = setPlugAddrToPlugInfoCmd();
+    //extPlugInfoCmd.setVerbose( true );
+    ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+        ExtendedPlugInfoInfoType::eIT_NoOfChannels );
+    extendedPlugInfoInfoType.initialize();
+    extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+    extPlugInfoCmd.setVerbose( m_verboseLevel );
+
+    if ( !extPlugInfoCmd.fire() ) {
+        debugError( "number of channels command failed\n" );
+        return false;
+    }
+
+    ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+    if ( infoType
+         && infoType->m_plugNrOfChns )
+    {
+        nr_of_channels_t nrOfChannels
+            = infoType->m_plugNrOfChns->m_nrOfChannels;
+
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "plug %d has %d channels\n",
+                     m_id,
+                     nrOfChannels );
+
+        m_nrOfChannels = nrOfChannels;
+    }
+    return true;
+}
+
+bool
+AvPlug::discoverChannelPosition()
+{
+    ExtendedPlugInfoCmd extPlugInfoCmd = setPlugAddrToPlugInfoCmd();
+    ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+        ExtendedPlugInfoInfoType::eIT_ChannelPosition );
+    extendedPlugInfoInfoType.initialize();
+    extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+    extPlugInfoCmd.setVerbose( m_verboseLevel );
+
+    if ( !extPlugInfoCmd.fire() ) {
+        debugError( "channel position command failed\n" );
+        return false;
+    }
+
+    ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+    if ( infoType
+         && infoType->m_plugChannelPosition )
+    {
+        if ( !copyClusterInfo( *( infoType->m_plugChannelPosition ) ) ) {
+            debugError( "Could not copy channel position "
+                        "information\n" );
+            return false;
+        }
+
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "plug %d: channel position information "
+                     "retrieved\n",
+                     m_id );
+
+        debugOutputClusterInfos( DEBUG_LEVEL_VERBOSE );
+    }
+
+    return true;
+}
+
+bool
+AvPlug::discoverChannelName()
+{
+    for ( ClusterInfoVector::iterator clit = m_clusterInfos.begin();
+          clit != m_clusterInfos.end();
+          ++clit )
+    {
+        ClusterInfo* clitInfo = &*clit;
+
+        for ( ChannelInfoVector::iterator pit =  clitInfo->m_channelInfos.begin();
+              pit != clitInfo->m_channelInfos.end();
+              ++pit )
+        {
+            ChannelInfo* channelInfo = &*pit;
+
+            ExtendedPlugInfoCmd extPlugInfoCmd = setPlugAddrToPlugInfoCmd();
+            ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+                ExtendedPlugInfoInfoType::eIT_ChannelName );
+            extendedPlugInfoInfoType.initialize();
+            extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+            extPlugInfoCmd.setVerbose( m_verboseLevel );
+
+            ExtendedPlugInfoInfoType* infoType =
+                extPlugInfoCmd.getInfoType();
+            if ( infoType ) {
+                infoType->m_plugChannelName->m_streamPosition =
+                    channelInfo->m_streamPosition;
+            }
+            if ( !extPlugInfoCmd.fire() ) {
+                debugError( "channel name command failed\n" );
+                return false;
+            }
+            infoType = extPlugInfoCmd.getInfoType();
+            if ( infoType
+                 && infoType->m_plugChannelName )
+            {
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "plug %d stream "
+                             "position %d: channel name = %s\n",
+                             m_id,
+                             channelInfo->m_streamPosition,
+                             infoType->m_plugChannelName->m_plugChannelName.c_str() );
+                channelInfo->m_name =
+                    infoType->m_plugChannelName->m_plugChannelName;
+            }
+
+        }
+    }
+
+    return true;
+}
+
+bool
+AvPlug::discoverClusterInfo()
+{
+    if ( m_infoPlugType == eAPT_Sync )
+    {
+        // If the plug is of type sync it is either a normal 2 channel
+        // stream (not compound stream) or it is a compound stream
+        // with exactly one cluster. This depends on the
+        // extended stream format command version which is used.
+        // We are not interested in this plug so we skip it.
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "%s plug %d is of type sync -> skip\n",
+                     getName(),
+                     m_id );
+        return true;
+    }
+
+    for ( ClusterInfoVector::iterator clit = m_clusterInfos.begin();
+          clit != m_clusterInfos.end();
+          ++clit )
+    {
+        ClusterInfo* clusterInfo = &*clit;
+
+        ExtendedPlugInfoCmd extPlugInfoCmd = setPlugAddrToPlugInfoCmd();
+        ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+            ExtendedPlugInfoInfoType::eIT_ClusterInfo );
+        extendedPlugInfoInfoType.initialize();
+        extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+        extPlugInfoCmd.setVerbose( m_verboseLevel );
+
+        extPlugInfoCmd.getInfoType()->m_plugClusterInfo->m_clusterIndex =
+            clusterInfo->m_index;
+
+        if ( !extPlugInfoCmd.fire() ) {
+            debugError( "cluster info command failed\n" );
+            return false;
+        }
+
+        ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+        if ( infoType
+             && infoType->m_plugClusterInfo )
+        {
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "%s plug %d: cluster index = %d, "
+                         "portType %s, cluster name = %s\n",
+                         getName(),
+                         m_id,
+                         infoType->m_plugClusterInfo->m_clusterIndex,
+                         extendedPlugInfoClusterInfoPortTypeToString(
+                             infoType->m_plugClusterInfo->m_portType ),
+                         infoType->m_plugClusterInfo->m_clusterName.c_str() );
+
+            clusterInfo->m_portType = infoType->m_plugClusterInfo->m_portType;
+            clusterInfo->m_name = infoType->m_plugClusterInfo->m_clusterName;
+        }
+    }
+
+    return true;
+}
+
+bool
+AvPlug::discoverStreamFormat()
+{
+    ExtendedStreamFormatCmd extStreamFormatCmd =
+        setPlugAddrToStreamFormatCmd( ExtendedStreamFormatCmd::eSF_ExtendedStreamFormatInformationCommand );
+    extStreamFormatCmd.setVerbose( m_verboseLevel );
+
+    if ( !extStreamFormatCmd.fire() ) {
+        debugError( "stream format command failed\n" );
+        return false;
+    }
+
+    if ( ( extStreamFormatCmd.getStatus() ==  ExtendedStreamFormatCmd::eS_NoStreamFormat )
+         || ( extStreamFormatCmd.getStatus() ==  ExtendedStreamFormatCmd::eS_NotUsed ) )
+    {
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "No stream format information available\n" );
+        return true;
+    }
+
+    if ( !extStreamFormatCmd.getFormatInformation() ) {
+        debugWarning( "No stream format information for plug found -> skip\n" );
+        return true;
+    }
+
+    if ( extStreamFormatCmd.getFormatInformation()->m_root
+           != FormatInformation::eFHR_AudioMusic  )
+    {
+        debugWarning( "Format hierarchy root is not Audio&Music -> skip\n" );
+        return true;
+    }
+
+    FormatInformation* formatInfo =
+        extStreamFormatCmd.getFormatInformation();
+    FormatInformationStreamsCompound* compoundStream
+        = dynamic_cast< FormatInformationStreamsCompound* > (
+            formatInfo->m_streams );
+    if ( compoundStream ) {
+        m_samplingFrequency =
+            compoundStream->m_samplingFrequency;
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "%s plug %d uses "
+                     "sampling frequency %d, nr of stream infos = %d\n",
+                     getName(),
+                     m_id,
+                     m_samplingFrequency,
+                     compoundStream->m_numberOfStreamFormatInfos );
+
+        for ( int i = 1;
+              i <= compoundStream->m_numberOfStreamFormatInfos;
+              ++i )
+        {
+            ClusterInfo* clusterInfo =
+                const_cast<ClusterInfo*>( getClusterInfoByIndex( i ) );
+
+            if ( !clusterInfo ) {
+                debugError( "No matching cluster "
+                            "info found for index %d\n",  i );
+                    return false;
+            }
+            StreamFormatInfo* streamFormatInfo =
+                compoundStream->m_streamFormatInfos[ i - 1 ];
+
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "number of channels = %d, stream format = %d\n",
+                         streamFormatInfo->m_numberOfChannels,
+                         streamFormatInfo->m_streamFormat );
+
+            int nrOfChannels = clusterInfo->m_nrOfChannels;
+            if ( streamFormatInfo->m_streamFormat ==
+                 FormatInformation::eFHL2_AM824_MIDI_CONFORMANT )
+            {
+                // 8 logical midi channels fit into 1 channel
+                nrOfChannels = ( ( nrOfChannels + 7 ) / 8 );
+            }
+            // sanity check
+            if ( nrOfChannels != streamFormatInfo->m_numberOfChannels )
+            {
+                debugWarning( "Number of channels "
+                              "mismatch: '%s' plug discovering reported "
+                              "%d channels for cluster '%s', while stream "
+                              "format reported %d\n",
+                              getName(),
+                              nrOfChannels,
+                              clusterInfo->m_name.c_str(),
+                              streamFormatInfo->m_numberOfChannels);
+            }
+            clusterInfo->m_streamFormat = streamFormatInfo->m_streamFormat;
+
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "%s plug %d cluster info %d ('%s'): "
+                         "stream format %d\n",
+                         getName(),
+                         m_id,
+                         i,
+                         clusterInfo->m_name.c_str(),
+                         clusterInfo->m_streamFormat );
+        }
+    }
+
+    FormatInformationStreamsSync* syncStream
+        = dynamic_cast< FormatInformationStreamsSync* > (
+            formatInfo->m_streams );
+    if ( syncStream ) {
+        m_samplingFrequency =
+            syncStream->m_samplingFrequency;
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "%s plug %d is sync stream with sampling frequency %d\n",
+                     getName(),
+                     m_id,
+                     m_samplingFrequency );
+    }
+
+
+    if ( !compoundStream && !syncStream )
+    {
+        debugError( "Unsupported stream format\n" );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+AvPlug::discoverSupportedStreamFormats()
+{
+    ExtendedStreamFormatCmd extStreamFormatCmd =
+        setPlugAddrToStreamFormatCmd(
+            ExtendedStreamFormatCmd::eSF_ExtendedStreamFormatInformationCommandList);
+    extStreamFormatCmd.setVerbose( m_verboseLevel );
+
+    int i = 0;
+    bool cmdSuccess = false;
+
+    do {
+        extStreamFormatCmd.setIndexInStreamFormat( i );
+        extStreamFormatCmd.setCommandType( AVCCommand::eCT_Status );
+        cmdSuccess = extStreamFormatCmd.fire();
+        if ( cmdSuccess
+             && ( extStreamFormatCmd.getResponse()
+                  == AVCCommand::eR_Implemented ) )
+        {
+            FormatInfo formatInfo;
+            formatInfo.m_index = i;
+            bool formatInfoIsValid = true;
+
+            FormatInformationStreamsSync* syncStream
+                = dynamic_cast< FormatInformationStreamsSync* >
+                ( extStreamFormatCmd.getFormatInformation()->m_streams );
+            if ( syncStream ) {
+                formatInfo.m_samplingFrequency =
+                    syncStream->m_samplingFrequency;
+                formatInfo.m_isSyncStream = true ;
+            }
+
+            FormatInformationStreamsCompound* compoundStream
+                = dynamic_cast< FormatInformationStreamsCompound* >
+                ( extStreamFormatCmd.getFormatInformation()->m_streams );
+            if ( compoundStream ) {
+                formatInfo.m_samplingFrequency =
+                    compoundStream->m_samplingFrequency;
+                formatInfo.m_isSyncStream = false;
+                for ( int j = 0;
+                      j < compoundStream->m_numberOfStreamFormatInfos;
+                      ++j )
+                {
+                    switch ( compoundStream->m_streamFormatInfos[j]->m_streamFormat ) {
+                    case AVC1394_STREAM_FORMAT_AM824_IEC60968_3:
+                        formatInfo.m_audioChannels +=
+                            compoundStream->m_streamFormatInfos[j]->m_numberOfChannels;
+                        break;
+                    case AVC1394_STREAM_FORMAT_AM824_MULTI_BIT_LINEAR_AUDIO_RAW:
+                        formatInfo.m_audioChannels +=
+                            compoundStream->m_streamFormatInfos[j]->m_numberOfChannels;
+                        break;
+                    case AVC1394_STREAM_FORMAT_AM824_MIDI_CONFORMANT:
+                        formatInfo.m_midiChannels +=
+                            compoundStream->m_streamFormatInfos[j]->m_numberOfChannels;
+                        break;
+                    default:
+                        formatInfoIsValid = false;
+                        debugWarning("unknown stream format (0x%02x) for channel "
+                                      "(%d)\n",
+                                     compoundStream->m_streamFormatInfos[j]->m_streamFormat,
+                                     j );
+                    }
+                }
+            }
+
+            if ( formatInfoIsValid ) {
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "[%s:%d] formatInfo[%d].m_samplingFrequency "
+                             "= %d\n",
+                             getName(), m_id,
+                             i, formatInfo.m_samplingFrequency );
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "[%s:%d] formatInfo[%d].m_isSyncStream = %d\n",
+                             getName(), m_id,
+                             i, formatInfo.m_isSyncStream );
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "[%s:%d] formatInfo[%d].m_audioChannels = %d\n",
+                             getName(), m_id,
+                             i, formatInfo.m_audioChannels );
+                debugOutput( DEBUG_LEVEL_VERBOSE,
+                             "[%s:%d] formatInfo[%d].m_midiChannels = %d\n",
+                             getName(), m_id,
+                             i, formatInfo.m_midiChannels );
+                m_formatInfos.push_back( formatInfo );
+            }
+        }
+
+        ++i;
+    } while ( cmdSuccess && ( extStreamFormatCmd.getResponse()
+                              == ExtendedStreamFormatCmd::eR_Implemented ) );
+
+    return true;
+}
+
+
+bool
+AvPlug::discoverConnectionsInput()
+{
+    ExtendedPlugInfoCmd extPlugInfoCmd = setPlugAddrToPlugInfoCmd();
+    ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+        ExtendedPlugInfoInfoType::eIT_PlugInput );
+    extendedPlugInfoInfoType.initialize();
+    extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+    extPlugInfoCmd.setVerbose( m_verboseLevel );
+
+    if ( !extPlugInfoCmd.fire() ) {
+        debugError( "plug type command failed\n" );
+        return false;
+    }
+
+    if ( extPlugInfoCmd.getResponse() == AVCCommand::eR_Rejected ) {
+        // Plugs does not like to be asked about connections
+        debugOutput( DEBUG_LEVEL_VERBOSE, "Plug '%s' rejects "
+                     "connections command\n",
+                     getName() );
+        return true;
+    }
+
+    ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+    if ( infoType
+         && infoType->m_plugInput )
+    {
+        PlugAddressSpecificData* plugAddress
+            = infoType->m_plugInput->m_plugAddress;
+
+        if ( plugAddress->m_addressMode ==
+             PlugAddressSpecificData::ePAM_Undefined )
+        {
+            // This plug has no input connection
+            return true;
+        }
+
+        if ( !discoverConnectionsFromSpecificData( eAPD_Input,
+                                                   plugAddress,
+                                                   m_inputConnections ) )
+        {
+            debugWarning( "Could not discover connnections for plug '%s'\n",
+                          getName() );
+        }
+    } else {
+        debugError( "no valid info type for plug '%s'\n", getName() );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+AvPlug::discoverConnectionsOutput()
+{
+    ExtendedPlugInfoCmd extPlugInfoCmd = setPlugAddrToPlugInfoCmd();
+    ExtendedPlugInfoInfoType extendedPlugInfoInfoType(
+        ExtendedPlugInfoInfoType::eIT_PlugOutput );
+    extendedPlugInfoInfoType.initialize();
+    extPlugInfoCmd.setInfoType( extendedPlugInfoInfoType );
+    extPlugInfoCmd.setVerbose( m_verboseLevel );
+
+    if ( !extPlugInfoCmd.fire() ) {
+        debugError( "plug type command failed\n" );
+        return false;
+    }
+
+    if ( extPlugInfoCmd.getResponse() == AVCCommand::eR_Rejected ) {
+        // Plugs does not like to be asked about connections
+        debugOutput( DEBUG_LEVEL_VERBOSE, "Plug '%s' rejects "
+                     "connections command\n",
+                     getName() );
+        return true;
+    }
+
+    ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+    if ( infoType
+         && infoType->m_plugOutput )
+    {
+        if ( infoType->m_plugOutput->m_nrOfOutputPlugs
+             != infoType->m_plugOutput->m_outputPlugAddresses.size() )
+        {
+            debugError( "number of output plugs (%d) disagree with "
+                        "number of elements in plug address vector (%d)\n",
+                        infoType->m_plugOutput->m_nrOfOutputPlugs,
+                        infoType->m_plugOutput->m_outputPlugAddresses.size());
+        }
+
+        if ( infoType->m_plugOutput->m_nrOfOutputPlugs == 0 ) {
+            // This plug has no output connections
+            return true;
+        }
+
+        for ( unsigned int i = 0;
+              i < infoType->m_plugOutput->m_outputPlugAddresses.size();
+              ++i )
+        {
+            PlugAddressSpecificData* plugAddress
+                = infoType->m_plugOutput->m_outputPlugAddresses[i];
+
+            if ( !discoverConnectionsFromSpecificData( eAPD_Output,
+                                                       plugAddress,
+                                                       m_outputConnections ) )
+            {
+                debugWarning( "Could not discover connnections for "
+                              "plug '%s'\n", getName() );
+            }
+        }
+    } else {
+        debugError( "no valid info type for plug '%s'\n", getName() );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+AvPlug::discoverConnectionsFromSpecificData(
+    EAvPlugDirection discoverDirection,
+    PlugAddressSpecificData* plugAddress,
+    AvPlugVector& connections )
+{
+    UnitPlugSpecificDataPlugAddress* pUnitPlugAddress =
+        dynamic_cast<UnitPlugSpecificDataPlugAddress*>
+        ( plugAddress->m_plugAddressData );
+
+    SubunitPlugSpecificDataPlugAddress* pSubunitPlugAddress =
+        dynamic_cast<SubunitPlugSpecificDataPlugAddress*>
+        ( plugAddress->m_plugAddressData );
+
+    FunctionBlockPlugSpecificDataPlugAddress*
+        pFunctionBlockPlugAddress =
+        dynamic_cast<FunctionBlockPlugSpecificDataPlugAddress*>
+        ( plugAddress->m_plugAddressData );
+
+    AvPlug* plug = getPlugDefinedBySpecificData(
+        pUnitPlugAddress,
+        pSubunitPlugAddress,
+        pFunctionBlockPlugAddress );
+
+    if ( plug ) {
+        debugOutput( DEBUG_LEVEL_NORMAL,
+                     "'(%d) %s' has a connection to '(%d) %s'\n",
+                     getGlobalId(),
+                     getName(),
+                     plug->getGlobalId(),
+                     plug->getName() );
+        addPlugConnection( connections, *plug );
+    } else {
+        debugError( "no corresponding plug found for '(%d) %s'\n",
+                    getGlobalId(),
+                    getName() );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+AvPlug::addPlugConnection( AvPlugVector& connections,
+                           AvPlug& plug )
+
+{
+    for ( AvPlugVector::iterator it = connections.begin();
+          it != connections.end();
+          ++it )
+    {
+        AvPlug* cPlug = *it;
+        if ( cPlug == &plug ) {
+            debugOutput( DEBUG_LEVEL_VERBOSE,
+                         "plug '%s' already in connection list\n",
+                         plug.getName() );
+            return true;
+        }
+    }
+
+    connections.push_back( &plug );
+    return true;
+}
+
+ExtendedPlugInfoCmd
+AvPlug::setPlugAddrToPlugInfoCmd()
+{
+    ExtendedPlugInfoCmd extPlugInfoCmd( m_1394Service );
+
+    switch( m_subunitType ) {
+    case AVCCommand::eST_Unit:
+        {
+            UnitPlugAddress::EPlugType ePlugType =
+                UnitPlugAddress::ePT_Unknown;
+            switch ( m_addressType ) {
+                case eAPA_PCR:
+                    ePlugType = UnitPlugAddress::ePT_PCR;
+                    break;
+                case eAPA_ExternalPlug:
+                    ePlugType = UnitPlugAddress::ePT_ExternalPlug;
+                    break;
+                case eAPA_AsynchronousPlug:
+                    ePlugType = UnitPlugAddress::ePT_AsynchronousPlug;
+                    break;
+                default:
+                    ePlugType = UnitPlugAddress::ePT_Unknown;
+            }
+            UnitPlugAddress unitPlugAddress( ePlugType,
+                                             m_id );
+            extPlugInfoCmd.setPlugAddress(
+                PlugAddress( convertPlugDirection( getPlugDirection() ),
+                             PlugAddress::ePAM_Unit,
+                             unitPlugAddress ) );
+        }
+        break;
+    case AVCCommand::eST_Music:
+    case AVCCommand::eST_Audio:
+        {
+            switch( m_addressType ) {
+            case eAPA_SubunitPlug:
+            {
+                SubunitPlugAddress subunitPlugAddress( m_id );
+                extPlugInfoCmd.setPlugAddress(
+                    PlugAddress(
+                        convertPlugDirection( getPlugDirection() ),
+                        PlugAddress::ePAM_Subunit,
+                        subunitPlugAddress ) );
+            }
+            break;
+            case eAPA_FunctionBlockPlug:
+            {
+                FunctionBlockPlugAddress functionBlockPlugAddress(
+                    m_functionBlockType,
+                    m_functionBlockId,
+                    m_id );
+                extPlugInfoCmd.setPlugAddress(
+                    PlugAddress(
+                        convertPlugDirection( getPlugDirection() ),
+                        PlugAddress::ePAM_FunctionBlock,
+                        functionBlockPlugAddress ) );
+            }
+            break;
+            default:
+                extPlugInfoCmd.setPlugAddress(PlugAddress());
+            }
+        }
+        break;
+    default:
+        debugError( "Unknown subunit type\n" );
+    }
+
+    extPlugInfoCmd.setNodeId( m_nodeId );
+    extPlugInfoCmd.setCommandType( AVCCommand::eCT_Status );
+    extPlugInfoCmd.setSubunitId( m_subunitId );
+    extPlugInfoCmd.setSubunitType( m_subunitType );
+
+    return extPlugInfoCmd;
+}
+
+ExtendedStreamFormatCmd
+AvPlug::setPlugAddrToStreamFormatCmd(
+    ExtendedStreamFormatCmd::ESubFunction subFunction)
+{
+    ExtendedStreamFormatCmd extStreamFormatInfoCmd(
+        m_1394Service,
+        subFunction );
+    switch( m_subunitType ) {
+    case AVCCommand::eST_Unit:
+    {
+            UnitPlugAddress::EPlugType ePlugType =
+                UnitPlugAddress::ePT_Unknown;
+            switch ( m_addressType ) {
+                case eAPA_PCR:
+                    ePlugType = UnitPlugAddress::ePT_PCR;
+                    break;
+                case eAPA_ExternalPlug:
+                    ePlugType = UnitPlugAddress::ePT_ExternalPlug;
+                    break;
+                case eAPA_AsynchronousPlug:
+                    ePlugType = UnitPlugAddress::ePT_AsynchronousPlug;
+                    break;
+                default:
+                    ePlugType = UnitPlugAddress::ePT_Unknown;
+            }
+        UnitPlugAddress unitPlugAddress( ePlugType,
+                                         m_id );
+        extStreamFormatInfoCmd.setPlugAddress(
+            PlugAddress( convertPlugDirection( getPlugDirection() ),
+                         PlugAddress::ePAM_Unit,
+                         unitPlugAddress ) );
+        }
+        break;
+    case AVCCommand::eST_Music:
+    case AVCCommand::eST_Audio:
+    {
+        switch( m_addressType ) {
+        case eAPA_SubunitPlug:
+        {
+            SubunitPlugAddress subunitPlugAddress( m_id );
+            extStreamFormatInfoCmd.setPlugAddress(
+                PlugAddress( convertPlugDirection( getPlugDirection() ),
+                             PlugAddress::ePAM_Subunit,
+                             subunitPlugAddress ) );
+        }
+        break;
+        case eAPA_FunctionBlockPlug:
+        {
+            FunctionBlockPlugAddress functionBlockPlugAddress(
+                m_functionBlockType,
+                m_functionBlockId,
+                m_id );
+            extStreamFormatInfoCmd.setPlugAddress(
+                PlugAddress( convertPlugDirection( getPlugDirection() ),
+                             PlugAddress::ePAM_FunctionBlock,
+                             functionBlockPlugAddress ) );
+        }
+        break;
+        default:
+            extStreamFormatInfoCmd.setPlugAddress(PlugAddress());
+        }
+    }
+    break;
+    default:
+        debugError( "Unknown subunit type\n" );
+    }
+
+    extStreamFormatInfoCmd.setNodeId( m_nodeId );
+    extStreamFormatInfoCmd.setCommandType( AVCCommand::eCT_Status );
+    extStreamFormatInfoCmd.setSubunitId( m_subunitId );
+    extStreamFormatInfoCmd.setSubunitType( m_subunitType );
+
+    return extStreamFormatInfoCmd;
+}
+
+SignalSourceCmd
+AvPlug::setSrcPlugAddrToSignalCmd()
+{
+    SignalSourceCmd signalSourceCmd( m_1394Service );
+
+    switch( m_subunitType ) {
+    case AVCCommand::eST_Unit:
+    {
+        SignalUnitAddress signalUnitAddr;
+        if ( getPlugAddressType() == eAPA_ExternalPlug ) {
+            signalUnitAddr.m_plugId = m_id + 0x80;
+        } else {
+            signalUnitAddr.m_plugId = m_id;
+        }
+        signalSourceCmd.setSignalSource( signalUnitAddr );
+    }
+    break;
+    case AVCCommand::eST_Music:
+    case AVCCommand::eST_Audio:
+    {
+        SignalSubunitAddress signalSubunitAddr;
+        signalSubunitAddr.m_subunitType = m_subunitType;
+        signalSubunitAddr.m_subunitId = m_subunitId;
+        signalSubunitAddr.m_plugId = m_id;
+        signalSourceCmd.setSignalSource( signalSubunitAddr );
+    }
+    break;
+    default:
+        debugError( "Unknown subunit type\n" );
+    }
+
+    signalSourceCmd.setNodeId( m_nodeId );
+    signalSourceCmd.setCommandType( AVCCommand::eCT_SpecificInquiry );
+    signalSourceCmd.setSubunitType( AVCCommand::eST_Unit  );
+    signalSourceCmd.setSubunitId( 0xff );
+
+    return signalSourceCmd;
+}
+
+void
+AvPlug::setDestPlugAddrToSignalCmd(SignalSourceCmd& signalSourceCmd,
+                                   AvPlug& plug)
+{
+    switch( plug.m_subunitType ) {
+    case AVCCommand::eST_Unit:
+    {
+        SignalUnitAddress signalUnitAddr;
+        if ( plug.getPlugAddressType() == eAPA_ExternalPlug ) {
+            signalUnitAddr.m_plugId = plug.m_id + 0x80;
+        } else {
+            signalUnitAddr.m_plugId = plug.m_id;
+        }
+        signalSourceCmd.setSignalDestination( signalUnitAddr );
+    }
+    break;
+    case AVCCommand::eST_Music:
+    case AVCCommand::eST_Audio:
+    {
+        SignalSubunitAddress signalSubunitAddr;
+        signalSubunitAddr.m_subunitType = plug.m_subunitType;
+        signalSubunitAddr.m_subunitId = plug.m_subunitId;
+        signalSubunitAddr.m_plugId = plug.m_id;
+        signalSourceCmd.setSignalDestination( signalSubunitAddr );
+    }
+    break;
+    default:
+        debugError( "Unknown subunit type\n" );
+    }
+}
+
+
+bool
+AvPlug::copyClusterInfo(ExtendedPlugInfoPlugChannelPositionSpecificData&
+                        channelPositionData )
+{
+    int index = 1;
+    for ( ExtendedPlugInfoPlugChannelPositionSpecificData::ClusterInfoVector::const_iterator it
+              = channelPositionData.m_clusterInfos.begin();
+          it != channelPositionData.m_clusterInfos.end();
+          ++it )
+    {
+        const ExtendedPlugInfoPlugChannelPositionSpecificData::ClusterInfo*
+            extPlugSpClusterInfo = &( *it );
+
+        ClusterInfo clusterInfo;
+        clusterInfo.m_nrOfChannels = extPlugSpClusterInfo->m_nrOfChannels;
+        clusterInfo.m_index = index;
+        index++;
+
+        for (  ExtendedPlugInfoPlugChannelPositionSpecificData::ChannelInfoVector::const_iterator cit
+                  = extPlugSpClusterInfo->m_channelInfos.begin();
+              cit != extPlugSpClusterInfo->m_channelInfos.end();
+              ++cit )
+        {
+            const ExtendedPlugInfoPlugChannelPositionSpecificData::ChannelInfo*
+                extPlugSpChannelInfo = &( *cit );
+
+            ChannelInfo channelInfo;
+            channelInfo.m_streamPosition =
+                extPlugSpChannelInfo->m_streamPosition;
+            channelInfo.m_location =
+                extPlugSpChannelInfo->m_location;
+
+            clusterInfo.m_channelInfos.push_back( channelInfo );
+        }
+        m_clusterInfos.push_back( clusterInfo );
+    }
+
+    return true;
+}
+
+void
+AvPlug::debugOutputClusterInfos( int debugLevel )
+{
+    for ( ClusterInfoVector::const_iterator it = m_clusterInfos.begin();
+          it != m_clusterInfos.end();
+          ++it )
+    {
+        const ClusterInfo* clusterInfo = &( *it );
+
+        debugOutput( debugLevel, "number of channels: %d\n",
+                     clusterInfo->m_nrOfChannels );
+
+        for ( ChannelInfoVector::const_iterator cit
+                  = clusterInfo->m_channelInfos.begin();
+              cit != clusterInfo->m_channelInfos.end();
+              ++cit )
+        {
+            const ChannelInfo* channelInfo = &( *cit );
+            channelInfo = channelInfo;
+            debugOutput( debugLevel,
+                         "stream position: %d\n",
+                         channelInfo->m_streamPosition );
+            debugOutput( debugLevel,
+                         "location: %d\n",
+                         channelInfo->m_location );
+        }
+    }
+}
+
+const AvPlug::ClusterInfo*
+AvPlug::getClusterInfoByIndex(int index) const
+{
+    for ( AvPlug::ClusterInfoVector::const_iterator clit =
+              m_clusterInfos.begin();
+          clit != m_clusterInfos.end();
+          ++clit )
+    {
+        const ClusterInfo* info = &*clit;
+        if ( info->m_index == index ) {
+            return info;
+        }
+    }
+    return 0;
+}
+
+PlugAddress::EPlugDirection
+AvPlug::convertPlugDirection( EAvPlugDirection direction )
+{
+    PlugAddress::EPlugDirection dir;
+    switch ( direction ) {
+    case AvPlug::eAPD_Input:
+        dir = PlugAddress::ePD_Input;
+        break;
+    case AvPlug::eAPD_Output:
+        dir = PlugAddress::ePD_Output;
+        break;
+    default:
+        dir = PlugAddress::ePD_Undefined;
+    }
+    return dir;
+}
+
+void
+AvPlug::showPlug() const
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "\tName               = %s\n",
+                 getName() );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "\tType               = %s\n",
+                 extendedPlugInfoPlugTypeToString( getPlugType() ) );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "\tAddress Type       = %s\n",
+                 avPlugAddressTypeToString( getPlugAddressType() ) );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "\tId                 = %d\n",
+                 getPlugId() );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "\tSubunitType        = %d\n",
+                 getSubunitType() );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "\tSubunitId          = %d\n",
+                 getSubunitId() );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "\tDirection          = %s\n",
+                 avPlugDirectionToString( getPlugDirection() ) );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "\tSampling Rate      = %d\n",
+                 getSampleRate() );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "\tNumber of Channels = %d\n",
+                 getNrOfChannels() );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "\tNumber of Streams  = %d\n",
+                 getNrOfStreams() );
+}
+
+
+AvPlug*
+AvPlug::getPlugDefinedBySpecificData(
+    UnitPlugSpecificDataPlugAddress* pUnitPlugAddress,
+    SubunitPlugSpecificDataPlugAddress* pSubunitPlugAddress,
+    FunctionBlockPlugSpecificDataPlugAddress* pFunctionBlockPlugAddress )
+{
+    subunit_type_t        subunitType       = 0xff;
+    subunit_id_t          subunitId         = 0xff;
+    function_block_type_t functionBlockType = 0xff;
+    function_block_id_t   functionBlockId   = 0xff;
+    EAvPlugAddressType    addressType       = eAPA_Undefined;
+    EAvPlugDirection      direction         = eAPD_Unknown;
+    plug_id_t             plugId            = 0xff;
+
+    if ( !pUnitPlugAddress
+         && !pSubunitPlugAddress
+         && !pFunctionBlockPlugAddress )
+    {
+        debugError( "No correct specific data found\n" );
+        return 0;
+    }
+
+    if ( pUnitPlugAddress ) {
+        subunitType = AVCCommand::eST_Unit;
+        switch ( pUnitPlugAddress->m_plugType ) {
+        case UnitPlugSpecificDataPlugAddress::ePT_PCR:
+            addressType = eAPA_PCR;
+            break;
+        case UnitPlugSpecificDataPlugAddress::ePT_ExternalPlug:
+            addressType = eAPA_ExternalPlug;
+            break;
+        case UnitPlugSpecificDataPlugAddress::ePT_AsynchronousPlug:
+            addressType = eAPA_AsynchronousPlug;
+            break;
+        }
+        // unit plug have only connections to subunits
+        if ( getPlugAddressType() == eAPA_SubunitPlug ) {
+            direction = getDirection();
+        } else {
+            debugError( "Function block has connection from/to unknown "
+                        "plug type\n" );
+            direction = eAPD_Unknown;
+        }
+        plugId = pUnitPlugAddress->m_plugId;
+
+        debugOutput( DEBUG_LEVEL_NORMAL,
+                     "'(%d) %s': Remote plug is a unit plug "
+                     "(%s, %s, %d)\n",
+                     getGlobalId(),
+                     getName(),
+                     avPlugAddressTypeToString( addressType ),
+                     avPlugDirectionToString( direction ),
+                     plugId );
+    }
+
+    if ( pSubunitPlugAddress ) {
+        subunitType = pSubunitPlugAddress->m_subunitType;
+        subunitId = pSubunitPlugAddress->m_subunitId;
+        addressType = eAPA_SubunitPlug;
+
+        if ( getPlugAddressType() == eAPA_FunctionBlockPlug ) {
+            direction = getDirection();
+        } else if ( getPlugAddressType() == eAPA_SubunitPlug ) {
+            direction = toggleDirection( getDirection() );
+        } else {
+            // unit
+            direction = getDirection();
+        }
+
+        plugId = pSubunitPlugAddress->m_plugId;
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "'(%d) %s': Remote plug is a subunit plug "
+                     "(%d, %d, %s, %d)\n",
+                     getGlobalId(),
+                     getName(),
+                     subunitType,
+                     subunitId,
+                     avPlugDirectionToString( direction ),
+                     plugId );
+    }
+
+    if ( pFunctionBlockPlugAddress ) {
+        subunitType = pFunctionBlockPlugAddress->m_subunitType;
+        subunitId = pFunctionBlockPlugAddress->m_subunitId;
+        functionBlockType = pFunctionBlockPlugAddress->m_functionBlockType;
+        functionBlockId = pFunctionBlockPlugAddress->m_functionBlockId;
+        addressType = eAPA_FunctionBlockPlug;
+
+        if ( getPlugAddressType() == eAPA_FunctionBlockPlug ) {
+            direction = toggleDirection( getDirection() );
+        } else if ( getPlugAddressType() == eAPA_SubunitPlug ){
+            direction = getDirection();
+        } else {
+            debugError( "Function block has connection from/to unknown "
+                        "plug type\n" );
+            direction = eAPD_Unknown;
+        }
+
+        plugId = pFunctionBlockPlugAddress->m_plugId;
+
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "'(%d) %s': Remote plug is a functionblock plug "
+                     "(%d, %d, %d, %d, %s, %d)\n",
+                     getGlobalId(),
+                     getName(),
+                     subunitType,
+                     subunitId,
+                     functionBlockType,
+                     functionBlockId,
+                     avPlugDirectionToString( direction ),
+                     plugId );
+    }
+
+    AVCCommand::ESubunitType enumSubunitType =
+        static_cast<AVCCommand::ESubunitType>( subunitType );
+
+    return m_plugManager->getPlug(
+        enumSubunitType,
+        subunitId,
+        functionBlockType,
+        functionBlockId,
+        addressType,
+        direction,
+        plugId );
+}
+
+AvPlug::EAvPlugDirection
+AvPlug::toggleDirection( EAvPlugDirection direction ) const
+{
+    EAvPlugDirection newDirection;
+    switch ( direction ) {
+    case eAPD_Output:
+        newDirection = eAPD_Input;
+        break;
+    case eAPD_Input:
+        newDirection = eAPD_Output;
+        break;
+    default:
+        newDirection = direction;
+    }
+
+    return newDirection;
+}
+
+/////////////////////////////////////////
+/////////////////////////////////////////
+
+const char* avPlugAddressTypeStrings[] =
+{
+    "PCR",
+    "external",
+    "asynchronous",
+    "subunit",
+    "functionblock",
+    "undefined",
+};
+
+const char* avPlugAddressTypeToString( AvPlug::EAvPlugAddressType type )
+{
+    if ( type > ( int )( sizeof( avPlugAddressTypeStrings )
+                         / sizeof( avPlugAddressTypeStrings[0] ) ) )
+    {
+        type = AvPlug::eAPA_Undefined;
+    }
+    return avPlugAddressTypeStrings[type];
+}
+
+const char* avPlugTypeStrings[] =
+{
+    "IsoStream",
+    "AsyncStream",
+    "MIDI",
+    "Sync",
+    "Analog",
+    "Digital",
+    "Unknown",
+};
+
+const char* avPlugTypeToString( AvPlug::EAvPlugType type )
+{
+    if ( type > ( int )( sizeof( avPlugTypeStrings )
+                         / sizeof( avPlugTypeStrings[0] ) ) )
+    {
+        type = AvPlug::eAPT_Unknown;
+    }
+    return avPlugTypeStrings[type];
+}
+
+const char* avPlugDirectionStrings[] =
+{
+    "Input",
+    "Output",
+    "Unknown",
+};
+
+const char* avPlugDirectionToString( AvPlug::EAvPlugDirection type )
+{
+    if ( type > ( int )( sizeof( avPlugDirectionStrings )
+                         / sizeof( avPlugDirectionStrings[0] ) ) )
+    {
+        type = AvPlug::eAPD_Unknown;
+    }
+    return avPlugDirectionStrings[type];
+}
+
+/////////////////////////////////////
+
+
+AvPlugManager::AvPlugManager( int verboseLevel )
+    : m_verboseLevel( verboseLevel )
+{
+    if ( m_verboseLevel ) {
+        setDebugLevel( DEBUG_LEVEL_VERBOSE );
+    }
+}
+
+AvPlugManager::AvPlugManager( const AvPlugManager& rhs )
+    : m_verboseLevel( rhs.m_verboseLevel )
+{
+    if ( m_verboseLevel ) {
+        setDebugLevel( DEBUG_LEVEL_VERBOSE );
+    }
+}
+
+AvPlugManager::~AvPlugManager()
+{
+}
+
+bool
+AvPlugManager::addPlug( AvPlug& plug )
+{
+    m_plugs.push_back( &plug );
+    return true;
+}
+
+bool
+AvPlugManager::remPlug( AvPlug& plug )
+{
+    for ( AvPlugVector::iterator it = m_plugs.begin();
+          it !=  m_plugs.end();
+          ++it )
+    {
+        AvPlug* plugIt = *it;
+        if ( plugIt == &plug ) {
+            m_plugs.erase( it );
+            return true;
+        }
+    }
+    return false;
+}
+
+// helper function
+static void addConnection( AvPlugConnectionOwnerVector& connections,
+                           AvPlug& srcPlug,
+                           AvPlug& destPlug )
+{
+    for ( AvPlugConnectionOwnerVector::iterator it = connections.begin();
+          it != connections.end();
+          ++it )
+    {
+        AvPlugConnection& con = *it;
+        if ( ( &( con.getSrcPlug() ) == &srcPlug )
+             && ( &( con.getDestPlug() ) == &destPlug ) )
+        {
+            return;
+        }
+    }
+    connections.push_back( AvPlugConnection( srcPlug, destPlug ) );
+}
+
+void
+AvPlugManager::showPlugs() const
+{
+    // \todo The information provided here could be better arranged. For a start it is ok, but
+    // there is room for improvement. Something for a lazy sunday afternoon (tip: maybe drink some
+    // beer to get into the mood)
+
+    printf( "\nSummary\n" );
+    printf( "-------\n\n" );
+    printf( "Nr | AddressType     | Direction | SubUnitType | SubUnitId | FunctionBlockType | FunctionBlockId | Id   | Type         |Name\n" );
+    printf( "---+-----------------+-----------+-------------+-----------+-------------------+-----------------+------+--------------+------\n" );
+
+    for ( AvPlugVector::const_iterator it = m_plugs.begin();
+          it !=  m_plugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+
+        printf( "%2d | %15s | %9s | %11s |      0x%02x |              0x%02x |            0x%02x | 0x%02x | %12s | %s\n",
+                plug->getGlobalId(),
+                avPlugAddressTypeToString( plug->getPlugAddressType() ),
+                avPlugDirectionToString( plug->getDirection() ),
+                subunitTypeToString( plug->getSubunitType() ),
+                plug->getSubunitId(),
+                plug->getFunctionBlockType(),
+                plug->getFunctionBlockId(),
+                plug->getPlugId(),
+                avPlugTypeToString( plug->getPlugType() ),
+                plug->getName() );
+    }
+
+    printf( "\nConnections\n" );
+    printf( "-----------\n" );
+
+    AvPlugConnectionOwnerVector connections;
+
+    for ( AvPlugVector::const_iterator it = m_plugs.begin();
+          it !=  m_plugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+        for ( AvPlugVector::const_iterator it =
+                  plug->getInputConnections().begin();
+            it != plug->getInputConnections().end();
+            ++it )
+        {
+            addConnection( connections, *( *it ), *plug );
+        }
+        for ( AvPlugVector::const_iterator it =
+                  plug->getOutputConnections().begin();
+            it != plug->getOutputConnections().end();
+            ++it )
+        {
+            addConnection( connections, *plug, *( *it ) );
+        }
+    }
+
+    printf( "digraph avcconnections {\n" );
+    for ( AvPlugConnectionOwnerVector::iterator it = connections.begin();
+          it != connections.end();
+          ++it )
+    {
+        AvPlugConnection& con = *it;
+        printf( "\t\"(%d) %s\" -> \"(%d) %s\"\n",
+                con.getSrcPlug().getGlobalId(),
+                con.getSrcPlug().getName(),
+                con.getDestPlug().getGlobalId(),
+                con.getDestPlug().getName() );
+    }
+    for ( AvPlugVector::const_iterator it = m_plugs.begin();
+          it != m_plugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+        if ( plug->getFunctionBlockType() != 0xff ) {
+            if ( plug->getPlugDirection() == AvPlug::eAPD_Input ) {
+                printf( "\t\"(%d) %s\" -> \"(0x%02x,%d)\"\n",
+                        plug->getGlobalId(),
+                        plug->getName(),
+                        plug->getFunctionBlockType(),
+                        plug->getFunctionBlockId() );
+            } else {
+                printf( "\t\"(0x%02x,%d)\" -> \t\"(%d) %s\"\n",
+                        plug->getFunctionBlockType(),
+                        plug->getFunctionBlockId(),
+                        plug->getGlobalId(),
+                        plug->getName() );
+            }
+        }
+    }
+
+    const char* colorStrings[] = {
+        "coral",
+        "slateblue",
+        "white",
+        "green",
+        "yellow",
+        "grey",
+    };
+
+    for ( AvPlugVector::const_iterator it = m_plugs.begin();
+          it !=  m_plugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+        printf( "\t\"(%d) %s\" [color=%s,style=filled];\n",
+                plug->getGlobalId(), plug->getName(),
+                colorStrings[plug->getPlugAddressType() ] );
+    }
+
+    printf("}\n" );
+    printf( "Use \"dot -Tps FILENAME.dot -o FILENAME.ps\" "
+            "to generate graph\n");
+
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Plug details\n" );
+    debugOutput( DEBUG_LEVEL_VERBOSE, "------------\n" );
+    for ( AvPlugVector::const_iterator it = m_plugs.begin();
+          it !=  m_plugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+        debugOutput( DEBUG_LEVEL_VERBOSE, "Plug %d:\n", plug->getGlobalId() );
+        plug->showPlug();
+
+    }
+}
+
+AvPlug*
+AvPlugManager::getPlug( AVCCommand::ESubunitType subunitType,
+                        subunit_id_t subunitId,
+                        function_block_type_t functionBlockType,
+                        function_block_id_t functionBlockId,
+                        AvPlug::EAvPlugAddressType plugAddressType,
+                        AvPlug::EAvPlugDirection plugDirection,
+                        plug_id_t plugId ) const
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "SBT, SBID, FBT, FBID, AT, PD, ID = "
+                 "(0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x)\n",
+                 subunitType,
+                 subunitId,
+                 functionBlockType,
+                 functionBlockId,
+                 plugAddressType,
+                 plugDirection,
+                 plugId );
+
+    for ( AvPlugVector::const_iterator it = m_plugs.begin();
+          it !=  m_plugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+
+        if (    ( subunitType == plug->getSubunitType() )
+             && ( subunitId == plug->getSubunitId() )
+             && ( functionBlockType == plug->getFunctionBlockType() )
+             && ( functionBlockId == plug->getFunctionBlockId() )
+             && ( plugAddressType == plug->getPlugAddressType() )
+             && ( plugDirection == plug->getPlugDirection() )
+             && ( plugId == plug->getPlugId() ) )
+        {
+            return plug;
+        }
+    }
+
+    return 0;
+}
+
+AvPlugVector
+AvPlugManager::getPlugsByType( AVCCommand::ESubunitType subunitType,
+                               subunit_id_t subunitId,
+                               function_block_type_t functionBlockType,
+                               function_block_id_t functionBlockId,
+                               AvPlug::EAvPlugAddressType plugAddressType,
+                               AvPlug::EAvPlugDirection plugDirection,
+                               AvPlug::EAvPlugType type) const
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "SBT, SBID, FBT, FBID, AT, PD, T = "
+                 "(0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x)\n",
+                 subunitType,
+                 subunitId,
+                 functionBlockType,
+                 functionBlockId,
+                 plugAddressType,
+                 plugDirection,
+                 type );
+
+    AvPlugVector plugVector;
+    for ( AvPlugVector::const_iterator it = m_plugs.begin();
+          it !=  m_plugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+
+        if (    ( subunitType == plug->getSubunitType() )
+             && ( subunitId == plug->getSubunitId() )
+             && ( functionBlockType == plug->getFunctionBlockType() )
+             && ( functionBlockId == plug->getFunctionBlockId() )
+             && ( plugAddressType == plug->getPlugAddressType() )
+             && ( plugDirection == plug->getPlugDirection() )
+             && ( type == plug->getPlugType() ) )
+        {
+            plugVector.push_back( plug );
+        }
+    }
+
+    return plugVector;
+}
+
+////////////////////////////////////
+
+AvPlugCluster::AvPlugCluster()
+{
+}
+
+AvPlugCluster::~AvPlugCluster()
+{
+}
+
+////////////////////////////////////
+
+AvPlugConnection::AvPlugConnection( AvPlug& srcPlug, AvPlug& destPlug )
+    : m_srcPlug( &srcPlug )
+    , m_destPlug( &destPlug )
+{
+}
+
+}
Index: branches/freebob-syt-experiments/src/bebob/bebob_avplug_xml.cpp
===================================================================
--- branches/freebob-syt-experiments/src/bebob/bebob_avplug_xml.cpp (revision 187)
+++ branches/freebob-syt-experiments/src/bebob/bebob_avplug_xml.cpp (revision 187)
@@ -0,0 +1,268 @@
+/* bebob_avplug_xml.cpp
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+// AvPlug XML stuff
+
+#include "bebob/bebob_avplug.h"
+
+#include "libfreebobavc/ieee1394service.h"
+
+namespace BeBoB {
+
+bool
+AvPlug::addXmlDescription( xmlNodePtr connectionSet )
+{
+    char* result;
+
+    int direction;
+    switch ( m_direction ) {
+        case 0:
+            direction = FREEBOB_PLAYBACK;
+            break;
+        case 1:
+            direction = FREEBOB_CAPTURE;
+            break;
+    default:
+        debugError( "plug direction invalid (%d)\n",
+                    m_direction );
+        return false;
+    }
+
+    asprintf( &result, "%d",  direction );
+    if ( !xmlNewChild( connectionSet,
+                       0,
+                       BAD_CAST "Direction",
+                       BAD_CAST result ) )
+    {
+        debugError( "Couldn't create 'Direction' node\n" );
+        return false;
+    }
+
+    xmlNodePtr connection = xmlNewChild( connectionSet, 0,
+                                         BAD_CAST "Connection", 0 );
+    if ( !connection ) {
+        debugError( "Couldn't create 'Connection' node for "
+                    "direction %d\n", m_direction );
+        return false;
+    }
+
+    /*
+    asprintf( &result, "%08x%08x",
+              ( quadlet_t )( m_configRom->getGuid() >> 32 ),
+              ( quadlet_t )( m_configRom->getGuid() & 0xfffffff ) );
+    if ( !xmlNewChild( connection,  0,
+                       BAD_CAST "GUID",  BAD_CAST result ) ) {
+        debugError( "Couldn't create 'GUID' node\n" );
+        return false;
+    }
+    */
+
+    asprintf( &result, "%d", m_1394Service->getPort() );
+    if ( !xmlNewChild( connection,  0,
+                       BAD_CAST "Port",  BAD_CAST result ) ) {
+        debugError( "Couldn't create 'Port' node\n" );
+        return false;
+    }
+
+    asprintf( &result, "%d",  m_nodeId);
+    if ( !xmlNewChild( connection,  0,
+                       BAD_CAST "Node",  BAD_CAST result ) ) {
+        debugError( "Couldn't create 'Node' node\n" );
+        return false;
+    }
+
+    asprintf( &result, "%d",  m_nrOfChannels );
+    if ( !xmlNewChild( connection,  0,
+                       BAD_CAST "Dimension",  BAD_CAST result ) ) {
+        debugError( "Couldn't create 'Dimension' node\n" );
+        return false;
+    }
+
+    asprintf( &result, "%d",  getSampleRate() );
+    if ( !xmlNewChild( connection,  0,
+                       BAD_CAST "Samplerate",  BAD_CAST result ) ) {
+        debugError( "Couldn't create 'Samplerate' node\n" );
+        return false;
+    }
+
+    if ( !xmlNewChild( connection,  0,
+                       BAD_CAST "IsoChannel", BAD_CAST "-1" ) )
+    {
+        debugError( "Couldn't create 'IsoChannel' node\n" );
+        return false;
+    }
+
+    xmlNodePtr streams = xmlNewChild( connection,  0,
+                                      BAD_CAST "Streams",  0 );
+    if ( !streams ) {
+        debugError( "Couldn't create 'Streams' node for "
+                    "direction %d\n", m_direction );
+        return false;
+    }
+
+    for ( AvPlug::ClusterInfoVector::const_iterator it = m_clusterInfos.begin();
+          it != m_clusterInfos.end();
+          ++it )
+    {
+        const AvPlug::ClusterInfo* clusterInfo = &( *it );
+
+        AvPlug::ChannelInfoVector channelInfos = clusterInfo->m_channelInfos;
+        for ( AvPlug::ChannelInfoVector::const_iterator it = channelInfos.begin();
+              it != channelInfos.end();
+              ++it )
+        {
+            const AvPlug::ChannelInfo* channelInfo = &( *it );
+
+            xmlNodePtr stream = xmlNewChild( streams,  0,
+                                             BAD_CAST "Stream",  0 );
+            if ( !stream ) {
+                debugError( "Coulnd't create 'Stream' node" );
+                return false;
+            }
+
+            // \todo: iec61883 backend expects indexing starting from 0
+            // but bebob reports it starting from 1. Decide where
+            // and how to handle this
+            asprintf( &result, "%d", channelInfo->m_streamPosition - 1 );
+            if ( !xmlNewChild( stream,  0,
+                               BAD_CAST "Position",  BAD_CAST result ) )
+            {
+                debugError( "Couldn't create 'Position' node" );
+                return false;
+            }
+
+            asprintf( &result, "%d", channelInfo->m_location );
+            if ( !xmlNewChild( stream,  0,
+                               BAD_CAST "Location",  BAD_CAST result ) )
+            {
+                debugError( "Couldn't create 'Location' node" );
+                return false;
+            }
+
+            asprintf( &result, "%d", clusterInfo->m_streamFormat );
+            if ( !xmlNewChild( stream,  0,
+                               BAD_CAST "Format",  BAD_CAST result ) )
+            {
+                debugError( "Couldn't create 'Format' node" );
+                return false;
+            }
+
+            asprintf( &result, "%d", clusterInfo->m_portType );
+            if ( !xmlNewChild( stream,  0,
+                               BAD_CAST "Type",  BAD_CAST result ) )
+            {
+                debugError( "Couldn't create 'Type' node" );
+                return false;
+            }
+
+            // \todo XXX: What do to do with DestinationPort value??
+            asprintf( &result, "%d", 0 );
+            if ( !xmlNewChild( stream,  0,
+                               BAD_CAST "DestinationPort",  BAD_CAST result ) )
+            {
+                debugError( "Couldn't create 'DestinationPort' node" );
+                return false;
+            }
+
+            if ( !xmlNewChild( stream,  0,
+                               BAD_CAST "Name",
+                               BAD_CAST channelInfo->m_name.c_str() ) )
+            {
+                debugError( "Couldn't create 'Name' node" );
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+
+bool
+AvPlug::addXmlDescriptionStreamFormats( xmlNodePtr streamFormatNode )
+{
+    int direction;
+    switch ( m_direction ) {
+        case 0:
+            direction = FREEBOB_PLAYBACK;
+            break;
+        case 1:
+            direction = FREEBOB_CAPTURE;
+            break;
+    default:
+        debugError( "addXmlDescriptionStreamFormats: plug direction invalid (%d)\n",
+                    m_direction );
+        return false;
+    }
+
+    char* result;
+    asprintf( &result, "%d",  direction );
+    if ( !xmlNewChild( streamFormatNode,
+                       0,
+                       BAD_CAST "Direction",
+                       BAD_CAST result ) )
+    {
+        debugError( "addXmlDescriptionStreamFormats: Could not  create 'Direction' node\n" );
+        return false;
+    }
+
+    for ( FormatInfoVector::iterator it =
+              m_formatInfos.begin();
+          it != m_formatInfos.end();
+          ++it )
+    {
+        AvPlug::FormatInfo formatInfo = *it;
+        xmlNodePtr formatNode = xmlNewChild( streamFormatNode, 0,
+                                             BAD_CAST "Format", 0 );
+        if ( !formatNode ) {
+            debugError( "addXmlDescriptionStreamFormats: Could not create 'Format' node\n" );
+            return false;
+        }
+
+        asprintf( &result, "%d",
+                  convertESamplingFrequency( static_cast<ESamplingFrequency>( formatInfo.m_samplingFrequency ) ) );
+        if ( !xmlNewChild( formatNode,  0,
+                           BAD_CAST "Samplerate",  BAD_CAST result ) )
+        {
+            debugError( "Couldn't create 'Samplerate' node\n" );
+            return false;
+        }
+
+        asprintf( &result, "%d",  formatInfo.m_audioChannels );
+        if ( !xmlNewChild( formatNode,  0,
+                           BAD_CAST "AudioChannels",  BAD_CAST result ) )
+        {
+            debugError( "Couldn't create 'AudioChannels' node\n" );
+            return false;
+        }
+
+        asprintf( &result, "%d",  formatInfo.m_midiChannels );
+        if ( !xmlNewChild( formatNode,  0,
+                           BAD_CAST "MidiChannels",  BAD_CAST result ) )
+        {
+            debugError( "Couldn't create 'MidiChannels' node\n" );
+            return false;
+        }
+    }
+
+    return true;
+}
+
+}
Index: branches/freebob-syt-experiments/src/bebob/bebob_avdevice_subunit.cpp
===================================================================
--- branches/freebob-syt-experiments/src/bebob/bebob_avdevice_subunit.cpp (revision 187)
+++ branches/freebob-syt-experiments/src/bebob/bebob_avdevice_subunit.cpp (revision 187)
@@ -0,0 +1,461 @@
+/* bebob_avdevice_subunit.cpp
+ * Copyright (C) 2005,06 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "bebob/bebob_functionblock.h"
+#include "bebob/bebob_avdevice_subunit.h"
+#include "bebob/bebob_avdevice.h"
+#include "bebob/bebob_avplug.h"
+#include "configrom.h"
+
+#include "libfreebobavc/avc_plug_info.h"
+#include "libfreebobavc/avc_extended_stream_format.h"
+#include "libfreebobavc/serialize.h"
+
+namespace BeBoB {
+
+IMPL_DEBUG_MODULE( AvDeviceSubunit, AvDeviceSubunit, DEBUG_LEVEL_VERBOSE );
+
+////////////////////////////////////////////
+
+AvDeviceSubunit::AvDeviceSubunit( AvDevice& avDevice,
+                                  AVCCommand::ESubunitType type,
+                                  subunit_t id,
+                                  int verboseLevel )
+    : m_avDevice( &avDevice )
+    , m_sbType( type )
+    , m_sbId( id )
+    , m_verboseLevel( verboseLevel )
+{
+    if ( m_verboseLevel ) {
+        setDebugLevel( DEBUG_LEVEL_VERBOSE );
+    }
+}
+
+AvDeviceSubunit::~AvDeviceSubunit()
+{
+    for ( AvPlugVector::iterator it = m_plugs.begin();
+          it != m_plugs.end();
+          ++it )
+    {
+        delete *it;
+    }
+}
+
+bool
+AvDeviceSubunit::discover()
+{
+    if ( !discoverPlugs() ) {
+        debugError( "plug discovering failed\n" );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+AvDeviceSubunit::discoverPlugs()
+{
+    PlugInfoCmd plugInfoCmd( m_avDevice->get1394Service(),
+                             PlugInfoCmd::eSF_SerialBusIsochronousAndExternalPlug );
+    plugInfoCmd.setNodeId( m_avDevice->getConfigRom().getNodeId() );
+    plugInfoCmd.setCommandType( AVCCommand::eCT_Status );
+    plugInfoCmd.setSubunitType( m_sbType );
+    plugInfoCmd.setSubunitId( m_sbId );
+    plugInfoCmd.setVerbose( m_verboseLevel );
+
+    if ( !plugInfoCmd.fire() ) {
+        debugError( "plug info command failed\n" );
+        return false;
+    }
+
+    debugOutput( DEBUG_LEVEL_NORMAL, "number of source plugs = %d\n",
+                 plugInfoCmd.m_sourcePlugs );
+    debugOutput( DEBUG_LEVEL_NORMAL, "number of destination output "
+                 "plugs = %d\n", plugInfoCmd.m_destinationPlugs );
+
+    if ( !discoverPlugs( AvPlug::eAPD_Input,
+                         plugInfoCmd.m_destinationPlugs ) )
+    {
+        debugError( "destination plug discovering failed\n" );
+        return false;
+    }
+
+    if ( !discoverPlugs(  AvPlug::eAPD_Output,
+                          plugInfoCmd.m_sourcePlugs ) )
+    {
+        debugError( "source plug discovering failed\n" );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+AvDeviceSubunit::discoverConnections()
+{
+    for ( AvPlugVector::iterator it = m_plugs.begin();
+          it != m_plugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+        if ( !plug->discoverConnections() ) {
+            debugError( "plug connection discovering failed ('%s')\n",
+                        plug->getName() );
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool
+AvDeviceSubunit::discoverPlugs(AvPlug::EAvPlugDirection plugDirection,
+                               plug_id_t plugMaxId )
+{
+    for ( int plugIdx = 0;
+          plugIdx < plugMaxId;
+          ++plugIdx )
+    {
+        AVCCommand::ESubunitType subunitType =
+            static_cast<AVCCommand::ESubunitType>( getSubunitType() );
+        AvPlug* plug = new AvPlug( *m_avDevice->get1394Service(),
+                                   m_avDevice->getConfigRom().getNodeId(),
+                                   m_avDevice->getPlugManager(),
+                                   subunitType,
+                                   getSubunitId(),
+                                   0xff,
+                                   0xff,
+                                   AvPlug::eAPA_SubunitPlug,
+                                   plugDirection,
+                                   plugIdx,
+                                   m_verboseLevel );
+        if ( !plug || !plug->discover() ) {
+            debugError( "plug discover failed\n" );
+            return false;
+        }
+
+        debugOutput( DEBUG_LEVEL_NORMAL, "plug '%s' found\n",
+                     plug->getName() );
+        m_plugs.push_back( plug );
+    }
+    return true;
+}
+
+bool
+AvDeviceSubunit::addPlug( AvPlug& plug )
+{
+    m_plugs.push_back( &plug );
+    return true;
+}
+
+
+AvPlug*
+AvDeviceSubunit::getPlug(AvPlug::EAvPlugDirection direction, plug_id_t plugId)
+{
+    for ( AvPlugVector::iterator it = m_plugs.begin();
+          it != m_plugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+        if ( ( plug->getPlugId() == plugId )
+            && ( plug->getDirection() == direction ) )
+        {
+            return plug;
+        }
+    }
+    return 0;
+}
+
+////////////////////////////////////////////
+
+AvDeviceSubunitAudio::AvDeviceSubunitAudio( AvDevice& avDevice,
+                                            subunit_t id,
+                                            int verboseLevel )
+    : AvDeviceSubunit( avDevice, AVCCommand::eST_Audio, id, verboseLevel )
+{
+}
+
+AvDeviceSubunitAudio::~AvDeviceSubunitAudio()
+{
+    for ( FunctionBlockVector::iterator it = m_functions.begin();
+          it != m_functions.end();
+          ++it )
+    {
+        delete *it;
+    }
+}
+
+bool
+AvDeviceSubunitAudio::discover()
+{
+    if ( !AvDeviceSubunit::discover() ) {
+        return false;
+    }
+
+    if ( !discoverFunctionBlocks() ) {
+        debugError( "function block discovering failed\n" );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+AvDeviceSubunitAudio::discoverConnections()
+{
+    if ( !AvDeviceSubunit::discoverConnections() ) {
+        return false;
+    }
+
+    for ( FunctionBlockVector::iterator it = m_functions.begin();
+          it != m_functions.end();
+          ++it )
+    {
+        FunctionBlock* function = *it;
+        if ( !function->discoverConnections() ) {
+            debugError( "functionblock connection discovering failed ('%s')\n",
+                        function->getName() );
+            return false;
+        }
+    }
+
+    return true;
+}
+
+const char*
+AvDeviceSubunitAudio::getName()
+{
+    return "AudioSubunit";
+}
+
+bool
+AvDeviceSubunitAudio::discoverFunctionBlocks()
+{
+    if ( !discoverFunctionBlocksDo(
+             ExtendedSubunitInfoCmd::eFBT_AudioSubunitSelector) )
+    {
+        debugError( "Could not discover function block selector\n" );
+        return false;
+    }
+    if ( !discoverFunctionBlocksDo(
+             ExtendedSubunitInfoCmd::eFBT_AudioSubunitFeature) )
+    {
+        debugError( "Could not discover function block feature\n" );
+        return false;
+    }
+    if ( !discoverFunctionBlocksDo(
+             ExtendedSubunitInfoCmd::eFBT_AudioSubunitProcessing) )
+    {
+        debugError( "Could not discover function block processing\n" );
+        return false;
+    }
+    if ( !discoverFunctionBlocksDo(
+             ExtendedSubunitInfoCmd::eFBT_AudioSubunitCodec) )
+    {
+        debugError( "Could not discover function block codec\n" );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+AvDeviceSubunitAudio::discoverFunctionBlocksDo(
+    ExtendedSubunitInfoCmd::EFunctionBlockType fbType )
+{
+    int page = 0;
+    bool cmdSuccess = false;
+    bool finished = false;
+
+    do {
+        ExtendedSubunitInfoCmd
+            extSubunitInfoCmd( m_avDevice->get1394Service() );
+        extSubunitInfoCmd.setNodeId( m_avDevice->getConfigRom().getNodeId() );
+        extSubunitInfoCmd.setCommandType( AVCCommand::eCT_Status );
+        extSubunitInfoCmd.setSubunitId( getSubunitId() );
+        extSubunitInfoCmd.setSubunitType( getSubunitType() );
+        extSubunitInfoCmd.setVerbose( m_verboseLevel );
+
+        extSubunitInfoCmd.m_fbType = fbType;
+        extSubunitInfoCmd.m_page = page;
+
+        cmdSuccess = extSubunitInfoCmd.fire();
+        if ( cmdSuccess
+             && ( extSubunitInfoCmd.getResponse()
+                  == AVCCommand::eR_Implemented ) )
+        {
+            for ( ExtendedSubunitInfoPageDataVector::iterator it =
+                      extSubunitInfoCmd.m_infoPageDatas.begin();
+                  cmdSuccess
+                      && ( it != extSubunitInfoCmd.m_infoPageDatas.end() );
+                  ++it )
+            {
+                cmdSuccess = createFunctionBlock( fbType, **it );
+            }
+            if ( ( extSubunitInfoCmd.m_infoPageDatas.size() != 0 )
+                 && ( extSubunitInfoCmd.m_infoPageDatas.size() == 5 ) )
+            {
+                page++;
+            } else {
+                finished = true;
+            }
+        } else {
+            finished = true;
+        }
+    } while ( cmdSuccess && !finished );
+
+    return cmdSuccess;
+}
+
+bool
+AvDeviceSubunitAudio::createFunctionBlock(
+    ExtendedSubunitInfoCmd::EFunctionBlockType fbType,
+    ExtendedSubunitInfoPageData& data )
+{
+    FunctionBlock::ESpecialPurpose purpose
+        = convertSpecialPurpose(  data.m_functionBlockSpecialPupose );
+
+    FunctionBlock* fb = 0;
+
+    switch ( fbType ) {
+    case ExtendedSubunitInfoCmd::eFBT_AudioSubunitSelector:
+    {
+        fb = new FunctionBlockSelector( *this,
+                                        data.m_functionBlockId,
+                                        purpose,
+                                        data.m_noOfInputPlugs,
+                                        data.m_noOfOutputPlugs,
+                                        m_verboseLevel );
+    }
+    break;
+    case ExtendedSubunitInfoCmd::eFBT_AudioSubunitFeature:
+    {
+        fb = new FunctionBlockFeature( *this,
+                                       data.m_functionBlockId,
+                                       purpose,
+                                       data.m_noOfInputPlugs,
+                                       data.m_noOfOutputPlugs,
+                                       m_verboseLevel );
+    }
+    break;
+    case ExtendedSubunitInfoCmd::eFBT_AudioSubunitProcessing:
+    {
+        switch ( data.m_functionBlockType ) {
+        case ExtendedSubunitInfoCmd::ePT_EnhancedMixer:
+        {
+            fb = new FunctionBlockEnhancedMixer( *this,
+                                                 data.m_functionBlockId,
+                                                 purpose,
+                                                 data.m_noOfInputPlugs,
+                                                 data.m_noOfOutputPlugs,
+                                                 m_verboseLevel );
+        }
+        break;
+        case ExtendedSubunitInfoCmd::ePT_Mixer:
+        case ExtendedSubunitInfoCmd::ePT_Generic:
+        case ExtendedSubunitInfoCmd::ePT_UpDown:
+        case ExtendedSubunitInfoCmd::ePT_DolbyProLogic:
+        case ExtendedSubunitInfoCmd::ePT_3DStereoExtender:
+        case ExtendedSubunitInfoCmd::ePT_Reverberation:
+        case ExtendedSubunitInfoCmd::ePT_Chorus:
+        case ExtendedSubunitInfoCmd::ePT_DynamicRangeCompression:
+        default:
+            fb = new FunctionBlockProcessing( *this,
+                                              data.m_functionBlockId,
+                                              purpose,
+                                              data.m_noOfInputPlugs,
+                                              data.m_noOfOutputPlugs,
+                                              m_verboseLevel );
+            debugWarning( "Dummy function block processing created. "
+                          "Implementation is missing\n" );
+        }
+    }
+    break;
+    case ExtendedSubunitInfoCmd::eFBT_AudioSubunitCodec:
+    {
+        fb = new FunctionBlockCodec( *this,
+                                     data.m_functionBlockId,
+                                     purpose,
+                                     data.m_noOfInputPlugs,
+                                     data.m_noOfOutputPlugs,
+                                     m_verboseLevel );
+        debugWarning( "Dummy function block codec created. "
+                      "Implementation is missing\n" );
+    }
+    break;
+    default:
+        debugError( "Unhandled function block type found\n" );
+        return false;
+    }
+
+    if ( !fb ) {
+        debugError( "Could create function block\n" );
+        return false;
+    }
+    if ( !fb->discover() ) {
+        debugError( "Could not discover function block %s\n",
+                    fb->getName() );
+        delete fb;
+        return false;
+    }
+    m_functions.push_back( fb );
+
+    return true;
+}
+
+FunctionBlock::ESpecialPurpose
+AvDeviceSubunitAudio::convertSpecialPurpose(
+    function_block_special_purpose_t specialPurpose )
+{
+    FunctionBlock::ESpecialPurpose p;
+    switch ( specialPurpose ) {
+    case ExtendedSubunitInfoPageData::eSP_InputGain:
+        p  = FunctionBlock::eSP_InputGain;
+        break;
+    case ExtendedSubunitInfoPageData::eSP_OutputVolume:
+        p = FunctionBlock::eSP_OutputVolume;
+    break;
+    default:
+        p = FunctionBlock::eSP_NoSpecialPurpose;
+    }
+    return p;
+}
+
+
+////////////////////////////////////////////
+
+AvDeviceSubunitMusic::AvDeviceSubunitMusic( AvDevice& avDevice,
+                                            subunit_t id,
+                                            int verboseLevel )
+    : AvDeviceSubunit( avDevice, AVCCommand::eST_Music, id, verboseLevel )
+{
+}
+
+AvDeviceSubunitMusic::~AvDeviceSubunitMusic()
+{
+}
+
+const char*
+AvDeviceSubunitMusic::getName()
+{
+    return "MusicSubunit";
+}
+
+}
Index: branches/freebob-syt-experiments/src/bebob/bebob_functionblock.cpp
===================================================================
--- branches/freebob-syt-experiments/src/bebob/bebob_functionblock.cpp (revision 187)
+++ branches/freebob-syt-experiments/src/bebob/bebob_functionblock.cpp (revision 187)
@@ -0,0 +1,325 @@
+/* bebob_functionblock.cpp
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "bebob/bebob_functionblock.h"
+#include "bebob/bebob_avdevice_subunit.h"
+#include "bebob/bebob_avdevice.h"
+#include "configrom.h"
+
+namespace BeBoB {
+
+IMPL_DEBUG_MODULE( FunctionBlock, FunctionBlock, DEBUG_LEVEL_NORMAL );
+
+FunctionBlock::FunctionBlock(
+    AvDeviceSubunit& subunit,
+    function_block_type_t type,
+    function_block_id_t id,
+    ESpecialPurpose purpose,
+    no_of_input_plugs_t nrOfInputPlugs,
+    no_of_output_plugs_t nrOfOutputPlugs,
+    bool verbose )
+    : m_subunit( &subunit )
+    , m_type( type )
+    , m_id( id )
+    , m_purpose( purpose )
+    , m_nrOfInputPlugs( nrOfInputPlugs )
+    , m_nrOfOutputPlugs( nrOfOutputPlugs )
+    , m_verbose( verbose )
+{
+    if ( m_verbose ) {
+        setDebugLevel( DEBUG_LEVEL_VERBOSE );
+    }
+}
+
+FunctionBlock::FunctionBlock( const FunctionBlock& rhs )
+    : m_subunit( rhs.m_subunit )
+    , m_type( rhs.m_type )
+    , m_id( rhs.m_id )
+    , m_purpose( rhs.m_purpose )
+    , m_nrOfInputPlugs( rhs.m_nrOfInputPlugs )
+    , m_nrOfOutputPlugs( rhs.m_nrOfOutputPlugs )
+    , m_verbose( rhs.m_verbose )
+{
+}
+
+FunctionBlock::~FunctionBlock()
+{
+    for ( AvPlugVector::iterator it = m_plugs.begin();
+          it != m_plugs.end();
+          ++it )
+    {
+        delete *it;
+    }
+
+}
+
+bool
+FunctionBlock::discover()
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE,
+                 "discover function block %s (nr of input plugs = %d, "
+                 "nr of output plugs = %d)\n",
+                 getName(),
+                 m_nrOfInputPlugs,
+                 m_nrOfOutputPlugs );
+
+    if ( !discoverPlugs( AvPlug::eAPD_Input, m_nrOfInputPlugs ) ) {
+        debugError( "Could not discover input plug for '%s'\n",
+                    getName() );
+        return false;
+    }
+
+    if ( !discoverPlugs( AvPlug::eAPD_Output, m_nrOfOutputPlugs ) ) {
+        debugError( "Could not discover output plugs for '%s'\n",
+                    getName() );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+FunctionBlock::discoverPlugs( AvPlug::EAvPlugDirection plugDirection,
+                              plug_id_t plugMaxId )
+{
+    for ( int plugId = 0; plugId < plugMaxId; ++plugId ) {
+        AvPlug* plug = new AvPlug(
+            *( m_subunit->getAvDevice().get1394Service() ),
+            m_subunit->getAvDevice().getConfigRom().getNodeId(),
+            m_subunit->getAvDevice().getPlugManager(),
+            m_subunit->getSubunitType(),
+            m_subunit->getSubunitId(),
+            m_type,
+            m_id,
+            AvPlug::eAPA_FunctionBlockPlug,
+            plugDirection,
+            plugId,
+            m_verbose );
+
+        if ( !plug || !plug->discover() ) {
+            debugError( "plug discovering failed for plug %d\n",
+                        plugId );
+            delete plug;
+            return false;
+        }
+
+        debugOutput( DEBUG_LEVEL_NORMAL, "plug '%s' found\n",
+                     plug->getName() );
+        m_plugs.push_back( plug );
+    }
+
+    return true;
+}
+
+bool
+FunctionBlock::discoverConnections()
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE,
+                 "discover connections function block %s\n",
+                 getName() );
+
+    for ( AvPlugVector::iterator it = m_plugs.begin();
+          it != m_plugs.end();
+          ++it )
+    {
+        AvPlug* plug = *it;
+        if ( !plug->discoverConnections() ) {
+            debugError( "Could not discover plug connections\n" );
+            return false;
+        }
+    }
+    return true;
+}
+
+///////////////////////
+
+FunctionBlockSelector::FunctionBlockSelector(
+    AvDeviceSubunit& subunit,
+    function_block_id_t id,
+    ESpecialPurpose purpose,
+    no_of_input_plugs_t nrOfInputPlugs,
+    no_of_output_plugs_t nrOfOutputPlugs,
+    bool verbose )
+    : FunctionBlock( subunit,
+                     eFBT_AudioSubunitSelector,
+                     id,
+                     purpose,
+                     nrOfInputPlugs,
+                     nrOfOutputPlugs,
+                     verbose )
+{
+}
+
+FunctionBlockSelector::FunctionBlockSelector(
+    const FunctionBlockSelector& rhs )
+    : FunctionBlock( rhs )
+{
+}
+
+FunctionBlockSelector::~FunctionBlockSelector()
+{
+}
+
+const char*
+FunctionBlockSelector::getName()
+{
+    return "Selector";
+}
+
+///////////////////////
+
+FunctionBlockFeature::FunctionBlockFeature(
+    AvDeviceSubunit& subunit,
+    function_block_id_t id,
+    ESpecialPurpose purpose,
+    no_of_input_plugs_t nrOfInputPlugs,
+    no_of_output_plugs_t nrOfOutputPlugs,
+    bool verbose )
+    : FunctionBlock( subunit,
+                     eFBT_AudioSubunitFeature,
+                     id,
+                     purpose,
+                     nrOfInputPlugs,
+                     nrOfOutputPlugs,
+                     verbose )
+{
+}
+
+FunctionBlockFeature::FunctionBlockFeature(
+    const FunctionBlockFeature& rhs )
+    : FunctionBlock( rhs )
+{
+}
+
+FunctionBlockFeature::~FunctionBlockFeature()
+{
+}
+
+const char*
+FunctionBlockFeature::getName()
+{
+    return "Feature";
+}
+
+///////////////////////
+
+FunctionBlockEnhancedMixer::FunctionBlockEnhancedMixer(
+    AvDeviceSubunit& subunit,
+    function_block_id_t id,
+    ESpecialPurpose purpose,
+    no_of_input_plugs_t nrOfInputPlugs,
+    no_of_output_plugs_t nrOfOutputPlugs,
+    bool verbose )
+    : FunctionBlock( subunit,
+                     eFBT_AudioSubunitProcessing,
+                     id,
+                     purpose,
+                     nrOfInputPlugs,
+                     nrOfOutputPlugs,
+                     verbose )
+{
+}
+
+FunctionBlockEnhancedMixer::FunctionBlockEnhancedMixer(
+    const FunctionBlockEnhancedMixer& rhs )
+    : FunctionBlock( rhs )
+{
+}
+
+FunctionBlockEnhancedMixer::~FunctionBlockEnhancedMixer()
+{
+}
+
+const char*
+FunctionBlockEnhancedMixer::getName()
+{
+    return "EnhancedMixer";
+}
+
+///////////////////////
+
+FunctionBlockProcessing::FunctionBlockProcessing(
+    AvDeviceSubunit& subunit,
+    function_block_id_t id,
+    ESpecialPurpose purpose,
+    no_of_input_plugs_t nrOfInputPlugs,
+    no_of_output_plugs_t nrOfOutputPlugs,
+    bool verbose )
+    : FunctionBlock( subunit,
+                     eFBT_AudioSubunitProcessing,
+                     id,
+                     purpose,
+                     nrOfInputPlugs,
+                     nrOfOutputPlugs,
+                     verbose )
+{
+}
+
+FunctionBlockProcessing::FunctionBlockProcessing(
+    const FunctionBlockProcessing& rhs )
+    : FunctionBlock( rhs )
+{
+}
+
+FunctionBlockProcessing::~FunctionBlockProcessing()
+{
+}
+
+const char*
+FunctionBlockProcessing::getName()
+{
+    return "Dummy Processing";
+}
+
+///////////////////////
+
+FunctionBlockCodec::FunctionBlockCodec(
+    AvDeviceSubunit& subunit,
+    function_block_id_t id,
+    ESpecialPurpose purpose,
+    no_of_input_plugs_t nrOfInputPlugs,
+    no_of_output_plugs_t nrOfOutputPlugs,
+    bool verbose )
+    : FunctionBlock( subunit,
+                     eFBT_AudioSubunitCodec,
+                     id,
+                     purpose,
+                     nrOfInputPlugs,
+                     nrOfOutputPlugs,
+                     verbose )
+{
+}
+
+FunctionBlockCodec::FunctionBlockCodec( const FunctionBlockCodec& rhs )
+    : FunctionBlock( rhs )
+{
+}
+
+FunctionBlockCodec::~FunctionBlockCodec()
+{
+}
+
+const char*
+FunctionBlockCodec::getName()
+{
+    return "Dummy Codec";
+}
+
+}
Index: branches/freebob-syt-experiments/src/bebob/bebob_avplug.h
===================================================================
--- branches/freebob-syt-experiments/src/bebob/bebob_avplug.h (revision 187)
+++ branches/freebob-syt-experiments/src/bebob/bebob_avplug.h (revision 187)
@@ -0,0 +1,321 @@
+/* bebob_avplug.h
+ * Copyright (C) 2005,06 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef BEBOB_AVPLUG_H
+#define BEBOB_AVPLUG_H
+
+#include "libfreebobavc/avc_signal_source.h"
+#include "libfreebobavc/avc_extended_stream_format.h"
+#include "libfreebobavc/avc_extended_plug_info.h"
+#include "libfreebobavc/avc_extended_cmd_generic.h"
+#include "libfreebobavc/avc_definitions.h"
+#include "libfreebobavc/avc_generic.h"
+#include "libfreebob/xmlparser.h"
+
+#include "debugmodule/debugmodule.h"
+
+class Ieee1394Service;
+
+namespace BeBoB {
+
+class AvPlugManager;
+class AvPlug;
+
+typedef std::vector<AvPlug*> AvPlugVector;
+
+class AvPlug {
+public:
+
+    enum EAvPlugAddressType {
+	eAPA_PCR,
+	eAPA_ExternalPlug,
+	eAPA_AsynchronousPlug,
+	eAPA_SubunitPlug,
+	eAPA_FunctionBlockPlug,
+	eAPA_Undefined,
+    };
+
+    enum EAvPlugType {
+        eAPT_IsoStream,
+        eAPT_AsyncStream,
+        eAPT_Midi,
+        eAPT_Sync,
+        eAPT_Analog,
+        eAPT_Digital,
+        eAPT_Unknown,
+    };
+
+    enum EAvPlugDirection {
+	eAPD_Input,
+	eAPD_Output,
+	eAPD_Unknown,
+    };
+
+    // \todo This constructors sucks. too many parameters. fix it.
+    AvPlug( Ieee1394Service& ieee1394Service,
+	    int m_nodeId,
+            AvPlugManager& plugManager,
+	    AVCCommand::ESubunitType subunitType,
+	    subunit_id_t subunitId,
+	    function_block_type_t functionBlockType,
+	    function_block_type_t functionBlockId,
+	    EAvPlugAddressType plugAddressType,
+	    EAvPlugDirection plugDirection,
+	    plug_id_t plugId,
+	    int verboseLevel );
+    AvPlug( const AvPlug& rhs );
+    virtual ~AvPlug();
+
+    bool discover();
+    bool discoverConnections();
+
+    bool inquireConnnection( AvPlug& plug );
+
+    int getGlobalId() const
+	{ return m_globalId; }
+    plug_id_t getPlugId() const
+	{ return m_id; }
+    AVCCommand::ESubunitType getSubunitType() const
+	{ return m_subunitType; }
+    subunit_id_t getSubunitId() const
+	{ return m_subunitId; }
+    const char* getName() const
+	{ return m_name.c_str(); }
+    EAvPlugDirection getPlugDirection() const
+	{ return m_direction; }
+    sampling_frequency_t getSamplingFrequency() const
+	{ return m_samplingFrequency; }
+    int getSampleRate() const; // 22050, 24000, 32000, ...
+    int getNrOfChannels() const;
+    int getNrOfStreams() const;
+
+    EAvPlugDirection getDirection() const
+        { return m_direction; }
+    EAvPlugAddressType getPlugAddressType() const
+        { return m_addressType; }
+    EAvPlugType getPlugType() const
+	{ return m_infoPlugType; }
+
+    function_block_type_t getFunctionBlockType() const
+	{ return m_functionBlockType; }
+    function_block_id_t getFunctionBlockId() const
+        { return m_functionBlockId; }
+
+    const AvPlugVector& getInputConnections() const
+        { return m_inputConnections; }
+    const AvPlugVector& getOutputConnections() const
+        { return m_outputConnections; }
+
+    bool addXmlDescription( xmlNodePtr conectionSet );
+    bool addXmlDescriptionStreamFormats( xmlNodePtr streamFormats );
+
+    static PlugAddress::EPlugDirection convertPlugDirection(
+	EAvPlugDirection direction);
+
+    void showPlug() const;
+
+protected:
+    bool discoverPlugType();
+    bool discoverName();
+    bool discoverNoOfChannels();
+    bool discoverChannelPosition();
+    bool discoverChannelName();
+    bool discoverClusterInfo();
+    bool discoverStreamFormat();
+    bool discoverSupportedStreamFormats();
+    bool discoverConnectionsInput();
+    bool discoverConnectionsOutput();
+
+    ExtendedPlugInfoCmd setPlugAddrToPlugInfoCmd();
+
+    ExtendedStreamFormatCmd setPlugAddrToStreamFormatCmd(
+	ExtendedStreamFormatCmd::ESubFunction subFunction);
+
+    SignalSourceCmd setSrcPlugAddrToSignalCmd();
+
+    void setDestPlugAddrToSignalCmd(
+	SignalSourceCmd& signalSourceCmd, AvPlug& plug );
+
+    void debugOutputClusterInfos( int debugLevel );
+
+    bool copyClusterInfo(ExtendedPlugInfoPlugChannelPositionSpecificData&
+                         channelPositionData );
+
+    bool addPlugConnection( AvPlugVector& connections, AvPlug& plug );
+
+    bool discoverConnectionsFromSpecificData(
+        EAvPlugDirection discoverDirection,
+        PlugAddressSpecificData* plugAddress,
+        AvPlugVector& connections );
+
+    AvPlug* getPlugDefinedBySpecificData(
+        UnitPlugSpecificDataPlugAddress* pUnitPlugAddress,
+        SubunitPlugSpecificDataPlugAddress* pSubunitPlugAddress,
+        FunctionBlockPlugSpecificDataPlugAddress* pFunctionBlockPlugAddress );
+
+    EAvPlugDirection toggleDirection( EAvPlugDirection direction ) const;
+
+private:
+    Ieee1394Service*             m_1394Service;
+    int                          m_nodeId;
+    AVCCommand::ESubunitType     m_subunitType;
+    subunit_id_t                 m_subunitId;
+    function_block_type_t        m_functionBlockType;
+    function_block_id_t          m_functionBlockId;
+    EAvPlugAddressType           m_addressType;
+    EAvPlugDirection             m_direction;
+    plug_id_t                    m_id;
+
+    // Info plug type
+    EAvPlugType m_infoPlugType;
+
+    // Number of channels
+    nr_of_channels_t             m_nrOfChannels;
+
+    // Plug name
+    std::string                  m_name;
+
+    // Channel & Cluster Info
+    struct ChannelInfo {
+        stream_position_t          m_streamPosition;
+        stream_position_location_t m_location;
+	std::string                m_name;
+    };
+    typedef std::vector<ChannelInfo> ChannelInfoVector;
+
+    struct ClusterInfo {
+	int                      m_index;
+	port_type_t              m_portType;
+	std::string              m_name;
+
+        nr_of_channels_t         m_nrOfChannels;
+        ChannelInfoVector        m_channelInfos;
+	stream_format_t          m_streamFormat;
+    };
+    typedef std::vector<ClusterInfo> ClusterInfoVector;
+
+    ClusterInfoVector        m_clusterInfos;
+
+    // Sampling frequency
+    sampling_frequency_t m_samplingFrequency;
+
+    // Supported stream formats
+    struct FormatInfo {
+        FormatInfo()
+            : m_samplingFrequency( eSF_DontCare )
+            , m_isSyncStream( false )
+            , m_audioChannels( 0 )
+            , m_midiChannels( 0 )
+            , m_index( 0xff )
+            {}
+	sampling_frequency_t  m_samplingFrequency;
+	bool                  m_isSyncStream;
+	number_of_channels_t  m_audioChannels;
+	number_of_channels_t  m_midiChannels;
+	byte_t                m_index;
+    };
+    typedef std::vector<FormatInfo> FormatInfoVector;
+
+    FormatInfoVector         m_formatInfos;
+
+    const ClusterInfo* getClusterInfoByIndex( int index ) const;
+
+    AvPlugVector             m_inputConnections;
+    AvPlugVector             m_outputConnections;
+
+    AvPlugManager*           m_plugManager;
+
+    int                      m_verboseLevel;
+
+    int                      m_globalId;
+
+    static int               m_globalIdCounter;
+
+    DECLARE_DEBUG_MODULE;
+};
+
+const char* avPlugAddressTypeToString( AvPlug::EAvPlugAddressType addressType );
+const char* avPlugTypeToString( AvPlug::EAvPlugType type );
+const char* avPlugDirectionToString( AvPlug::EAvPlugDirection direction );
+
+class AvPlugManager
+{
+public:
+    AvPlugManager( int verboseLevel );
+    AvPlugManager( const AvPlugManager& rhs );
+    ~AvPlugManager();
+
+    bool addPlug( AvPlug& plug );
+    bool remPlug( AvPlug& plug );
+
+    void showPlugs() const;
+
+    AvPlug* getPlug( AVCCommand::ESubunitType subunitType,
+                     subunit_id_t subunitId,
+		     function_block_type_t functionBlockType,
+		     function_block_id_t functionBlockId,
+                     AvPlug::EAvPlugAddressType plugAddressType,
+                     AvPlug::EAvPlugDirection plugDirection,
+                     plug_id_t plugId ) const;
+    AvPlugVector getPlugsByType( AVCCommand::ESubunitType subunitType,
+				 subunit_id_t subunitId,
+				 function_block_type_t functionBlockType,
+				 function_block_id_t functionBlockId,
+				 AvPlug::EAvPlugAddressType plugAddressType,
+				 AvPlug::EAvPlugDirection plugDirection,
+				 AvPlug::EAvPlugType type) const;
+
+private:
+    int          m_verboseLevel;
+    AvPlugVector m_plugs;
+
+    DECLARE_DEBUG_MODULE;
+};
+
+class AvPlugCluster {
+public:
+    AvPlugCluster();
+    virtual ~AvPlugCluster();
+
+    std::string  m_name;
+
+    AvPlugVector m_avPlugs;
+};
+
+class AvPlugConnection {
+public:
+    AvPlugConnection( AvPlug& srcPlug, AvPlug& destPlug );
+
+    AvPlug& getSrcPlug() const
+        { return *m_srcPlug; }
+    AvPlug& getDestPlug() const
+        { return *m_destPlug; }
+
+private:
+    AvPlug* m_srcPlug;
+    AvPlug* m_destPlug;
+};
+
+typedef std::vector<AvPlugConnection*> AvPlugConnectionVector;
+typedef std::vector<AvPlugConnection> AvPlugConnectionOwnerVector;
+
+}
+
+#endif
Index: branches/freebob-syt-experiments/src/bebob/bebob_avdevice_subunit.h
===================================================================
--- branches/freebob-syt-experiments/src/bebob/bebob_avdevice_subunit.h (revision 187)
+++ branches/freebob-syt-experiments/src/bebob/bebob_avdevice_subunit.h (revision 187)
@@ -0,0 +1,127 @@
+/* bebob_avdevice_subunit.h
+ * Copyright (C) 2005,06 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef BEBOB_AVDEVICESUBUNIT_H
+#define BEBOB_AVDEVICESUBUNIT_H
+
+#include "bebob/bebob_avplug.h"
+#include "bebob/bebob_functionblock.h"
+
+#include "debugmodule/debugmodule.h"
+#include "libfreebobavc/avc_extended_subunit_info.h"
+#include "libfreebobavc/avc_definitions.h"
+#include "libfreebobavc/avc_generic.h"
+
+#include <vector>
+
+namespace BeBoB {
+
+class AvDevice;
+
+class AvDeviceSubunit {
+ public:
+    AvDeviceSubunit( AvDevice& avDevice,
+		     AVCCommand::ESubunitType type,
+		     subunit_t id,
+		     int verboseLevel );
+    virtual ~AvDeviceSubunit();
+
+    virtual bool discover();
+    virtual bool discoverConnections();
+    virtual const char* getName() = 0;
+
+    bool addPlug( AvPlug& plug );
+
+    subunit_t getSubunitId()
+	{ return m_sbId; }
+    AVCCommand::ESubunitType getSubunitType()
+	{ return m_sbType; }
+
+    AvPlugVector& getPlugs()
+	{ return m_plugs; }
+    AvPlug* getPlug(AvPlug::EAvPlugDirection direction, plug_id_t plugId);
+
+
+    AvDevice& getAvDevice() const
+        { return *m_avDevice; }
+
+ protected:
+    bool discoverPlugs();
+    bool discoverPlugs(AvPlug::EAvPlugDirection plugDirection,
+                       plug_id_t plugMaxId );
+
+ protected:
+    AvDevice*                m_avDevice;
+    AVCCommand::ESubunitType m_sbType;
+    subunit_t                m_sbId;
+    int                      m_verboseLevel;
+
+    AvPlugVector             m_plugs;
+
+    DECLARE_DEBUG_MODULE;
+};
+
+typedef std::vector<AvDeviceSubunit*> AvDeviceSubunitVector;
+
+/////////////////////////////
+
+class AvDeviceSubunitAudio: public AvDeviceSubunit {
+ public:
+    AvDeviceSubunitAudio( AvDevice& avDevice,
+			  subunit_t id,
+			  int verboseLevel );
+    virtual ~AvDeviceSubunitAudio();
+
+    virtual bool discover();
+    virtual bool discoverConnections();
+
+    virtual const char* getName();
+
+
+protected:
+    bool discoverFunctionBlocks();
+    bool discoverFunctionBlocksDo(
+        ExtendedSubunitInfoCmd::EFunctionBlockType fbType );
+    bool createFunctionBlock(
+        ExtendedSubunitInfoCmd::EFunctionBlockType fbType,
+        ExtendedSubunitInfoPageData& data );
+
+    FunctionBlock::ESpecialPurpose convertSpecialPurpose(
+        function_block_special_purpose_t specialPurpose );
+
+protected:
+    FunctionBlockVector m_functions;
+};
+
+/////////////////////////////
+
+class AvDeviceSubunitMusic: public AvDeviceSubunit {
+ public:
+    AvDeviceSubunitMusic( AvDevice& avDevice,
+			  subunit_t id,
+			  int verboseLevel );
+    virtual ~AvDeviceSubunitMusic();
+
+    virtual const char* getName();
+};
+
+}
+
+#endif
Index: branches/freebob-syt-experiments/src/Makefile.am
===================================================================
--- branches/freebob-syt-experiments/src/Makefile.am (revision 188)
+++ branches/freebob-syt-experiments/src/Makefile.am (revision 188)
@@ -0,0 +1,63 @@
+# Makefile.am - Makefile template
+# Copyright (C) 2005,06 by Daniel Wagner.
+# Copyright (C) 2006 by Pieter Palmers.
+#
+# This file is part of FreeBob.
+#
+# FreeBob is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# FreeBob 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 General Public License
+# along with FreeBob; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+SUBDIRS = debugmodule libfreebobavc libfreebobstreaming
+
+INCLUDES = $(LIBSIGC_CFLAGS) $(LIBRAW1394_CFLAGS) $(LIBIEC61883_CFLAGS) \
+	$(LIBAVC1394_CFLAGS) $(LIBLO_CFLAGS) $(LIBXML_CFLAGS) \
+	-I$(top_srcdir) -I$(top_srcdir)/src
+
+lib_LTLIBRARIES = libfreebob.la
+
+libfreebob_la_SOURCES = 				\
+	configrom.h					\
+	configrom.cpp					\
+	csr1212.h					\
+	csr1212.c					\
+	devicemanager.h         			\
+	devicemanager.cpp       			\
+	fbtypes.h					\
+	freebob.cpp 					\
+	xmlparser.c					\
+	bebob/bebob_avdevice.h          		\
+	bebob/bebob_avdevice.cpp			\
+	bebob/bebob_avdevice_xml.cpp			\
+	bebob/bebob_avdevice_subunit.h			\
+	bebob/bebob_avdevice_subunit.cpp		\
+	bebob/bebob_avplug.h            		\
+	bebob/bebob_avplug.cpp				\
+	bebob/bebob_avplug_xml.cpp			\
+	bebob/bebob_functionblock.h			\
+	bebob/bebob_functionblock.cpp 			\
+	bebob_light/bebob_light_avdevice.h		\
+	bebob_light/bebob_light_avdevice.cpp		\
+	bebob_light/bebob_light_avdevicesubunit.h	\
+	bebob_light/bebob_light_avdevicesubunit.cpp	\
+	bebob_light/bebob_light_avplug.h		\
+	bebob_light/bebob_light_avplug.cpp		\
+	bounce/bounce_avdevice.h			\
+	bounce/bounce_avdevice.cpp
+
+libfreebob_la_LDFLAGS = -version-info $(LT_VERSION) -lpthread $(LIBSIGC_LIBS) \
+	$(LIBRAW1394_LIBS) $(LIBIEC61883_LIBS) $(LIBAVC1394_LIBS) \
+	$(LIBLO_LIBS) $(LIBXML_LIBS) -safe-temps
+
+libfreebob_la_LIBADD = debugmodule/libdebugmodule.la libfreebobavc/libfreebobavc.la \
+	libfreebobstreaming/libfreebobstreaming.la
+
+
Index: branches/freebob-syt-experiments/src/devicemanager.cpp
===================================================================
--- branches/freebob-syt-experiments/src/devicemanager.cpp (revision 188)
+++ branches/freebob-syt-experiments/src/devicemanager.cpp (revision 188)
@@ -0,0 +1,327 @@
+/* devicemanager.cpp
+ * Copyright (C) 2005,06 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "fbtypes.h"
+
+#include "devicemanager.h"
+#include "iavdevice.h"
+#include "configrom.h"
+
+#include "libfreebobavc/ieee1394service.h"
+#include "debugmodule/debugmodule.h"
+#include "bebob/bebob_avdevice.h"
+#include "bebob_light/bebob_light_avdevice.h"
+#include "bounce/bounce_avdevice.h"
+
+#include <iostream>
+
+using namespace std;
+
+IMPL_DEBUG_MODULE( DeviceManager, DeviceManager, DEBUG_LEVEL_NORMAL );
+
+DeviceManager::DeviceManager()
+    : m_1394Service( 0 )
+{
+    m_probeList.push_back( probeBeBoB );
+    m_probeList.push_back( probeBounce );
+}
+
+DeviceManager::~DeviceManager()
+{
+    for ( IAvDeviceVectorIterator it = m_avDevices.begin();
+          it != m_avDevices.end();
+          ++it )
+    {
+        delete *it;
+    }
+
+    delete m_1394Service;
+}
+
+bool
+DeviceManager::initialize( int port )
+{
+    m_1394Service = new Ieee1394Service();
+    if ( !m_1394Service ) {
+        debugFatal( "Could not create Ieee1349Service object\n" );
+        return false;
+    }
+
+    if ( !m_1394Service->initialize( port ) ) {
+        debugFatal( "Could not initialize Ieee1349Service object\n" );
+        delete m_1394Service;
+        m_1394Service = 0;
+        return false;
+    }
+
+    return true;
+}
+
+bool
+DeviceManager::discover( int verboseLevel )
+{
+    if ( verboseLevel ) {
+        setDebugLevel( DEBUG_LEVEL_VERBOSE );
+    }
+    for ( IAvDeviceVectorIterator it = m_avDevices.begin();
+          it != m_avDevices.end();
+          ++it )
+    {
+        delete *it;
+    }
+    m_avDevices.clear();
+
+    for ( fb_nodeid_t nodeId = 0;
+          nodeId < m_1394Service->getNodeCount();
+          ++nodeId )
+    {
+        ConfigRom configRom( m_1394Service, nodeId );
+        if ( !configRom.initialize() ) {
+            // \todo If a PHY on the bus in power safe mode than
+            // the config rom is missing. So this might be just
+            // such a case and we can safely skip it. But it might
+            // be there is a real software problem on our side.
+            // This should be handled more carefuly.
+            debugOutput( DEBUG_LEVEL_NORMAL,
+                         "Could not read config rom from device (noe id %d). "
+                         "Skip device discovering for this node\n",
+                         nodeId );
+            continue;
+        }
+
+        if ( !configRom.isAvcDevice() ) {
+            continue;
+        }
+
+        for ( ProbeFunctionVector::iterator it = m_probeList.begin();
+              it != m_probeList.end();
+              ++it )
+        {
+            ProbeFunction func = *it;
+            IAvDevice* avDevice = func(*m_1394Service, nodeId, verboseLevel);
+            if ( avDevice ) {
+                m_avDevices.push_back( avDevice );
+                if ( verboseLevel ) {
+                    avDevice->showDevice();
+                }
+                break;
+            }
+        }
+
+    }
+
+    return true;
+}
+
+
+IAvDevice*
+DeviceManager::probeBeBoB(Ieee1394Service& service, int id, int level)
+{
+    IAvDevice* avDevice = new BeBoB_Light::AvDevice( service, id, level );
+    if ( !avDevice ) {
+        return 0;
+    }
+
+    if ( !avDevice->discover() ) {
+        delete avDevice;
+        return 0;
+    }
+    return avDevice;
+}
+
+IAvDevice*
+DeviceManager::probeBounce(Ieee1394Service& service, int id, int level)
+{
+    IAvDevice* avDevice = new Bounce::BounceDevice( service, id, level );
+    if ( !avDevice ) {
+        return 0;
+    }
+
+    if ( !avDevice->discover() ) {
+        delete avDevice;
+        return 0;
+    }
+    return avDevice;
+}
+
+bool
+DeviceManager::isValidNode(int node)
+{
+    for ( IAvDeviceVectorIterator it = m_avDevices.begin();
+          it != m_avDevices.end();
+          ++it )
+    {
+        IAvDevice* avDevice = *it;
+
+        if (avDevice->getConfigRom().getNodeId() == node) {
+        	return true;
+	}
+    }
+    return false;
+}
+
+int
+DeviceManager::getNbDevices()
+{
+    return m_avDevices.size();
+}
+
+int
+DeviceManager::getDeviceNodeId( int deviceNr )
+{
+    if ( ! ( deviceNr < getNbDevices() ) ) {
+        debugError( "Device number out of range (%d)\n", deviceNr );
+        return -1;
+    }
+
+    IAvDevice* avDevice = m_avDevices.at( deviceNr );
+
+    if ( !avDevice ) {
+        debugError( "Could not get device at position (%d)\n",  deviceNr );
+    }
+
+    return avDevice->getConfigRom().getNodeId();
+}
+
+IAvDevice*
+DeviceManager::getAvDevice( int nodeId )
+{
+    for ( IAvDeviceVectorIterator it = m_avDevices.begin();
+          it != m_avDevices.end();
+          ++it )
+    {
+        IAvDevice* avDevice = *it;
+        if ( avDevice->getConfigRom().getNodeId() == nodeId ) {
+            return avDevice;
+        }
+    }
+
+    return 0;
+}
+
+xmlDocPtr
+DeviceManager::getXmlDescription()
+{
+    xmlDocPtr doc = xmlNewDoc( BAD_CAST "1.0" );
+    if ( !doc ) {
+        debugError( "Couldn't create new xml doc\n" );
+        return 0;
+    }
+
+    xmlNodePtr rootNode = xmlNewNode( 0,  BAD_CAST "FreeBobConnectionInfo" );
+    if ( !rootNode ) {
+        debugError( "Couldn't create root node\n" );
+        xmlFreeDoc( doc );
+        xmlCleanupParser();
+        return 0;
+    }
+    xmlDocSetRootElement( doc, rootNode );
+
+    for ( IAvDeviceVectorIterator it = m_avDevices.begin();
+          it != m_avDevices.end();
+          ++it )
+    {
+        IAvDevice* avDevice = *it;
+
+        xmlNodePtr deviceNode = xmlNewChild( rootNode, 0,
+                                             BAD_CAST "Device", 0 );
+        if ( !deviceNode ) {
+            debugError( "Couldn't create device node\n" );
+            xmlFreeDoc( doc );
+            xmlCleanupParser();
+            return 0;
+        }
+
+        char* result;
+        asprintf( &result, "%d", avDevice->getConfigRom().getNodeId() );
+        if ( !xmlNewChild( deviceNode,  0,
+                           BAD_CAST "NodeId",  BAD_CAST result ) )
+        {
+            debugError( "Couldn't create 'NodeId' node" );
+            return false;
+        }
+
+        std::string res = "Connection Information for "
+                          + avDevice->getConfigRom().getVendorName()
+                          +", "
+                          + avDevice->getConfigRom().getModelName()
+                          + " configuration";
+        if ( !xmlNewChild( deviceNode,
+                           0,
+                           BAD_CAST "Comment",
+                           BAD_CAST res.c_str() ) ) {
+            debugError( "Couldn't create comment node\n" );
+            xmlFreeDoc( doc );
+            xmlCleanupParser();
+            return 0;
+        }
+
+        res = avDevice->getConfigRom().getVendorName();
+
+        if ( !xmlNewChild( deviceNode,
+                           0,
+                           BAD_CAST "Vendor",
+                           BAD_CAST res.c_str() ) ) {
+            debugError( "Couldn't create vendor node\n" );
+            xmlFreeDoc( doc );
+            xmlCleanupParser();
+            return 0;
+        }
+
+        res = avDevice->getConfigRom().getModelName();
+
+        if ( !xmlNewChild( deviceNode,
+                           0,
+                           BAD_CAST "Model",
+                           BAD_CAST res.c_str() ) ) {
+            debugError( "Couldn't create model node\n" );
+            xmlFreeDoc( doc );
+            xmlCleanupParser();
+            return 0;
+        }
+
+        asprintf( &result, "%08x%08x",
+                  ( quadlet_t )( avDevice->getConfigRom().getGuid() >> 32 ),
+                  ( quadlet_t )( avDevice->getConfigRom().getGuid() & 0xfffffff ) );
+        if ( !xmlNewChild( deviceNode,  0,
+                           BAD_CAST "GUID",  BAD_CAST result ) ) {
+            debugError( "Couldn't create 'GUID' node\n" );
+            xmlFreeDoc( doc );
+            xmlCleanupParser();
+            return false;
+        }
+
+        if ( !avDevice->addXmlDescription( deviceNode ) ) {
+            debugError( "Adding XML description failed\n" );
+            xmlFreeDoc( doc );
+            xmlCleanupParser();
+            return 0;
+        }
+    }
+
+    return doc;
+}
+
+bool
+DeviceManager::deinitialize()
+{
+    return true;
+}
+
Index: branches/freebob-syt-experiments/src/bounce/bounce_avdevice.cpp
===================================================================
--- branches/freebob-syt-experiments/src/bounce/bounce_avdevice.cpp (revision 185)
+++ branches/freebob-syt-experiments/src/bounce/bounce_avdevice.cpp (revision 185)
@@ -0,0 +1,100 @@
+/* bounce_avdevice.cpp
+ * Copyright (C) 2006 by Pieter Palmers
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#include "bounce/bounce_avdevice.h"
+#include "configrom.h"
+
+#include "libfreebobavc/ieee1394service.h"
+#include "libfreebobavc/avc_definitions.h"
+
+#include "debugmodule/debugmodule.h"
+
+#include <string>
+#include <stdint.h>
+
+namespace Bounce {
+
+IMPL_DEBUG_MODULE( BounceDevice, BounceDevice, DEBUG_LEVEL_NORMAL );
+
+BounceDevice::BounceDevice( Ieee1394Service& ieee1394service,
+                            int nodeId,
+                            int verboseLevel )
+    : m_1394Service( &ieee1394service )
+    , m_nodeId( nodeId )
+    , m_verboseLevel( verboseLevel )
+{
+    if ( m_verboseLevel ) {
+        setDebugLevel( DEBUG_LEVEL_VERBOSE );
+    }
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Created Bounce::BounceDevice (NodeID %d)\n",
+                 nodeId );
+    m_configRom = new ConfigRom( m_1394Service, m_nodeId );
+    m_configRom->initialize();
+}
+
+BounceDevice::~BounceDevice()
+{
+
+}
+
+ConfigRom&
+BounceDevice::getConfigRom() const
+{
+    return *m_configRom;
+}
+
+bool
+BounceDevice::discover()
+{
+    std::string vendor = std::string(FREEBOB_BOUNCE_SERVER_VENDORNAME);
+    std::string model = std::string(FREEBOB_BOUNCE_SERVER_MODELNAME);
+
+    if (m_configRom->getVendorName().compare(0,vendor.length(),vendor,0,vendor.length())==0) {
+        if(m_configRom->getModelName().compare(0,model.length(),model,0,model.length())==0) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool
+BounceDevice::setSamplingFrequency( ESamplingFrequency samplingFrequency )
+{
+    return true;
+}
+
+void
+BounceDevice::showDevice() const
+{
+    printf( "\nI am the bouncedevice, the bouncedevice I am...\n" );
+    printf( "Vendor :  %s\n", m_configRom->getVendorName().c_str());
+    printf( "Model  :  %s\n", m_configRom->getModelName().c_str());
+    printf( "GUID   :  0x%016llX\n", m_configRom->getGuid());
+    printf( "\n" );
+}
+
+bool
+BounceDevice::addXmlDescription( xmlNodePtr deviceNode )
+{
+    return true;
+}
+
+}
Index: branches/freebob-syt-experiments/src/bounce/bounce_avdevice.h
===================================================================
--- branches/freebob-syt-experiments/src/bounce/bounce_avdevice.h (revision 185)
+++ branches/freebob-syt-experiments/src/bounce/bounce_avdevice.h (revision 185)
@@ -0,0 +1,61 @@
+/* bounce_avdevice.h
+ * Copyright (C) 2006 by Pieter Palmers
+ * Copyright (C) 2006 by Daniel Wagner
+ *
+ * This file is part of FreeBob.
+ *
+ * FreeBob is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FreeBob 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 General Public License
+ * along with FreeBob; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
+#ifndef BOUNCEDEVICE_H
+#define BOUNCEDEVICE_H
+
+#include "iavdevice.h"
+
+#include "debugmodule/debugmodule.h"
+#include "libfreebobavc/avc_definitions.h"
+#include "libfreebobavc/avc_extended_cmd_generic.h"
+#include "libfreebob/xmlparser.h"
+
+class ConfigRom;
+class Ieee1394Service;
+
+namespace Bounce {
+
+class BounceDevice : public IAvDevice {
+public:
+    BounceDevice( Ieee1394Service& ieee1394Service,
+		  int nodeId,
+		  int verboseLevel );
+    virtual ~BounceDevice();
+
+    virtual bool discover();
+    virtual ConfigRom& getConfigRom() const;
+    virtual bool addXmlDescription( xmlNodePtr deviceNode );
+    virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency );
+    virtual void showDevice() const;
+
+protected:
+    Ieee1394Service* m_1394Service;
+    ConfigRom*       m_configRom;
+    int              m_nodeId;
+    int              m_verboseLevel;
+
+    DECLARE_DEBUG_MODULE;
+};
+
+}
+
+#endif
Index: branches/freebob-syt-experiments/src/.cvsignore
===================================================================
--- branches/freebob-syt-experiments/src/.cvsignore (revision 134)
+++ branches/freebob-syt-experiments/src/.cvsignore (revision 134)
@@ -0,0 +1,7 @@
+.cvsignore
+Makefile
+Makefile.in
+.deps
+.libs
+*.lo
+*.la
Index: branches/freebob-syt-experiments/src/csr1212.c
===================================================================
--- branches/freebob-syt-experiments/src/csr1212.c (revision 125)
+++ branches/freebob-syt-experiments/src/csr1212.c (revision 125)
@@ -0,0 +1,1629 @@
+/*
+ * csr1212.c -- IEEE 1212 Control and Status Register support for Linux
+ *
+ * Copyright (C) 2003 Francois Retief <fgretief@sun.ac.za>
+ *                    Steve Kinneberg <kinnebergsteve@acmsystems.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *    3. The name of the author may not be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+/* TODO List:
+ * - Verify interface consistency: i.e., public functions that take a size
+ *   parameter expect size to be in bytes.
+ * - Convenience functions for reading a block of data from a given offset.
+ */
+
+#ifndef __KERNEL__
+#include <string.h>
+#endif
+
+#include "csr1212.h"
+
+
+/* Permitted key type for each key id */
+#define __I (1 << CSR1212_KV_TYPE_IMMEDIATE)
+#define __C (1 << CSR1212_KV_TYPE_CSR_OFFSET)
+#define __D (1 << CSR1212_KV_TYPE_DIRECTORY)
+#define __L (1 << CSR1212_KV_TYPE_LEAF)
+static const u_int8_t csr1212_key_id_type_map[0x30] = {
+	0,			/* Reserved */
+	__D | __L,		/* Descriptor */
+	__I | __D | __L,	/* Bus_Dependent_Info */
+	__I | __D | __L,	/* Vendor */
+	__I,			/* Hardware_Version */
+	0, 0,			/* Reserved */
+	__D | __L,		/* Module */
+	0, 0, 0, 0,		/* Reserved */
+	__I,			/* Node_Capabilities */
+	__L,			/* EUI_64 */
+	0, 0, 0,		/* Reserved */
+	__D,			/* Unit */
+	__I,			/* Specifier_ID */
+	__I,			/* Version */
+	__I | __C | __D | __L,	/* Dependent_Info */
+	__L,			/* Unit_Location */
+	0,			/* Reserved */
+	__I,			/* Model */
+	__D,			/* Instance */
+	__L,			/* Keyword */
+	__D,			/* Feature */
+	__L,			/* Extended_ROM */
+	__I,			/* Extended_Key_Specifier_ID */
+	__I,			/* Extended_Key */
+	__I | __C | __D | __L,	/* Extended_Data */
+	__L,			/* Modifiable_Descriptor */
+	__I,			/* Directory_ID */
+	__I,			/* Revision */
+};
+#undef __I
+#undef __C
+#undef __D
+#undef __L
+
+
+#define quads_to_bytes(_q) ((_q) * sizeof(u_int32_t))
+#define bytes_to_quads(_b) (((_b) + sizeof(u_int32_t) - 1) / sizeof(u_int32_t))
+
+static inline void free_keyval(struct csr1212_keyval *kv)
+{
+	if ((kv->key.type == CSR1212_KV_TYPE_LEAF) &&
+	    (kv->key.id != CSR1212_KV_ID_EXTENDED_ROM))
+		CSR1212_FREE(kv->value.leaf.data);
+
+	CSR1212_FREE(kv);
+}
+
+static u_int16_t csr1212_crc16(const u_int32_t *buffer, size_t length)
+{
+	int shift;
+	u_int32_t data;
+	u_int16_t sum, crc = 0;
+
+	for (; length; length--) {
+		data = CSR1212_BE32_TO_CPU(*buffer);
+		buffer++;
+		for (shift = 28; shift >= 0; shift -= 4 ) {
+			sum = ((crc >> 12) ^ (data >> shift)) & 0xf;
+			crc = (crc << 4) ^ (sum << 12) ^ (sum << 5) ^ (sum);
+		}
+		crc &= 0xffff;
+	}
+
+	return CSR1212_CPU_TO_BE16(crc);
+}
+
+#if 0
+/* Microsoft computes the CRC with the bytes in reverse order.  Therefore we
+ * have a special version of the CRC algorithm to account for their buggy
+ * software. */
+static u_int16_t csr1212_msft_crc16(const u_int32_t *buffer, size_t length)
+{
+	int shift;
+	u_int32_t data;
+	u_int16_t sum, crc = 0;
+
+	for (; length; length--) {
+		data = CSR1212_LE32_TO_CPU(*buffer);
+		buffer++;
+		for (shift = 28; shift >= 0; shift -= 4 ) {
+			sum = ((crc >> 12) ^ (data >> shift)) & 0xf;
+			crc = (crc << 4) ^ (sum << 12) ^ (sum << 5) ^ (sum);
+		}
+		crc &= 0xffff;
+	}
+
+	return CSR1212_CPU_TO_BE16(crc);
+}
+#endif
+
+static inline struct csr1212_dentry *csr1212_find_keyval(struct csr1212_keyval *dir,
+							 struct csr1212_keyval *kv)
+{
+	struct csr1212_dentry *pos;
+
+	for (pos = dir->value.directory.dentries_head;
+	     pos != NULL; pos = pos->next) {
+		if (pos->kv == kv)
+			return pos;
+	}
+	return NULL;
+}
+
+
+static inline struct csr1212_keyval *csr1212_find_keyval_offset(struct csr1212_keyval *kv_list,
+								u_int32_t offset)
+{
+	struct csr1212_keyval *kv;
+
+	for (kv = kv_list->next; kv && (kv != kv_list); kv = kv->next) {
+		if (kv->offset == offset)
+			return kv;
+	}
+	return NULL;
+}
+
+
+/* Creation Routines */
+struct csr1212_csr *csr1212_create_csr(struct csr1212_bus_ops *ops,
+				       size_t bus_info_size, void *private_data)
+{
+	struct csr1212_csr *csr;
+
+	csr = CSR1212_MALLOC(sizeof(*csr));
+	if (!csr)
+		return NULL;
+
+	csr->cache_head =
+		csr1212_rom_cache_malloc(CSR1212_CONFIG_ROM_SPACE_OFFSET,
+					 CSR1212_CONFIG_ROM_SPACE_SIZE);
+	if (!csr->cache_head) {
+		CSR1212_FREE(csr);
+		return NULL;
+	}
+
+	/* The keyval key id is not used for the root node, but a valid key id
+	 * that can be used for a directory needs to be passed to
+	 * csr1212_new_directory(). */
+	csr->root_kv = csr1212_new_directory(CSR1212_KV_ID_VENDOR);
+	if (!csr->root_kv) {
+		CSR1212_FREE(csr->cache_head);
+		CSR1212_FREE(csr);
+		return NULL;
+	}
+
+	csr->bus_info_data = csr->cache_head->data;
+	csr->bus_info_len = bus_info_size;
+	csr->crc_len = bus_info_size;
+	csr->ops = ops;
+	csr->private_data = private_data;
+	csr->cache_tail = csr->cache_head;
+
+	return csr;
+}
+
+
+
+void csr1212_init_local_csr(struct csr1212_csr *csr,
+			    const u_int32_t *bus_info_data, int max_rom)
+{
+	static const int mr_map[] = { 4, 64, 1024, 0 };
+
+#ifdef __KERNEL__
+	BUG_ON(max_rom & ~0x3);
+	csr->max_rom = mr_map[max_rom];
+#else
+	if (max_rom & ~0x3) /* caller supplied invalid argument */
+		csr->max_rom = 0;
+	else
+		csr->max_rom = mr_map[max_rom];
+#endif
+	memcpy(csr->bus_info_data, bus_info_data, csr->bus_info_len);
+}
+
+
+static struct csr1212_keyval *csr1212_new_keyval(u_int8_t type, u_int8_t key)
+{
+	struct csr1212_keyval *kv;
+
+	if (key < 0x30 && ((csr1212_key_id_type_map[key] & (1 << type)) == 0))
+		return NULL;
+
+	kv = CSR1212_MALLOC(sizeof(*kv));
+	if (!kv)
+		return NULL;
+
+	kv->key.type = type;
+	kv->key.id = key;
+
+	kv->associate = NULL;
+	kv->refcnt = 1;
+
+	kv->next = NULL;
+	kv->prev = NULL;
+	kv->offset = 0;
+	kv->valid = 0;
+	return kv;
+}
+
+struct csr1212_keyval *csr1212_new_immediate(u_int8_t key, u_int32_t value)
+{
+	struct csr1212_keyval *kv = csr1212_new_keyval(CSR1212_KV_TYPE_IMMEDIATE, key);
+
+	if (!kv)
+		return NULL;
+
+	kv->value.immediate = value;
+	kv->valid = 1;
+	return kv;
+}
+
+struct csr1212_keyval *csr1212_new_leaf(u_int8_t key, const void *data, size_t data_len)
+{
+	struct csr1212_keyval *kv = csr1212_new_keyval(CSR1212_KV_TYPE_LEAF, key);
+
+	if (!kv)
+		return NULL;
+
+	if (data_len > 0) {
+		kv->value.leaf.data = CSR1212_MALLOC(data_len);
+		if (!kv->value.leaf.data) {
+			CSR1212_FREE(kv);
+			return NULL;
+		}
+
+		if (data)
+			memcpy(kv->value.leaf.data, data, data_len);
+	} else {
+		kv->value.leaf.data = NULL;
+	}
+
+	kv->value.leaf.len = bytes_to_quads(data_len);
+	kv->offset = 0;
+	kv->valid = 1;
+
+	return kv;
+}
+
+struct csr1212_keyval *csr1212_new_csr_offset(u_int8_t key, u_int32_t csr_offset)
+{
+	struct csr1212_keyval *kv = csr1212_new_keyval(CSR1212_KV_TYPE_CSR_OFFSET, key);
+
+	if (!kv)
+		return NULL;
+
+	kv->value.csr_offset = csr_offset;
+
+	kv->offset = 0;
+	kv->valid = 1;
+	return kv;
+}
+
+struct csr1212_keyval *csr1212_new_directory(u_int8_t key)
+{
+	struct csr1212_keyval *kv = csr1212_new_keyval(CSR1212_KV_TYPE_DIRECTORY, key);
+
+	if (!kv)
+		return NULL;
+
+	kv->value.directory.len = 0;
+	kv->offset = 0;
+	kv->value.directory.dentries_head = NULL;
+	kv->value.directory.dentries_tail = NULL;
+	kv->valid = 1;
+	return kv;
+}
+
+int csr1212_associate_keyval(struct csr1212_keyval *kv,
+			     struct csr1212_keyval *associate)
+{
+	if (!kv || !associate)
+		return CSR1212_EINVAL;
+
+	if (kv->key.id == CSR1212_KV_ID_DESCRIPTOR ||
+	   (associate->key.id != CSR1212_KV_ID_DESCRIPTOR &&
+	    associate->key.id != CSR1212_KV_ID_DEPENDENT_INFO &&
+	    associate->key.id != CSR1212_KV_ID_EXTENDED_KEY &&
+	    associate->key.id != CSR1212_KV_ID_EXTENDED_DATA &&
+	    associate->key.id < 0x30))
+		return CSR1212_EINVAL;
+
+	if (kv->key.id == CSR1212_KV_ID_EXTENDED_KEY_SPECIFIER_ID &&
+	   associate->key.id != CSR1212_KV_ID_EXTENDED_KEY)
+		return CSR1212_EINVAL;
+
+	if (kv->key.id == CSR1212_KV_ID_EXTENDED_KEY &&
+	   associate->key.id != CSR1212_KV_ID_EXTENDED_DATA)
+		return CSR1212_EINVAL;
+
+	if (associate->key.id == CSR1212_KV_ID_EXTENDED_KEY &&
+	   kv->key.id != CSR1212_KV_ID_EXTENDED_KEY_SPECIFIER_ID)
+		return CSR1212_EINVAL;
+
+	if (associate->key.id == CSR1212_KV_ID_EXTENDED_DATA &&
+	   kv->key.id != CSR1212_KV_ID_EXTENDED_KEY)
+		return CSR1212_EINVAL;
+
+	if (kv->associate)
+		csr1212_release_keyval(kv->associate);
+
+	associate->refcnt++;
+	kv->associate = associate;
+
+	return CSR1212_SUCCESS;
+}
+
+int csr1212_attach_keyval_to_directory(struct csr1212_keyval *dir,
+				       struct csr1212_keyval *kv)
+{
+	struct csr1212_dentry *dentry;
+
+	if (!kv || !dir || dir->key.type != CSR1212_KV_TYPE_DIRECTORY)
+		return CSR1212_EINVAL;
+
+	dentry = CSR1212_MALLOC(sizeof(*dentry));
+	if (!dentry)
+		return CSR1212_ENOMEM;
+
+	dentry->kv = kv;
+
+	kv->refcnt++;
+
+	dentry->next = NULL;
+	dentry->prev = dir->value.directory.dentries_tail;
+
+	if (!dir->value.directory.dentries_head)
+		dir->value.directory.dentries_head = dentry;
+
+	if (dir->value.directory.dentries_tail)
+		dir->value.directory.dentries_tail->next = dentry;
+	dir->value.directory.dentries_tail = dentry;
+
+	return CSR1212_SUCCESS;
+}
+
+struct csr1212_keyval *csr1212_new_extended_immediate(u_int32_t spec, u_int32_t key,
+						      u_int32_t value)
+{
+	struct csr1212_keyval *kvs, *kvk, *kvv;
+
+	kvs = csr1212_new_immediate(CSR1212_KV_ID_EXTENDED_KEY_SPECIFIER_ID, spec);
+	kvk = csr1212_new_immediate(CSR1212_KV_ID_EXTENDED_KEY, key);
+	kvv = csr1212_new_immediate(CSR1212_KV_ID_EXTENDED_DATA, value);
+
+	if (!kvs || !kvk || !kvv) {
+		if (kvs)
+			free_keyval(kvs);
+		if (kvk)
+			free_keyval(kvk);
+		if (kvv)
+			free_keyval(kvv);
+		return NULL;
+	}
+
+	/* Don't keep a local reference to the extended key or value. */
+	kvk->refcnt = 0;
+	kvv->refcnt = 0;
+
+	csr1212_associate_keyval(kvk, kvv);
+	csr1212_associate_keyval(kvs, kvk);
+
+	return kvs;
+}
+
+struct csr1212_keyval *csr1212_new_extended_leaf(u_int32_t spec, u_int32_t key,
+						 const void *data, size_t data_len)
+{
+	struct csr1212_keyval *kvs, *kvk, *kvv;
+
+	kvs = csr1212_new_immediate(CSR1212_KV_ID_EXTENDED_KEY_SPECIFIER_ID, spec);
+	kvk = csr1212_new_immediate(CSR1212_KV_ID_EXTENDED_KEY, key);
+	kvv = csr1212_new_leaf(CSR1212_KV_ID_EXTENDED_DATA, data, data_len);
+
+	if (!kvs || !kvk || !kvv) {
+		if (kvs)
+			free_keyval(kvs);
+		if (kvk)
+			free_keyval(kvk);
+		if (kvv)
+			free_keyval(kvv);
+		return NULL;
+	}
+
+	/* Don't keep a local reference to the extended key or value. */
+	kvk->refcnt = 0;
+	kvv->refcnt = 0;
+
+	csr1212_associate_keyval(kvk, kvv);
+	csr1212_associate_keyval(kvs, kvk);
+
+	return kvs;
+}
+
+struct csr1212_keyval *csr1212_new_descriptor_leaf(u_int8_t dtype, u_int32_t specifier_id,
+						   const void *data, size_t data_len)
+{
+	struct csr1212_keyval *kv;
+
+	kv = csr1212_new_leaf(CSR1212_KV_ID_DESCRIPTOR, NULL,
+			      data_len + CSR1212_DESCRIPTOR_LEAF_OVERHEAD);
+	if (!kv)
+		return NULL;
+
+	CSR1212_DESCRIPTOR_LEAF_SET_TYPE(kv, dtype);
+	CSR1212_DESCRIPTOR_LEAF_SET_SPECIFIER_ID(kv, specifier_id);
+
+	if (data) {
+		memcpy(CSR1212_DESCRIPTOR_LEAF_DATA(kv), data, data_len);
+	}
+
+	return kv;
+}
+
+
+struct csr1212_keyval *csr1212_new_textual_descriptor_leaf(u_int8_t cwidth,
+							   u_int16_t cset,
+							   u_int16_t language,
+							   const void *data,
+							   size_t data_len)
+{
+	struct csr1212_keyval *kv;
+	char *lstr;
+
+	kv = csr1212_new_descriptor_leaf(0, 0, NULL, data_len +
+					 CSR1212_TEXTUAL_DESCRIPTOR_LEAF_OVERHEAD);
+	if (!kv)
+		return NULL;
+
+	CSR1212_TEXTUAL_DESCRIPTOR_LEAF_SET_WIDTH(kv, cwidth);
+	CSR1212_TEXTUAL_DESCRIPTOR_LEAF_SET_CHAR_SET(kv, cset);
+	CSR1212_TEXTUAL_DESCRIPTOR_LEAF_SET_LANGUAGE(kv, language);
+
+	lstr = (char*)CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA(kv);
+
+	/* make sure last quadlet is zeroed out */
+	*((u_int32_t*)&(lstr[(data_len - 1) & ~0x3])) = 0;
+
+	/* don't copy the NUL terminator */
+	memcpy(lstr, data, data_len);
+
+	return kv;
+}
+
+static int csr1212_check_minimal_ascii(const char *s)
+{
+	static const char minimal_ascii_table[] = {
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
+		0x00, 0x00, 0x0a, 0x00, 0x0C, 0x0D, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x20, 0x21, 0x22, 0x00, 0x00, 0x25, 0x26, 0x27,
+		0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+		0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+		0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+		0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+		0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+		0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+		0x58, 0x59, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x5f,
+		0x00, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+		0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+		0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+		0x78, 0x79, 0x7a, 0x00, 0x00, 0x00, 0x00, 0x00,
+	};
+	for (; *s; s++) {
+		if (minimal_ascii_table[*s & 0x7F] != *s)
+			return -1; /* failed */
+	}
+	/* String conforms to minimal-ascii, as specified by IEEE 1212,
+	 * par. 7.4 */
+	return 0;
+}
+
+struct csr1212_keyval *csr1212_new_string_descriptor_leaf(const char *s)
+{
+	/* Check if string conform to minimal_ascii format */
+	if (csr1212_check_minimal_ascii(s))
+		return NULL;
+
+	/* IEEE 1212, par. 7.5.4.1  Textual descriptors (minimal ASCII) */
+	return csr1212_new_textual_descriptor_leaf(0, 0, 0, s, strlen(s));
+}
+
+struct csr1212_keyval *csr1212_new_icon_descriptor_leaf(u_int32_t version,
+							u_int8_t palette_depth,
+							u_int8_t color_space,
+							u_int16_t language,
+							u_int16_t hscan,
+							u_int16_t vscan,
+							u_int32_t *palette,
+							u_int32_t *pixels)
+{
+	static const int pd[4] = { 0, 4, 16, 256 };
+	static const int cs[16] = { 4, 2 };
+	struct csr1212_keyval *kv;
+	int palette_size;
+	int pixel_size = (hscan * vscan + 3) & ~0x3;
+
+	if (!pixels || (!palette && palette_depth) ||
+	    (palette_depth & ~0x3) || (color_space & ~0xf))
+		return NULL;
+
+	palette_size = pd[palette_depth] * cs[color_space];
+
+	kv = csr1212_new_descriptor_leaf(1, 0, NULL,
+					 palette_size + pixel_size +
+					 CSR1212_ICON_DESCRIPTOR_LEAF_OVERHEAD);
+	if (!kv)
+		return NULL;
+
+	CSR1212_ICON_DESCRIPTOR_LEAF_SET_VERSION(kv, version);
+	CSR1212_ICON_DESCRIPTOR_LEAF_SET_PALETTE_DEPTH(kv, palette_depth);
+	CSR1212_ICON_DESCRIPTOR_LEAF_SET_COLOR_SPACE(kv, color_space);
+	CSR1212_ICON_DESCRIPTOR_LEAF_SET_LANGUAGE(kv, language);
+	CSR1212_ICON_DESCRIPTOR_LEAF_SET_HSCAN(kv, hscan);
+	CSR1212_ICON_DESCRIPTOR_LEAF_SET_VSCAN(kv, vscan);
+
+	if (palette_size)
+		memcpy(CSR1212_ICON_DESCRIPTOR_LEAF_PALETTE(kv), palette,
+		       palette_size);
+
+	memcpy(CSR1212_ICON_DESCRIPTOR_LEAF_PIXELS(kv), pixels, pixel_size);
+
+	return kv;
+}
+
+struct csr1212_keyval *csr1212_new_modifiable_descriptor_leaf(u_int16_t max_size,
+							      u_int64_t address)
+{
+	struct csr1212_keyval *kv;
+
+	/* IEEE 1212, par. 7.5.4.3  Modifiable descriptors */
+	kv = csr1212_new_leaf(CSR1212_KV_ID_MODIFIABLE_DESCRIPTOR, NULL, sizeof(u_int64_t));
+	if(!kv)
+		return NULL;
+
+	CSR1212_MODIFIABLE_DESCRIPTOR_SET_MAX_SIZE(kv, max_size);
+	CSR1212_MODIFIABLE_DESCRIPTOR_SET_ADDRESS_HI(kv, address);
+	CSR1212_MODIFIABLE_DESCRIPTOR_SET_ADDRESS_LO(kv, address);
+
+	return kv;
+}
+
+static int csr1212_check_keyword(const char *s)
+{
+	for (; *s; s++) {
+
+		if (('A' <= *s) && (*s <= 'Z'))
+			continue;
+		if (('0' <= *s) && (*s <= '9'))
+			continue;
+		if (*s == '-')
+			continue;
+
+		return -1; /* failed */
+	}
+	/* String conforms to keyword, as specified by IEEE 1212,
+	 * par. 7.6.5 */
+	return CSR1212_SUCCESS;
+}
+
+struct csr1212_keyval *csr1212_new_keyword_leaf(int strc, const char *strv[])
+{
+	struct csr1212_keyval *kv;
+	char *buffer;
+	int i, data_len = 0;
+
+	/* Check all keywords to see if they conform to restrictions:
+	 * Only the following characters is allowed ['A'..'Z','0'..'9','-']
+	 * Each word is zero-terminated.
+	 * Also calculate the total length of the keywords.
+	 */
+	for (i = 0; i < strc; i++) {
+		if (!strv[i] || csr1212_check_keyword(strv[i])) {
+			return NULL;
+		}
+		data_len += strlen(strv[i]) + 1; /* Add zero-termination char. */
+	}
+
+	/* IEEE 1212, par. 7.6.5 Keyword leaves */
+	kv = csr1212_new_leaf(CSR1212_KV_ID_KEYWORD, NULL, data_len);
+	if (!kv)
+		return NULL;
+
+	buffer = (char *)kv->value.leaf.data;
+
+	/* make sure last quadlet is zeroed out */
+	*((u_int32_t*)&(buffer[(data_len - 1) & ~0x3])) = 0;
+
+	/* Copy keyword(s) into leaf data buffer */
+	for (i = 0; i < strc; i++) {
+		int len = strlen(strv[i]) + 1;
+		memcpy(buffer, strv[i], len);
+		buffer += len;
+	}
+	return kv;
+}
+
+
+/* Destruction Routines */
+
+void csr1212_detach_keyval_from_directory(struct csr1212_keyval *dir,
+					  struct csr1212_keyval *kv)
+{
+	struct csr1212_dentry *dentry;
+
+	if (!kv || !dir || dir->key.type != CSR1212_KV_TYPE_DIRECTORY)
+		return;
+
+	dentry = csr1212_find_keyval(dir, kv);
+
+	if (!dentry)
+		return;
+
+	if (dentry->prev)
+		dentry->prev->next = dentry->next;
+	if (dentry->next)
+		dentry->next->prev = dentry->prev;
+	if (dir->value.directory.dentries_head == dentry)
+		dir->value.directory.dentries_head = dentry->next;
+	if (dir->value.directory.dentries_tail == dentry)
+		dir->value.directory.dentries_tail = dentry->prev;
+
+	CSR1212_FREE(dentry);
+
+	csr1212_release_keyval(kv);
+}
+
+
+void csr1212_disassociate_keyval(struct csr1212_keyval *kv)
+{
+	if (kv->associate) {
+		csr1212_release_keyval(kv->associate);
+	}
+
+	kv->associate = NULL;
+}
+
+
+/* This function is used to free the memory taken by a keyval.  If the given
+ * keyval is a directory type, then any keyvals contained in that directory
+ * will be destroyed as well if their respective refcnts are 0.  By means of
+ * list manipulation, this routine will descend a directory structure in a
+ * non-recursive manner. */
+void _csr1212_destroy_keyval(struct csr1212_keyval *kv)
+{
+	struct csr1212_keyval *k, *a;
+	struct csr1212_dentry dentry;
+	struct csr1212_dentry *head, *tail;
+
+	dentry.kv = kv;
+	dentry.next = NULL;
+	dentry.prev = NULL;
+
+	head = &dentry;
+	tail = head;
+
+	while (head) {
+		k = head->kv;
+
+		while (k) {
+			k->refcnt--;
+
+			if (k->refcnt > 0)
+				break;
+
+			a = k->associate;
+
+			if (k->key.type == CSR1212_KV_TYPE_DIRECTORY) {
+				/* If the current entry is a directory, then move all
+				 * the entries to the destruction list. */
+				if (k->value.directory.dentries_head) {
+					tail->next = k->value.directory.dentries_head;
+					k->value.directory.dentries_head->prev = tail;
+					tail = k->value.directory.dentries_tail;
+				}
+			}
+			free_keyval(k);
+			k = a;
+		}
+
+		head = head->next;
+		if (head) {
+			if (head->prev && head->prev != &dentry) {
+				CSR1212_FREE(head->prev);
+			}
+			head->prev = NULL;
+		} else if (tail != &dentry)
+			CSR1212_FREE(tail);
+	}
+}
+
+
+void csr1212_destroy_csr(struct csr1212_csr *csr)
+{
+	struct csr1212_csr_rom_cache *c, *oc;
+	struct csr1212_cache_region *cr, *ocr;
+
+	csr1212_release_keyval(csr->root_kv);
+
+	c = csr->cache_head;
+	while (c) {
+		oc = c;
+		cr = c->filled_head;
+		while (cr) {
+			ocr = cr;
+			cr = cr->next;
+			CSR1212_FREE(ocr);
+		}
+		c = c->next;
+		CSR1212_FREE(oc);
+	}
+
+	CSR1212_FREE(csr);
+}
+
+
+
+/* CSR Image Creation */
+
+static int csr1212_append_new_cache(struct csr1212_csr *csr, size_t romsize)
+{
+	struct csr1212_csr_rom_cache *cache;
+	u_int64_t csr_addr;
+
+	if (!csr || !csr->ops || !csr->ops->allocate_addr_range ||
+	    !csr->ops->release_addr || csr->max_rom < 1)
+		return CSR1212_EINVAL;
+
+	/* ROM size must be a multiple of csr->max_rom */
+	romsize = (romsize + (csr->max_rom - 1)) & ~(csr->max_rom - 1);
+
+	csr_addr = csr->ops->allocate_addr_range(romsize, csr->max_rom, csr->private_data);
+	if (csr_addr == ~0ULL) {
+		return CSR1212_ENOMEM;
+	}
+	if (csr_addr < CSR1212_REGISTER_SPACE_BASE) {
+		/* Invalid address returned from allocate_addr_range(). */
+		csr->ops->release_addr(csr_addr, csr->private_data);
+		return CSR1212_ENOMEM;
+	}
+
+	cache = csr1212_rom_cache_malloc(csr_addr - CSR1212_REGISTER_SPACE_BASE, romsize);
+	if (!cache) {
+		csr->ops->release_addr(csr_addr, csr->private_data);
+		return CSR1212_ENOMEM;
+	}
+
+	cache->ext_rom = csr1212_new_keyval(CSR1212_KV_TYPE_LEAF, CSR1212_KV_ID_EXTENDED_ROM);
+	if (!cache->ext_rom) {
+		csr->ops->release_addr(csr_addr, csr->private_data);
+		CSR1212_FREE(cache);
+		return CSR1212_ENOMEM;
+	}
+
+	if (csr1212_attach_keyval_to_directory(csr->root_kv, cache->ext_rom) != CSR1212_SUCCESS) {
+		csr1212_release_keyval(cache->ext_rom);
+		csr->ops->release_addr(csr_addr, csr->private_data);
+		CSR1212_FREE(cache);
+		return CSR1212_ENOMEM;
+	}
+	cache->ext_rom->offset = csr_addr - CSR1212_REGISTER_SPACE_BASE;
+	cache->ext_rom->value.leaf.len = -1;
+	cache->ext_rom->value.leaf.data = cache->data;
+
+	/* Add cache to tail of cache list */
+	cache->prev = csr->cache_tail;
+	csr->cache_tail->next = cache;
+	csr->cache_tail = cache;
+	return CSR1212_SUCCESS;
+}
+
+static inline void csr1212_remove_cache(struct csr1212_csr *csr,
+					struct csr1212_csr_rom_cache *cache)
+{
+	if (csr->cache_head == cache)
+		csr->cache_head = cache->next;
+	if (csr->cache_tail == cache)
+		csr->cache_tail = cache->prev;
+
+	if (cache->prev)
+		cache->prev->next = cache->next;
+	if (cache->next)
+		cache->next->prev = cache->prev;
+
+	if (cache->ext_rom) {
+		csr1212_detach_keyval_from_directory(csr->root_kv, cache->ext_rom);
+		csr1212_release_keyval(cache->ext_rom);
+	}
+
+	CSR1212_FREE(cache);
+}
+
+static int csr1212_generate_layout_subdir(struct csr1212_keyval *dir,
+					  struct csr1212_keyval **layout_tail)
+{
+	struct csr1212_dentry *dentry;
+	struct csr1212_keyval *dkv;
+	struct csr1212_keyval *last_extkey_spec = NULL;
+	struct csr1212_keyval *last_extkey = NULL;
+	int num_entries = 0;
+
+	for (dentry = dir->value.directory.dentries_head; dentry;
+	     dentry = dentry->next) {
+		for (dkv = dentry->kv; dkv; dkv = dkv->associate) {
+			/* Special Case: Extended Key Specifier_ID */
+			if (dkv->key.id == CSR1212_KV_ID_EXTENDED_KEY_SPECIFIER_ID) {
+				if (last_extkey_spec == NULL) {
+					last_extkey_spec = dkv;
+				} else if (dkv->value.immediate != last_extkey_spec->value.immediate) {
+					last_extkey_spec = dkv;
+				} else {
+					continue;
+				}
+			/* Special Case: Extended Key */
+			} else if (dkv->key.id == CSR1212_KV_ID_EXTENDED_KEY) {
+				if (last_extkey == NULL) {
+					last_extkey = dkv;
+				} else if (dkv->value.immediate != last_extkey->value.immediate) {
+					last_extkey = dkv;
+				} else {
+					continue;
+				}
+			}
+
+			num_entries += 1;
+
+			switch(dkv->key.type) {
+			default:
+			case CSR1212_KV_TYPE_IMMEDIATE:
+			case CSR1212_KV_TYPE_CSR_OFFSET:
+				break;
+			case CSR1212_KV_TYPE_LEAF:
+			case CSR1212_KV_TYPE_DIRECTORY:
+				/* Remove from list */
+				if (dkv->prev && (dkv->prev->next == dkv))
+					dkv->prev->next = dkv->next;
+				if (dkv->next && (dkv->next->prev == dkv))
+					dkv->next->prev = dkv->prev;
+				//if (dkv == *layout_tail)
+				//	*layout_tail = dkv->prev;
+
+				/* Special case: Extended ROM leafs */
+				if (dkv->key.id == CSR1212_KV_ID_EXTENDED_ROM) {
+					dkv->value.leaf.len = -1;
+					/* Don't add Extended ROM leafs in the layout list,
+					 * they are handled differently. */
+					break;
+				}
+
+				/* Add to tail of list */
+				dkv->next = NULL;
+				dkv->prev = *layout_tail;
+				(*layout_tail)->next = dkv;
+				*layout_tail = dkv;
+				break;
+			}
+		}
+	}
+	return num_entries;
+}
+
+size_t csr1212_generate_layout_order(struct csr1212_keyval *kv)
+{
+	struct csr1212_keyval *ltail = kv;
+	size_t agg_size = 0;
+
+	while(kv) {
+		switch(kv->key.type) {
+		case CSR1212_KV_TYPE_LEAF:
+			/* Add 1 quadlet for crc/len field */
+			agg_size += kv->value.leaf.len + 1;
+			break;
+
+		case CSR1212_KV_TYPE_DIRECTORY:
+			kv->value.directory.len = csr1212_generate_layout_subdir(kv, &ltail);
+			/* Add 1 quadlet for crc/len field */
+			agg_size += kv->value.directory.len + 1;
+			break;
+		}
+		kv = kv->next;
+	}
+	return quads_to_bytes(agg_size);
+}
+
+struct csr1212_keyval *csr1212_generate_positions(struct csr1212_csr_rom_cache *cache,
+						  struct csr1212_keyval *start_kv,
+						  int start_pos)
+{
+	struct csr1212_keyval *kv = start_kv;
+	struct csr1212_keyval *okv = start_kv;
+	int pos = start_pos;
+	int kv_len = 0, okv_len = 0;
+
+	cache->layout_head = kv;
+
+	while(kv && pos < cache->size) {
+		/* Special case: Extended ROM leafs */
+		if (kv->key.id != CSR1212_KV_ID_EXTENDED_ROM) {
+			kv->offset = cache->offset + pos;
+		}
+
+		switch(kv->key.type) {
+		case CSR1212_KV_TYPE_LEAF:
+			kv_len = kv->value.leaf.len;
+			break;
+
+		case CSR1212_KV_TYPE_DIRECTORY:
+			kv_len = kv->value.directory.len;
+			break;
+
+		default:
+			/* Should never get here */
+			break;
+		}
+
+		pos += quads_to_bytes(kv_len + 1);
+
+		if (pos <= cache->size) {
+			okv = kv;
+			okv_len = kv_len;
+			kv = kv->next;
+		}
+	}
+
+	cache->layout_tail = okv;
+	cache->len = (okv->offset - cache->offset) + quads_to_bytes(okv_len + 1);
+
+	return kv;
+}
+
+static void csr1212_generate_tree_subdir(struct csr1212_keyval *dir,
+					 u_int32_t *data_buffer)
+{
+	struct csr1212_dentry *dentry;
+	struct csr1212_keyval *last_extkey_spec = NULL;
+	struct csr1212_keyval *last_extkey = NULL;
+	int index = 0;
+
+	for (dentry = dir->value.directory.dentries_head; dentry; dentry = dentry->next) {
+		struct csr1212_keyval *a;
+
+		for (a = dentry->kv; a; a = a->associate) {
+			u_int32_t value = 0;
+
+			/* Special Case: Extended Key Specifier_ID */
+			if (a->key.id == CSR1212_KV_ID_EXTENDED_KEY_SPECIFIER_ID) {
+				if (last_extkey_spec == NULL) {
+					last_extkey_spec = a;
+				} else if (a->value.immediate != last_extkey_spec->value.immediate) {
+					last_extkey_spec = a;
+				} else {
+					continue;
+				}
+			/* Special Case: Extended Key */
+			} else if (a->key.id == CSR1212_KV_ID_EXTENDED_KEY) {
+				if (last_extkey == NULL) {
+					last_extkey = a;
+				} else if (a->value.immediate != last_extkey->value.immediate) {
+					last_extkey = a;
+				} else {
+					continue;
+				}
+			}
+
+			switch(a->key.type) {
+			case CSR1212_KV_TYPE_IMMEDIATE:
+				value = a->value.immediate;
+				break;
+			case CSR1212_KV_TYPE_CSR_OFFSET:
+				value = a->value.csr_offset;
+				break;
+			case CSR1212_KV_TYPE_LEAF:
+				value = a->offset;
+				value -= dir->offset + quads_to_bytes(1+index);
+				value = bytes_to_quads(value);
+				break;
+			case CSR1212_KV_TYPE_DIRECTORY:
+				value = a->offset;
+				value -= dir->offset + quads_to_bytes(1+index);
+				value = bytes_to_quads(value);
+				break;
+			default:
+				/* Should never get here */
+				break; /* GDB breakpoint */
+			}
+
+			value |= (a->key.id & CSR1212_KV_KEY_ID_MASK) << CSR1212_KV_KEY_SHIFT;
+			value |= (a->key.type & CSR1212_KV_KEY_TYPE_MASK) <<
+				(CSR1212_KV_KEY_SHIFT + CSR1212_KV_KEY_TYPE_SHIFT);
+			data_buffer[index] = CSR1212_CPU_TO_BE32(value);
+			index++;
+		}
+	}
+}
+
+void csr1212_fill_cache(struct csr1212_csr_rom_cache *cache)
+{
+	struct csr1212_keyval *kv, *nkv;
+	struct csr1212_keyval_img *kvi;
+
+	for (kv = cache->layout_head; kv != cache->layout_tail->next; kv = nkv) {
+		kvi = (struct csr1212_keyval_img *)
+			(cache->data + bytes_to_quads(kv->offset - cache->offset));
+		switch(kv->key.type) {
+		default:
+		case CSR1212_KV_TYPE_IMMEDIATE:
+		case CSR1212_KV_TYPE_CSR_OFFSET:
+			/* Should never get here */
+			break; /* GDB breakpoint */
+
+		case CSR1212_KV_TYPE_LEAF:
+			/* Don't copy over Extended ROM areas, they are
+			 * already filled out! */
+			if (kv->key.id != CSR1212_KV_ID_EXTENDED_ROM)
+				memcpy(kvi->data, kv->value.leaf.data,
+				       quads_to_bytes(kv->value.leaf.len));
+
+			kvi->length = CSR1212_CPU_TO_BE16(kv->value.leaf.len);
+			kvi->crc = csr1212_crc16(kvi->data, kv->value.leaf.len);
+			break;
+
+		case CSR1212_KV_TYPE_DIRECTORY:
+			csr1212_generate_tree_subdir(kv, kvi->data);
+
+			kvi->length = CSR1212_CPU_TO_BE16(kv->value.directory.len);
+			kvi->crc = csr1212_crc16(kvi->data, kv->value.directory.len);
+			break;
+		}
+
+		nkv = kv->next;
+		if (kv->prev)
+			kv->prev->next = NULL;
+		if (kv->next)
+			kv->next->prev = NULL;
+		kv->prev = NULL;
+		kv->next = NULL;
+	}
+}
+
+int csr1212_generate_csr_image(struct csr1212_csr *csr)
+{
+	struct csr1212_bus_info_block_img *bi;
+	struct csr1212_csr_rom_cache *cache;
+	struct csr1212_keyval *kv;
+	size_t agg_size;
+	int ret;
+	int init_offset;
+
+	if (!csr)
+		return CSR1212_EINVAL;
+
+	cache = csr->cache_head;
+
+	bi = (struct csr1212_bus_info_block_img*)cache->data;
+
+	bi->length = bytes_to_quads(csr->bus_info_len) - 1;
+	bi->crc_length = bi->length;
+	bi->crc = csr1212_crc16(bi->data, bi->crc_length);
+
+	csr->root_kv->next = NULL;
+	csr->root_kv->prev = NULL;
+
+	agg_size = csr1212_generate_layout_order(csr->root_kv);
+
+	init_offset = csr->bus_info_len;
+
+	for (kv = csr->root_kv, cache = csr->cache_head; kv; cache = cache->next) {
+		if (!cache) {
+			/* Estimate approximate number of additional cache
+			 * regions needed (it assumes that the cache holding
+			 * the first 1K Config ROM space always exists). */
+			int est_c = agg_size / (CSR1212_EXTENDED_ROM_SIZE -
+						(2 * sizeof(u_int32_t))) + 1;
+
+			/* Add additional cache regions, extras will be
+			 * removed later */
+			for (; est_c; est_c--) {
+				ret = csr1212_append_new_cache(csr, CSR1212_EXTENDED_ROM_SIZE);
+				if (ret != CSR1212_SUCCESS)
+					return ret;
+			}
+			/* Need to re-layout for additional cache regions */
+			agg_size = csr1212_generate_layout_order(csr->root_kv);
+			kv = csr->root_kv;
+			cache = csr->cache_head;
+			init_offset = csr->bus_info_len;
+		}
+		kv = csr1212_generate_positions(cache, kv, init_offset);
+		agg_size -= cache->len;
+		init_offset = sizeof(u_int32_t);
+	}
+
+	/* Remove unused, excess cache regions */
+	while (cache) {
+		struct csr1212_csr_rom_cache *oc = cache;
+
+		cache = cache->next;
+		csr1212_remove_cache(csr, oc);
+	}
+
+	/* Go through the list backward so that when done, the correct CRC
+	 * will be calculated for the Extended ROM areas. */
+	for(cache = csr->cache_tail; cache; cache = cache->prev) {
+		/* Only Extended ROM caches should have this set. */
+		if (cache->ext_rom) {
+			int leaf_size;
+
+			/* Make sure the Extended ROM leaf is a multiple of
+			 * max_rom in size. */
+			if (csr->max_rom < 1)
+				return CSR1212_EINVAL;
+			leaf_size = (cache->len + (csr->max_rom - 1)) &
+				~(csr->max_rom - 1);
+
+			/* Zero out the unused ROM region */
+			memset(cache->data + bytes_to_quads(cache->len), 0x00,
+			       leaf_size - cache->len);
+
+			/* Subtract leaf header */
+			leaf_size -= sizeof(u_int32_t);
+
+			/* Update the Extended ROM leaf length */
+			cache->ext_rom->value.leaf.len =
+				bytes_to_quads(leaf_size);
+		} else {
+			/* Zero out the unused ROM region */
+			memset(cache->data + bytes_to_quads(cache->len), 0x00,
+			       cache->size - cache->len);
+		}
+
+		/* Copy the data into the cache buffer */
+		csr1212_fill_cache(cache);
+
+		if (cache != csr->cache_head) {
+			/* Set the length and CRC of the extended ROM. */
+			struct csr1212_keyval_img *kvi =
+				(struct csr1212_keyval_img*)cache->data;
+
+			kvi->length = CSR1212_CPU_TO_BE16(bytes_to_quads(cache->len) - 1);
+			kvi->crc = csr1212_crc16(kvi->data,
+						 bytes_to_quads(cache->len) - 1);
+
+		}
+	}
+
+	return CSR1212_SUCCESS;
+}
+
+int csr1212_read(struct csr1212_csr *csr, u_int32_t offset, void *buffer, u_int32_t len)
+{
+	struct csr1212_csr_rom_cache *cache;
+
+	for (cache = csr->cache_head; cache; cache = cache->next) {
+		if (offset >= cache->offset &&
+		    (offset + len) <= (cache->offset + cache->size)) {
+			memcpy(buffer,
+			       &cache->data[bytes_to_quads(offset - cache->offset)],
+			       len);
+			return CSR1212_SUCCESS;
+		}
+	}
+	return CSR1212_ENOENT;
+}
+
+
+
+/* Parse a chunk of data as a Config ROM */
+
+static int csr1212_parse_bus_info_block(struct csr1212_csr *csr)
+{
+	struct csr1212_bus_info_block_img *bi;
+	struct csr1212_cache_region *cr;
+	int i;
+	int ret;
+
+	/* IEEE 1212 says that the entire bus info block should be readable in
+	 * a single transaction regardless of the max_rom value.
+	 * Unfortunately, many IEEE 1394 devices do not abide by that, so the
+	 * bus info block will be read 1 quadlet at a time.  The rest of the
+	 * ConfigROM will be read according to the max_rom field. */
+	for (i = 0; i < csr->bus_info_len; i += sizeof(csr1212_quad_t)) {
+		ret = csr->ops->bus_read(csr, CSR1212_CONFIG_ROM_SPACE_BASE + i,
+					 sizeof(csr1212_quad_t),
+					 &csr->cache_head->data[bytes_to_quads(i)],
+					 csr->private_data);
+		if (ret != CSR1212_SUCCESS)
+			return ret;
+	}
+
+	bi = (struct csr1212_bus_info_block_img*)csr->cache_head->data;
+	csr->crc_len = quads_to_bytes(bi->crc_length);
+
+	/* IEEE 1212 recommends that crc_len be equal to bus_info_len, but that is not
+	 * always the case, so read the rest of the crc area 1 quadlet at a time. */
+	for (i = csr->bus_info_len; i <= csr->crc_len; i += sizeof(csr1212_quad_t)) {
+		ret = csr->ops->bus_read(csr, CSR1212_CONFIG_ROM_SPACE_BASE + i,
+					 sizeof(csr1212_quad_t),
+					 &csr->cache_head->data[bytes_to_quads(i)],
+					 csr->private_data);
+		if (ret != CSR1212_SUCCESS)
+			return ret;
+	}
+
+	if (bytes_to_quads(csr->bus_info_len - sizeof(csr1212_quad_t)) != bi->length)
+		return CSR1212_EINVAL;
+
+#if 0
+	/* Apparently there are too many differnt wrong implementations of the
+	 * CRC algorithm that verifying them is moot. */
+	if ((csr1212_crc16(bi->data, bi->crc_length) != bi->crc) &&
+	    (csr1212_msft_crc16(bi->data, bi->crc_length) != bi->crc))
+		return CSR1212_EINVAL;
+#endif
+
+	cr = CSR1212_MALLOC(sizeof(struct csr1212_cache_region));
+	if (!cr)
+		return CSR1212_ENOMEM;
+
+	cr->next = NULL;
+	cr->prev = NULL;
+	cr->offset_start = 0;
+	cr->offset_end = csr->crc_len + 4;
+
+	csr->cache_head->filled_head = cr;
+	csr->cache_head->filled_tail = cr;
+
+	return CSR1212_SUCCESS;
+}
+
+static int csr1212_parse_dir_entry(struct csr1212_keyval *dir,
+				   csr1212_quad_t ki,
+				   u_int32_t kv_pos)
+{
+	int ret = CSR1212_SUCCESS;
+	struct csr1212_keyval *k = NULL;
+	u_int32_t offset;
+
+	switch(CSR1212_KV_KEY_TYPE(ki)) {
+	case CSR1212_KV_TYPE_IMMEDIATE:
+		k = csr1212_new_immediate(CSR1212_KV_KEY_ID(ki),
+					  CSR1212_KV_VAL(ki));
+		if (!k) {
+			ret = CSR1212_ENOMEM;
+			goto fail;
+		}
+
+		k->refcnt = 0;	/* Don't keep local reference when parsing. */
+		break;
+
+	case CSR1212_KV_TYPE_CSR_OFFSET:
+		k = csr1212_new_csr_offset(CSR1212_KV_KEY_ID(ki),
+					   CSR1212_KV_VAL(ki));
+		if (!k) {
+			ret = CSR1212_ENOMEM;
+			goto fail;
+		}
+		k->refcnt = 0;	/* Don't keep local reference when parsing. */
+		break;
+
+	default:
+		/* Compute the offset from 0xffff f000 0000. */
+		offset = quads_to_bytes(CSR1212_KV_VAL(ki)) + kv_pos;
+		if (offset == kv_pos) {
+			/* Uh-oh.  Can't have a relative offset of 0 for Leaves
+			 * or Directories.  The Config ROM image is most likely
+			 * messed up, so we'll just abort here. */
+			ret = CSR1212_EIO;
+			goto fail;
+		}
+
+		k = csr1212_find_keyval_offset(dir, offset);
+
+		if (k)
+			break;		/* Found it. */
+
+		if (CSR1212_KV_KEY_TYPE(ki) == CSR1212_KV_TYPE_DIRECTORY) {
+			k = csr1212_new_directory(CSR1212_KV_KEY_ID(ki));
+		} else {
+			k = csr1212_new_leaf(CSR1212_KV_KEY_ID(ki), NULL, 0);
+		}
+		if (!k) {
+			ret = CSR1212_ENOMEM;
+			goto fail;
+		}
+		k->refcnt = 0;	/* Don't keep local reference when parsing. */
+		k->valid = 0;	/* Contents not read yet so it's not valid. */
+		k->offset = offset;
+
+		k->prev = dir;
+		k->next = dir->next;
+		dir->next->prev = k;
+		dir->next = k;
+	}
+	ret = csr1212_attach_keyval_to_directory(dir, k);
+
+fail:
+	if (ret != CSR1212_SUCCESS) {
+		if (k)
+			free_keyval(k);
+	}
+	return ret;
+}
+
+
+int csr1212_parse_keyval(struct csr1212_keyval *kv,
+			 struct csr1212_csr_rom_cache *cache)
+{
+	struct csr1212_keyval_img *kvi;
+	int i;
+	int ret = CSR1212_SUCCESS;
+	int kvi_len;
+
+	kvi = (struct csr1212_keyval_img*)&cache->data[bytes_to_quads(kv->offset -
+								      cache->offset)];
+	kvi_len = CSR1212_BE16_TO_CPU(kvi->length);
+
+#if 0
+	/* Apparently there are too many differnt wrong implementations of the
+	 * CRC algorithm that verifying them is moot. */
+	if ((csr1212_crc16(kvi->data, kvi_len) != kvi->crc) &&
+	    (csr1212_msft_crc16(kvi->data, kvi_len) != kvi->crc)) {
+		ret = CSR1212_EINVAL;
+		goto fail;
+	}
+#endif
+
+	switch(kv->key.type) {
+	case CSR1212_KV_TYPE_DIRECTORY:
+		for (i = 0; i < kvi_len; i++) {
+			csr1212_quad_t ki = kvi->data[i];
+
+			/* Some devices put null entries in their unit
+			 * directories.  If we come across such an entry,
+			 * then skip it. */
+			if (ki == 0x0)
+				continue;
+			ret = csr1212_parse_dir_entry(kv, ki,
+						      (kv->offset +
+						       quads_to_bytes(i + 1)));
+		}
+		kv->value.directory.len = kvi_len;
+		break;
+
+	case CSR1212_KV_TYPE_LEAF:
+		if (kv->key.id != CSR1212_KV_ID_EXTENDED_ROM) {
+			kv->value.leaf.data = CSR1212_MALLOC(quads_to_bytes(kvi_len));
+			if (!kv->value.leaf.data)
+			{
+				ret = CSR1212_ENOMEM;
+				goto fail;
+			}
+
+			kv->value.leaf.len = kvi_len;
+			memcpy(kv->value.leaf.data, kvi->data, quads_to_bytes(kvi_len));
+		}
+		break;
+	}
+
+	kv->valid = 1;
+
+fail:
+	return ret;
+}
+
+
+int _csr1212_read_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv)
+{
+	struct csr1212_cache_region *cr, *ncr, *newcr = NULL;
+	struct csr1212_keyval_img *kvi = NULL;
+	struct csr1212_csr_rom_cache *cache;
+	int cache_index;
+	u_int64_t addr;
+	u_int32_t *cache_ptr;
+	u_int16_t kv_len = 0;
+
+	if (!csr || !kv || csr->max_rom < 1)
+		return CSR1212_EINVAL;
+
+	/* First find which cache the data should be in (or go in if not read
+	 * yet). */
+	for (cache = csr->cache_head; cache; cache = cache->next) {
+		if (kv->offset >= cache->offset &&
+		    kv->offset < (cache->offset + cache->size))
+			break;
+	}
+
+	if (!cache) {
+		csr1212_quad_t q;
+		u_int32_t cache_size;
+
+		/* Only create a new cache for Extended ROM leaves. */
+		if (kv->key.id != CSR1212_KV_ID_EXTENDED_ROM)
+			return CSR1212_EINVAL;
+
+		if (csr->ops->bus_read(csr,
+				       CSR1212_REGISTER_SPACE_BASE + kv->offset,
+				       sizeof(csr1212_quad_t), &q, csr->private_data)) {
+			return CSR1212_EIO;
+		}
+
+		kv->value.leaf.len = CSR1212_BE32_TO_CPU(q) >> 16;
+
+		cache_size = (quads_to_bytes(kv->value.leaf.len + 1) +
+			      (csr->max_rom - 1)) & ~(csr->max_rom - 1);
+
+		cache = csr1212_rom_cache_malloc(kv->offset, cache_size);
+		if (!cache)
+			return CSR1212_ENOMEM;
+
+		kv->value.leaf.data = &cache->data[1];
+		csr->cache_tail->next = cache;
+		cache->prev = csr->cache_tail;
+		cache->next = NULL;
+		csr->cache_tail = cache;
+		cache->filled_head =
+			CSR1212_MALLOC(sizeof(struct csr1212_cache_region));
+		if (!cache->filled_head) {
+			return CSR1212_ENOMEM;
+		}
+
+		cache->filled_head->offset_start = 0;
+		cache->filled_head->offset_end = sizeof(csr1212_quad_t);
+		cache->filled_tail = cache->filled_head;
+		cache->filled_head->next = NULL;
+		cache->filled_head->prev = NULL;
+		cache->data[0] = q;
+
+		/* Don't read the entire extended ROM now.  Pieces of it will
+		 * be read when entries inside it are read. */
+		return csr1212_parse_keyval(kv, cache);
+	}
+
+	cache_index = kv->offset - cache->offset;
+
+	/* Now seach read portions of the cache to see if it is there. */
+	for (cr = cache->filled_head; cr; cr = cr->next) {
+		if (cache_index < cr->offset_start) {
+			newcr = CSR1212_MALLOC(sizeof(struct csr1212_cache_region));
+			if (!newcr)
+				return CSR1212_ENOMEM;
+
+			newcr->offset_start = cache_index & ~(csr->max_rom - 1);
+			newcr->offset_end = newcr->offset_start;
+			newcr->next = cr;
+			newcr->prev = cr->prev;
+			cr->prev = newcr;
+			cr = newcr;
+			break;
+		} else if ((cache_index >= cr->offset_start) &&
+			   (cache_index < cr->offset_end)) {
+			kvi = (struct csr1212_keyval_img*)
+				(&cache->data[bytes_to_quads(cache_index)]);
+			kv_len = quads_to_bytes(CSR1212_BE16_TO_CPU(kvi->length) +
+						1);
+			break;
+		} else if (cache_index == cr->offset_end)
+			break;
+	}
+
+	if (!cr) {
+		cr = cache->filled_tail;
+		newcr = CSR1212_MALLOC(sizeof(struct csr1212_cache_region));
+		if (!newcr)
+			return CSR1212_ENOMEM;
+
+		newcr->offset_start = cache_index & ~(csr->max_rom - 1);
+		newcr->offset_end = newcr->offset_start;
+		newcr->prev = cr;
+		newcr->next = cr->next;
+		cr->next = newcr;
+		cr = newcr;
+		cache->filled_tail = newcr;
+	}
+
+	while(!kvi || cr->offset_end < cache_index + kv_len) {
+		cache_ptr = &cache->data[bytes_to_quads(cr->offset_end &
+							~(csr->max_rom - 1))];
+
+		addr = (CSR1212_CSR_ARCH_REG_SPACE_BASE + cache->offset +
+			cr->offset_end) & ~(csr->max_rom - 1);
+
+		if (csr->ops->bus_read(csr, addr, csr->max_rom, cache_ptr,
+				       csr->private_data)) {
+			if (csr->max_rom == 4)
+				/* We've got problems! */
+				return CSR1212_EIO;
+
+			/* Apperently the max_rom value was a lie, set it to
+			 * do quadlet reads and try again. */
+			csr->max_rom = 4;
+			continue;
+		}
+
+		cr->offset_end += csr->max_rom - (cr->offset_end &
+						  (csr->max_rom - 1));
+
+		if (!kvi && (cr->offset_end > cache_index)) {
+			kvi = (struct csr1212_keyval_img*)
+				(&cache->data[bytes_to_quads(cache_index)]);
+			kv_len = quads_to_bytes(CSR1212_BE16_TO_CPU(kvi->length) +
+						1);
+		}
+
+		if ((kv_len + (kv->offset - cache->offset)) > cache->size) {
+			/* The Leaf or Directory claims its length extends
+			 * beyond the ConfigROM image region and thus beyond the
+			 * end of our cache region.  Therefore, we abort now
+			 * rather than seg faulting later. */
+			return CSR1212_EIO;
+		}
+
+		ncr = cr->next;
+
+		if (ncr && (cr->offset_end >= ncr->offset_start)) {
+			/* consolidate region entries */
+			ncr->offset_start = cr->offset_start;
+
+			if (cr->prev)
+				cr->prev->next = cr->next;
+			ncr->prev = cr->prev;
+			if (cache->filled_head == cr)
+				cache->filled_head = ncr;
+			CSR1212_FREE(cr);
+			cr = ncr;
+		}
+	}
+
+	return csr1212_parse_keyval(kv, cache);
+}
+
+
+
+int csr1212_parse_csr(struct csr1212_csr *csr)
+{
+	static const int mr_map[] = { 4, 64, 1024, 0 };
+	struct csr1212_dentry *dentry;
+	int ret;
+
+	if (!csr || !csr->ops || !csr->ops->bus_read)
+		return CSR1212_EINVAL;
+
+	ret = csr1212_parse_bus_info_block(csr);
+	if (ret != CSR1212_SUCCESS)
+		return ret;
+
+	if (!csr->ops->get_max_rom)
+		csr->max_rom = mr_map[0];	/* default value */
+	else {
+		int i = csr->ops->get_max_rom(csr->bus_info_data,
+					      csr->private_data);
+		if (i & ~0x3)
+			return CSR1212_EINVAL;
+		csr->max_rom = mr_map[i];
+	}
+
+	csr->cache_head->layout_head = csr->root_kv;
+	csr->cache_head->layout_tail = csr->root_kv;
+
+	csr->root_kv->offset = (CSR1212_CONFIG_ROM_SPACE_BASE & 0xffff) +
+		csr->bus_info_len;
+
+	csr->root_kv->valid = 0;
+	csr->root_kv->next = csr->root_kv;
+	csr->root_kv->prev = csr->root_kv;
+	csr1212_get_keyval(csr, csr->root_kv);
+
+	/* Scan through the Root directory finding all extended ROM regions
+	 * and make cache regions for them */
+	for (dentry = csr->root_kv->value.directory.dentries_head;
+	     dentry; dentry = dentry->next) {
+		if (dentry->kv->key.id == CSR1212_KV_ID_EXTENDED_ROM) {
+			csr1212_get_keyval(csr, dentry->kv);
+
+			if (ret != CSR1212_SUCCESS)
+				return ret;
+		}
+	}
+
+	return CSR1212_SUCCESS;
+}
Index: branches/freebob-syt-experiments/Makefile.am
===================================================================
--- branches/freebob-syt-experiments/Makefile.am (revision 125)
+++ branches/freebob-syt-experiments/Makefile.am (revision 125)
@@ -0,0 +1,42 @@
+# Makefile.am - Makefile template
+# Copyright (C) 2005 by Daniel Wagner.
+#
+# This file is part of FreeBob.
+#
+# FreeBob is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# FreeBob 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 General Public License
+# along with FreeBob; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+SUBDIRS = libfreebob src tests
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libfreebob.pc
+
+$(srcdir)/configure: configure.ac aclocal.m4
+	cd $(srcdir) && autoconf
+
+# autoheader might not change config.h.in, so touch a stamp file.
+$(srcdir)/config.h.in: stamp-h.in
+$(srcdir)/stamp-h.in: configure.ac aclocal.m4
+	cd $(srcdir) && autoheader
+	echo timestamp > $(srcdir)/stamp-h.in
+
+config.h: stamp-h
+stamp-h: config.h.in config.status
+	./config.status
+
+Makefile: Makefile.am config.status
+	./config.status
+
+config.status: configure
+	./config.status --recheck
+
+
Index: branches/freebob-syt-experiments/autogen.sh
===================================================================
--- branches/freebob-syt-experiments/autogen.sh (revision 125)
+++ branches/freebob-syt-experiments/autogen.sh (revision 125)
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+
+autoreconf -f -i -s
+./configure --enable-maintainer-mode
+make
Index: branches/freebob-syt-experiments/libfreebob/freebob_streaming.h
===================================================================
--- branches/freebob-syt-experiments/libfreebob/freebob_streaming.h (revision 194)
+++ branches/freebob-syt-experiments/libfreebob/freebob_streaming.h (revision 194)
@@ -0,0 +1,427 @@
+/*
+ *   FreeBob Streaming API
+ *   FreeBob = Firewire (pro-)audio for linux
+ *
+ *   http://freebob.sf.net
+ *
+ *   Copyright (C) 2005 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program 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 General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * 
+ *
+ */
+
+/* freebob_streaming.h
+ *
+ * Specification for the FreeBob Streaming API
+ *
+ */
+#ifndef __FREEBOB_STREAMING_H__
+#define __FREEBOB_STREAMING_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define FREEBOB_STREAMING_MAX_URL_LENGTH 2048
+
+#define FREEBOB_IGNORE_CAPTURE 		(1<<0)
+#define FREEBOB_IGNORE_PLAYBACK 	(1<<1)
+
+#include <stdlib.h>
+
+/* The basic operation of the API is as follows:
+ * 
+ * freebob_streaming_init()
+ * freebob_streaming_start()
+ * while(running) {
+ *   retval = freebob_streaming_wait();
+ *   if (retval == -1) {
+ *     freebob_streaming_reset();
+ *     continue;
+ *   }
+ *
+ *   freebob_streaming_transfer_buffers(dev);
+ *
+ *   for(all channels) {
+ *     switch (channel_type) {
+ *     case audio:
+ *       bytesread=freebob_streaming_read(audioinbuffer[channel]);
+ *       byteswritten=freebob_streaming_write(audiooutbuffer[channel]);
+ *     case midi:
+ *       bytesread=freebob_streaming_read(midiinbuffer[channel]);
+ *       byteswritten=freebob_streaming_write(midioutbuffer[channel]);
+ *     }
+ *   }
+ * }
+ * freebob_streaming_stop();
+ * freebob_streaming_finish();
+ *
+ */
+
+typedef struct _freebob_device freebob_device_t;
+
+/**
+ * The sample format used by the freebob streaming API
+ */
+
+typedef unsigned int freebob_sample_t;
+
+
+typedef unsigned int freebob_nframes_t;
+
+
+typedef struct freebob_device_info {
+	/* TODO: How is the device specification done? */
+//	char xml_location[FREEBOB_STREAMING_MAX_URL_LENGTH]; // can be an osc url or an XML filename
+//	freebob_device_info_location_type location_type;
+} freebob_device_info_t;
+
+/**
+ * Structure to pass the options to the freebob streaming code.
+ */
+typedef struct freebob_options {
+	/* driver related setup */
+	int sample_rate; 		/* this is acutally dictated by the device
+							 * you can specify a value here or -1 to autodetect
+						 	 */
+
+	/* buffer setup */
+	int period_size; 	/* one period is the amount of frames that
+				 * has to be sent or received in order for
+				 * a period boundary to be signalled.
+				 * (unit: frames)
+				 */
+	int nb_buffers;	/* the size of the frame buffer (in periods) */
+
+	/* packetizer thread options */
+	int realtime;
+	int packetizer_priority;
+	
+	/* libfreebob related setup */
+	int node_id;
+	int port;
+	
+	/* direction map */
+	int directions;
+
+} freebob_options_t;
+
+/**
+ * The types of streams supported by the API
+ *
+ * A freebob_audio type stream is a stream that consists of successive samples.
+ * The format is a 24bit UINT in host byte order, aligned as the 24LSB's of the 
+ * 32bit UINT of the read/write buffer.
+ * The wait operation looks at this type of streams only.
+ *
+ * A freebob_midi type stream is a stream of midi bytes. The bytes are 8bit UINT,
+ * aligned as the first 8LSB's of the 32bit UINT of the read/write buffer.
+ *
+ */
+typedef enum {
+	freebob_stream_type_invalid                      =   -1,
+  	freebob_stream_type_unknown                      =   0,
+  	freebob_stream_type_audio                        =   1,
+  	freebob_stream_type_midi                         =   2,
+} freebob_streaming_stream_type;
+
+/**
+ * 
+ * Buffer types known to the API
+ * 
+ */
+typedef enum {
+	freebob_buffer_type_per_stream          =   -1, // use this to use the per-stream read functions
+	freebob_buffer_type_uint24           =   0,
+	freebob_buffer_type_float            =   1,
+// 	freebob_buffer_type_uint32           =   2,
+// 	freebob_buffer_type_double           =   3,
+// 	...
+} freebob_streaming_buffer_type;
+
+/**
+ * Initializes the streaming from/to a FreeBob device. A FreeBob device
+ * is a virtual device composed of several BeBoB or compatible devices,
+ * linked together in one sync domain.
+ *
+ * This prepares all IEEE1394 related stuff and sets up all buffering.
+ * It elects a sync master if nescessary.
+ * 
+ * @param device_info provides a way to specify the virtual device
+ * @param options options regarding buffers, ieee1394 setup, ...
+ *
+ * @return Opaque device handle if successful.  If this is NULL, the
+ * init operation failed.
+ *
+ */
+freebob_device_t *freebob_streaming_init (freebob_device_info_t *device_info,
+				 	freebob_options_t options);
+
+/**
+ * Finishes the FreeBob streaming. Cleans up all internal data structures
+ * and terminates connections.
+ *
+ * @param dev the freebob device to be closed.
+ */
+void freebob_streaming_finish(freebob_device_t *dev);
+
+/**
+ * Returns the amount of capture channels available
+ *
+ * @param dev the freebob device
+ *
+ * @return the number of capture streams present & active on the device. 
+ *         can be 0. returns -1 upon error.
+ */
+int freebob_streaming_get_nb_capture_streams(freebob_device_t *dev);
+
+/**
+ * Returns the amount of playack channels available
+ *
+ * @param dev the freebob device
+ *
+ * @return the number of playback streams present & active on the device. 
+ *         can be 0. returns -1 upon error.
+ */
+int freebob_streaming_get_nb_playback_streams(freebob_device_t *dev);
+
+/**
+ * Copies the capture channel name into the specified buffer
+ *
+ * @param dev the freebob device
+ * @param number the stream number
+ * @param buffer the buffer to copy the name into. has to be allocated.
+ * @param buffersize the size of the buffer
+ *
+ * @return the number of characters copied into the buffer
+ */
+int freebob_streaming_get_capture_stream_name(freebob_device_t *dev, int number, char* buffer, size_t buffersize);
+
+/**
+ * Copies the playback channel name into the specified buffer
+ *
+ * @param dev the freebob device
+ * @param number the stream number
+ * @param buffer the buffer to copy the name into. has to be allocated.
+ * @param buffersize the size of the buffer
+ *
+ * @return the number of characters copied into the buffer
+ */
+int freebob_streaming_get_playback_stream_name(freebob_device_t *dev, int number, char* buffer, size_t buffersize);
+
+/**
+ * Returns the type of a capture channel
+ *
+ * @param dev the freebob device
+ * @param number the stream number
+ *
+ * @return the channel type 
+ */
+freebob_streaming_stream_type freebob_streaming_get_capture_stream_type(freebob_device_t *dev, int number);
+
+/**
+ * Returns the type of a playback channel
+ *
+ * @param dev the freebob device
+ * @param number the stream number
+ *
+ * @return the channel type 
+ */
+freebob_streaming_stream_type freebob_streaming_get_playback_stream_type(freebob_device_t *dev, int number);
+/*
+ *
+ * Note: buffer handling will change in order to allow setting the sample type for *_read and *_write
+ * and separately indicate if you want to use a user buffer or a managed buffer.
+ *
+ */
+/**
+ * Sets the decode buffer for the stream. This allows for zero-copy decoding.
+ * The call to freebob_streaming_transfer_buffers will decode one period of the stream to
+ * this buffer. Make sure it is large enough. 
+ * 
+ * @param dev the freebob device
+ * @param number the stream number
+ * @param buff a pointer to the sample buffer, make sure it is large enough 
+ *             i.e. sizeof(your_sample_type)*period_size
+ * @param t   the type of the buffer. this determines sample type and the decode function used.
+ *
+ * @return -1 on error, 0 on success
+ */
+int freebob_streaming_set_capture_stream_buffer(freebob_device_t *dev, int number, char *buff, freebob_streaming_buffer_type t);
+
+/**
+ * Sets the encode buffer for the stream. This allows for zero-copy encoding (directly to the events).
+ * The call to freebob_streaming_transfer_buffers will encode one period of the stream from
+ * this buffer to the event buffer.
+ * 
+ * @param dev the freebob device
+ * @param number the stream number
+ * @param buff a pointer to the sample buffer
+ * @param t   the type of the buffer. this determines sample type and the decode function used.
+ *
+ * @return -1 on error, 0 on success
+ */
+int freebob_streaming_set_playback_stream_buffer(freebob_device_t *dev, int number, char *buff, freebob_streaming_buffer_type t);
+
+
+/**
+ * Starts the streaming operation. This initiates the connections to the FreeBob devices and
+ * starts the packet handling thread(s). This has to be called before any I/O can occur.
+ *
+ * @param dev the freebob device
+ *
+ * @return 0 on success, -1 on failure.
+ */
+int freebob_streaming_start(freebob_device_t *dev);
+
+/**
+ * Stops the streaming operation. This closes the connections to the FreeBob devices and
+ * stops the packet handling thread(s). 
+ *
+ * @param dev the freebob device
+ *
+ * @return 0 on success, -1 on failure.
+ */
+int freebob_streaming_stop(freebob_device_t *dev);
+
+/**
+ * Resets the streaming as if it was stopped and restarted. The difference is that the connections
+ * are not nescessarily broken and restored.
+ *
+ * All buffers are reset in the initial state and all data in them is lost.
+ *
+ * @param dev the freebob device
+ *
+ * @return 0 on success, -1 on failure.
+ */
+int freebob_streaming_reset(freebob_device_t *dev);
+
+/**
+ * Waits until there is at least one period of data available on all capture connections and
+ * room for one period of data on all playback connections
+ *
+ * @param dev the freebob device
+ *
+ * @return The number of frames ready. -1 when a problem occurred.
+ */
+int freebob_streaming_wait(freebob_device_t *dev);
+
+/**
+ * Reads from a specific channel to a supplied buffer.
+ * 
+ * @param dev the freebob device
+ * @param number the stream number
+ * @param buffer the buffer to copy the samples into
+ * @param nsamples the number of samples to be read. the buffer has to be big enough for this amount of samples.
+ *
+ * @return the amount of samples actually read. -1 on error (xrun).
+ */
+int freebob_streaming_read(freebob_device_t *dev, int number, freebob_sample_t *buffer, int nsamples);
+
+/**
+ * Write to a specific channel from a supplied buffer.
+ * 
+ * @param dev the freebob device
+ * @param number the stream number
+ * @param buffer the buffer to copy the samples from
+ * @param nsamples the number of samples to be written.
+ *
+ * @return the amount of samples actually written. -1 on error.
+ */
+int freebob_streaming_write(freebob_device_t *dev, int number, freebob_sample_t *buffer, int nsamples);
+
+/**
+ * Transfer & decode the events from the packet buffer to the sample buffers
+ * 
+ * This should be called after the wait call returns, before reading/writing the sample buffers
+ * with freebob_streaming_[read|write].
+ * 
+ * The purpose is to allow more precise timing information. freebob_streaming_wait returns as soon as the 
+ * period boundary is crossed, and can therefore be used to determine the time instant of this crossing (e.g. jack DLL).
+ *
+ * The actual decoding work is done in this function and can therefore be omitted in this timing calculation.
+ * Note that you HAVE to call this function in order for the buffers not to overflow, and only call it when
+ * freebob_streaming_wait doesn't indicate a buffer xrun (xrun handler resets buffer).
+ * 
+ * If user supplied playback buffers are specified with freebob_streaming_set_playback_buffers
+ * their contents should be valid before calling this function.
+ * If user supplied capture buffers are specified with freebob_streaming_set_capture_buffers
+ * their contents are updated in this function.
+ * 
+ * Use either freebob_streaming_transfer_buffers to transfer all buffers at once, or use 
+ * freebob_streaming_transfer_playback_buffers and freebob_streaming_transfer_capture_buffers 
+ * to have more control. Don't use both.
+ * 
+ * @param dev the freebob device
+ * @return  -1 on error.
+ */
+ 
+int freebob_streaming_transfer_buffers(freebob_device_t *dev);
+
+/**
+ * Transfer & encode the events from the sample buffers to the packet buffer
+ * 
+ * This should be called after the wait call returns, after writing the sample buffers
+ * with freebob_streaming_write.
+ * 
+ * If user supplied playback buffers are specified with freebob_streaming_set_playback_buffers
+ * their contents should be valid before calling this function.
+ * 
+ * Use either freebob_streaming_transfer_buffers to transfer all buffers at once, or use 
+ * freebob_streaming_transfer_playback_buffers and freebob_streaming_transfer_capture_buffers 
+ * to have more control. Don't use both.
+ * 
+ * @param dev the freebob device
+ * @return  -1 on error.
+ */
+ 
+int freebob_streaming_transfer_playback_buffers(freebob_device_t *dev);
+
+/**
+ * Transfer & decode the events from the packet buffer to the sample buffers
+ * 
+ * This should be called after the wait call returns, before reading the sample buffers
+ * with freebob_streaming_read.
+ * 
+ * If user supplied capture buffers are specified with freebob_streaming_set_capture_buffers
+ * their contents are updated in this function.
+ * 
+ * Use either freebob_streaming_transfer_buffers to transfer all buffers at once, or use 
+ * freebob_streaming_transfer_playback_buffers and freebob_streaming_transfer_capture_buffers 
+ * to have more control. Don't use both.
+ * 
+ * @param dev the freebob device
+ * @return  -1 on error.
+ */
+
+int freebob_streaming_transfer_capture_buffers(freebob_device_t *dev);
+
+/**
+ * Returns the packetizer thread to allow RT enabling by the host.
+ * 
+ * @param dev the freebob device
+ *
+ * @return the thread.
+ */
+pthread_t freebob_streaming_get_packetizer_thread(freebob_device_t *dev);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Index: branches/freebob-syt-experiments/libfreebob/xmlparser.h
===================================================================
--- branches/freebob-syt-experiments/libfreebob/xmlparser.h (revision 153)
+++ branches/freebob-syt-experiments/libfreebob/xmlparser.h (revision 153)
@@ -0,0 +1,47 @@
+/* freebob.h
+ * Copyright (C) 2005 Pieter Palmers
+ *
+ * This file is part of FreeBoB
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef XMLPARSER_H
+#define XMLPARSER_H
+
+#include "libfreebob/freebob.h"
+
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+freebob_connection_info_t* 
+freebob_xmlparse_get_connection_info( xmlDocPtr doc,
+				      int node_id,
+                                      int direction );
+
+freebob_supported_stream_format_info_t*
+freebob_xmlparse_get_stream_formats( xmlDocPtr doc, 
+				     int node_id, 
+				     int direction );
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* XMLPARSER_H */
Index: branches/freebob-syt-experiments/libfreebob/Makefile.am
===================================================================
--- branches/freebob-syt-experiments/libfreebob/Makefile.am (revision 159)
+++ branches/freebob-syt-experiments/libfreebob/Makefile.am (revision 159)
@@ -0,0 +1,20 @@
+# Makefile.am - Makefile template
+# Copyright (C) 2005 by Daniel Wagner.
+#
+# This file is part of FreeBob.
+#
+# FreeBob is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# FreeBob 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 General Public License
+# along with FreeBob; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+libfreebobincludedir = $(includedir)/libfreebob
+libfreebobinclude_HEADERS = freebob.h freebob_streaming.h xmlparser.h
Index: branches/freebob-syt-experiments/libfreebob/freebob.h
===================================================================
--- branches/freebob-syt-experiments/libfreebob/freebob.h (revision 185)
+++ branches/freebob-syt-experiments/libfreebob/freebob.h (revision 185)
@@ -0,0 +1,177 @@
+/* freebob.h
+ * Copyright (C) 2005 Pieter Palmers
+ * Copyright (C) 2006 Daniel Wagner
+ *
+ * This file is part of FreeBoB
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef FREEBOB_H
+#define FREEBOB_H
+
+#define FREEBOB_MAX_NAME_LEN 256
+
+#define FREEBOB_BOUNCE_SERVER_VENDORNAME  "FreeBoB Server"
+#define FREEBOB_BOUNCE_SERVER_MODELNAME   "freebob-server"
+
+enum freebob_direction {
+    FREEBOB_CAPTURE  = 0,
+    FREEBOB_PLAYBACK = 1,
+};
+
+typedef struct freebob_handle* freebob_handle_t;
+
+/*
+ * Buffer specification
+ */
+typedef struct _freebob_stream_spec freebob_stream_spec_t;
+typedef struct _freebob_stream_info freebob_stream_info_t;
+typedef struct _freebob_connection_spec freebob_connection_spec_t;
+typedef struct _freebob_connection_info freebob_connection_info_t;
+typedef struct _freebob_supported_stream_format_spec freebob_supported_stream_format_spec_t;
+typedef struct _freebob_supported_stream_format_info freebob_supported_stream_format_info_t;
+
+/*
+ * Stream specification
+ */
+struct _freebob_stream_spec {
+    int location;
+    int position;
+    int format;
+    int type;
+    int destination_port;
+    char name[FREEBOB_MAX_NAME_LEN];
+};
+
+struct _freebob_stream_info {
+    int nb_streams;
+    freebob_stream_spec_t** streams;
+};
+
+/*
+ * Connection specification
+ */
+struct _freebob_connection_spec {
+    int id;
+    int port;
+    int node;
+    int plug;
+    int dimension;  /* due to the midi stuff, the dimension isn't equal */
+                    /* to the number of streams */
+    int samplerate; /* this should be equal for all connections when */
+                    /* using jack. maybe not when using other api's */
+    int iso_channel;
+    enum freebob_direction direction;
+    int is_master;
+    freebob_stream_info_t* stream_info;
+};
+
+/*
+ * topology info
+ */
+struct _freebob_connection_info {
+    int direction;
+    int nb_connections;
+    freebob_connection_spec_t** connections;
+};
+
+/*
+ * Supported stream formats
+ */
+struct _freebob_supported_stream_format_spec {
+    int samplerate;
+    int nb_audio_channels;
+    int nb_midi_channels;
+};
+
+struct _freebob_supported_stream_format_info {
+    int direction;
+    int nb_formats;
+    freebob_supported_stream_format_spec_t** formats;
+};
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+freebob_handle_t
+freebob_new_handle( int port );
+
+int
+freebob_destroy_handle( freebob_handle_t freebob_handle );
+
+int
+freebob_discover_devices( freebob_handle_t freebob_handle, int verbose_level );
+
+
+freebob_connection_info_t*
+freebob_get_connection_info( freebob_handle_t freebob_handle,
+			     int node_id,
+			     enum freebob_direction direction );
+
+freebob_supported_stream_format_info_t*
+freebob_get_supported_stream_format_info( freebob_handle_t freebob_handle,
+					  int node_id,
+					  enum freebob_direction direction );
+
+void
+freebob_free_connection_info( freebob_connection_info_t* connection_info );
+void
+freebob_free_connection_spec( freebob_connection_spec_t* connection_spec );
+void
+freebob_free_stream_info( freebob_stream_info_t* stream_info );
+void
+freebob_free_stream_spec( freebob_stream_spec_t* stream_spec );
+void
+freebob_free_supported_stream_format_info( freebob_supported_stream_format_info_t* stream_info );
+void
+freebob_free_supported_stream_format_spec( freebob_supported_stream_format_spec_t* stream_spec );
+
+
+
+void
+freebob_print_connection_info( freebob_connection_info_t* connection_info );
+void
+freebob_print_supported_stream_format_info( freebob_supported_stream_format_info_t* stream_info );
+
+int freebob_node_is_valid_freebob_device(freebob_handle_t fb_handle, int node_id);
+int freebob_get_nb_devices_on_bus(freebob_handle_t fb_handle);
+
+int freebob_get_device_node_id(freebob_handle_t fb_handle, int device_nr);
+int freebob_set_samplerate(freebob_handle_t freebob_handle, int node_id, int samplerate);
+
+/* debug function */
+void
+freebob_print_xml_description( freebob_handle_t freebob_handle,
+			       int node_id,
+			       enum freebob_direction direction );
+
+const char*
+freebob_get_version();
+
+/* various function */
+
+/* workaround: wait usec after each AVC command.
+   will disapear as soon bug is fixed */    
+void freebob_sleep_after_avc_command( int time );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREEBOB_H */
Index: branches/freebob-syt-experiments/libfreebob/.cvsignore
===================================================================
--- branches/freebob-syt-experiments/libfreebob/.cvsignore (revision 134)
+++ branches/freebob-syt-experiments/libfreebob/.cvsignore (revision 134)
@@ -0,0 +1,3 @@
+.cvsignore
+Makefile
+Makefile.in
Index: branches/freebob-syt-experiments/NEWS
===================================================================
--- branches/freebob-syt-experiments/NEWS (revision 125)
+++ branches/freebob-syt-experiments/NEWS (revision 125)
@@ -0,0 +1,1 @@
+26.12.2005: First beta release of libfreebob called 'late x-mass gift' release.
Index: branches/freebob-syt-experiments/.cvsignore
===================================================================
--- branches/freebob-syt-experiments/.cvsignore (revision 134)
+++ branches/freebob-syt-experiments/.cvsignore (revision 134)
@@ -0,0 +1,11 @@
+.cvsignore
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.*
+configure
+libfreebob.pc
+libtool
+stamp*
+libfreebob-*.tar.gz
Index: branches/freebob-syt-experiments/README
===================================================================
--- branches/freebob-syt-experiments/README (revision 125)
+++ branches/freebob-syt-experiments/README (revision 125)
@@ -0,0 +1,503 @@
+FreeBob version 0.0.1
+=====================
+
+This project aims to provide a free driver implemenation for the BeBoB
+platform.  The BeBob is used in many available IEEE 1394 based break-out 
+boxes.
+
+This is the first beta release of libfreebob. Currently it depends
+still on the old streaming backend driver from the prealpha-release 2.1.
+In order to use libfreebob you need to download and install it this
+special version.
+
+The device discovering is done completely different to the 
+prealpha-release version of freebob. In the old version
+it is done using the descriptors. But this version has several sever
+drawbacks, e.g. not every BeBoB device is supported. This implemention
+now uses a some extended commands like the extended plug info command.
+This allows to discover any BeBoB device. Furthermore it provides
+more information and it is extremly faster... which is of course
+not very important because it is only device discovering and not
+streaming :)
+
+Dependencies
+------------
+
+To build libfreebob you need several libraries. For all libraries a version
+is provided which is a 'known good' version (all tested with a debian testing
+installation).  The first few libraries it seems it is not necessary that 
+the version must match. The chances that it works also with an older versions 
+are good:
+
+alsa        (>= 1.0.11)
+libxml2     (>= 2.6.22)
+libpthread  (>= 2.3.5)
+
+These libraries here should be at least the version listed:
+
+libraw1394  (>= 1.2.0),  http://www.linux1394.org
+libiec61883 (>= 1.1.0),  http://www.linux1394.org
+libavc1394  (>= 0.5.1),  http://sourceforge.net/projects/libavc1394
+
+And finally, you need the special jackd version which uses libfreebob.
+It can be downloaded from sf.net as well.
+
+
+How to build
+------------
+
+Building the code is straight forward if PKG_CONFIG_PATH, LD_LIBRARY_PATH
+and INCLUDE_PATH is correctly set up.
+
+E.g on my system I have installed libraw1394, libiec61883 and libavc1394
+under /usr/local:
+
+$ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
+$ export LD_LIBRARY_PATH=/usr/local/lib
+
+If you want to build the release version you can do following (CVS checkout)
+
+$ ./autogen.sh
+$ make install
+
+If you have not a CVS checkout you can do following:
+
+$ ./configure
+$ make 
+$ make install
+
+If you want some debug information (because something seems not
+to work correctly) you can try do following (not CVS checkout):
+
+$ ./configure --enable-debug
+$ make
+$ make install
+
+After you have install libfreebob you can start building the
+special jack version with the iec61883 backend driver which is using
+libfreebob.
+
+
+Testing
+-------
+
+Under the tests directory there is a test program. You should first
+try to run this. 
+
+If you don't have installed libfreebob then you can adapt your
+LD_LIBRARY_PATH environment variable to
+
+$ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../src/.libs
+
+Then you can try running the program without having to install it.
+
+With the release version you see something like this (note that you 
+have to provide the correct node id, in this example '-n 0'):
+
+wagi@cruxam:~/src/libfreebob/tests$ ./test-freebob -n 0 discover
+Using freebob library version: libfreebob 0.0.1
+
+Direction:              0 (capture)
+
+Connection Info
+===============
+
+Number of connections:  1
+
+  Connection  0
+  -------------
+    [ 0] Id:         0
+    [ 0] Port:       0
+    [ 0] Node:       0
+    [ 0] Plug:       0
+    [ 0] Dimension:  7
+    [ 0] Samplerate: 48000
+    [ 0] Number of stream infos: 7
+
+    StreamId  Position Location Format Type DPort Name
+    --------------------------------------------------
+    [ 0]:[ 0] 0x01     0x01     0x06   0x03 0x00  LineOut 1+2 left
+    [ 0]:[ 1] 0x04     0x02     0x06   0x03 0x00  LineOut 1+2 right
+    [ 0]:[ 2] 0x02     0x01     0x06   0x03 0x00  LineOut 3+4 left
+    [ 0]:[ 3] 0x05     0x02     0x06   0x03 0x00  LineOut 3+4 right
+    [ 0]:[ 4] 0x00     0x01     0x06   0x04 0x00  SpdifOut left
+    [ 0]:[ 5] 0x03     0x02     0x06   0x04 0x00  SpdifOut right
+    [ 0]:[ 6] 0x06     0x01     0x0d   0x0a 0x00  MidiPort_1
+
+
+Direction:              1 (playback)
+
+Connection Info
+===============
+
+Number of connections:  1
+
+  Connection  0
+  -------------
+    [ 0] Id:         0
+    [ 0] Port:       0
+    [ 0] Node:       0
+    [ 0] Plug:       0
+    [ 0] Dimension:  7
+    [ 0] Samplerate: 48000
+    [ 0] Number of stream infos: 7
+
+    StreamId  Position Location Format Type DPort Name
+    --------------------------------------------------
+    [ 0]:[ 0] 0x01     0x01     0x06   0x02 0x00  MicIn1 left
+    [ 0]:[ 1] 0x04     0x02     0x06   0x02 0x00  MicIn1 right
+    [ 0]:[ 2] 0x02     0x01     0x06   0x03 0x00  LineIn 3+4 left
+    [ 0]:[ 3] 0x05     0x02     0x06   0x03 0x00  LineIn 3+4 right
+    [ 0]:[ 4] 0x00     0x01     0x06   0x04 0x00  SpdifIn left
+    [ 0]:[ 5] 0x03     0x02     0x06   0x04 0x00  SpdifIn right
+    [ 0]:[ 6] 0x06     0x01     0x0d   0x0a 0x00  MidiPort_1
+
+
+To impress friends you need of course to use the debug version
+which looks like this:
+
+wagi@cruxam:~/src/libfreebob/tests$ ./test-freebob -n 0 discover
+Using freebob library version: libfreebob 0.0.1
+
+Debug (avdevice.cpp)[47] AvDevice: Found AvDevice (NodeID 0)
+Debug (avdevice.cpp)[1262] enumerateSubUnits: subunit_id =  0, subunit_type =  1 (Audio), max_subunit_ID = 0
+Debug (avdevice.cpp)[1262] enumerateSubUnits: subunit_id =  0, subunit_type = 12 (Music), max_subunit_ID = 0
+Debug (avdevice.cpp)[169] discoverStep1: number of iso input plugs = 2, number of iso output plugs = 2
+Debug (avdevice.cpp)[214] discoverStep2: number of output plugs is 1 for iso input plug 0
+Debug (avdevice.cpp)[251] discoverStep2: output plug 0 is owned by subunit_type 12, subunit_id = 0
+Debug (avdevice.cpp)[1203] discoverPlugConnection: IsoStreamInput plug 0 has a valid connection to plug 0 of MusicSubunit subunit 0
+Debug (avdevice.cpp)[214] discoverStep2: number of output plugs is 0 for iso input plug 1
+Debug (avdevice.cpp)[339] discoverStep3: output plug 0 is owned by subunit_type 12, subunit_id 0
+Debug (avdevice.cpp)[1203] discoverPlugConnection: IsoStreamOutput plug 0 has a valid connection to plug 0 of MusicSubunit subunit 0
+Debug (avdevice.cpp)[339] discoverStep3: output plug 5 is owned by subunit_type 12, subunit_id 0
+Debug (avdevice.cpp)[1203] discoverPlugConnection: IsoStreamOutput plug 1 has a valid connection to plug 5 of MusicSubunit subunit 0
+Debug (avdevice.cpp)[416] discoverStep4: iso input plug 0 is of type 0 (IsoStream)
+Debug (avdevice.cpp)[383] discoverStep4: iso input plug 1 has no valid connecton -> skip
+Debug (avdevice.cpp)[465] discoverStep4: iso output plug 0 is of type 0 (IsoStream)
+Debug (avdevice.cpp)[465] discoverStep4: iso output plug 1 is of type 3 (Sync)
+Debug (avdevice.cpp)[524] discoverStep5: iso input plug 0 has 7 channels
+Debug (avdevice.cpp)[491] discoverStep5: iso input plug 1 has no valid connecton -> skip
+Debug (avdevice.cpp)[573] discoverStep5: iso output plug 0 has 7 channels
+Debug (avdevice.cpp)[573] discoverStep5: iso output plug 1 has 2 channels
+Debug (avdevice.cpp)[636] discoverStep6: iso input plug 0: channel position information retrieved
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 2
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 2
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 5
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 2
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 2
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 3
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 6
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 2
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 2
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 1
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 4
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 2
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 7
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avdevice.cpp)[598] discoverStep6: iso input plug 1 has no valid connecton -> skip
+Debug (avdevice.cpp)[690] discoverStep6: iso output plug 0: channel position information retrieved
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 2
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 2
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 5
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 2
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 2
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 3
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 6
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 2
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 2
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 1
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 4
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 2
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 7
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avdevice.cpp)[690] discoverStep6: iso output plug 1: channel position information retrieved
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 2
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 1
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 2
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 2
+Debug (avdevice.cpp)[767] discoverStep7: iso input plug 0 stream position 2: channel name = LineOut 1+2 left
+Debug (avdevice.cpp)[767] discoverStep7: iso input plug 0 stream position 5: channel name = LineOut 1+2 right
+Debug (avdevice.cpp)[767] discoverStep7: iso input plug 0 stream position 3: channel name = LineOut 3+4 left
+Debug (avdevice.cpp)[767] discoverStep7: iso input plug 0 stream position 6: channel name = LineOut 3+4 right
+Debug (avdevice.cpp)[767] discoverStep7: iso input plug 0 stream position 1: channel name = SpdifOut left
+Debug (avdevice.cpp)[767] discoverStep7: iso input plug 0 stream position 4: channel name = SpdifOut right
+Debug (avdevice.cpp)[767] discoverStep7: iso input plug 0 stream position 7: channel name = MidiPort_1
+Debug (avdevice.cpp)[716] discoverStep7: iso input plug 1 has no valid connecton -> skip
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 0 stream position 2: channel name = MicIn1 left
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 0 stream position 5: channel name = MicIn1 right
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 0 stream position 3: channel name = LineIn 3+4 left
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 0 stream position 6: channel name = LineIn 3+4 right
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 0 stream position 1: channel name = SpdifIn left
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 0 stream position 4: channel name = SpdifIn right
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 0 stream position 7: channel name = MidiPort_1
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 1 stream position 1: channel name = SynchChannel1
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 1 stream position 2: channel name = SynchChannel2
+Debug (avdevice.cpp)[910] discoverStep8: iso input plug 0: cluster index = 1, portType Line, cluster name = LineOut 1+2
+Debug (avdevice.cpp)[910] discoverStep8: iso input plug 0: cluster index = 2, portType Line, cluster name = LineOut 3+4
+Debug (avdevice.cpp)[910] discoverStep8: iso input plug 0: cluster index = 3, portType SPDIF, cluster name = SpdifOut
+Debug (avdevice.cpp)[910] discoverStep8: iso input plug 0: cluster index = 4, portType MIDI, cluster name = MidiSection.0
+Debug (avdevice.cpp)[866] discoverStep8: iso input plug 1 has no valid connecton -> skip
+Debug (avdevice.cpp)[980] discoverStep8: iso output plug 0: cluster index = 1, portType Microphone, cluster name = MicIn1
+Debug (avdevice.cpp)[980] discoverStep8: iso output plug 0: cluster index = 2, portType Line, cluster name = LineIn 3+4
+Debug (avdevice.cpp)[980] discoverStep8: iso output plug 0: cluster index = 3, portType SPDIF, cluster name = SpdifIn
+Debug (avdevice.cpp)[980] discoverStep8: iso output plug 0: cluster index = 4, portType MIDI, cluster name = MidiSection.0
+Warning (avdevice.cpp)[936] discoverStep8: Skipping plugs with id > 0. Further investigation needed
+Debug (avdevice.cpp)[1040] discoverStep9: discoverStep9: iso input plug 0 uses sampling frequency 4
+Debug (avdevice.cpp)[1070] discoverStep9: iso input plug 0 cluster info 1: stream format 6
+Debug (avdevice.cpp)[1070] discoverStep9: iso input plug 0 cluster info 2: stream format 6
+Debug (avdevice.cpp)[1070] discoverStep9: iso input plug 0 cluster info 3: stream format 6
+Debug (avdevice.cpp)[1070] discoverStep9: iso input plug 0 cluster info 4: stream format 13
+Debug (avdevice.cpp)[1008] discoverStep9: iso input plug 1 has no valid connecton -> skip
+Debug (avdevice.cpp)[1134] discoverStep9: discoverStep9: iso output plug 0 uses sampling frequency 4
+Debug (avdevice.cpp)[1164] discoverStep9: iso output plug 0 cluster info 1: stream format 6
+Debug (avdevice.cpp)[1164] discoverStep9: iso output plug 0 cluster info 2: stream format 6
+Debug (avdevice.cpp)[1164] discoverStep9: iso output plug 0 cluster info 3: stream format 6
+Debug (avdevice.cpp)[1164] discoverStep9: iso output plug 0 cluster info 4: stream format 13
+Debug (avdevice.cpp)[1177] discoverStep9: iso output plug 1 is sync stream with sampling frequency 4
+Direction:              0 (capture)
+
+Connection Info
+===============
+
+Number of connections:  1
+
+  Connection  0
+  -------------
+    [ 0] Id:         0
+    [ 0] Port:       0
+    [ 0] Node:       0
+    [ 0] Plug:       0
+    [ 0] Dimension:  7
+    [ 0] Samplerate: 48000
+    [ 0] Number of stream infos: 7
+
+    StreamId  Position Location Format Type DPort Name
+    --------------------------------------------------
+    [ 0]:[ 0] 0x01     0x01     0x06   0x03 0x00  LineOut 1+2 left
+    [ 0]:[ 1] 0x04     0x02     0x06   0x03 0x00  LineOut 1+2 right
+    [ 0]:[ 2] 0x02     0x01     0x06   0x03 0x00  LineOut 3+4 left
+    [ 0]:[ 3] 0x05     0x02     0x06   0x03 0x00  LineOut 3+4 right
+    [ 0]:[ 4] 0x00     0x01     0x06   0x04 0x00  SpdifOut left
+    [ 0]:[ 5] 0x03     0x02     0x06   0x04 0x00  SpdifOut right
+    [ 0]:[ 6] 0x06     0x01     0x0d   0x0a 0x00  MidiPort_1
+
+
+Direction:              1 (playback)
+
+Connection Info
+===============
+
+Number of connections:  1
+
+  Connection  0
+  -------------
+    [ 0] Id:         0
+    [ 0] Port:       0
+    [ 0] Node:       0
+    [ 0] Plug:       0
+    [ 0] Dimension:  7
+    [ 0] Samplerate: 48000
+    [ 0] Number of stream infos: 7
+
+    StreamId  Position Location Format Type DPort Name
+    --------------------------------------------------
+    [ 0]:[ 0] 0x01     0x01     0x06   0x02 0x00  MicIn1 left
+    [ 0]:[ 1] 0x04     0x02     0x06   0x02 0x00  MicIn1 right
+    [ 0]:[ 2] 0x02     0x01     0x06   0x03 0x00  LineIn 3+4 left
+    [ 0]:[ 3] 0x05     0x02     0x06   0x03 0x00  LineIn 3+4 right
+    [ 0]:[ 4] 0x00     0x01     0x06   0x04 0x00  SpdifIn left
+    [ 0]:[ 5] 0x03     0x02     0x06   0x04 0x00  SpdifIn right
+    [ 0]:[ 6] 0x06     0x01     0x0d   0x0a 0x00  MidiPort_1
+
+
+Running jackd
+-------------
+
+In order to get it running you need to provide some arguments to 
+jackd, e.g.
+
+$ jackd -d iec61883 -n 1 -d 0 -p 512 -b 1000 -b 1000 -i 20 -r 8192
+
+Note that '-n' most be addapted to your local 1394 bus configuraiton.
+This is the node number of the device.
+
+On my screen I get:
+
+wagi@cruxam:~/src/jack-audio-connection-kit+freebob-0.100.0$ jackd -d iec61883 -n 1 -d 0 -p 512 -b 1000 -b 1000 -i 20 -r 8192
+jackd 0.100.0
+Copyright 2001-2005 Paul Davis and others.
+jackd comes with ABSOLUTELY NO WARRANTY
+This is free software, and you are welcome to redistribute it
+under certain conditions; see the file COPYING for details
+
+JACK compiled with System V SHM support.
+loading driver ..
+IEC61883: Using libfreebob version libfreebob 0.0.1
+Debug (avdevice.cpp)[47] AvDevice: Found AvDevice (NodeID 1)
+Debug (avdevice.cpp)[1262] enumerateSubUnits: subunit_id =  0, subunit_type =  1 (Audio), max_subunit_ID = 0
+Debug (avdevice.cpp)[1262] enumerateSubUnits: subunit_id =  0, subunit_type = 12 (Music), max_subunit_ID = 0
+Debug (avdevice.cpp)[169] discoverStep1: number of iso input plugs = 2, number of iso output plugs = 2
+Debug (avdevice.cpp)[214] discoverStep2: number of output plugs is 1 for iso input plug 0
+Debug (avdevice.cpp)[251] discoverStep2: output plug 0 is owned by subunit_type 12, subunit_id = 0
+Debug (avdevice.cpp)[1203] discoverPlugConnection: IsoStreamInput plug 0 has a valid connection to plug 0 of MusicSubunit subunit 0
+Debug (avdevice.cpp)[214] discoverStep2: number of output plugs is 0 for iso input plug 1
+Debug (avdevice.cpp)[339] discoverStep3: output plug 0 is owned by subunit_type 12, subunit_id 0
+Debug (avdevice.cpp)[1203] discoverPlugConnection: IsoStreamOutput plug 0 has a valid connection to plug 0 of MusicSubunit subunit 0
+Debug (avdevice.cpp)[339] discoverStep3: output plug 5 is owned by subunit_type 12, subunit_id 0
+Debug (avdevice.cpp)[1203] discoverPlugConnection: IsoStreamOutput plug 1 has a valid connection to plug 5 of MusicSubunit subunit 0
+Debug (avdevice.cpp)[416] discoverStep4: iso input plug 0 is of type 0 (IsoStream)
+Debug (avdevice.cpp)[383] discoverStep4: iso input plug 1 has no valid connecton -> skip
+Debug (avdevice.cpp)[465] discoverStep4: iso output plug 0 is of type 0 (IsoStream)
+Debug (avdevice.cpp)[465] discoverStep4: iso output plug 1 is of type 3 (Sync)
+Debug (avdevice.cpp)[524] discoverStep5: iso input plug 0 has 7 channels
+Debug (avdevice.cpp)[491] discoverStep5: iso input plug 1 has no valid connecton -> skip
+Debug (avdevice.cpp)[573] discoverStep5: iso output plug 0 has 7 channels
+Debug (avdevice.cpp)[573] discoverStep5: iso output plug 1 has 2 channels
+Debug (avdevice.cpp)[636] discoverStep6: iso input plug 0: channel position information retrieved
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 2
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 2
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 5
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 2
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 2
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 3
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 6
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 2
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 2
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 1
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 4
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 2
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 7
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avdevice.cpp)[598] discoverStep6: iso input plug 1 has no valid connecton -> skip
+Debug (avdevice.cpp)[690] discoverStep6: iso output plug 0: channel position information retrieved
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 2
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 2
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 5
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 2
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 2
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 3
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 6
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 2
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 2
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 1
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 4
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 2
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 7
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avdevice.cpp)[690] discoverStep6: iso output plug 1: channel position information retrieved
+Debug (avplug.cpp)[105] debugOutputClusterInfos: number of channels: 2
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 1
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 1
+Debug (avplug.cpp)[115] debugOutputClusterInfos: stream position: 2
+Debug (avplug.cpp)[118] debugOutputClusterInfos: location: 2
+Debug (avdevice.cpp)[767] discoverStep7: iso input plug 0 stream position 2: channel name = LineOut 1+2 left
+Debug (avdevice.cpp)[767] discoverStep7: iso input plug 0 stream position 5: channel name = LineOut 1+2 right
+Debug (avdevice.cpp)[767] discoverStep7: iso input plug 0 stream position 3: channel name = LineOut 3+4 left
+Debug (avdevice.cpp)[767] discoverStep7: iso input plug 0 stream position 6: channel name = LineOut 3+4 right
+Debug (avdevice.cpp)[767] discoverStep7: iso input plug 0 stream position 1: channel name = SpdifOut left
+Debug (avdevice.cpp)[767] discoverStep7: iso input plug 0 stream position 4: channel name = SpdifOut right
+Debug (avdevice.cpp)[767] discoverStep7: iso input plug 0 stream position 7: channel name = MidiPort_1
+Debug (avdevice.cpp)[716] discoverStep7: iso input plug 1 has no valid connecton -> skip
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 0 stream position 2: channel name = MicIn1 left
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 0 stream position 5: channel name = MicIn1 right
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 0 stream position 3: channel name = LineIn 3+4 left
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 0 stream position 6: channel name = LineIn 3+4 right
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 0 stream position 1: channel name = SpdifIn left
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 0 stream position 4: channel name = SpdifIn right
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 0 stream position 7: channel name = MidiPort_1
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 1 stream position 1: channel name = SynchChannel1
+Debug (avdevice.cpp)[838] discoverStep7: iso output plug 1 stream position 2: channel name = SynchChannel2
+Debug (avdevice.cpp)[910] discoverStep8: iso input plug 0: cluster index = 1, portType Line, cluster name = LineOut 1+2
+Debug (avdevice.cpp)[910] discoverStep8: iso input plug 0: cluster index = 2, portType Line, cluster name = LineOut 3+4
+Debug (avdevice.cpp)[910] discoverStep8: iso input plug 0: cluster index = 3, portType SPDIF, cluster name = SpdifOut
+Debug (avdevice.cpp)[910] discoverStep8: iso input plug 0: cluster index = 4, portType MIDI, cluster name = MidiSection.0
+Debug (avdevice.cpp)[866] discoverStep8: iso input plug 1 has no valid connecton -> skip
+Debug (avdevice.cpp)[980] discoverStep8: iso output plug 0: cluster index = 1, portType Microphone, cluster name = MicIn1
+Debug (avdevice.cpp)[980] discoverStep8: iso output plug 0: cluster index = 2, portType Line, cluster name = LineIn 3+4
+Debug (avdevice.cpp)[980] discoverStep8: iso output plug 0: cluster index = 3, portType SPDIF, cluster name = SpdifIn
+Debug (avdevice.cpp)[980] discoverStep8: iso output plug 0: cluster index = 4, portType MIDI, cluster name = MidiSection.0
+Warning (avdevice.cpp)[936] discoverStep8: Skipping plugs with id > 0. Further investigation needed
+Debug (avdevice.cpp)[1040] discoverStep9: discoverStep9: iso input plug 0 uses sampling frequency 4
+Debug (avdevice.cpp)[1070] discoverStep9: iso input plug 0 cluster info 1: stream format 6
+Debug (avdevice.cpp)[1070] discoverStep9: iso input plug 0 cluster info 2: stream format 6
+Debug (avdevice.cpp)[1070] discoverStep9: iso input plug 0 cluster info 3: stream format 6
+Debug (avdevice.cpp)[1070] discoverStep9: iso input plug 0 cluster info 4: stream format 13
+Debug (avdevice.cpp)[1008] discoverStep9: iso input plug 1 has no valid connecton -> skip
+Debug (avdevice.cpp)[1134] discoverStep9: discoverStep9: iso output plug 0 uses sampling frequency 4
+Debug (avdevice.cpp)[1164] discoverStep9: iso output plug 0 cluster info 1: stream format 6
+Debug (avdevice.cpp)[1164] discoverStep9: iso output plug 0 cluster info 2: stream format 6
+Debug (avdevice.cpp)[1164] discoverStep9: iso output plug 0 cluster info 3: stream format 6
+Debug (avdevice.cpp)[1164] discoverStep9: iso output plug 0 cluster info 4: stream format 13
+Debug (avdevice.cpp)[1177] discoverStep9: iso output plug 1 is sync stream with sampling frequency 4
+IEC61883: Adding 1 capture connection(s)...
+IEC61883:   capture connection 0: 0 streams, dim 1 from (0,7,7)
+IEC61883:     adding stream 0: (1,1) 0x06 0x03 -> 0 (LineOut 1+2 left)
+IEC61883:     adding stream 1: (4,2) 0x06 0x03 -> 0 (LineOut 1+2 right)
+IEC61883:     adding stream 2: (2,1) 0x06 0x03 -> 0 (LineOut 3+4 left)
+IEC61883:     adding stream 3: (5,2) 0x06 0x03 -> 0 (LineOut 3+4 right)
+IEC61883:     adding stream 4: (0,1) 0x06 0x04 -> 0 (SpdifOut left)
+IEC61883:     adding stream 5: (3,2) 0x06 0x04 -> 0 (SpdifOut right)
+IEC61883:     adding stream 6: (6,1) 0x0D 0x0A -> 0 (MidiPort_1)
+IEC61883: Adding 1 playback connection(s)...
+IEC61883:   playback connection 0: 0 streams, dim 1 to (0,7,7)
+IEC61883:     adding stream 0: (1,1) 0x06 0x02 -> 0 (MicIn1 left)
+IEC61883:     adding stream 1: (4,2) 0x06 0x02 -> 0 (MicIn1 right)
+IEC61883:     adding stream 2: (2,1) 0x06 0x03 -> 0 (LineIn 3+4 left)
+IEC61883:     adding stream 3: (5,2) 0x06 0x03 -> 0 (LineIn 3+4 right)
+IEC61883:     adding stream 4: (0,1) 0x06 0x04 -> 0 (SpdifIn left)
+IEC61883:     adding stream 5: (3,2) 0x06 0x04 -> 0 (SpdifIn right)
+IEC61883:     adding stream 6: (6,1) 0x0D 0x0A -> 0 (MidiPort_1)
+IEC61883D: Creating driver (period_size=512, ringbuffer_size=8192)
+Creating IEC61883 client... 512/8192/48000
+ poll timeout = 10 ms
+Creating 7 buffers of 8192 quadlets...
+IEC61883C: Creating playback connection from node 65473, plug 0
+             prebuffers=0, buffers=1000, irq_interval=20
+Creating 7 buffers of 8192 quadlets...
+IEC61883 Client created...
+IEC61883CM: registered jack port cap_0_1_0_LineOut 1+2 left
+IEC61883CM: registered jack port cap_0_1_0_LineOut 1+2 right
+IEC61883CM: registered jack port cap_0_1_0_LineOut 3+4 left
+IEC61883CM: registered jack port cap_0_1_0_LineOut 3+4 right
+IEC61883CM: registered jack port cap_0_1_0_SpdifOut left
+IEC61883CM: registered jack port cap_0_1_0_SpdifOut right
+IEC61883CM: registered midi port MidiIn_0_1_0_MidiPort_1_1 as 128:0
+IEC61883CM: registered jack port pbk_0_1_0_MicIn1 left
+IEC61883CM: registered jack port pbk_0_1_0_MicIn1 right
+IEC61883CM: registered jack port pbk_0_1_0_LineIn 3+4 left
+IEC61883CM: registered jack port pbk_0_1_0_LineIn 3+4 right
+IEC61883CM: registered jack port pbk_0_1_0_SpdifIn left
+IEC61883CM: registered jack port pbk_0_1_0_SpdifIn right
+IEC61883CM: registered midi port MidiOut_0_1_0_MidiPort_1_1 as 128:1
+Client start...
+ creating capture connections...
+libiec61883 warning: Established connection on channel 0.
+You may need to manually set the channel on the receiving node.
+Init ISO master receive handler on channel 0...
+   (BUFFER=1000,PACKET_MAX=2048,IRQ=20)...
+Start ISO master receive...
+ creating playback connections...
+libiec61883 warning: Established connection on channel 1.
+You may need to manually set the channel on the transmitting node.
+Init ISO slave transmit handler on channel 1...
+   other mode (BUFFER=1000,PACKET_MAX=2048,IRQ=20)...
+Start ISO slave transmit... PREBUFFER=0
+  ->     2618k Packets, Bufferfill (I:  512, O:    0), Packets dropped (I:    0, O:   11), XRUNS (   0)(1, 8/0)
+