From b3aa6837c02d59893cf94b086ec2d71c008bd5da Mon Sep 17 00:00:00 2001 From: niklas Date: Tue, 5 Mar 1996 08:28:04 +0000 Subject: [PATCH] From NetBSD: merge with 960217 --- sys/dev/ic/cs4231reg.h | 64 +++++++++++++++++----------------- sys/dev/ic/dp8390reg.h | 3 +- sys/dev/ic/hayespreg.h | 76 +++++++++++++++++++++++++++++++++++++++++ sys/dev/ic/ics2101reg.h | 44 +++++++++++++----------- sys/dev/ic/ncr5380sbc.c | 6 ++-- 5 files changed, 138 insertions(+), 55 deletions(-) create mode 100644 sys/dev/ic/hayespreg.h diff --git a/sys/dev/ic/cs4231reg.h b/sys/dev/ic/cs4231reg.h index 7ad90f03999..5a470c666f5 100644 --- a/sys/dev/ic/cs4231reg.h +++ b/sys/dev/ic/cs4231reg.h @@ -1,31 +1,39 @@ -/* $NetBSD: cs4231reg.h,v 1.1 1995/07/07 02:11:46 brezak Exp $ */ -/* - * Copyright (c) 1995 John T. Kohl - * All rights reserved. +/* $NetBSD: cs4231reg.h,v 1.4 1996/02/16 08:12:33 mycroft Exp $ */ + +/*- + * Copyright (c) 1996 The NetBSD Foundation, Inc. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * This code is derived from software contributed to The NetBSD Foundation + * by Ken Hornstein and John Kohl. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ /* @@ -68,12 +76,6 @@ * */ - -/* - * The CS4231 mixer is write-only--it cannot be queried for current - * settings. Drivers must keep track of current values themselves. - */ - /* CS4231/AD1845 mode2 registers; added to AD1848 registers */ #define CS_ALT_FEATURE1 0x10 #define CS_ALT_FEATURE2 0x11 diff --git a/sys/dev/ic/dp8390reg.h b/sys/dev/ic/dp8390reg.h index ba7aad30bda..c0f6d931a37 100644 --- a/sys/dev/ic/dp8390reg.h +++ b/sys/dev/ic/dp8390reg.h @@ -1,3 +1,4 @@ +/* $OpenBSD: dp8390reg.h,v 1.2 1996/03/05 08:28:05 niklas Exp $ */ /* $NetBSD: dp8390reg.h,v 1.2 1995/04/12 16:12:42 mycroft Exp $ */ /* @@ -530,7 +531,7 @@ * was received. */ struct ed_ring { -#if BYTE_ORDER == BIG_ENDIAN +#if ED_BYTE_ORDER == BIG_ENDIAN u_char next_packet; /* pointer to next packet */ u_char rsr; /* receiver status */ #else diff --git a/sys/dev/ic/hayespreg.h b/sys/dev/ic/hayespreg.h new file mode 100644 index 00000000000..cd007999aea --- /dev/null +++ b/sys/dev/ic/hayespreg.h @@ -0,0 +1,76 @@ +/* $NetBSD: hayespreg.h,v 1.1 1996/02/10 20:23:40 christos Exp $ */ + +/*- + * Copyright (c) 1995 Sean E. Fagin, John M Vinopal. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the author nor the names of contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _HAYESPREG_H_ +#define _HAYESPREG_H_ + +/* + * Definitions for Hayes ESP serial cards. + */ + +/* + * CMD1 and CMD2 are the command ports, offsets from . + */ +#define HAYESP_CMD1 4 +#define HAYESP_CMD2 5 + +/* + * STAT1 and STAT2 are to get return values and status bytes + */ +#define HAYESP_STATUS1 HAYESP_CMD1 +#define HAYESP_STATUS2 HAYESP_CMD2 + +/* + * Commands. Commands are given by writing the command value to + * HAYESP_CMD1 and then writing or reading some number of bytes from + * HAYESP_CMD2 or HAYESP_STATUS2. + */ +#define HAYESP_GETTEST 0x01 /* self-test command (1b+extras) */ +#define HAYESP_GETDIPS 0x02 /* get on-board DIP switches (1b) */ +#define HAYESP_SETFLOWTYPE 0x08 /* set type of flow-control (2b) */ +#define HAYESP_SETRXFLOW 0x0a /* set Rx FIFO " levels (4b) */ +#define HAYESP_SETMODE 0x10 /* set board mode (1b) */ + +/* Mode bits (HAYESP_SETMODE). */ +#define HAYESP_MODE_FIFO 0x02 /* act like a 16550 (compat mode) */ +#define HAYESP_MODE_RTS 0x04 /* use RTS hardware flow control */ +#define HAYESP_MODE_SCALE 0x80 /* scale FIFO trigger levels */ + +/* Flow control type bits (HAYESP_SETFLOWTYPE). */ +#define HAYESP_FLOW_RTS 0x04 /* cmd1: local Rx sends RTS flow control */ +#define HAYESP_FLOW_CTS 0x10 /* cmd2: local transmitter responds to CTS */ + +/* Used by HAYESP_SETRXFLOW. */ +#define HAYESP_RXHIWMARK 768 +#define HAYESP_RXLOWMARK 512 +#define HAYESP_HIBYTE(w) (((w) >> 8) & 0xff) +#define HAYESP_LOBYTE(w) ((w) & 0xff) + +#endif /* !_HAYESPREG_H_ */ diff --git a/sys/dev/ic/ics2101reg.h b/sys/dev/ic/ics2101reg.h index 2a6181324aa..2b920695d90 100644 --- a/sys/dev/ic/ics2101reg.h +++ b/sys/dev/ic/ics2101reg.h @@ -1,7 +1,12 @@ -/* $NetBSD: ics2101reg.h,v 1.1 1995/07/19 19:58:33 brezak Exp $ */ -/* - * Copyright (c) 1994, 1995 Ken Hornstein. All rights reserved. - * Copyright (c) 1995 John T. Kohl. All rights reserved. +/* $OpenBSD: ics2101reg.h,v 1.2 1996/03/05 08:28:07 niklas Exp $ */ +/* $NetBSD: ics2101reg.h,v 1.3 1996/02/05 02:18:52 jtc Exp $ */ + +/*- + * Copyright (c) 1996 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Ken Hornstein and John Kohl. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -13,22 +18,23 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by Ken Hornstein. - * 4. The name of the authors may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * $Id: ics2101reg.h,v 1.1.1.1 1995/10/18 08:52:31 deraadt Exp $ + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ /* diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c index dc22db77a2d..6d1aaf78b0f 100644 --- a/sys/dev/ic/ncr5380sbc.c +++ b/sys/dev/ic/ncr5380sbc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ncr5380sbc.c,v 1.2 1996/01/23 19:47:00 gwr Exp $ */ +/* $NetBSD: ncr5380sbc.c,v 1.3 1996/02/10 00:11:48 christos Exp $ */ /* * Copyright (c) 1995 David Jones, Gordon W. Ross @@ -119,9 +119,7 @@ static void ncr5380_machine __P((struct ncr5380_softc *)); * Debugging stuff *****************************************************************/ -#ifdef DDB -int Debugger(); -#else +#ifndef DDB /* This is used only in recoverable places. */ #define Debugger() printf("Debug: ncr5380.c:%d\n", __LINE__) #endif -- 2.20.1