Module Name: src
Committed By: martin
Date: Wed Jun 2 19:47:34 UTC 2010
Modified Files:
src/sys/dev/mii: mii_physubr.c ukphy.c
Log Message:
Move all miiverbose/module related functions from ukphy.c to mii_physubr.c -
ukphy is not included in all kernels, but mii_physubr.c should be in every
kernel that has a phy.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/mii/mii_physubr.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/mii/ukphy.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/mii/mii_physubr.c
diff -u src/sys/dev/mii/mii_physubr.c:1.68 src/sys/dev/mii/mii_physubr.c:1.69
--- src/sys/dev/mii/mii_physubr.c:1.68 Tue Mar 2 08:30:40 2010
+++ src/sys/dev/mii/mii_physubr.c Wed Jun 2 19:47:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.68 2010/03/02 08:30:40 martin Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.69 2010/06/02 19:47:34 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.68 2010/03/02 08:30:40 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.69 2010/06/02 19:47:34 martin Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -43,6 +43,7 @@
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/errno.h>
+#include <sys/module.h>
#include <sys/proc.h>
#include <net/if.h>
@@ -52,6 +53,33 @@
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
+const char *(*mii_get_descr)(int, int) = mii_get_descr_stub;
+
+const char *mii_get_descr_stub(int oui, int model)
+{
+ return NULL;
+}
+
+/*
+ * Routine to load/unload the miiverbose kernel module as needed
+ */
+void mii_verbose_ctl(bool load)
+{
+ static int loaded = 0;
+
+ if (load) {
+ if (loaded++ == 0)
+ if (module_load("miiverbose", MODCTL_LOAD_FORCE,
+ NULL, MODULE_CLASS_MISC) !=0 )
+ loaded = 0;
+ return;
+ }
+ if (loaded == 0)
+ return;
+ if (--loaded == 0)
+ module_unload("miiverbose");
+}
+
static void mii_phy_statusmsg(struct mii_softc *);
/*
Index: src/sys/dev/mii/ukphy.c
diff -u src/sys/dev/mii/ukphy.c:1.41 src/sys/dev/mii/ukphy.c:1.42
--- src/sys/dev/mii/ukphy.c:1.41 Sun May 30 17:44:08 2010
+++ src/sys/dev/mii/ukphy.c Wed Jun 2 19:47:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ukphy.c,v 1.41 2010/05/30 17:44:08 pgoyette Exp $ */
+/* $NetBSD: ukphy.c,v 1.42 2010/06/02 19:47:34 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.41 2010/05/30 17:44:08 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.42 2010/06/02 19:47:34 martin Exp $");
#include "opt_mii.h"
@@ -69,7 +69,6 @@
#include <sys/device.h>
#include <sys/socket.h>
#include <sys/errno.h>
-#include <sys/module.h>
#include <net/if.h>
#include <net/if_media.h>
@@ -80,8 +79,6 @@
static int ukphymatch(device_t, cfdata_t, void *);
static void ukphyattach(device_t, device_t, void *);
-const char *(*mii_get_descr)(int, int) = mii_get_descr_stub;
-
CFATTACH_DECL3_NEW(ukphy, sizeof(struct mii_softc),
ukphymatch, ukphyattach, mii_phy_detach, mii_phy_activate, NULL, NULL,
DVF_DETACH_SHUTDOWN);
@@ -92,31 +89,6 @@
ukphy_service, ukphy_status, mii_phy_reset,
};
-const char *mii_get_descr_stub(int oui, int model)
-{
- return NULL;
-}
-
-/*
- * Routine to load/unload the miiverbose kernel module as needed
- */
-void mii_verbose_ctl(bool load)
-{
- static int loaded = 0;
-
- if (load) {
- if (loaded++ == 0)
- if (module_load("miiverbose", MODCTL_LOAD_FORCE,
- NULL, MODULE_CLASS_MISC) !=0 )
- loaded = 0;
- return;
- }
- if (loaded == 0)
- return;
- if (--loaded == 0)
- module_unload("miiverbose");
-}
-
static int
ukphymatch(device_t parent, cfdata_t match, void *aux)
{
