===================================================================
RCS file: /cvs/funnyos/arch/testarm/dev/tacons.c,v
retrieving revision 1.2
retrieving revision 1.5
diff -u -r1.2 -r1.5
--- funnyos/arch/testarm/dev/tacons.c	2007/10/16 21:28:24	1.2
+++ funnyos/arch/testarm/dev/tacons.c	2007/10/16 22:34:49	1.5
@@ -1,11 +1,12 @@
 /*
- * $Id: tacons.c,v 1.2 2007/10/16 20:28:24 init Exp $
+ * $Id: tacons.c,v 1.5 2007/10/16 21:34:49 init Exp $
  */
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 
 #include <arch/testarm/dev/taconsreg.h>
+#include <arch/testarm/dev/taconsvar.h>
 #include <dev/fcons/fconsvar.h>
 #include <libkern/printf.h>
 
@@ -29,7 +30,7 @@
 tacons_attach(struct device *self, uint32_t loc, uint8_t flags)
 {
 	struct tacons_dd *ddp = self->dv_devdata;
-	struct consoleops *cop = &ddp->td_consops;
+	struct fcons_handle *fhp = &ddp->td_fh;
 
 	/* aquire bus handle from parent */
 	ddp->td_bhp = self->dv_parent->dv_aux;
@@ -37,12 +38,15 @@
 	/* all reads/writes will use this addr; in testarm cons this is the same addr for getc/putc */
 	ddp->td_ioaddr = loc;
 
-	/* we export struct consoleops */
-	cop->getc = tacons_getc;
-	cop->putc = tacons_putc;
+	/* we export struct fcons_handle */
+	fhp->getc = tacons_getc;
+	fhp->putc = tacons_putc;
 
-	self->dv_aux = cop;
+	/* give our dd to fcons_handle */
+	fhp->fh_ownerdd = ddp;
 
+	self->dv_aux = fhp;
+
 	printf("testarm simple console (non-blocking, halt)\n");
 
 	return(0);
@@ -70,7 +74,7 @@
 	 */
 	struct tacons_dd *tdp = ddp;
 
-	return( bus_write_1(tdp->td_dhp, tdp->td_ioaddr, ch) );
+	bus_write_1(tdp->td_bhp, tdp->td_ioaddr, ch);
 }