From eb1759579c7f0f7436263df1fe527e0e5797cb81 Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Mon, 7 Jun 2010 19:54:34 +0000 Subject: Rework the way onboard devices attach on Sun 4/110 systems (which only have a 28 bit address bus) by reusing the regular sun4 configuration stanzas (with the upper four bits set in the device addresses), and clearing them when searching for a PROM mapping. This makes the obio autoconf code simpler, and all knowledge of the 4/110 specifics is now contained in a single file (dev/obio.c). ok todd@ deraadt@ --- share/man/man4/man4.sparc/bwtwo.4 | 7 +++---- share/man/man4/man4.sparc/cgeight.4 | 7 +++---- share/man/man4/man4.sparc/cgfour.4 | 7 +++---- share/man/man4/man4.sparc/cgsix.4 | 7 +++---- share/man/man4/man4.sparc/clock.4 | 5 ++--- share/man/man4/man4.sparc/ie.4 | 7 +++---- share/man/man4/man4.sparc/sw.4 | 8 ++++---- share/man/man4/man4.sparc/zs.4 | 10 ++++------ 8 files changed, 25 insertions(+), 33 deletions(-) (limited to 'share') diff --git a/share/man/man4/man4.sparc/bwtwo.4 b/share/man/man4/man4.sparc/bwtwo.4 index 759b5763db1..6728130bec1 100644 --- a/share/man/man4/man4.sparc/bwtwo.4 +++ b/share/man/man4/man4.sparc/bwtwo.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bwtwo.4,v 1.26 2008/03/31 07:44:30 jmc Exp $ +.\" $OpenBSD: bwtwo.4,v 1.27 2010/06/07 19:54:30 miod Exp $ .\" Copyright (c) 1992, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -33,7 +33,7 @@ .\" from: Header: bwtwo.4,v 1.3 94/02/03 20:42:13 leres Exp .\" from: @(#)bwtwo.4 8.2 (Berkeley) 2/16/94 .\" -.Dd $Mdocdate: March 31 2008 $ +.Dd $Mdocdate: June 7 2010 $ .Dt BWTWO 4 sparc .Os .Sh NAME @@ -43,8 +43,7 @@ .Cd "bwtwo0 at sbus0 " Pq "sun4c on-board" .Cd "bwtwo* at sbus? " Pq "sun4c and sun4m" .Cd "bwtwo0 at obio0 addr 0xfd000000 level 4" Pq sun4/200 -.Cd "bwtwo0 at obio0 addr 0xfb300000 level 4" Pq "sun4/300 in P4 slot" -.Cd "bwtwo0 at obio0 addr 0x0b300000 level 4" Pq "sun4/100 in P4 slot" +.Cd "bwtwo0 at obio0 addr 0xfb300000 level 4" Pq "sun4/100 and sun 4/300 P4" .Cd "wsdisplay* at bwtwo?" .Sh DESCRIPTION The diff --git a/share/man/man4/man4.sparc/cgeight.4 b/share/man/man4/man4.sparc/cgeight.4 index b1c2fcca5d9..3b9156053ac 100644 --- a/share/man/man4/man4.sparc/cgeight.4 +++ b/share/man/man4/man4.sparc/cgeight.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cgeight.4,v 1.24 2008/06/26 05:42:07 ray Exp $ +.\" $OpenBSD: cgeight.4,v 1.25 2010/06/07 19:54:30 miod Exp $ .\" $NetBSD: cgeight.4,v 1.2 1997/10/08 22:00:03 jtc Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -28,15 +28,14 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 26 2008 $ +.Dd $Mdocdate: June 7 2010 $ .Dt CGEIGHT 4 sparc .Os .Sh NAME .Nm cgeight .Nd 24-bit color frame buffer .Sh SYNOPSIS -.Cd "cgeight0 at obio0 addr 0xfb300000 level 4" Pq sun4/300 -.Cd "cgeight0 at obio0 addr 0x0b300000 level 4" Pq sun4/100 +.Cd "cgeight0 at obio0 addr 0xfb300000 level 4" Pq "sun4/100 and sun4/300" .Cd "wsdisplay* at cgeight?" .Sh DESCRIPTION The diff --git a/share/man/man4/man4.sparc/cgfour.4 b/share/man/man4/man4.sparc/cgfour.4 index 272ec251b37..70df9117ed5 100644 --- a/share/man/man4/man4.sparc/cgfour.4 +++ b/share/man/man4/man4.sparc/cgfour.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cgfour.4,v 1.23 2008/06/26 05:42:07 ray Exp $ +.\" $OpenBSD: cgfour.4,v 1.24 2010/06/07 19:54:30 miod Exp $ .\" $NetBSD: cgfour.4,v 1.2 1997/10/08 22:00:05 jtc Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -28,15 +28,14 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 26 2008 $ +.Dd $Mdocdate: June 7 2010 $ .Dt CGFOUR 4 sparc .Os .Sh NAME .Nm cgfour .Nd 8-bit color frame buffer .Sh SYNOPSIS -.Cd "cgfour0 at obio0 addr 0xfb300000 level 4" Pq sun4/300 -.Cd "cgfour0 at obio0 addr 0x0b300000 level 4" Pq sun4/100 +.Cd "cgfour0 at obio0 addr 0xfb300000 level 4" Pq "sun4/100 and sun4/300" .Cd "wsdisplay* at cgfour?" .Sh DESCRIPTION The diff --git a/share/man/man4/man4.sparc/cgsix.4 b/share/man/man4/man4.sparc/cgsix.4 index 72b50ee20d5..15996e197ac 100644 --- a/share/man/man4/man4.sparc/cgsix.4 +++ b/share/man/man4/man4.sparc/cgsix.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cgsix.4,v 1.31 2008/03/31 07:44:30 jmc Exp $ +.\" $OpenBSD: cgsix.4,v 1.32 2010/06/07 19:54:30 miod Exp $ .\" $NetBSD: cgsix.4,v 1.4 1998/06/11 08:32:20 fair Exp $ .\" .\" Copyright 1994 @@ -34,7 +34,7 @@ .\" .\" from: @(#)cgsix.4 8.1 (Berkeley) 2/16/94 .\" -.Dd $Mdocdate: March 31 2008 $ +.Dd $Mdocdate: June 7 2010 $ .Dt CGSIX 4 sparc .Os .Sh NAME @@ -42,8 +42,7 @@ .Nd accelerated 8-bit color frame buffer .Sh SYNOPSIS .Cd "cgsix* at sbus? " Pq "sun4c and sun4m" -.Cd "cgsix0 at obio0 addr 0xfb000000 level 4" Pq "sun4/300 P4" -.Cd "cgsix0 at obio0 addr 0x0b000000 level 4" Pq "sun4/100 P4" +.Cd "cgsix0 at obio0 addr 0xfb000000 level 4" Pq "sun4/100 and sun4/300 P4" .Cd "wsdisplay* at cgsix?" .Sh DESCRIPTION The diff --git a/share/man/man4/man4.sparc/clock.4 b/share/man/man4/man4.sparc/clock.4 index 47089a87b28..6aa3412a3db 100644 --- a/share/man/man4/man4.sparc/clock.4 +++ b/share/man/man4/man4.sparc/clock.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: clock.4,v 1.4 2010/06/07 19:47:54 miod Exp $ +.\" $OpenBSD: clock.4,v 1.5 2010/06/07 19:54:30 miod Exp $ .\" .\" Copyright (c) 2004 Jason L. Wright (jason@thought.net) .\" All rights reserved. @@ -34,8 +34,7 @@ .Cd "clock0 at mainbus0 # sun4c" .Cd "clock0 at obio0 # sun4m" .Cd "clock0 at obio0 addr 0xf2000000 # sun4/300" -.Cd "oclock0 at obio0 addr 0xf3000000 # sun4/200" -.Cd "oclock0 at obio0 addr 0x03000000 # sun4/100" +.Cd "oclock0 at obio0 addr 0xf3000000 # sun4/100 and sun4/200" .Sh DESCRIPTION The .Nm diff --git a/share/man/man4/man4.sparc/ie.4 b/share/man/man4/man4.sparc/ie.4 index 3289091144b..c34cfbed7f3 100644 --- a/share/man/man4/man4.sparc/ie.4 +++ b/share/man/man4/man4.sparc/ie.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ie.4,v 1.14 2008/03/31 07:44:30 jmc Exp $ +.\" $OpenBSD: ie.4,v 1.15 2010/06/07 19:54:30 miod Exp $ .\" .\" Copyright (c) 1988 John E. Stone .\" @@ -14,15 +14,14 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: March 31 2008 $ +.Dd $Mdocdate: June 7 2010 $ .Dt IE 4 sparc .Os .Sh NAME .Nm ie .Nd Intel i82586 Ethernet device .Sh SYNOPSIS -.Cd "ie0 at obio0 addr 0xf6000000 level 6 " Pq "sun4/200 on-board" -.Cd "ie0 at obio0 addr 0x06000000 level 6 " Pq "sun4/100 on-board" +.Cd "ie0 at obio0 addr 0xf6000000 level 6 " Pq "sun4/100 and sun4/200" .Cd "ie1 at vmes0 addr 0xffe88000 level 5 vect 0x75" Pq "VME" .Cd "ie2 at vmes0 addr 0xff31ff02 level 5 vect 0x76" Pq "VME" .Cd "ie3 at vmes0 addr 0xff35ff02 level 5 vect 0x77" Pq "VME" diff --git a/share/man/man4/man4.sparc/sw.4 b/share/man/man4/man4.sparc/sw.4 index 1299e95b04b..a8e04de84b2 100644 --- a/share/man/man4/man4.sparc/sw.4 +++ b/share/man/man4/man4.sparc/sw.4 @@ -1,18 +1,18 @@ -.\" $OpenBSD: sw.4,v 1.8 2007/05/31 19:19:56 jmc Exp $ +.\" $OpenBSD: sw.4,v 1.9 2010/06/07 19:54:30 miod Exp $ .\" .\" Copyright (c) 1998 The OpenBSD Project .\" All rights reserved. .\" .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: June 7 2010 $ .Dt SW 4 sparc .Os .Sh NAME .Nm sw .Nd NCR 5380 "SCSI Weird" Sun 4/100 on-board SCSI controller .Sh SYNOPSIS -.Cd "sw0 at obio0 addr 0x0a000000 level 3" Pq sun4/100 -.Cd "#sw0 at obio0 addr 0x0a000000 level 3 flags 0x07" Pq sun4/100 +.Cd "sw0 at obio0 addr 0xfa000000 level 3" Pq sun4/100 +.Cd "#sw0 at obio0 addr 0xfa000000 level 3 flags 0x07" Pq sun4/100 .Cd "scsibus* at sw?" .Sh DESCRIPTION The diff --git a/share/man/man4/man4.sparc/zs.4 b/share/man/man4/man4.sparc/zs.4 index 36841e76897..06b9c58f444 100644 --- a/share/man/man4/man4.sparc/zs.4 +++ b/share/man/man4/man4.sparc/zs.4 @@ -1,10 +1,10 @@ -.\" $OpenBSD: zs.4,v 1.21 2009/05/20 20:13:42 jmc Exp $ +.\" $OpenBSD: zs.4,v 1.22 2010/06/07 19:54:30 miod Exp $ .\" .\" Copyright (c) 1998, 2002 The OpenBSD Project .\" All rights reserved. .\" .\" -.Dd $Mdocdate: May 20 2009 $ +.Dd $Mdocdate: June 7 2010 $ .Dt ZS 4 sparc .Os .Sh NAME @@ -13,12 +13,10 @@ .Sh SYNOPSIS .Cd "zs0 at mainbus0 " Pq sun4c .Cd "zs0 at obio0 " Pq sun4m -.Cd "zs0 at obio0 addr 0xf1000000 level 12" Pq sun4/[23]00 -.Cd "zs0 at obio0 addr 0x01000000 level 12" Pq sun4/100 +.Cd "zs0 at obio0 addr 0xf1000000 level 12" Pq sun4 .Cd "zs1 at mainbus0 " Pq sun4c .Cd "zs1 at obio0 " Pq sun4m -.Cd "zs1 at obio0 addr 0xf0000000 level 12" Pq sun4/[23]00 -.Cd "zs1 at obio0 addr 0x00000000 level 12" Pq sun4/100 +.Cd "zs1 at obio0 addr 0xf0000000 level 12" Pq sun4 .Cd "zs2 at obio0 addr 0xe0000000 level 12" Pq sun4/300 .Cd "zstty* at zs?" .Cd "zskbd* at zs?" -- cgit v1.2.3