diff --git a/sys/arch/hpcmips/vr/vrkiu.c b/sys/arch/hpcmips/vr/vrkiu.c index 42ececbedf17..f8d69bdd73ae 100644 --- a/sys/arch/hpcmips/vr/vrkiu.c +++ b/sys/arch/hpcmips/vr/vrkiu.c @@ -1,4 +1,4 @@ -/* $NetBSD: vrkiu.c,v 1.26 2001/02/22 18:38:05 uch Exp $ */ +/* $NetBSD: vrkiu.c,v 1.27 2001/06/11 06:04:55 enami Exp $ */ /*- * Copyright (c) 1999 SASAKI Takesi All rights reserved. @@ -75,26 +75,6 @@ int vrkiu_debug = 0; #define DPRINTF(arg) #endif -/* - * structure and data types - */ -struct vrkiu_chip { - bus_space_tag_t kc_iot; - bus_space_handle_t kc_ioh; - unsigned short kc_scandata[KIU_NSCANLINE/2]; - int kc_enabled; - struct vrkiu_softc* kc_sc; /* back link */ - struct hpckbd_ic_if kc_if; - struct hpckbd_if *kc_hpckbd; -}; - -struct vrkiu_softc { - struct device sc_dev; - struct vrkiu_chip *sc_chip; - struct vrkiu_chip sc_chip_body; - void *sc_handler; -}; - /* * function prototypes */ diff --git a/sys/arch/hpcmips/vr/vrkiuvar.h b/sys/arch/hpcmips/vr/vrkiuvar.h index 23901a91e2be..fcade9167dfc 100644 --- a/sys/arch/hpcmips/vr/vrkiuvar.h +++ b/sys/arch/hpcmips/vr/vrkiuvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: vrkiuvar.h,v 1.2 1999/10/24 08:37:30 takemura Exp $ */ +/* $NetBSD: vrkiuvar.h,v 1.3 2001/06/11 06:04:55 enami Exp $ */ /*- * Copyright (c) 1999 SASAKI Takesi All rights reserved. @@ -34,5 +34,25 @@ * */ +/* + * structure and data types + */ +struct vrkiu_chip { + bus_space_tag_t kc_iot; + bus_space_handle_t kc_ioh; + unsigned short kc_scandata[KIU_NSCANLINE/2]; + int kc_enabled; + struct vrkiu_softc *kc_sc; /* back link */ + struct hpckbd_ic_if kc_if; + struct hpckbd_if *kc_hpckbd; +}; + +struct vrkiu_softc { + struct device sc_dev; + struct vrkiu_chip *sc_chip; + struct vrkiu_chip sc_chip_body; + void *sc_handler; +}; + extern int vrkiu_getc __P((void)); extern int vrkiu_cnattach __P((bus_space_tag_t iot, int iobase));