- The ioblix zbus board comes in 24 MHz and 22.1184 MHz clock variants.

We default to the (newer, more sane) 22.1184 MHz value, but set it from
the iobzclock variable (in Hz), which is initialized from the IOBZCLOCK
configuration option and patchable.
XXX we should time the clock at system startup.
- add ioblix_zbus to the GENERIC configuration.
This commit is contained in:
is 2001-03-10 23:55:29 +00:00
parent 4fea751ddc
commit 782a7670e9
7 changed files with 89 additions and 36 deletions

View File

@ -1,4 +1,4 @@
.\" $NetBSD: options.4,v 1.130 2001/03/05 02:35:22 mrg Exp $
.\" $NetBSD: options.4,v 1.131 2001/03/10 23:55:30 is Exp $
.\"
.\" Copyright (c) 1996
.\" Perry E. Metzger. All rights reserved.
@ -1348,6 +1348,14 @@ You need this with
.Tn ROM Ns s
up to (at least) V40.xxx (OS3.1),
when you boot via the bootblocks and don't have a DraCo.
.It Cd options IOBZCLOCK=frequency
The IOBlix boards come with two different serial master clocks: older ones
use 24 MHz, newer ones use 22.1184 MHz. The driver normally assumes the latter.
If your board uses 24 MHz, you can recompile your kernel with
options IOBZCLOCK=24000000
or patch the kernel variable
.Tn iobzclock
to the same value.
.It Cd options LIMITMEM=value
If there, limit the part of the first memory bank used by
.Nx

View File

@ -1,14 +1,13 @@
# $NetBSD: AMIGA,v 1.34 2001/01/21 20:41:39 is Exp $
# $NetBSD: AMIGA,v 1.35 2001/03/10 23:55:31 is Exp $
#
# This file was automatically created. Changes will be
# lost when running make in this directory.
#
# Created from:
#$ NetBSD: GENERIC,v 1.155 2001/01/21 20:38:20 is Exp $
# Created from: #NetBSD: GENERIC,v 1.156 2001/02/02 21:52:13 is Exp $
include "arch/amiga/conf/std.amiga"
#ident "GENERIC-$Revision: 1.34 $"
#ident "GENERIC-$Revision: 1.35 $"
maxusers 8
options RTC_OFFSET=0
@ -190,6 +189,13 @@ options GRF_SUPER72 # AGA Super-72
#enables the Hardwarecursor which does not work on some systems.
#options RH_HARDWARECURSOR
#wscons aware interface to amiga custom chips. Text-only console.
#If you enable it enable also wskbd.
#amidisplaycc0 at mainbus0 # wscons interface to custom chips
#wsdisplay0 at amidisplaycc0 console ?
#options WSEMUL_VT100
grfcc0 at mainbus0 # custom chips
grfrt0 at zbus0 # retina II
@ -238,10 +244,19 @@ hyper* at zbus? # zbus HyperCom3/3+/4/4+
com* at hyper? port ? # Hypercom3/4 serial ports
lpt* at hyper? port ? # Hypercom3+/4+ parallel port
#not enabled yet... needs more testing and clock frequency autodetection
#iobl* at zbus? # zbus IOBlix
#com* at iobl? port ? # IOBlix serial ports
#lpt* at iobl? port ? # IOBlix parallel ports
#options IOBZCLOCK=22118400 # default, uncomment the next line
#options IOBZCLOCK=24000000 # if needed.
iobl* at zbus? # zbus IOBlix
com* at iobl? port ? # IOBlix serial ports
lpt* at iobl? port ? # IOBlix parallel ports
#Keyboard device. Optionally can attach a wskbd.
#wskbd works together with a wsdisplay so enable them both if you will.
#Don't enable wskbd if you use ite.
#XXX in std.amiga: kbd0 at mainbus0
#wskbd0 at kbd0 console ?
#Amiga Mainboard devices (sans graphics and keyboard)

View File

@ -1,14 +1,13 @@
# $NetBSD: DRACO,v 1.51 2000/12/29 22:36:51 is Exp $
# $NetBSD: DRACO,v 1.52 2001/03/10 23:55:31 is Exp $
#
# This file was automatically created. Changes will be
# lost when running make in this directory.
#
# Created from:
#$ NetBSD: GENERIC,v 1.154 2000/12/29 22:31:56 is Exp $
# Created from: #NetBSD: GENERIC,v 1.156 2001/02/02 21:52:13 is Exp $
include "arch/amiga/conf/std.amiga"
#ident "GENERIC-$Revision: 1.51 $"
#ident "GENERIC-$Revision: 1.52 $"
maxusers 8
options RTC_OFFSET=0
@ -185,10 +184,19 @@ hyper* at zbus? # zbus HyperCom3/3+/4/4+
com* at hyper? port ? # Hypercom3/4 serial ports
lpt* at hyper? port ? # Hypercom3+/4+ parallel port
#not enabled yet... needs more testing and clock frequency autodetection
#iobl* at zbus? # zbus IOBlix
#com* at iobl? port ? # IOBlix serial ports
#lpt* at iobl? port ? # IOBlix parallel ports
#options IOBZCLOCK=22118400 # default, uncomment the next line
#options IOBZCLOCK=24000000 # if needed.
iobl* at zbus? # zbus IOBlix
com* at iobl? port ? # IOBlix serial ports
lpt* at iobl? port ? # IOBlix parallel ports
#Keyboard device. Optionally can attach a wskbd.
#wskbd works together with a wsdisplay so enable them both if you will.
#Don't enable wskbd if you use ite.
#XXX in std.amiga: kbd0 at mainbus0
#wskbd0 at kbd0 console ?
#DraCo Mainboard devices (sans keyboard)

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.156 2001/02/02 21:52:13 is Exp $
# $NetBSD: GENERIC,v 1.157 2001/03/10 23:55:31 is Exp $
#
#if 0
@ -16,7 +16,7 @@
include "arch/amiga/conf/std.amiga"
#ident "GENERIC-$Revision: 1.156 $"
#ident "GENERIC-$Revision: 1.157 $"
#ifdef INSTALL_CONFIGURATION
makeoptions COPTS="-Os"
@ -299,10 +299,12 @@ hyper* at zbus? # zbus HyperCom3/3+/4/4+
com* at hyper? port ? # Hypercom3/4 serial ports
lpt* at hyper? port ? # Hypercom3+/4+ parallel port
# not enabled yet... needs more testing and clock frequency autodetection
#iobl* at zbus? # zbus IOBlix
#com* at iobl? port ? # IOBlix serial ports
#lpt* at iobl? port ? # IOBlix parallel ports
#options IOBZCLOCK=22118400 # default, uncomment the next line
#options IOBZCLOCK=24000000 # if needed.
iobl* at zbus? # zbus IOBlix
com* at iobl? port ? # IOBlix serial ports
lpt* at iobl? port ? # IOBlix parallel ports
#

