diff options
Diffstat (limited to 'sys/arch/hp300/dev/grf_tc.c')
| -rw-r--r-- | sys/arch/hp300/dev/grf_tc.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/sys/arch/hp300/dev/grf_tc.c b/sys/arch/hp300/dev/grf_tc.c index 65eae4683d5..c44b6d04967 100644 --- a/sys/arch/hp300/dev/grf_tc.c +++ b/sys/arch/hp300/dev/grf_tc.c @@ -1,5 +1,5 @@ -/* $OpenBSD: grf_tc.c,v 1.3 1997/01/12 15:12:38 downsj Exp $ */ -/* $NetBSD: grf_tc.c,v 1.9 1996/12/17 08:41:12 thorpej Exp $ */ +/* $OpenBSD: grf_tc.c,v 1.4 1997/02/03 04:47:31 downsj Exp $ */ +/* $NetBSD: grf_tc.c,v 1.10 1997/01/30 09:18:50 thorpej Exp $ */ /* * Copyright (c) 1996 Jason R. Thorpe. All rights reserved. @@ -78,13 +78,12 @@ int tc_init __P((struct grf_data *, int, caddr_t)); int tc_mode __P((struct grf_data *, int, caddr_t)); -#ifdef NEWCONFIG void topcat_common_attach __P((struct grfdev_softc *, caddr_t, u_int8_t)); -int topcat_intio_match __P((struct device *, struct cfdata *, void *)); +int topcat_intio_match __P((struct device *, void *, void *)); void topcat_intio_attach __P((struct device *, struct device *, void *)); -int topcat_dio_match __P((struct device *, struct cfdata *, void *)); +int topcat_dio_match __P((struct device *, void *, void *)); void topcat_dio_attach __P((struct device *, struct device *, void *)); struct cfattach topcat_intio_ca = { @@ -98,7 +97,6 @@ struct cfattach topcat_dio_ca = { struct cfdriver topcat_cd = { NULL, "topcat", DV_DULL }; -#endif /* NEWCONFIG */ /* Topcat (bobcat) grf switch */ struct grfsw topcat_grfsw = { @@ -137,12 +135,10 @@ struct itesw topcat_itesw = { }; #endif /* NITE > 0 */ -#ifdef NEWCONFIG int topcat_intio_match(parent, match, aux) struct device *parent; - struct cfdata *match; - void *aux; + void *match, *aux; { struct intio_attach_args *ia = aux; struct grfreg *grf; @@ -186,8 +182,7 @@ topcat_intio_attach(parent, self, aux) int topcat_dio_match(parent, match, aux) struct device *parent; - struct cfdata *match; - void *aux; + void *match, *aux; { struct dio_attach_args *da = aux; @@ -268,7 +263,6 @@ topcat_common_attach(sc, grf, secid) grfdev_attach(sc, tc_init, grf, sw); } -#endif /* NEWCONFIG */ /* * Initialize hardware. |