=================================================================== RCS file: /cvs/funnyos/dev/fcons/fconsvar.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- funnyos/dev/fcons/fconsvar.h 2007/10/16 22:04:52 1.5 +++ funnyos/dev/fcons/fconsvar.h 2007/10/16 22:07:19 1.6 @@ -1,5 +1,5 @@ /* - * $Id: fconsvar.h,v 1.5 2007/10/16 21:04:52 init Exp $ + * $Id: fconsvar.h,v 1.6 2007/10/16 21:07:19 init Exp $ */ #ifndef _DEV_FCONS_FCONSVAR_H #define _DEV_FCONS_FCONSVAR_H @@ -7,8 +7,6 @@ #define FCONS_WIDTH 80 #define FCONS_HEIGHT 25 -#define NFCONS 1 - struct fcons_handle { void *fh_ownerdd; /* similar to bh_ownerdd in bus_handle; XXX kill this cause it is ugly */ @@ -27,12 +25,8 @@ int fcons_devctl(struct device *devp, uint8_t ctl, void *data); -char fcons_getchar(struct device *devp); -void fcons_putchar(struct device *devp, char ch); - -/* XXX */ -//#define putchar(x) fcons_putchar() - +char fcons_getchar(void *ddp); +void fcons_putchar(void *ddp, char ch); /* devctl stuff */ #define DCFCONS_GETCURROW 0