Move cfdriver structs to better places, in preparation for new attachments.

4 files changed, 13 insertions, 13 deletions

diff --git a/sys/arch/vax/dec/dzkbd.c b/sys/arch/vax/dec/dzkbd.c
index 8fa4a3f9126..22ba50eb035 100644
--- a/sys/arch/vax/dec/dzkbd.c
+++ b/sys/arch/vax/dec/dzkbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dzkbd.c,v 1.11 2006/08/05 22:05:55 miod Exp $	*/
+/*	$OpenBSD: dzkbd.c,v 1.12 2006/08/27 16:50:43 miod Exp $	*/
 /*	$NetBSD: dzkbd.c,v 1.1 2000/12/02 17:03:55 ragge Exp $	*/
 
 /*
@@ -90,10 +90,6 @@ struct cfattach dzkbd_ca = {
 	sizeof(struct dzkbd_softc), (cfmatch_t)dzkbd_match, dzkbd_attach,
 };
 
-struct	cfdriver lkkbd_cd = {
-	NULL, "lkkbd", DV_DULL
-};
-
 int	dzkbd_enable(void *, int);
 void	dzkbd_set_leds(void *, int);
 int	dzkbd_ioctl(void *, u_long, caddr_t, int, struct proc *);
diff --git a/sys/arch/vax/dec/lk201_ws.c b/sys/arch/vax/dec/lk201_ws.c
index 236c1d561dd..86d3c25ffce 100644
--- a/sys/arch/vax/dec/lk201_ws.c
+++ b/sys/arch/vax/dec/lk201_ws.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lk201_ws.c,v 1.9 2006/08/05 22:05:55 miod Exp $	*/
+/*	$OpenBSD: lk201_ws.c,v 1.10 2006/08/27 16:50:43 miod Exp $	*/
 /* $NetBSD: lk201_ws.c,v 1.2 1998/10/22 17:55:20 drochner Exp $ */
 
 /*
@@ -46,6 +46,10 @@
 #include <vax/dec/lk201var.h>
 #include <vax/dec/wskbdmap_lk201.h> /* for {MIN,MAX}_LK201_KEY */
 
+struct	cfdriver lkkbd_cd = {
+	NULL, "lkkbd", DV_DULL
+};
+
 void	lk201_identify(void *);
 
 static const char *lkkbd_descr[] = {
diff --git a/sys/arch/vax/if/if_ze.c b/sys/arch/vax/if/if_ze.c
index c44aa1a3f20..05c8027aca1 100644
--- a/sys/arch/vax/if/if_ze.c
+++ b/sys/arch/vax/if/if_ze.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ze.c,v 1.5 2003/11/07 10:16:45 jmc Exp $	*/
+/*	$OpenBSD: if_ze.c,v 1.6 2006/08/27 16:50:44 miod Exp $	*/
 /*      $NetBSD: if_ze.c,v 1.3 2000/01/24 02:54:03 matt Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -69,10 +69,6 @@ struct	cfattach ze_ibus_ca = {
 	sizeof(struct ze_softc), (cfmatch_t)zematch, zeattach
 };
 
-struct	cfdriver ze_cd = {
-	NULL, "ze", DV_IFNET
-};
-
 /*
  * Check for present SGEC.
  */
diff --git a/sys/arch/vax/if/sgec.c b/sys/arch/vax/if/sgec.c
index d7b9fd4d277..ccc7bbef789 100644
--- a/sys/arch/vax/if/sgec.c
+++ b/sys/arch/vax/if/sgec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sgec.c,v 1.12 2006/08/24 20:45:26 miod Exp $	*/
+/*	$OpenBSD: sgec.c,v 1.13 2006/08/27 16:50:44 miod Exp $	*/
 /*      $NetBSD: sgec.c,v 1.5 2000/06/04 02:14:14 matt Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -78,6 +78,10 @@ static	void	ze_setup(struct ze_softc *);
 static	void	zetimeout(struct ifnet *);
 static	int	zereset(struct ze_softc *);
 
+struct	cfdriver ze_cd = {
+	NULL, "ze", DV_IFNET
+};
+
 #define	ZE_WCSR(csr, val) \
 	bus_space_write_4(sc->sc_iot, sc->sc_ioh, csr, val)
 #define	ZE_RCSR(csr) \
@@ -387,7 +391,7 @@ zestart(ifp)
 		 * Kick off the transmit logic, if it is stopped.
 		 */
 		if ((ZE_RCSR(ZE_CSR5) & ZE_NICSR5_TS) != ZE_NICSR5_TS_RUN)
-			ZE_WCSR(ZE_CSR1, -1);
+			ZE_WCSR(ZE_CSR1, ZE_NICSR1_TXPD);
 		sc->sc_nexttx = idx;
 	}
 	if (sc->sc_inq == (TXDESCS - 1))