blob-cvs-commit

[Stefan E. <se...@us...>]

Update of /cvsroot/blob/blob/src/lib
In directory usw-pr-cvs1:/tmp/cvs-serv19986

Modified Files:
	generic_io.c 
Log Message:
- IO driver debug macro


Index: generic_io.c
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/generic_io.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- generic_io.c	2 May 2002 15:27:50 -0000	1.2
+++ generic_io.c	8 May 2002 14:02:35 -0000	1.3
@@ -49,9 +49,14 @@
 #define IO_DEBUG 1
 
 #ifdef IO_DEBUG
-#	define DBG( x, args... )		if ( io_dbg>x ) printf( args )
+#	define DBG( x, args... )	if ( io_dbg>x ) printf( args )
+#	define DBGIO( x, io )		if ( io_dbg>x ) printf( "%s: " \
+			"%s(%p)={ c=%p, r=%p, w=%p,\n\tp=%p, sz=%d, ch=%p,\n\tn='%s' }\n", \
+			__FUNCTION__, #io, io, io->conf, io->read, io->write, \
+			io->private_data, io->io_size, io->child_io, io->name );
 #else
 #	define DBG( x, args... )
+#	define DBGIO( x, io )
 #endif
 
 
@@ -128,9 +133,14 @@
 
 int io_configure( io_driver_t *io, void *conf_data )
 {
+	DBG( 1, "%s: io=%p, conf_data=%p\n", __FUNCTION__,
+			io, conf_data );
+
 	if ( !io )
 		return -EINVAL;
 
+	DBGIO( 5, io );
+
 	if (io->conf )
 		return io->conf( io, conf_data );
 
@@ -167,10 +177,14 @@
 	if ( !p )
 		return -EINVAL;
 
+	DBGIO( 5, p );
+
 	c = io_get_byname( new_child );
 	if ( !c )
 		return -EINVAL;
 
+	DBGIO( 5, c );
+
 	DBG( 1, "%s: chained Parent '%s' -> child '%s'.\n", __FUNCTION__,
 			io_get_name( p ), io_get_name( c ) );
 
@@ -181,6 +195,11 @@
 
 int io_read( unsigned char *dest, unsigned char *src, size_t amount, io_driver_t *rd )
 {
+	DBG( 1, "%s: dest=%p, src=%p, amount=%d, rd=%p\n", __FUNCTION__,
+			dest, src, amount, rd );
+
+	DBGIO( 5, rd );
+
 	if ( !rd || !rd->read )
 		return -EINVAL;
 
@@ -191,6 +210,11 @@
 
 int io_write( unsigned char *dest, unsigned char *src, size_t amount, io_driver_t *rd )
 {
+	DBG( 1, "%s: dest=%p, src=%p, amount=%d, rd=%p\n", __FUNCTION__,
+			dest, src, amount, rd );
+
+	DBGIO( 5, rd );
+
 	if ( !rd|| !rd->write  )
 		return -EINVAL;
 
@@ -205,6 +229,12 @@
 	int ret = 0;
 	int blocks, block, to_copy;
 	unsigned char *adr = NULL;
+
+	DBG( 1, "%s: dest=%p, src=%p, amount=%d\n", __FUNCTION__,
+			dest, src, amount  );
+
+	DBGIO( 5, src );
+	DBGIO( 5, dest );
 
 	if ( !dest || !src )
 		return -EINVAL;