Module Name: src
Committed By: nisimura
Date: Thu Apr 2 13:03:03 UTC 2020
Modified Files:
src/sys/arch/mips/ingenic: ingenic_dme.c
Log Message:
add miivar.h and put a stop gap to compile.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/ingenic/ingenic_dme.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/arch/mips/ingenic/ingenic_dme.c
diff -u src/sys/arch/mips/ingenic/ingenic_dme.c:1.3 src/sys/arch/mips/ingenic/ingenic_dme.c:1.4
--- src/sys/arch/mips/ingenic/ingenic_dme.c:1.3 Fri May 19 07:43:31 2017
+++ src/sys/arch/mips/ingenic/ingenic_dme.c Thu Apr 2 13:03:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ingenic_dme.c,v 1.3 2017/05/19 07:43:31 skrll Exp $ */
+/* $NetBSD: ingenic_dme.c,v 1.4 2020/04/02 13:03:03 nisimura Exp $ */
/*-
* Copyright (c) 2015 Michael Lorenz
@@ -27,14 +27,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ingenic_dme.c,v 1.3 2017/05/19 07:43:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ingenic_dme.c,v 1.4 2020/04/02 13:03:03 nisimura Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/mutex.h>
+#include <sys/intr.h>
#include <sys/bus.h>
-#include <sys/workqueue.h>
+#include <sys/device.h>
+#include <sys/systm.h>
#include <mips/ingenic/ingenic_var.h>
#include <mips/ingenic/ingenic_regs.h>
@@ -42,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: ingenic_dme.
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_media.h>
+#include <dev/mii/miivar.h>
#include <dev/ic/dm9000var.h>
#include <dev/ic/dm9000reg.h>
@@ -132,7 +132,7 @@ ingenic_dme_attach(device_t parent, devi
13);
goto fail;
}
-
+#if 0
eaddrprop = prop_dictionary_get(device_properties(self), "mac-address");
if (eaddrprop != NULL && prop_data_size(eaddrprop) == ETHER_ADDR_LEN) {
@@ -148,6 +148,13 @@ ingenic_dme_attach(device_t parent, devi
aprint_error_dev(self, "reading MAC address from chip\n");
dme_read_c(sc, DM9000_PAB0, enaddr, 6);
}
+#else
+ (void)eaddrprop;
+ /*
+ * dme_attach checks dictionary, then previous setting, then roll
+ * a dice to make random MAC address
+ */
+#endif
dme_attach(sc, enaddr);
return;
fail:
