Module Name: src
Committed By: pgoyette
Date: Thu Aug 25 02:27:31 UTC 2011
Modified Files:
src/sys/dev/usb: if_axe.c if_rum.c
Log Message:
Update the module command-processing routine to match the ioconf files
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/usb/if_rum.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.48 src/sys/dev/usb/if_axe.c:1.49
--- src/sys/dev/usb/if_axe.c:1.48 Tue Aug 23 12:53:29 2011
+++ src/sys/dev/usb/if_axe.c Thu Aug 25 02:27:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.48 2011/08/23 12:53:29 pgoyette Exp $ */
+/* $NetBSD: if_axe.c,v 1.49 2011/08/25 02:27:31 pgoyette Exp $ */
/* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
/*
@@ -89,7 +89,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.48 2011/08/23 12:53:29 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.49 2011/08/25 02:27:31 pgoyette Exp $");
#if defined(__NetBSD__)
#ifndef _MODULE
@@ -212,6 +212,8 @@
static void axe_ax88178_init(struct axe_softc *);
static void axe_ax88772_init(struct axe_softc *);
+extern int usbdebug; /* XXX */
+
/* Get exclusive access to the MII registers */
static void
axe_lock_mii(struct axe_softc *sc)
@@ -1473,14 +1475,16 @@
switch (cmd) {
case MODULE_CMD_INIT:
#ifdef _MODULE
- error = config_init_component(cfdriver_ioconf_if_axe,
- cfattach_ioconf_if_axe, cfdata_ioconf_if_axe);
+ usbdebug++; /* XXX */
+ error = config_init_component(cfdriver_ioconf_axe,
+ cfattach_ioconf_axe, cfdata_ioconf_axe);
+ usbdebug--; /* XXX */
#endif
return error;
case MODULE_CMD_FINI:
#ifdef _MODULE
- error = config_fini_component(cfdriver_ioconf_if_axe,
- cfattach_ioconf_if_axe, cfdata_ioconf_if_axe);
+ error = config_fini_component(cfdriver_ioconf_axe,
+ cfattach_ioconf_axe, cfdata_ioconf_axe);
#endif
return error;
default:
Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.38 src/sys/dev/usb/if_rum.c:1.39
--- src/sys/dev/usb/if_rum.c:1.38 Tue Aug 23 12:53:29 2011
+++ src/sys/dev/usb/if_rum.c Thu Aug 25 02:27:31 2011
@@ -1,5 +1,5 @@
/* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */
-/* $NetBSD: if_rum.c,v 1.38 2011/08/23 12:53:29 pgoyette Exp $ */
+/* $NetBSD: if_rum.c,v 1.39 2011/08/25 02:27:31 pgoyette Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <[email protected]>
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.38 2011/08/23 12:53:29 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.39 2011/08/25 02:27:31 pgoyette Exp $");
#include <sys/param.h>
@@ -2313,14 +2313,14 @@
switch (cmd) {
case MODULE_CMD_INIT:
#ifdef _MODULE
- error = config_init_component(cfdriver_ioconf_if_rum,
- cfattach_ioconf_if_rum, cfdata_ioconf_if_rum);
+ error = config_init_component(cfdriver_ioconf_rum,
+ cfattach_ioconf_rum, cfdata_ioconf_rum);
#endif
return error;
case MODULE_CMD_FINI:
#ifdef _MODULE
- error = config_fini_component(cfdriver_ioconf_if_rum,
- cfattach_ioconf_if_rum, cfdata_ioconf_if_rum);
+ error = config_fini_component(cfdriver_ioconf_rum,
+ cfattach_ioconf_rum, cfdata_ioconf_rum);
#endif
return error;
default:
