CVS commit: src/sys/dev/usb

[Paul Goyette]

Module Name:    src
Committed By:   pgoyette
Date:           Tue Aug 23 12:53:29 UTC 2011

Modified Files:
        src/sys/dev/usb: if_axe.c if_rum.c

Log Message:
Update for modular build


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.37 -r1.38 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.47 src/sys/dev/usb/if_axe.c:1.48
--- src/sys/dev/usb/if_axe.c:1.47	Wed Nov  3 22:28:31 2010
+++ src/sys/dev/usb/if_axe.c	Tue Aug 23 12:53:29 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_axe.c,v 1.47 2010/11/03 22:28:31 dyoung Exp $	*/
+/*	$NetBSD: if_axe.c,v 1.48 2011/08/23 12:53:29 pgoyette Exp $	*/
 /*	$OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
 
 /*
@@ -89,12 +89,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.47 2010/11/03 22:28:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.48 2011/08/23 12:53:29 pgoyette Exp $");
 
 #if defined(__NetBSD__)
+#ifndef _MODULE
 #include "opt_inet.h"
 #include "rnd.h"
 #endif
+#endif
 
 
 #include <sys/param.h>
@@ -102,6 +104,7 @@
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
+#include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
@@ -1455,3 +1458,32 @@
 
 	sc->axe_link = 0;
 }
+
+MODULE(MODULE_CLASS_DRIVER, if_axe, NULL);
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+static int
+if_axe_modcmd(modcmd_t cmd, void *aux)
+{
+	int error = 0;
+
+	switch (cmd) {
+	case MODULE_CMD_INIT:
+#ifdef _MODULE
+		error = config_init_component(cfdriver_ioconf_if_axe,
+		    cfattach_ioconf_if_axe, cfdata_ioconf_if_axe);
+#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);
+#endif
+		return error;
+	default:
+		return ENOTTY;
+	}
+}

Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.37 src/sys/dev/usb/if_rum.c:1.38
--- src/sys/dev/usb/if_rum.c:1.37	Tue Aug 23 12:33:50 2011
+++ src/sys/dev/usb/if_rum.c	Tue Aug 23 12:53:29 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.37 2011/08/23 12:33:50 pgoyette Exp $	*/
+/*	$NetBSD: if_rum.c,v 1.38 2011/08/23 12:53:29 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergam...@free.fr>
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.37 2011/08/23 12:33:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.38 2011/08/23 12:53:29 pgoyette Exp $");
 
 
 #include <sys/param.h>
@@ -35,6 +35,7 @@
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
+#include <sys/module.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 
@@ -2297,3 +2298,32 @@
 		return 0;
 	}
 }
+
+MODULE(MODULE_CLASS_DRIVER, if_rum, NULL);
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+static int
+if_rum_modcmd(modcmd_t cmd, void *aux)
+{
+	int error = 0;
+
+	switch (cmd) {
+	case MODULE_CMD_INIT:
+#ifdef _MODULE
+		error = config_init_component(cfdriver_ioconf_if_rum,
+		    cfattach_ioconf_if_rum, cfdata_ioconf_if_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);
+#endif
+		return error;
+	default:
+		return ENOTTY;
+	}
+}