View File

@ -1,14 +1,13 @@
# $NetBSD: INSTALL,v 1.13 2001/01/21 20:41:40 is Exp $
# $NetBSD: INSTALL,v 1.14 2001/03/10 23:55:31 is Exp $
#
# This file was automatically created. Changes will be
# lost when running make in this directory.
#
# Created from:
#$ NetBSD: GENERIC,v 1.155 2001/01/21 20:38:20 is Exp $
# Created from: #NetBSD: GENERIC,v 1.156 2001/02/02 21:52:13 is Exp $
include "arch/amiga/conf/std.amiga"
#ident "GENERIC-$Revision: 1.13 $"
#ident "GENERIC-$Revision: 1.14 $"
makeoptions COPTS="-Os"
@ -147,6 +146,13 @@ options GRF_SUPER72 # AGA Super-72
#enables the Hardwarecursor which does not work on some systems.
#options RH_HARDWARECURSOR
#wscons aware interface to amiga custom chips. Text-only console.
#If you enable it enable also wskbd.
#amidisplaycc0 at mainbus0 # wscons interface to custom chips
#wsdisplay0 at amidisplaycc0 console ?
#options WSEMUL_VT100
grfcc0 at mainbus0 # custom chips
grfrt0 at zbus0 # retina II
@ -195,10 +201,19 @@ hyper* at zbus? # zbus HyperCom3/3+/4/4+
com* at hyper? port ? # Hypercom3/4 serial ports
lpt* at hyper? port ? # Hypercom3+/4+ parallel port
#not enabled yet... needs more testing and clock frequency autodetection
#iobl* at zbus? # zbus IOBlix
#com* at iobl? port ? # IOBlix serial ports
#lpt* at iobl? port ? # IOBlix parallel ports
#options IOBZCLOCK=22118400 # default, uncomment the next line
#options IOBZCLOCK=24000000 # if needed.
iobl* at zbus? # zbus IOBlix
com* at iobl? port ? # IOBlix serial ports
lpt* at iobl? port ? # IOBlix parallel ports
#Keyboard device. Optionally can attach a wskbd.
#wskbd works together with a wsdisplay so enable them both if you will.
#Don't enable wskbd if you use ite.
#XXX in std.amiga: kbd0 at mainbus0
#wskbd0 at kbd0 console ?
#Amiga Mainboard devices (sans graphics and keyboard)

View File

@ -1,4 +1,4 @@
# $NetBSD: files.amiga,v 1.104 2001/02/02 21:52:12 is Exp $
# $NetBSD: files.amiga,v 1.105 2001/03/10 23:55:31 is Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@ -23,6 +23,8 @@ defopt opt_retina.h RETINA_SPEED_HACK
defopt BB060STUPIDROM
defopt P5PPC68KBOARD
defopt IOBZCLOCK
device mainbus {}
attach mainbus at root

View File

@ -1,4 +1,4 @@
/* $NetBSD: ioblix_zbus.c,v 1.2 2001/03/08 19:21:53 is Exp $ */
/* $NetBSD: ioblix_zbus.c,v 1.3 2001/03/10 23:55:29 is Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -96,7 +96,7 @@ struct iobz_devs {
unsigned off;
int arg;
} iobzdevices[] = {
{ "com", 0x100, 24000000 },
{ "com", 0x100, 24000000 }, /* XXX see below */
{ "com", 0x108, 24000000 },
{ "com", 0x110, 24000000 },
{ "com", 0x118, 24000000 },
@ -105,7 +105,10 @@ struct iobz_devs {
{ 0, 0, 0}
};
#ifndef IOBZCLOCK
#define IOBZCLOCK 22118400;
#endif
int iobzclock = IOBZCLOCK; /* patchable! */
void
iobzattach(parent, self, auxp)
@ -137,7 +140,7 @@ iobzattach(parent, self, auxp)
while (iobzd->name) {
supa.supio_name = iobzd->name;
supa.supio_iobase = iobzd->off;
supa.supio_arg = iobzd->arg;
supa.supio_arg = iobzclock /* XXX iobzd->arg */;
config_found(self, &supa, iobzprint); /* XXX */
++iobzd;
}