i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dec21xxx: Upgrade to FreeBSD 12.

Browse Source
This commit is contained in:
Augustin Cavalier
2018-12-27 16:55:23 -05:00
parent 25531c5613
commit 2aaa3af64d
13 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/dcphy.c
+3 -1
View File
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
* Bill Paul <[email protected]>. All rights reserved. * Bill Paul <[email protected]>. All rights reserved.
* *
@@ -31,7 +33,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/dc/dcphy.c 266974 2014-06-02 17:54:39Z marcel $"); __FBSDID("$FreeBSD: releng/12.0/sys/dev/dc/dcphy.c 325966 2017-11-18 14:26:50Z pfg $");
/* /*
* Pseudo-driver for internal NWAY support on DEC 21143 and workalike * Pseudo-driver for internal NWAY support on DEC 21143 and workalike
src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/if_dc.c
+5 -1
View File
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
* Bill Paul <[email protected]>. All rights reserved. * Bill Paul <[email protected]>. All rights reserved.
* *
@@ -31,7 +33,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/dc/if_dc.c 277565 2015-01-23 15:14:30Z kevlo $"); __FBSDID("$FreeBSD: releng/12.0/sys/dev/dc/if_dc.c 338948 2018-09-26 17:12:14Z imp $");
/* /*
* DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143
@@ -357,6 +359,8 @@ static devclass_t dc_devclass;
DRIVER_MODULE_ORDERED(dc, pci, dc_driver, dc_devclass, NULL, NULL, DRIVER_MODULE_ORDERED(dc, pci, dc_driver, dc_devclass, NULL, NULL,
SI_ORDER_ANY); SI_ORDER_ANY);
MODULE_PNP_INFO("W32:vendor/device;U8:revision;D:#", pci, dc, dc_devs,
nitems(dc_devs) - 1);
DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, NULL, NULL); DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, NULL, NULL);
#define DC_SETBIT(sc, reg, x) \ #define DC_SETBIT(sc, reg, x) \
src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/if_dcreg.h
+3 -1
View File
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
* *
@@ -29,7 +31,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE. * THE POSSIBILITY OF SUCH DAMAGE.
* *
* $FreeBSD: releng/11.1/sys/dev/dc/if_dcreg.h 227675 2011-11-18 19:38:19Z yongari $ * $FreeBSD: releng/12.0/sys/dev/dc/if_dcreg.h 325966 2017-11-18 14:26:50Z pfg $
*/ */
/* /*
src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/pnphy.c
+3 -1
View File
@@ -1,4 +1,6 @@
/* /*
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
* *
@@ -31,7 +33,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/dc/pnphy.c 266974 2014-06-02 17:54:39Z marcel $"); __FBSDID("$FreeBSD: releng/12.0/sys/dev/dc/pnphy.c 325966 2017-11-18 14:26:50Z pfg $");
/* /*
* Pseudo-driver for media selection on the Lite-On PNIC 82c168 * Pseudo-driver for media selection on the Lite-On PNIC 82c168
src/add-ons/kernel/drivers/network/dec21xxx/dev/de/dc21040reg.h
+3 -15
View File
@@ -1,8 +1,10 @@
/* $NetBSD: dc21040reg.h,v 1.15 1998/05/22 18:50:59 matt Exp $ */ /* $NetBSD: dc21040reg.h,v 1.15 1998/05/22 18:50:59 matt Exp $ */
/* $FreeBSD: releng/11.1/sys/dev/de/dc21040reg.h 298955 2016-05-03 03:41:25Z pfg $ */ /* $FreeBSD: releng/12.0/sys/dev/de/dc21040reg.h 326255 2017-11-27 14:52:40Z pfg $ */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-NetBSD
*
* Copyright (c) 1994, 1995, 1996 Matt Thomas <matt@3am-software.com> * Copyright (c) 1994, 1995, 1996 Matt Thomas <matt@3am-software.com>
* All rights reserved. * All rights reserved.
* *
@@ -494,20 +496,6 @@ typedef struct {
#define PHYCTL_AUTONEG_RESTART 0x0200 #define PHYCTL_AUTONEG_RESTART 0x0200
#define PHYCTL_FULL_DUPLEX 0x0100 #define PHYCTL_FULL_DUPLEX 0x0100
/*
* Definitions for the DE425.
*/
#define DE425_CFID 0x08 /* Configuration Id */
#define DE425_CFCS 0x0C /* Configuration Command-Status */
#define DE425_CFRV 0x18 /* Configuration Revision */
#define DE425_CFLT 0x1C /* Configuration Latency Timer */
#define DE425_CBIO 0x28 /* Configuration Base IO Address */
#define DE425_CFDA 0x2C /* Configuration Driver Area */
#define DE425_ENETROM_OFFSET 0xC90 /* Offset in I/O space for ENETROM */
#define DE425_CFG0 0xC88 /* IRQ register */
#define DE425_EISAID 0x10a34250 /* EISA device id */
#define DE425_EISA_IOSIZE 0x100
#define DEC_VENDORID 0x1011 #define DEC_VENDORID 0x1011
#define CHIPID_21040 0x0002 #define CHIPID_21040 0x0002
#define CHIPID_21140 0x0009 #define CHIPID_21140 0x0009
src/add-ons/kernel/drivers/network/dec21xxx/dev/de/if_de.c
+4 -14
View File
@@ -1,5 +1,7 @@
/* $NetBSD: if_de.c,v 1.86 1999/06/01 19:17:59 thorpej Exp $ */ /* $NetBSD: if_de.c,v 1.86 1999/06/01 19:17:59 thorpej Exp $ */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-NetBSD
*
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
* All rights reserved. * All rights reserved.
* *
@@ -36,7 +38,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/de/if_de.c 315221 2017-03-14 02:06:03Z pfg $"); __FBSDID("$FreeBSD: releng/12.0/sys/dev/de/if_de.c 339735 2018-10-25 17:00:39Z brooks $");
#define TULIP_HDR_DATA #define TULIP_HDR_DATA
@@ -3916,7 +3918,7 @@ tulip_txput(tulip_softc_t * const sc, struct mbuf *m)
* a bit reminiscent of going on the Ark two by two * a bit reminiscent of going on the Ark two by two
* since each descriptor for the TULIP can describe * since each descriptor for the TULIP can describe
* two buffers. So we advance through packet filling * two buffers. So we advance through packet filling
* each of the two entries at a time to to fill each * each of the two entries at a time to fill each
* descriptor. Clear the first and last segment bits * descriptor. Clear the first and last segment bits
* in each descriptor (actually just clear everything * in each descriptor (actually just clear everything
* but the end-of-ring or chain bits) to make sure * but the end-of-ring or chain bits) to make sure
@@ -4262,18 +4264,6 @@ tulip_ifioctl(struct ifnet * ifp, u_long cmd, caddr_t data)
break; break;
} }
#ifdef SIOCGADDRROM
case SIOCGADDRROM: {
error = copyout(sc->tulip_rombuf, ifr->ifr_data, sizeof(sc->tulip_rombuf));
break;
}
#endif
#ifdef SIOCGCHIPID
case SIOCGCHIPID: {
ifr->ifr_metric = (int) sc->tulip_chipid;
break;
}
#endif
default: { default: {
error = ether_ioctl(ifp, cmd, data); error = ether_ioctl(ifp, cmd, data);
break; break;
src/add-ons/kernel/drivers/network/dec21xxx/dev/de/if_devar.h
+3 -6
View File
@@ -1,8 +1,10 @@
/* $NetBSD: if_devar.h,v 1.32 1999/04/01 14:55:25 tsubai Exp $ */ /* $NetBSD: if_devar.h,v 1.32 1999/04/01 14:55:25 tsubai Exp $ */
/* $FreeBSD: releng/11.1/sys/dev/de/if_devar.h 298955 2016-05-03 03:41:25Z pfg $ */ /* $FreeBSD: releng/12.0/sys/dev/de/if_devar.h 331737 2018-03-29 15:58:49Z brooks $ */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-NetBSD
*
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
* All rights reserved. * All rights reserved.
* *
@@ -874,11 +876,6 @@ static const struct {
#define TULIP_TXMAP_POSTSYNC(ri, di) \ #define TULIP_TXMAP_POSTSYNC(ri, di) \
_TULIP_MAP_SYNC(ri, di, BUS_DMASYNC_POSTWRITE) _TULIP_MAP_SYNC(ri, di, BUS_DMASYNC_POSTWRITE)
#ifdef notyet
#define SIOCGADDRROM _IOW('i', 240, struct ifreq) /* get 128 bytes of ROM */
#define SIOCGCHIPID _IOWR('i', 241, struct ifreq) /* get chipid */
#endif
#if defined(TULIP_HDR_DATA) #if defined(TULIP_HDR_DATA)
static tulip_softc_t *tulips[TULIP_MAX_DEVICES]; static tulip_softc_t *tulips[TULIP_MAX_DEVICES];
#endif #endif
src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/acphy.c
+3 -1
View File
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-NetBSD
*
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
* *
@@ -53,7 +55,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/mii/acphy.c 281821 2015-04-21 09:39:48Z glebius $"); __FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/acphy.c 326255 2017-11-27 14:52:40Z pfg $");
/* /*
* Driver for Altima AC101 10/100 PHY * Driver for Altima AC101 10/100 PHY
src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/acphyreg.h
+3 -1
View File
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2001 Semen Ustimenko (semenu@FreeBSD.org) * Copyright (c) 2001 Semen Ustimenko (semenu@FreeBSD.org)
* All rights reserved. * All rights reserved.
* *
@@ -23,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $FreeBSD: releng/11.1/sys/dev/mii/acphyreg.h 165986 2007-01-12 22:58:04Z marius $ * $FreeBSD: releng/12.0/sys/dev/mii/acphyreg.h 326255 2017-11-27 14:52:40Z pfg $
*/ */
#ifndef _DEV_MII_ACPHYREG_H_ #ifndef _DEV_MII_ACPHYREG_H_
src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/amphy.c
+3 -1
View File
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
* *
@@ -31,7 +33,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/mii/amphy.c 257184 2013-10-26 18:40:17Z glebius $"); __FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/amphy.c 325966 2017-11-18 14:26:50Z pfg $");
/* /*
* driver for AMD AM79c873 PHYs * driver for AMD AM79c873 PHYs
src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/amphyreg.h
+3 -1
View File
@@ -1,4 +1,6 @@
/*- /*-
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
* *
@@ -29,7 +31,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE. * THE POSSIBILITY OF SUCH DAMAGE.
* *
* $FreeBSD: releng/11.1/sys/dev/mii/amphyreg.h 139749 2005-01-06 01:43:34Z imp $ * $FreeBSD: releng/12.0/sys/dev/mii/amphyreg.h 325966 2017-11-18 14:26:50Z pfg $
*/ */
#ifndef _DEV_MII_AMTPHYREG_H_ #ifndef _DEV_MII_AMTPHYREG_H_
src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/ukphy.c
+3 -1
View File
@@ -1,6 +1,8 @@
/* $NetBSD: ukphy.c,v 1.2 1999/04/23 04:24:32 thorpej Exp $ */ /* $NetBSD: ukphy.c,v 1.2 1999/04/23 04:24:32 thorpej Exp $ */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-NetBSD
*
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
* *
@@ -55,7 +57,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/mii/ukphy.c 257184 2013-10-26 18:40:17Z glebius $"); __FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/ukphy.c 326255 2017-11-27 14:52:40Z pfg $");
/* /*
* driver for generic unknown PHYs * driver for generic unknown PHYs
src/add-ons/kernel/drivers/network/dec21xxx/dev/mii/ukphy_subr.c
+3 -1
View File
@@ -1,6 +1,8 @@
/* $NetBSD: ukphy_subr.c,v 1.2 1998/11/05 04:08:02 thorpej Exp $ */ /* $NetBSD: ukphy_subr.c,v 1.2 1998/11/05 04:08:02 thorpej Exp $ */
/*- /*-
* SPDX-License-Identifier: BSD-2-Clause-NetBSD
*
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
* *
@@ -31,7 +33,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD: releng/11.1/sys/dev/mii/ukphy_subr.c 215297 2010-11-14 13:26:10Z marius $"); __FBSDID("$FreeBSD: releng/12.0/sys/dev/mii/ukphy_subr.c 326255 2017-11-27 14:52:40Z pfg $");
/* /*
* Subroutines shared by the ukphy driver and other PHY drivers. * Subroutines shared by the ukphy driver and other PHY drivers.