Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipro100: Upgrade to FreeBSD 12.

Browse Source
This commit is contained in:
Augustin Cavalier 2018-12-27 16:55:48 -05:00
parent 522d143920
commit 0c3e5b9745
6 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxp.c
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-2-Clause-NetBSD
*
* Copyright (c) 1995, David Greenman
* Copyright (c) 2001 Jonathan Lemon <jlemon@freebsd.org>
* All rights reserved.
@ -28,7 +30,7 @@
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
__FBSDID("$FreeBSD: releng/12.0/sys/dev/fxp/if_fxp.c 338948 2018-09-26 17:12:14Z imp $");
/*
* Intel EtherExpress Pro/100B PCI Fast Ethernet driver
@ -305,6 +307,8 @@ static devclass_t fxp_devclass;
DRIVER_MODULE_ORDERED(fxp, pci, fxp_driver, fxp_devclass, NULL, NULL,
SI_ORDER_ANY);
MODULE_PNP_INFO("U16:vendor;U16:device", pci, fxp, fxp_ident_table,
nitems(fxp_ident_table) - 1);
DRIVER_MODULE(miibus, fxp, miibus_driver, miibus_devclass, NULL, NULL);
static struct resource_spec fxp_res_spec_mem[] = {
@ -2212,18 +2216,15 @@ fxp_stop(struct fxp_softc *sc)
* Release any xmit buffers.
*/
txp = sc->fxp_desc.tx_list;
if (txp != NULL) {
for (i = 0; i < FXP_NTXCB; i++) {
if (txp[i].tx_mbuf != NULL) {
bus_dmamap_sync(sc->fxp_txmtag, txp[i].tx_map,
BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(sc->fxp_txmtag,
txp[i].tx_map);
m_freem(txp[i].tx_mbuf);
txp[i].tx_mbuf = NULL;
/* clear this to reset csum offload bits */
txp[i].tx_cb->tbd[0].tb_addr = 0;
}
for (i = 0; i < FXP_NTXCB; i++) {
if (txp[i].tx_mbuf != NULL) {
bus_dmamap_sync(sc->fxp_txmtag, txp[i].tx_map,
BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(sc->fxp_txmtag, txp[i].tx_map);
m_freem(txp[i].tx_mbuf);
txp[i].tx_mbuf = NULL;
/* clear this to reset csum offload bits */
txp[i].tx_cb->tbd[0].tb_addr = 0;
}
}
bus_dmamap_sync(sc->cbl_tag, sc->cbl_map,

4
src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxpreg.h
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-2-Clause-NetBSD
*
* Copyright (c) 1995, David Greenman
* Copyright (c) 2001 Jonathan Lemon <jlemon@freebsd.org>
* All rights reserved.
@ -25,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
* $FreeBSD: releng/12.0/sys/dev/fxp/if_fxpreg.h 326255 2017-11-27 14:52:40Z pfg $
*/
#define FXP_PCI_MMBA 0x10

4
src/add-ons/kernel/drivers/network/ipro100/dev/fxp/if_fxpvar.h
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
@ -24,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
* $FreeBSD: releng/12.0/sys/dev/fxp/if_fxpvar.h 326255 2017-11-27 14:52:40Z pfg $
*/
/*

4
src/add-ons/kernel/drivers/network/ipro100/dev/fxp/inphy.c
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 2001 Jonathan Lemon
* All rights reserved.
*
@ -29,7 +31,7 @@
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
__FBSDID("$FreeBSD: releng/12.0/sys/dev/fxp/inphy.c 326022 2017-11-20 19:36:21Z pfg $");
/*
* driver for Intel 82553 and 82555 PHYs

4
src/add-ons/kernel/drivers/network/ipro100/dev/fxp/inphyreg.h
View File

@ -1,4 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 2001 Jonathan Lemon
* All rights reserved.
*
@ -26,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
* $FreeBSD: releng/12.0/sys/dev/fxp/inphyreg.h 326022 2017-11-20 19:36:21Z pfg $
*/
#ifndef _INPHYREG_H

4
src/add-ons/kernel/drivers/network/ipro100/dev/fxp/rcvbundl.h
View File

@ -1,4 +1,6 @@
/*-
SPDX-License-Identifier: BSD-3-Clause
Copyright (c) 1999-2001, Intel Corporation
All rights reserved.
@ -29,7 +31,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
* $FreeBSD$
* $FreeBSD: releng/12.0/sys/dev/fxp/rcvbundl.h 326022 2017-11-20 19:36:21Z pfg $
*/
/*
rcvbundl.h