From: Stefan E. <se...@us...> - 2002-05-10 15:35:39
|
Update of /cvsroot/blob/blob/include/blob In directory usw-pr-cvs1:/tmp/cvs-serv12377 Modified Files: generic_io.h Log Message: - use names instead of pointers in io_configure() and io_copy() Index: generic_io.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/generic_io.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- generic_io.h 2 May 2002 15:22:36 -0000 1.1 +++ generic_io.h 10 May 2002 15:35:37 -0000 1.2 @@ -169,10 +169,10 @@ /* io_configure - configures io driver * - * io: the io "driver" + * io_name: the io "driver" name * conf_data: the configuration data */ -int io_configure( io_driver_t *io, void *conf_data ); +int io_configure( char *io_name, void *conf_data ); /* io_get_byname - get a io by its name * @@ -196,25 +196,26 @@ int io_read( unsigned char *dest, unsigned char *src, size_t amount, io_driver_t *rd ); -/* io_write - write data using io rd +/* io_write - write data using io wr * * dest: destination address * src: source address * amount: amount to read */ int io_write( unsigned char *dest, unsigned char *src, - size_t amount, io_driver_t *rd ); + size_t amount, io_driver_t *wr ); /* io_copy - copy data * * Copy data from io driver "src" to io driver "dest". Copy - * "amount" bytes of data. + * "amount" bytes of data. If amount is 0, then copy all + * available data from "src". * - * dest: destination io driver - * src: source io driver + * dest: destination io driver name + * src: source io driver name * amount: amount to copy */ -int io_copy( io_driver_t *dest, io_driver_t *src, size_t amount ); +int io_copy( char *dest, char *src, size_t amount ); /* FIXME: static inline functions instead of macros */ #define io_get_name( io ) ((io)->name) @@ -231,7 +232,5 @@ } ram_io_t; int ram_io_init( io_driver_t *io, ram_io_t *ram ); -int ram_io_conf( io_driver_t *io, void *conf ); -#define BLOB_GENERIC_IO_H 1 #endif |