=================================================================== RCS file: /cvs/funnyos/dev/fcons/fconsvar.h,v retrieving revision 1.3 retrieving revision 1.5 diff -u -r1.3 -r1.5 --- funnyos/dev/fcons/fconsvar.h 2007/10/16 21:49:40 1.3 +++ funnyos/dev/fcons/fconsvar.h 2007/10/16 22:04:52 1.5 @@ -1,5 +1,5 @@ /* - * $Id: fconsvar.h,v 1.3 2007/10/16 20:49:40 init Exp $ + * $Id: fconsvar.h,v 1.5 2007/10/16 21:04:52 init Exp $ */ #ifndef _DEV_FCONS_FCONSVAR_H #define _DEV_FCONS_FCONSVAR_H @@ -9,19 +9,20 @@ #define NFCONS 1 -struct fcons_devdata { - /* current cursor position */ - uint8_t currow; - uint8_t curcol; +struct fcons_handle { + void *fh_ownerdd; /* similar to bh_ownerdd in bus_handle; XXX kill this cause it is ugly */ + char (*getc)(void *); + void (*putc)(void *, char); }; -struct fcons_handle { - void *fh_ownerdd; /* similar to bh_ownerdd in bus_handle; XXX kill this cause it is ugly */ +struct fcons_dd { + /* current cursor position */ + uint8_t currow; + uint8_t curcol; - char (*getc)(struct device *); - void (*putc)(struct device *, char); + struct fcons_handle fd_fh; };