[Midnightbsd-cvs] src [10121] trunk/sys/dev: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun May 27 20:18:16 EDT 2018
Revision: 10121
http://svnweb.midnightbsd.org/src/?rev=10121
Author: laffer1
Date: 2018-05-27 20:18:15 -0400 (Sun, 27 May 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/sys/dev/cy/cy.c
trunk/sys/dev/cy/cy_isa.c
trunk/sys/dev/cy/cy_pci.c
trunk/sys/dev/cy/cyreg.h
trunk/sys/dev/cy/cyvar.h
trunk/sys/dev/dc/dcphy.c
trunk/sys/dev/dc/if_dc.c
trunk/sys/dev/dc/if_dcreg.h
trunk/sys/dev/dc/pnphy.c
trunk/sys/dev/dcons/dcons.c
trunk/sys/dev/dcons/dcons.h
trunk/sys/dev/dcons/dcons_crom.c
trunk/sys/dev/dcons/dcons_os.c
trunk/sys/dev/dcons/dcons_os.h
trunk/sys/dev/de/dc21040reg.h
trunk/sys/dev/de/if_de.c
trunk/sys/dev/de/if_devar.h
trunk/sys/dev/digi/CX.bios.h
trunk/sys/dev/digi/CX.c
trunk/sys/dev/digi/CX.fepos.h
trunk/sys/dev/digi/CX_PCI.bios.h
trunk/sys/dev/digi/CX_PCI.c
trunk/sys/dev/digi/CX_PCI.fepos.h
trunk/sys/dev/digi/EPCX.bios.h
trunk/sys/dev/digi/EPCX.c
trunk/sys/dev/digi/EPCX.fepos.h
trunk/sys/dev/digi/EPCX_PCI.bios.h
trunk/sys/dev/digi/EPCX_PCI.c
trunk/sys/dev/digi/EPCX_PCI.fepos.h
trunk/sys/dev/digi/Xe.bios.h
trunk/sys/dev/digi/Xe.c
trunk/sys/dev/digi/Xe.fepos.h
trunk/sys/dev/digi/Xem.bios.h
trunk/sys/dev/digi/Xem.c
trunk/sys/dev/digi/Xem.fepos.h
trunk/sys/dev/digi/Xr.bios.h
trunk/sys/dev/digi/Xr.c
trunk/sys/dev/digi/Xr.fepos.h
trunk/sys/dev/digi/digi.c
trunk/sys/dev/digi/digi.h
trunk/sys/dev/digi/digi_isa.c
trunk/sys/dev/digi/digi_mod.h
trunk/sys/dev/digi/digi_pci.c
trunk/sys/dev/digi/digi_pci.h
trunk/sys/dev/digi/digireg.h
trunk/sys/dev/dpms/dpms.c
trunk/sys/dev/dpt/dpt.h
trunk/sys/dev/dpt/dpt_eisa.c
trunk/sys/dev/dpt/dpt_isa.c
trunk/sys/dev/dpt/dpt_pci.c
trunk/sys/dev/dpt/dpt_scsi.c
Modified: trunk/sys/dev/cy/cy.c
===================================================================
--- trunk/sys/dev/cy/cy.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/cy/cy.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* cyclades cyclom-y serial driver
* Andrew Herbert <andrew at werple.apana.org.au>, 17 August 1993
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/cy/cy.c 166901 2007-02-23 12:19:07Z piso $");
#include "opt_compat.h"
Modified: trunk/sys/dev/cy/cy_isa.c
===================================================================
--- trunk/sys/dev/cy/cy_isa.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/cy/cy_isa.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* cyclades cyclom-y serial driver
* Andrew Herbert <andrew at werple.apana.org.au>, 17 August 1993
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/cy/cy_isa.c 166901 2007-02-23 12:19:07Z piso $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/dev/cy/cy_pci.c
===================================================================
--- trunk/sys/dev/cy/cy_pci.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/cy/cy_pci.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996, David Greenman
* All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/cy/cy_pci.c 166901 2007-02-23 12:19:07Z piso $");
#include "opt_cy_pci_fastintr.h"
Modified: trunk/sys/dev/cy/cyreg.h
===================================================================
--- trunk/sys/dev/cy/cyreg.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/cy/cyreg.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1995 Bruce Evans.
* All rights reserved.
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/cy/cyreg.h 50477 1999-08-28 01:08:13Z peter $
*/
/*
Modified: trunk/sys/dev/cy/cyvar.h
===================================================================
--- trunk/sys/dev/cy/cyvar.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/cy/cyvar.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2004 Bruce D. Evans
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/cy/cyvar.h 166901 2007-02-23 12:19:07Z piso $
*/
typedef u_char volatile *cy_addr;
Modified: trunk/sys/dev/dc/dcphy.c
===================================================================
--- trunk/sys/dev/dc/dcphy.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dc/dcphy.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul at ee.columbia.edu>. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/dc/dcphy.c 227908 2011-11-23 20:27:26Z marius $");
/*
* Pseudo-driver for internal NWAY support on DEC 21143 and workalike
Modified: trunk/sys/dev/dc/if_dc.c
===================================================================
--- trunk/sys/dev/dc/if_dc.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dc/if_dc.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul at ee.columbia.edu>. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/dc/if_dc.c 243857 2012-12-04 09:32:43Z glebius $");
/*
* DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143
Modified: trunk/sys/dev/dc/if_dcreg.h
===================================================================
--- trunk/sys/dev/dc/if_dcreg.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dc/if_dcreg.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul at ee.columbia.edu>. All rights reserved.
@@ -29,7 +30,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/dc/if_dcreg.h 227675 2011-11-18 19:38:19Z yongari $
*/
/*
Modified: trunk/sys/dev/dc/pnphy.c
===================================================================
--- trunk/sys/dev/dc/pnphy.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dc/pnphy.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul at ee.columbia.edu>. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/dc/pnphy.c 227908 2011-11-23 20:27:26Z marius $");
/*
* Pseudo-driver for media selection on the Lite-On PNIC 82c168
Modified: trunk/sys/dev/dcons/dcons.c
===================================================================
--- trunk/sys/dev/dcons/dcons.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dcons/dcons.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 2003,2004
* Hidetoshi Shimokawa. All rights reserved.
@@ -31,8 +32,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: dcons.c,v 1.2 2013-01-08 03:53:17 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: dcons.c,v 1.65 2003/10/24 03:24:55 simokawa Exp $
+ * $FreeBSD: stable/10/sys/dev/dcons/dcons.c 169972 2007-05-25 05:00:39Z simokawa $
*/
#include <sys/param.h>
Modified: trunk/sys/dev/dcons/dcons.h
===================================================================
--- trunk/sys/dev/dcons/dcons.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dcons/dcons.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 2002-2004
* Hidetoshi Shimokawa. All rights reserved.
@@ -31,8 +32,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: dcons.h,v 1.2 2013-01-08 03:53:17 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: dcons.h,v 1.15 2003/10/23 15:05:31 simokawa Exp $
+ * $FreeBSD: stable/10/sys/dev/dcons/dcons.h 181905 2008-08-20 08:31:58Z ed $
*/
#if defined(_KERNEL) || defined(_BOOT)
Modified: trunk/sys/dev/dcons/dcons_crom.c
===================================================================
--- trunk/sys/dev/dcons/dcons_crom.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dcons/dcons_crom.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
@@ -31,8 +32,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: dcons_crom.c,v 1.2 2013-01-08 03:53:17 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: dcons_crom.c,v 1.8 2003/10/23 15:47:21 simokawa Exp $
+ * $FreeBSD: stable/10/sys/dev/dcons/dcons_crom.c 186876 2009-01-07 21:25:44Z marius $
*/
#include <sys/param.h>
Modified: trunk/sys/dev/dcons/dcons_os.c
===================================================================
--- trunk/sys/dev/dcons/dcons_os.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dcons/dcons_os.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 2003,2004
* Hidetoshi Shimokawa. All rights reserved.
@@ -31,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/dcons/dcons_os.c 314667 2017-03-04 13:03:31Z avg $
*/
#include <sys/param.h>
@@ -74,6 +75,10 @@
#define DCONS_POLL_HZ 25
#endif
+#ifndef DCONS_POLL_IDLE
+#define DCONS_POLL_IDLE 256
+#endif
+
#ifndef DCONS_BUF_SIZE
#define DCONS_BUF_SIZE (16*1024)
#endif
@@ -90,6 +95,7 @@
static struct dcons_global dg;
struct dcons_global *dcons_conf;
static int poll_hz = DCONS_POLL_HZ;
+static u_int poll_idle = DCONS_POLL_HZ * DCONS_POLL_IDLE;
static struct dcons_softc sc[DCONS_NPORT];
@@ -214,14 +220,17 @@
tp = dc->tty;
tty_lock(tp);
- while ((c = dcons_os_checkc_nopoll(dc)) != -1)
+ while ((c = dcons_os_checkc_nopoll(dc)) != -1) {
ttydisc_rint(tp, c, 0);
+ poll_idle = 0;
+ }
ttydisc_rint_done(tp);
tty_unlock(tp);
}
- polltime = hz / poll_hz;
- if (polltime < 1)
- polltime = 1;
+ poll_idle++;
+ polltime = hz;
+ if (poll_idle <= (poll_hz * DCONS_POLL_IDLE))
+ polltime /= poll_hz;
callout_reset(&dcons_callout, polltime, dcons_timeout, tp);
}
@@ -366,10 +375,8 @@
dcons_attach_port(DCONS_CON, "dcons", 0);
dcons_attach_port(DCONS_GDB, "dgdb", DC_GDB);
- callout_init(&dcons_callout, CALLOUT_MPSAFE);
+ callout_init(&dcons_callout, 1);
polltime = hz / poll_hz;
- if (polltime < 1)
- polltime = 1;
callout_reset(&dcons_callout, polltime, dcons_timeout, NULL);
return(0);
}
Modified: trunk/sys/dev/dcons/dcons_os.h
===================================================================
--- trunk/sys/dev/dcons/dcons_os.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dcons/dcons_os.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 2002-2004
* Hidetoshi Shimokawa. All rights reserved.
@@ -31,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/dcons/dcons_os.h 170408 2007-06-08 00:54:44Z simokawa $
*/
Modified: trunk/sys/dev/de/dc21040reg.h
===================================================================
--- trunk/sys/dev/de/dc21040reg.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/de/dc21040reg.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,6 +1,7 @@
+/* $MidnightBSD$ */
/* $NetBSD: dc21040reg.h,v 1.15 1998/05/22 18:50:59 matt Exp $ */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/dev/de/dc21040reg.h 97748 2002-06-02 20:05:59Z schweikh $ */
/*-
* Copyright (c) 1994, 1995, 1996 Matt Thomas <matt at 3am-software.com>
Modified: trunk/sys/dev/de/if_de.c
===================================================================
--- trunk/sys/dev/de/if_de.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/de/if_de.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_de.c,v 1.86 1999/06/01 19:17:59 thorpej Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt at 3am-software.com)
@@ -36,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/de/if_de.c 332291 2018-04-08 17:03:39Z brooks $");
#define TULIP_HDR_DATA
@@ -1567,7 +1568,7 @@
#endif
}
-__inline static void
+static inline void
tulip_21140_mediainit(tulip_softc_t * const sc, tulip_media_info_t * const mip,
tulip_media_t const media, unsigned gpdata, unsigned cmdmode)
{
@@ -4263,18 +4264,6 @@
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: {
error = ether_ioctl(ifp, cmd, data);
break;
Modified: trunk/sys/dev/de/if_devar.h
===================================================================
--- trunk/sys/dev/de/if_devar.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/de/if_devar.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,6 +1,7 @@
+/* $MidnightBSD$ */
/* $NetBSD: if_devar.h,v 1.32 1999/04/01 14:55:25 tsubai Exp $ */
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/dev/de/if_devar.h 332291 2018-04-08 17:03:39Z brooks $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt at 3am-software.com)
@@ -874,11 +875,6 @@
#define TULIP_TXMAP_POSTSYNC(ri, di) \
_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)
static tulip_softc_t *tulips[TULIP_MAX_DEVICES];
#endif
Modified: trunk/sys/dev/digi/CX.bios.h
===================================================================
--- trunk/sys/dev/digi/CX.bios.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/CX.bios.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/CX.bios.h 145975 2005-05-06 20:53:34Z anholt $
*/
static const u_char CX_bios[] = {
Modified: trunk/sys/dev/digi/CX.c
===================================================================
--- trunk/sys/dev/digi/CX.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/CX.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/digi/CX.c 119418 2003-08-24 17:55:58Z obrien $");
#include <sys/param.h>
#include <sys/conf.h>
Modified: trunk/sys/dev/digi/CX.fepos.h
===================================================================
--- trunk/sys/dev/digi/CX.fepos.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/CX.fepos.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/CX.fepos.h 145975 2005-05-06 20:53:34Z anholt $
*/
static const u_char CX_fepos[] = {
Modified: trunk/sys/dev/digi/CX_PCI.bios.h
===================================================================
--- trunk/sys/dev/digi/CX_PCI.bios.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/CX_PCI.bios.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/CX_PCI.bios.h 145975 2005-05-06 20:53:34Z anholt $
*/
static const u_char CX_PCI_bios[] = {
Modified: trunk/sys/dev/digi/CX_PCI.c
===================================================================
--- trunk/sys/dev/digi/CX_PCI.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/CX_PCI.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/digi/CX_PCI.c 119418 2003-08-24 17:55:58Z obrien $");
#include <sys/param.h>
#include <sys/conf.h>
Modified: trunk/sys/dev/digi/CX_PCI.fepos.h
===================================================================
--- trunk/sys/dev/digi/CX_PCI.fepos.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/CX_PCI.fepos.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/CX_PCI.fepos.h 145975 2005-05-06 20:53:34Z anholt $
*/
static const u_char CX_PCI_fepos[] = {
Modified: trunk/sys/dev/digi/EPCX.bios.h
===================================================================
--- trunk/sys/dev/digi/EPCX.bios.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/EPCX.bios.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/EPCX.bios.h 145975 2005-05-06 20:53:34Z anholt $
*/
static const u_char EPCX_bios[] = {
Modified: trunk/sys/dev/digi/EPCX.c
===================================================================
--- trunk/sys/dev/digi/EPCX.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/EPCX.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/digi/EPCX.c 119418 2003-08-24 17:55:58Z obrien $");
#include <sys/param.h>
#include <sys/conf.h>
Modified: trunk/sys/dev/digi/EPCX.fepos.h
===================================================================
--- trunk/sys/dev/digi/EPCX.fepos.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/EPCX.fepos.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/EPCX.fepos.h 145975 2005-05-06 20:53:34Z anholt $
*/
static const u_char EPCX_fepos[] = {
Modified: trunk/sys/dev/digi/EPCX_PCI.bios.h
===================================================================
--- trunk/sys/dev/digi/EPCX_PCI.bios.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/EPCX_PCI.bios.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/EPCX_PCI.bios.h 145975 2005-05-06 20:53:34Z anholt $
*/
static const u_char EPCX_PCI_bios[] = {
Modified: trunk/sys/dev/digi/EPCX_PCI.c
===================================================================
--- trunk/sys/dev/digi/EPCX_PCI.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/EPCX_PCI.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/digi/EPCX_PCI.c 119418 2003-08-24 17:55:58Z obrien $");
#include <sys/param.h>
#include <sys/conf.h>
Modified: trunk/sys/dev/digi/EPCX_PCI.fepos.h
===================================================================
--- trunk/sys/dev/digi/EPCX_PCI.fepos.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/EPCX_PCI.fepos.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/EPCX_PCI.fepos.h 145975 2005-05-06 20:53:34Z anholt $
*/
static const u_char EPCX_PCI_fepos[] = {
Modified: trunk/sys/dev/digi/Xe.bios.h
===================================================================
--- trunk/sys/dev/digi/Xe.bios.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/Xe.bios.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/Xe.bios.h 145975 2005-05-06 20:53:34Z anholt $
*/
static const u_char Xe_bios[] = {
Modified: trunk/sys/dev/digi/Xe.c
===================================================================
--- trunk/sys/dev/digi/Xe.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/Xe.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/digi/Xe.c 119418 2003-08-24 17:55:58Z obrien $");
#include <sys/param.h>
#include <sys/conf.h>
Modified: trunk/sys/dev/digi/Xe.fepos.h
===================================================================
--- trunk/sys/dev/digi/Xe.fepos.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/Xe.fepos.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/Xe.fepos.h 145975 2005-05-06 20:53:34Z anholt $
*/
static const u_char Xe_fepos[] = {
Modified: trunk/sys/dev/digi/Xem.bios.h
===================================================================
--- trunk/sys/dev/digi/Xem.bios.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/Xem.bios.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/Xem.bios.h 145975 2005-05-06 20:53:34Z anholt $
*/
static const u_char Xem_bios[] = {
Modified: trunk/sys/dev/digi/Xem.c
===================================================================
--- trunk/sys/dev/digi/Xem.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/Xem.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/digi/Xem.c 119418 2003-08-24 17:55:58Z obrien $");
#include <sys/param.h>
#include <sys/conf.h>
Modified: trunk/sys/dev/digi/Xem.fepos.h
===================================================================
--- trunk/sys/dev/digi/Xem.fepos.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/Xem.fepos.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/Xem.fepos.h 145975 2005-05-06 20:53:34Z anholt $
*/
static const u_char Xem_fepos[] = {
Modified: trunk/sys/dev/digi/Xr.bios.h
===================================================================
--- trunk/sys/dev/digi/Xr.bios.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/Xr.bios.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/Xr.bios.h 76195 2001-05-02 01:08:09Z brian $
*/
static const u_char Xr_bios[] = {
Modified: trunk/sys/dev/digi/Xr.c
===================================================================
--- trunk/sys/dev/digi/Xr.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/Xr.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/digi/Xr.c 119418 2003-08-24 17:55:58Z obrien $");
#include <sys/param.h>
#include <sys/conf.h>
Modified: trunk/sys/dev/digi/Xr.fepos.h
===================================================================
--- trunk/sys/dev/digi/Xr.fepos.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/Xr.fepos.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/Xr.fepos.h 76195 2001-05-02 01:08:09Z brian $
*/
static const u_char Xr_fepos[] = {
Modified: trunk/sys/dev/digi/digi.c
===================================================================
--- trunk/sys/dev/digi/digi.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/digi.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/digi.c 320923 2017-07-12 22:16:54Z jhb $
*/
/*-
@@ -1458,6 +1459,8 @@
digi_loadmoduledata(sc);
digi_init(sc);
digi_freemoduledata(sc);
+ device_printf(dev,
+ "WARNING: This driver is deprecated and will be removed.\n");
return (0);
}
Modified: trunk/sys/dev/digi/digi.h
===================================================================
--- trunk/sys/dev/digi/digi.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/digi.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/digi.h 136516 2004-10-14 18:37:59Z phk $
*/
#define W(p) (*(u_int16_t *)(p))
Modified: trunk/sys/dev/digi/digi_isa.c
===================================================================
--- trunk/sys/dev/digi/digi_isa.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/digi_isa.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -29,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/digi/digi_isa.c 246128 2013-01-30 18:01:20Z sbz $");
/*-
* TODO:
@@ -462,7 +463,8 @@
DEVMETHOD(device_attach, digi_isa_attach),
DEVMETHOD(device_detach, digi_detach),
DEVMETHOD(device_shutdown, digi_shutdown),
- {0, 0}
+
+ DEVMETHOD_END
};
static driver_t digi_isa_drv = {
Modified: trunk/sys/dev/digi/digi_mod.h
===================================================================
--- trunk/sys/dev/digi/digi_mod.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/digi_mod.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/digi_mod.h 76195 2001-05-02 01:08:09Z brian $
*/
#define DIGI_MOD_VERSION 1
Modified: trunk/sys/dev/digi/digi_pci.c
===================================================================
--- trunk/sys/dev/digi/digi_pci.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/digi_pci.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/digi/digi_pci.c 246128 2013-01-30 18:01:20Z sbz $");
#include <sys/param.h>
@@ -219,7 +220,8 @@
DEVMETHOD(device_attach, digi_pci_attach),
DEVMETHOD(device_detach, digi_detach),
DEVMETHOD(device_shutdown, digi_shutdown),
- {0, 0}
+
+ DEVMETHOD_END
};
static driver_t digi_pci_drv = {
Modified: trunk/sys/dev/digi/digi_pci.h
===================================================================
--- trunk/sys/dev/digi/digi_pci.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/digi_pci.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/digi_pci.h 76195 2001-05-02 01:08:09Z brian $
*/
#define PCI_VENDOR_DIGI 0x114F
Modified: trunk/sys/dev/digi/digireg.h
===================================================================
--- trunk/sys/dev/digi/digireg.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/digi/digireg.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Slawa Olhovchenkov
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/digi/digireg.h 118607 2003-08-07 15:04:27Z jhb $
*/
struct global_data {
Modified: trunk/sys/dev/dpms/dpms.c
===================================================================
--- trunk/sys/dev/dpms/dpms.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dpms/dpms.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Yahoo!, Inc.
* All rights reserved.
@@ -59,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/dpms/dpms.c 200584 2009-12-15 19:58:23Z jkim $");
#include <sys/param.h>
#include <sys/bus.h>
Modified: trunk/sys/dev/dpt/dpt.h
===================================================================
--- trunk/sys/dev/dpt/dpt.h 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dpt/dpt.h 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 by Simon Shapiro
* All Rights Reserved
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/dpt/dpt.h 249348 2013-04-10 23:20:09Z sbruno $
*/
/*
@@ -1110,16 +1111,6 @@
#define DPT_HA_COMMAND_ACTIVE 0x00000080
#define DPT_HA_QUIET 0x00000100
-#ifdef DPT_LOST_IRQ
-#define DPT_LOST_IRQ_SET 0x10000000
-#define DPT_LOST_IRQ_ACTIVE 0x20000000
-#endif
-
-#ifdef DPT_HANDLE_TIMEOUTS
-#define DPT_HA_TIMEOUTS_SET 0x40000000
-#define DPT_HA_TIMEOUTS_ACTIVE 0x80000000
-#endif
-
u_int8_t primary; /* true if primary */
u_int8_t more_support :1, /* HBA supports MORE flag */
Modified: trunk/sys/dev/dpt/dpt_eisa.c
===================================================================
--- trunk/sys/dev/dpt/dpt_eisa.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dpt/dpt_eisa.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997, 2000 Matthew N. Dodd <winter at jurai.net>
* All rights reserved.
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/dpt/dpt_eisa.c 241593 2012-10-15 16:29:08Z jhb $");
#include "opt_eisa.h"
Modified: trunk/sys/dev/dpt/dpt_isa.c
===================================================================
--- trunk/sys/dev/dpt/dpt_isa.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dpt/dpt_isa.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2000 Matthew N. Dodd <winter at jurai.net>
* All rights reserved.
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/dpt/dpt_isa.c 241593 2012-10-15 16:29:08Z jhb $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/dev/dpt/dpt_pci.c
===================================================================
--- trunk/sys/dev/dpt/dpt_pci.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dpt/dpt_pci.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2000 Matthew N. Dodd <winter at jurai.net>
* All rights reserved.
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/dpt/dpt_pci.c 254263 2013-08-12 23:30:01Z scottl $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,23 +78,17 @@
dpt_softc_t * dpt;
int error = 0;
- u_int32_t command;
-
dpt = device_get_softc(dev);
dpt->dev = dev;
dpt_alloc(dev);
- command = pci_read_config(dev, PCIR_COMMAND, /*bytes*/1);
-
#ifdef DPT_ALLOW_MMIO
- if ((command & PCIM_CMD_MEMEN) != 0) {
- dpt->io_rid = DPT_PCI_MEMADDR;
- dpt->io_type = SYS_RES_MEMORY;
- dpt->io_res = bus_alloc_resource_any(dev, dpt->io_type,
- &dpt->io_rid, RF_ACTIVE);
- }
+ dpt->io_rid = DPT_PCI_MEMADDR;
+ dpt->io_type = SYS_RES_MEMORY;
+ dpt->io_res = bus_alloc_resource_any(dev, dpt->io_type,
+ &dpt->io_rid, RF_ACTIVE);
#endif
- if (dpt->io_res == NULL && (command & PCIM_CMD_PORTEN) != 0) {
+ if (dpt->io_res == NULL) {
dpt->io_rid = DPT_PCI_IOADDR;
dpt->io_type = SYS_RES_IOPORT;
dpt->io_res = bus_alloc_resource_any(dev, dpt->io_type,
Modified: trunk/sys/dev/dpt/dpt_scsi.c
===================================================================
--- trunk/sys/dev/dpt/dpt_scsi.c 2018-05-28 00:17:55 UTC (rev 10120)
+++ trunk/sys/dev/dpt/dpt_scsi.c 2018-05-28 00:18:15 UTC (rev 10121)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 by Simon Shapiro
* All Rights Reserved
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/dpt/dpt_scsi.c 315813 2017-03-23 06:41:13Z mav $");
/*
* dpt_scsi.c: SCSI dependant code for the DPT driver
@@ -793,8 +794,8 @@
dccb->state |= DCCB_ACTIVE;
ccb->ccb_h.status |= CAM_SIM_QUEUED;
LIST_INSERT_HEAD(&dpt->pending_ccb_list, &ccb->ccb_h, sim_links.le);
- callout_reset(&dccb->timer, (ccb->ccb_h.timeout * hz) / 1000,
- dpttimeout, dccb);
+ callout_reset_sbt(&dccb->timer, SBT_1MS * ccb->ccb_h.timeout, 0,
+ dpttimeout, dccb, 0);
if (dpt_send_eata_command(dpt, &dccb->eata_ccb,
dccb->eata_ccb.cp_busaddr,
EATA_CMD_DMA_SEND_CP, 0, 0, 0, 0) != 0) {
@@ -910,56 +911,22 @@
*/
/* Only use S/G if there is a transfer */
if ((ccbh->flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- if ((ccbh->flags & CAM_SCATTER_VALID) == 0) {
+ int error;
+
+ error = bus_dmamap_load_ccb(dpt->buffer_dmat,
+ dccb->dmamap,
+ ccb,
+ dptexecuteccb,
+ dccb, /*flags*/0);
+ if (error == EINPROGRESS) {
/*
- * We've been given a pointer
- * to a single buffer.
+ * So as to maintain ordering,
+ * freeze the controller queue
+ * until our mapping is
+ * returned.
*/
- if ((ccbh->flags & CAM_DATA_PHYS) == 0) {
- int error;
-
- error =
- bus_dmamap_load(dpt->buffer_dmat,
- dccb->dmamap,
- csio->data_ptr,
- csio->dxfer_len,
- dptexecuteccb,
- dccb, /*flags*/0);
- if (error == EINPROGRESS) {
- /*
- * So as to maintain ordering,
- * freeze the controller queue
- * until our mapping is
- * returned.
- */
- xpt_freeze_simq(sim, 1);
- dccb->state |= CAM_RELEASE_SIMQ;
- }
- } else {
- struct bus_dma_segment seg;
-
- /* Pointer to physical buffer */
- seg.ds_addr =
- (bus_addr_t)csio->data_ptr;
- seg.ds_len = csio->dxfer_len;
- dptexecuteccb(dccb, &seg, 1, 0);
- }
- } else {
- struct bus_dma_segment *segs;
-
- if ((ccbh->flags & CAM_DATA_PHYS) != 0)
- panic("dpt_action - Physical "
- "segment pointers "
- "unsupported");
-
- if ((ccbh->flags&CAM_SG_LIST_PHYS)==0)
- panic("dpt_action - Virtual "
- "segment addresses "
- "unsupported");
-
- /* Just use the segments provided */
- segs = (struct bus_dma_segment *)csio->data_ptr;
- dptexecuteccb(dccb, segs, csio->sglist_cnt, 0);
+ xpt_freeze_simq(sim, 1);
+ dccb->state |= CAM_RELEASE_SIMQ;
}
} else {
/*
@@ -1013,7 +980,6 @@
spi->valid = CTS_SPI_VALID_SYNC_RATE
| CTS_SPI_VALID_SYNC_OFFSET
- | CTS_SPI_VALID_SYNC_RATE
| CTS_SPI_VALID_BUS_WIDTH
| CTS_SPI_VALID_DISC;
scsi->valid = CTS_SCSI_VALID_TQ;
@@ -1062,9 +1028,9 @@
cpi->initiator_id = dpt->hostid[cam_sim_bus(sim)];
cpi->bus_id = cam_sim_bus(sim);
cpi->base_transfer_speed = 3300;
- strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
- strncpy(cpi->hba_vid, "DPT", HBA_IDLEN);
- strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
+ strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
+ strlcpy(cpi->hba_vid, "DPT", HBA_IDLEN);
+ strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
cpi->unit_number = cam_sim_unit(sim);
cpi->transport = XPORT_SPI;
cpi->transport_version = 2;
@@ -1424,7 +1390,7 @@
/* highaddr */ BUS_SPACE_MAXADDR,
/* filter */ NULL,
/* filterarg */ NULL,
- /* maxsize */ MAXBSIZE,
+ /* maxsize */ DFLTPHYS,
/* nsegments */ dpt->sgsize,
/* maxsegsz */ BUS_SPACE_MAXSIZE_32BIT,
/* flags */ BUS_DMA_ALLOCNOW,
@@ -1667,9 +1633,6 @@
"clear EOC.\n Marking as LOST.\n",
dccb->transaction_id);
-#ifdef DPT_HANDLE_TIMEOUTS
- dccb->state |= DPT_CCB_STATE_MARKED_LOST;
-#endif
/* This CLEARS the interrupt! */
status = dpt_inb(dpt, HA_RSTATUS);
continue;
@@ -2559,154 +2522,4 @@
return;
}
-#ifdef DPT_HANDLE_TIMEOUTS
-/**
- * This function walks down the SUBMITTED queue.
- * Every request that is too old gets aborted and marked.
- * Since the DPT will complete (interrupt) immediately (what does that mean?),
- * We just walk the list, aborting old commands and marking them as such.
- * The dpt_complete function will get rid of the that were interrupted in the
- * normal manner.
- *
- * This function needs to run at splcam(), as it interacts with the submitted
- * queue, as well as the completed and free queues. Just like dpt_intr() does.
- * To run it at any ISPL other than that of dpt_intr(), will mean that dpt_intr
- * willbe able to pre-empt it, grab a transaction in progress (towards
- * destruction) and operate on it. The state of this transaction will be not
- * very clear.
- * The only other option, is to lock it only as long as necessary but have
- * dpt_intr() spin-wait on it. In a UP environment this makes no sense and in
- * a SMP environment, the advantage is dubvious for a function that runs once
- * every ten seconds for few microseconds and, on systems with healthy
- * hardware, does not do anything anyway.
- */
-
-static void
-dpt_handle_timeouts(dpt_softc_t * dpt)
-{
- dpt_ccb_t *ccb;
-
- if (dpt->state & DPT_HA_TIMEOUTS_ACTIVE) {
- device_printf(dpt->dev, "WARNING: Timeout Handling Collision\n");
- return;
- }
- dpt->state |= DPT_HA_TIMEOUTS_ACTIVE;
-
- /* Loop through the entire submitted queue, looking for lost souls */
- TAILQ_FIRST(ccb, &&dpt->submitted_ccbs, links) {
- struct scsi_xfer *xs;
- u_int32_t age, max_age;
-
- xs = ccb->xs;
- age = dpt_time_delta(ccb->command_started, microtime_now);
-
-#define TenSec 10000000
-
- if (xs == NULL) { /* Local, non-kernel call */
- max_age = TenSec;
- } else {
- max_age = (((xs->timeout * (dpt->submitted_ccbs_count
- + DPT_TIMEOUT_FACTOR))
- > TenSec)
- ? (xs->timeout * (dpt->submitted_ccbs_count
- + DPT_TIMEOUT_FACTOR))
- : TenSec);
- }
-
- /*
- * If a transaction is marked lost and is TWICE as old as we
- * care, then, and only then do we destroy it!
- */
- if (ccb->state & DPT_CCB_STATE_MARKED_LOST) {
- /* Remember who is next */
- if (age > (max_age * 2)) {
- dpt_Qremove_submitted(dpt, ccb);
- ccb->state &= ~DPT_CCB_STATE_MARKED_LOST;
- ccb->state |= DPT_CCB_STATE_ABORTED;
-#define cmd_name scsi_cmd_name(ccb->eata_ccb.cp_scsi_cmd)
- if (ccb->retries++ > DPT_RETRIES) {
- device_printf(dpt->dev,
- "ERROR: Destroying stale "
- "%d (%s)\n"
- " on "
- "c%db%dt%du%d (%d/%d)\n",
- ccb->transaction_id,
- cmd_name,
- device_get_unit(dpt->dev),
- ccb->eata_ccb.cp_channel,
- ccb->eata_ccb.cp_id,
- ccb->eata_ccb.cp_LUN, age,
- ccb->retries);
-#define send_ccb &ccb->eata_ccb
-#define ESA EATA_SPECIFIC_ABORT
- (void) dpt_send_immediate(dpt,
- send_ccb,
- ESA,
- 0, 0);
- dpt_Qpush_free(dpt, ccb);
-
- /* The SCSI layer should re-try */
- xs->error |= XS_TIMEOUT;
- xs->flags |= SCSI_ITSDONE;
- scsi_done(xs);
- } else {
- device_printf(dpt->dev,
- "ERROR: Stale %d (%s) on "
- "c%db%dt%du%d (%d)\n"
- " gets another "
- "chance(%d/%d)\n",
- ccb->transaction_id,
- cmd_name,
- device_get_unit(dpt->dev),
- ccb->eata_ccb.cp_channel,
- ccb->eata_ccb.cp_id,
- ccb->eata_ccb.cp_LUN,
- age, ccb->retries, DPT_RETRIES);
-
- dpt_Qpush_waiting(dpt, ccb);
- dpt_sched_queue(dpt);
- }
- }
- } else {
- /*
- * This is a transaction that is not to be destroyed
- * (yet) But it is too old for our liking. We wait as
- * long as the upper layer thinks. Not really, we
- * multiply that by the number of commands in the
- * submitted queue + 1.
- */
- if (!(ccb->state & DPT_CCB_STATE_MARKED_LOST) &&
- (age != ~0) && (age > max_age)) {
- device_printf(dpt->dev,
- "ERROR: Marking %d (%s) on "
- "c%db%dt%du%d \n"
- " as late after %dusec\n",
- ccb->transaction_id,
- cmd_name,
- device_get_unit(dpt->dev),
- ccb->eata_ccb.cp_channel,
- ccb->eata_ccb.cp_id,
- ccb->eata_ccb.cp_LUN, age);
- ccb->state |= DPT_CCB_STATE_MARKED_LOST;
- }
- }
- }
-
- dpt->state &= ~DPT_HA_TIMEOUTS_ACTIVE;
-}
-
-static void
-dpt_timeout(void *arg)
-{
- dpt_softc_t *dpt = (dpt_softc_t *) arg;
-
- mtx_assert(&dpt->lock, MA_OWNED);
- if (!(dpt->state & DPT_HA_TIMEOUTS_ACTIVE))
- dpt_handle_timeouts(dpt);
-
- callout_reset(&dpt->timer, hz * 10, dpt_timeout, dpt);
-}
-
-#endif /* DPT_HANDLE_TIMEOUTS */
-
#endif
More information about the Midnightbsd-cvs
mailing list