=================================================================== RCS file: /cvs/funnyos/arch/testarm/dev/tacons.c,v retrieving revision 1.4 retrieving revision 1.7 diff -u -r1.4 -r1.7 --- funnyos/arch/testarm/dev/tacons.c 2007/10/16 22:33:24 1.4 +++ funnyos/arch/testarm/dev/tacons.c 2008/01/11 15:25:20 1.7 @@ -1,5 +1,5 @@ /* - * $Id: tacons.c,v 1.4 2007/10/16 21:33:24 init Exp $ + * $Id: tacons.c,v 1.7 2008/01/11 15:25:20 nbrk Exp $ */ #include #include @@ -18,11 +18,13 @@ char tacons_getc(void *); void tacons_putc(void *, char); void tacons_early_putc(char); +void tacons_interrupt(struct device *self); struct driver tacons_dr = { sizeof(struct tacons_dd), tacons_attach, - NULL + NULL, + tacons_interrupt }; @@ -74,7 +76,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); } @@ -87,5 +89,17 @@ */ *(char *)(TACONS_REG_BASE + TACONS_OFF_IO) = ch; +} + + +void +tacons_interrupt(struct device *self) +{ + struct tacons_dd *ddp = (struct tacons_dd *)self->dv_devdata; + char ch; + + ch = bus_read_1(ddp->td_bhp, ddp->td_ioaddr); + + fcons_ienqueue(ch); }