socsvn commit: r290042 - soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve

[iateaca at FreeBSD.org]

Author: iateaca
Date: Fri Aug 21 18:01:46 2015
New Revision: 290042
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=290042

Log:
  use ne2k as a pci key instead of ne2000-net

Modified:
  soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c

Modified: soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c
==============================================================================
--- soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c	Fri Aug 21 17:47:17 2015	(r290041)
+++ soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c	Fri Aug 21 18:01:46 2015	(r290042)
@@ -101,17 +101,6 @@
 	void *intr_arg;
 };
 
-static struct lpc_ne2000_softc {
-	struct ne2000_softc *ne2000_sc;
-	struct vmctx *lpc_ctx;
-	int base_addr;
-	int irq;
-	const char *name;
-} lpc_ne2000_sc[LPC_NE2000_NUM] = {
-	{NULL, NULL, 0x310, 10, "ne2k0"},
-	{NULL, NULL, 0x330, 11, "ne2k1"}
-};
-
 /*
  * NE2000 module function declarations
  */
@@ -214,6 +203,28 @@
 lpc_ne2000_intr_deassert(void *arg);
 
 /*
+ * NE2000 global data
+ */
+static struct lpc_ne2000_softc {
+	struct ne2000_softc *ne2000_sc;
+	struct vmctx *lpc_ctx;
+	int base_addr;
+	int irq;
+	const char *name;
+} lpc_ne2000_sc[LPC_NE2000_NUM] = {
+	{NULL, NULL, 0x310, 10, "ne2k0"},
+	{NULL, NULL, 0x330, 11, "ne2k1"}
+};
+
+struct pci_devemu pci_de_ne2000_net = {
+	.pe_emu         = "ne2k",
+	.pe_init        = pci_ne2000_init,
+	.pe_barwrite    = pci_ne2000_write,
+	.pe_barread     = pci_ne2000_read
+};
+PCI_EMUL_SET(pci_de_ne2000_net);
+
+/*
  * NE2000 module function definitions
  */
 static void
@@ -1329,11 +1340,3 @@
 	return;
 }
 
-struct pci_devemu pci_de_ne2000_net = {
-	.pe_emu         = "ne2000-net",
-	.pe_init        = pci_ne2000_init,
-	.pe_barwrite    = pci_ne2000_write,
-	.pe_barread     = pci_ne2000_read
-};
-
-PCI_EMUL_SET(pci_de_ne2000_net);