From owner-svn-soc-all@freebsd.org Fri Aug 21 18:01:48 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 009629BFFC2 for ; Fri, 21 Aug 2015 18:01:48 +0000 (UTC) (envelope-from iateaca@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E583416F7 for ; Fri, 21 Aug 2015 18:01:47 +0000 (UTC) (envelope-from iateaca@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t7LI1l2n013442 for ; Fri, 21 Aug 2015 18:01:47 GMT (envelope-from iateaca@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7LI1l9K012708 for svn-soc-all@FreeBSD.org; Fri, 21 Aug 2015 18:01:47 GMT (envelope-from iateaca@FreeBSD.org) Date: Fri, 21 Aug 2015 18:01:47 GMT Message-Id: <201508211801.t7LI1l9K012708@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to iateaca@FreeBSD.org using -f From: iateaca@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r290042 - soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Aug 2015 18:01:48 -0000 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);