src - OpenBSD base system

diff options


context:
space:
mode:

author	Steve Murphree <smurph@cvs.openbsd.org>	1998-12-15 05:52:32 +0000
committer	Steve Murphree <smurph@cvs.openbsd.org>	1998-12-15 05:52:32 +0000
commit	be8c8622ef57b334e07dd5c0f36cdacbd0ba355a (patch)
tree	bd550e88fe9e76416d05e97d3152a6fe0bf0a3b8
parent	2fb8d39328cdf8894f11b9eb00c06436c0677e5d (diff)

Commit for the first real OpenBSD mvme88k port.

Diffstat

-rw-r--r--

sys/arch/mvme88k/dev/bugio.c

-rw-r--r--

sys/arch/mvme88k/dev/bugtty.c

-rw-r--r--

sys/arch/mvme88k/dev/cl.c

106

-rw-r--r--

sys/arch/mvme88k/dev/clock.c

323

-rw-r--r--

sys/arch/mvme88k/dev/clockreg.h

-rw-r--r--

sys/arch/mvme88k/dev/clreg.h

204

-rw-r--r--

sys/arch/mvme88k/dev/i82586.h

-rw-r--r--

sys/arch/mvme88k/dev/if_ie.c

112

-rw-r--r--

sys/arch/mvme88k/dev/if_ie.h

-rw-r--r--

sys/arch/mvme88k/dev/mainbus.c

105

-rw-r--r--

sys/arch/mvme88k/dev/memc.c

-rw-r--r--

sys/arch/mvme88k/dev/memcreg.h

-rw-r--r--

sys/arch/mvme88k/dev/memdevs.c

-rw-r--r--

sys/arch/mvme88k/dev/nvram.c

317

-rw-r--r--

sys/arch/mvme88k/dev/nvramreg.h

-rw-r--r--

sys/arch/mvme88k/dev/pcctwo.c

306

-rw-r--r--

sys/arch/mvme88k/dev/pcctworeg.h

229

-rw-r--r--

sys/arch/mvme88k/dev/rd_root.c

-rw-r--r--

sys/arch/mvme88k/dev/siop.c

339

-rw-r--r--

sys/arch/mvme88k/dev/siop_script.out

273

-rw-r--r--

sys/arch/mvme88k/dev/siop_script.ss

-rw-r--r--

sys/arch/mvme88k/dev/siopdma.c

-rw-r--r--

sys/arch/mvme88k/dev/siopreg.h

-rw-r--r--

sys/arch/mvme88k/dev/siopvar.h

-rw-r--r--

sys/arch/mvme88k/dev/sram.c

223

-rw-r--r--

sys/arch/mvme88k/dev/vme.c

245

-rw-r--r--

sys/arch/mvme88k/dev/vme.h

-rw-r--r--

sys/arch/mvme88k/dev/vmel.c

-rw-r--r--

sys/arch/mvme88k/dev/vmes.c

29 files changed, 1831 insertions, 1385 deletions

diff --git a/sys/arch/mvme88k/dev/bugio.c b/sys/arch/mvme88k/dev/bugio.c
index 941c7f143b5..be68ef99c17 100644
--- a/sys/arch/mvme88k/dev/bugio.c
+++ b/sys/arch/mvme88k/dev/bugio.c

@@ -1,3 +1,5 @@

+/* $OpenBSD: bugio.c,v 1.2 1998/12/15 05:52:29 smurph Exp $ */

#include <machine/bugio.h>

#define INCHR "0x0000"

@@ -62,29 +64,14 @@ char

buginchr(void)

{

BUGCTXT();

asm volatile ("or r9,r0," INCHR);

asm volatile ("tb0 0,r0,0x1F0");

- /*asm("or %0,r0,r2" : "=r" (cc) : );*/

+ asm volatile ("or %0,r0,r2" : "=r" (cc) : );

OSCTXT();

return ((char)cc & 0xFF);

}

-/* return 1 if not empty else 0 */

-buginstat(void)

- int ret;

- BUGCTXT();

- asm volatile ("or r9,r0," INSTAT);

- asm volatile ("tb0 0,r0,0x1F0");

- asm volatile ("or %0,r0,r2" : "=r" (ret) : );

- OSCTXT();

- return (ret & 0x40 ? 1 : 0);

bugoutchr(unsigned char c)

{

unsigned char cc;

@@ -103,6 +90,20 @@ bugoutchr(unsigned char c)

OSCTXT();

}

+/* return 1 if not empty else 0 */

+buginstat(void)

+ int ret;

+ BUGCTXT();

+ asm volatile ("or r9,r0," INSTAT);

+ asm volatile ("tb0 0,r0,0x1F0");

+ asm volatile ("or %0,r0,r2" : "=r" (ret) : );

+ OSCTXT();

+ return (ret & 0x4 ? 1 : 0);

bugoutstr(char *s, char *se)

{

BUGCTXT();

@@ -176,9 +177,9 @@ bugbrdid(struct bugbrdid *id)

bugnetctrl(struct bugniocall *niocall)

{

- BUGCTXT();

+/* BUGCTXT();*/

asm("or r2,r0,%0" : : "r" (niocall));

asm("or r9,r0, " NETCTRL);

asm("tb0 0,r0,0x1F0");

- OSCTXT();

+/* OSCTXT();*/

}

diff --git a/sys/arch/mvme88k/dev/bugtty.c b/sys/arch/mvme88k/dev/bugtty.c
index 0eeafd308c7..87e20c7189c 100644
--- a/sys/arch/mvme88k/dev/bugtty.c
+++ b/sys/arch/mvme88k/dev/bugtty.c

@@ -1,6 +1,5 @@

-/* $NetBSD$ */

-/*

+/* $OpenBSD: bugtty.c,v 1.4 1998/12/15 05:52:29 smurph Exp $ */

@@ -81,6 +80,17 @@ char bug_obuffer[BUGBUF+1];

#define bugtty_tty bugttytty

struct tty *bugtty_tty[NBUGTTY];

int needprom = 1;

+/*

+ int ca_bustype;

+ void *ca_vaddr;

+ void *ca_paddr;

+ int ca_offset;

+ int ca_len;

+ int ca_ipl;

+ int ca_vec;

+ char *ca_name;

+ void *ca_master; points to bus-dependent data

+*/

int

bugttymatch(parent, self, aux)

@@ -88,17 +98,15 @@ bugttymatch(parent, self, aux)

void *self;

void *aux;

{

- extern int needprom;

struct confargs *ca = aux;

if (needprom == 0)

return (0);

- /*

- * tell our parent our requirements

- */

- ca->ca_paddr = (caddr_t)0xfff45000;

- ca->ca_size = 0x200;

+ ca->ca_paddr = (void *)0xfff45000;

+ ca->ca_vaddr = (void *)0xfff45000;

+ ca->ca_len = 0x200;

ca->ca_ipl = IPL_TTY;

+ ca->ca_name = "bugtty\0";

return (1);

}

@@ -108,7 +116,7 @@ bugttyattach(parent, self, aux)

struct device *self;

void *aux;

{

- printf("\n");

+ printf(": bugtty\n");

}

#define BUGTTYUNIT(x) ((x) & (0x7f))

@@ -444,8 +452,8 @@ bugttycnprobe(cp)

struct consdev *cp;

{

int maj;

- extern int needprom;

+ int needprom = 1;

if (needprom == 0) {

cp->cn_pri = CN_DEAD;

return (0);

@@ -460,7 +468,8 @@ bugttycnprobe(cp)

default:

break;

}

-#else

+#endif

+#if 0

cp->cn_pri = CN_NORMAL;

return (0);

#endif /* 0 */

@@ -472,7 +481,6 @@ bugttycnprobe(cp)

cp->cn_dev = makedev(maj, 0);

cp->cn_pri = CN_NORMAL;

return (1);

}

@@ -480,6 +488,7 @@ int

bugttycninit(cp)

struct consdev *cp;

{

+ /* Nothing to do */

}

int

diff --git a/sys/arch/mvme88k/dev/cl.c b/sys/arch/mvme88k/dev/cl.c
index 1c1ff9748ad..373c6816961 100644
--- a/sys/arch/mvme88k/dev/cl.c
+++ b/sys/arch/mvme88k/dev/cl.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: cl.c,v 1.1 1997/03/03 19:32:04 rahnds Exp $ */

+/* $OpenBSD: cl.c,v 1.2 1998/12/15 05:52:29 smurph Exp $ */

@@ -84,10 +84,14 @@

#define CL_TXINTR 0x02

#define CL_RXINTR 0x02

+#ifdef DEBUG

+#undef DEBUG

+#endif

+#define DEBUG_KERN 1

struct cl_cons {

void *cl_paddr;

volatile struct clreg *cl_vaddr;

- volatile struct pcc2reg *pcctwoaddr;

+ volatile struct pcctworeg *pcctwoaddr;

u_char channel;

} cl_cons;

@@ -133,7 +137,7 @@ struct clsoftc {

struct intrhand sc_ih_m;

struct intrhand sc_ih_t;

struct intrhand sc_ih_r;

- struct pcc2reg *sc_pcctwo;

+ struct pcctworeg *sc_pcctwo;

int sc_flags;

};

struct {

@@ -241,46 +245,20 @@ int clprobe(parent, self, aux)

struct clreg *cl_reg;

struct confargs *ca = aux;

- register struct cfdata *cf = self;

- caddr_t base;

int ret;

-#if 0

- if (cputyp != CPU_167 && cputyp != CPU_166

-#ifdef CPU_187

- && cputyp != CPU_187

-#endif

- )

- {

- return 0;

- }

-#endif /* 0 */

- if (cputyp != CPU_187) {

+ if (cputyp != CPU_187)

return 0;

- }

- /*

- * If bus or name do not match, fail.

- */

- if (ca->ca_bustype != BUS_PCCTWO ||

- strcmp(cf->cf_driver->cd_name, "cl")) {

- return 0;

- }

- base = (caddr_t)cf->cf_loc[0];

- if (badpaddr(base, 1) == -1) {

- return 0;

- }

- /*

- * tell our parent our requirements

- */

- ca->ca_paddr = (caddr_t)CD2400_BASE_ADDR;

- ca->ca_size = CD2400_SIZE;

ca->ca_ipl = IPL_TTY;

- return 1;

+ ca->ca_paddr = (void *)CD2400_BASE_ADDR;

+ cl_reg = (struct clreg *)ca->ca_vaddr;

+#if 0

+ ret = !badvaddr(&cl_reg->cl_gfrcr,1);

+#else

+ ret = 1;

+#endif

+ return ret;

}

void

@@ -294,7 +272,7 @@ clattach(parent, self, aux)

int i;

sc->cl_reg = (struct clreg *)ca->ca_vaddr;

- sc->sc_pcctwo = (struct pcc2reg *)ca->ca_parent;

+ sc->sc_pcctwo = ca->ca_master;

if ((u_char *)ca->ca_paddr == (u_char *)cl_cons.cl_paddr) {

/* if this device is configured as console,

@@ -305,6 +283,9 @@ clattach(parent, self, aux)

/* reset chip only if we are not console device */

/* wait for GFRCR */

}

+ /* allow chip to settle before continuing */

+ delay(100);

/* set up global registers */

sc->cl_reg->cl_tpr = CL_TIMEOUT;

sc->cl_reg->cl_rpilr = 0x03;

@@ -383,13 +364,13 @@ clattach(parent, self, aux)

intr_establish(PCC2_VECT + SMOIRQ, &sc->sc_ih_m);

intr_establish(PCC2_VECT + STxIRQ, &sc->sc_ih_t);

intr_establish(PCC2_VECT + SRxIRQ, &sc->sc_ih_r);

- sc->sc_pcctwo = (struct pcc2reg *)ca->ca_parent;

- sc->sc_pcctwo->pcc2_sccerrstat = 0x01; /* clear errors */

+ sc->sc_pcctwo = ca->ca_master;

+ sc->sc_pcctwo->pcc2_sccerr = 0x01; /* clear errors */

/* enable all interrupts at ca_ipl */

- sc->sc_pcctwo->pcc2_sccmoirq = 0x10 | (ca->ca_ipl & 0x7);

- sc->sc_pcctwo->pcc2_scctxirq = 0x10 | (ca->ca_ipl & 0x7);

- sc->sc_pcctwo->pcc2_sccrxirq = 0x10 | (ca->ca_ipl & 0x7);

+ sc->sc_pcctwo->pcc2_sccirq = 0x10 | (ca->ca_ipl & 0x7);

+ sc->sc_pcctwo->pcc2_scctx = 0x10 | (ca->ca_ipl & 0x7);

+ sc->sc_pcctwo->pcc2_sccrx = 0x10 | (ca->ca_ipl & 0x7);

break;

default:

/* oops */

@@ -959,29 +940,11 @@ int

clcninit(cp)

struct consdev *cp;

{

-#if defined(MVME187)

- volatile struct clreg *cl_reg;

- extern vm_offset_t clconsvaddr, pcc2consvaddr;

- cl_cons.cl_paddr = (void *)CD2400_BASE_ADDR;

- cl_cons.cl_vaddr = (struct clreg *)CD2400_BASE_ADDR;

- cl_cons.pcctwoaddr = (struct pcc2reg *)PCC2_BASE_ADDR;

-#else

-#ifdef MAP_DOES_WORK

- int size = (0x1ff + PGOFSET) & ~PGOFSET;

- int pcc2_size = (0x3C + PGOFSET) & ~PGOFSET;

-#endif

- struct clreg *cl_reg;

+ volatile struct clreg *cl_reg;

cl_cons.cl_paddr = (void *)0xfff45000;

-#ifdef MAP_DOES_WORK

- cl_cons.cl_vaddr = mapiodev(cl_cons.cl_paddr,size);

- cd_pcc2_base = mapiodev(0xfff42000,pcc2_size);

-#else

cl_cons.cl_vaddr = (struct clreg *)IIOV(cl_cons.cl_paddr);

cl_cons.pcctwoaddr = (void *)IIOV(0xfff42000);

-#endif

-#endif /* defined(MVME187)

cl_reg = cl_cons.cl_vaddr;

/* reset the chip? */

#ifdef CLCD_DO_RESET

@@ -1035,12 +998,13 @@ clcngetc(dev)

int got_char = 0;

u_char ier_old = 0xff;

volatile struct clreg *cl_reg = cl_cons.cl_vaddr;

- volatile struct pcc2reg *pcc2_base = cl_cons.pcctwoaddr;

+ volatile struct pcctworeg *pcc2_base = cl_cons.pcctwoaddr;

cl_reg->cl_car = 0;

if (!(cl_reg->cl_ier & 0x08)) {

ier_old = cl_reg->cl_ier;

cl_reg->cl_ier = 0x08;

}

while (got_char == 0) {

val = cl_reg->cl_rir;

/* if no receive interrupt pending wait */

@@ -1048,7 +1012,7 @@ clcngetc(dev)

continue;

}

/* XXX do we need to suck the entire FIFO contents? */

- reoir = pcc2_base->pcc2_sccrxpiack; /* receive PIACK */

+ reoir = pcc2_base->pcc2_sccrxiack; /* receive PIACK */

licr = cl_reg->cl_licr;

if (((licr >> 2) & 0x3) == 0) {

/* is the interrupt for us (port 0) */

@@ -1216,7 +1180,7 @@ clgetc(sc, channel)

int *channel;

{

volatile struct clreg *cl_reg;

- volatile struct pcc2reg *pcc2_base;

+ volatile struct pcctworeg *pcc2_base;

u_char val, reoir, licr, isrl, fifo_cnt, data;

if (0 == sc) {

cl_reg = cl_cons.cl_vaddr;

@@ -1231,7 +1195,7 @@ clgetc(sc, channel)

return 0;

}

/* XXX do we need to suck the entire FIFO contents? */

- reoir = pcc2_base->pcc2_sccrxpiack; /* receive PIACK */

+ reoir = pcc2_base->pcc2_sccrxiack; /* receive PIACK */

licr = cl_reg->cl_licr;

*channel = (licr >> 2) & 0x3;

/* is the interrupt for us (port 0) */

@@ -1685,7 +1649,7 @@ cl_rxintr(sc)

} else

/* We don't need no sinkin special characters */

if (risrl & 0x08) {

- cl_overflow (sc, channel, &sc->sc_fotime, "fifo");

+ cl_overflow (sc, channel, (long*)&sc->sc_fotime, "fifo");

reoir = 0x08;

} else

if (risrl & 0x04) {

@@ -1871,7 +1835,11 @@ cl_break (sc, channel)

struct clsoftc *sc;

int channel;

{

+#ifdef DEBUG_KERN

+ Debugger();

+#else

log(LOG_WARNING, "%s%d[%d]: break detected\n", cl_cd.cd_name, 0, channel);

+#endif

return;

}

diff --git a/sys/arch/mvme88k/dev/clock.c b/sys/arch/mvme88k/dev/clock.c
index 352bc426dfc..3535f83d231 100644
--- a/sys/arch/mvme88k/dev/clock.c
+++ b/sys/arch/mvme88k/dev/clock.c

@@ -1,6 +1,35 @@

-/* $NetBSD: clock.c,v 1.22 1995/05/29 23:57:15 pk Exp $ */

+/* $OpenBSD: clock.c,v 1.4 1998/12/15 05:52:29 smurph Exp $ */

+ *

+ * 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 under OpenBSD by

+ * Theo de Raadt for Willowglen Singapore.

+ * 4. The name of the author may not be used to endorse or promote products

+ * derived from this software without specific prior written permission.

+ *

+ * 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.

+ *

@@ -58,10 +87,12 @@

#include <sys/gmon.h>

#endif

+#include <machine/psl.h>

#include <machine/autoconf.h>

#include <machine/cpu.h>

#include <mvme88k/dev/pcctworeg.h>

+#include "pcctwo.h"

* Statistics clock interval and variance, in usec. Variance must be a

@@ -79,12 +110,13 @@ u_long delay_factor = 1;

static int clockmatch __P((struct device *, void *, void *));

static void clockattach __P((struct device *, struct device *, void *));

-int clockintr __P((void *, void *));

-int statintr __P((void *, void *));

+/*int clockintr __P((void *, void *));*/

+/*#int statintr __P((void *, void *));*/

struct clocksoftc {

struct device sc_dev;

- volatile struct pcc2reg *sc_pcc2reg;

+ struct intrhand sc_profih;

+ struct intrhand sc_statih;

};

struct cfattach clock_ca = {

@@ -95,13 +127,23 @@ struct cfdriver clock_cd = {

NULL, "clock", DV_DULL, 0

};

-struct intrhand clockintrhand, statintrhand;

+int clockintr __P((void *));

+int statintr __P((void *));

+int clockbus;

+u_char stat_reset, prof_reset;

-static int

-clockmatch(struct device *parent, void *self, void *aux)

+ /*

+ * Every machine must have a clock tick device of some sort; for this

+ * platform this file manages it, no matter what form it takes.

+ */

+int

+clockmatch(parent, vcf, args)

+ struct device *parent;

+ void *vcf, *args;

{

- register struct confargs *ca = aux;

- register struct cfdata *cf = self;

+ register struct confargs *ca = args;

+ register struct cfdata *cf = vcf;

if (ca->ca_bustype != BUS_PCCTWO ||

strcmp(cf->cf_driver->cd_name, "clock")) {

@@ -115,100 +157,62 @@ clockmatch(struct device *parent, void *self, void *aux)

ca->ca_ipl = IPL_CLOCK;

/* set size to 0 - see pcctwo.c:match for details */

- ca->ca_size = 0;

+ ca->ca_len = 0;

- return 1;

+ return (1);

}

-/* ARGSUSED */

-static void

-clockattach(struct device *parent, struct device *self, void *aux)

+void

+clockattach(parent, self, args)

+ struct device *parent, *self;

+ void *args;

{

- struct confargs *ca = aux;

+ struct confargs *ca = args;

struct clocksoftc *sc = (struct clocksoftc *)self;

- u_long elapsedtime;

- extern void delay(u_long);

- extern int cpuspeed;

+ sc->sc_profih.ih_fn = clockintr;

+ sc->sc_profih.ih_arg = 0;

+ sc->sc_profih.ih_wantframe = 1;

+ sc->sc_profih.ih_ipl = ca->ca_ipl;

- /*

- * save virtual address of the pcc2 block since our

- * registers are in that block.

- */

- sc->sc_pcc2reg = (struct pcc2reg *)ca->ca_vaddr;

+ sc->sc_statih.ih_fn = statintr;

+ sc->sc_statih.ih_arg = 0;

+ sc->sc_statih.ih_wantframe = 1;

+ sc->sc_statih.ih_ipl = ca->ca_ipl;

- /*

- * calibrate for delay() calls.

- * We do this by using tick timer1 in free running mode before

- * cpu_initclocks() is called so turn on clock interrupts etc.

- *

- * the approach is:

- * set count in timer to 0

- * call delay(1000) for a 1000 us delay

- * after return, stop count and figure out

- * how many us went by (call it x)

- * now the factor to multiply the arg. passed to

- * delay would be (x/1000) rounded up to an int.

- */

- printf("\n");

- sc->sc_pcc2reg->pcc2_t1ctl &= ~PCC2_TICTL_CEN;

- sc->sc_pcc2reg->pcc2_psclkadj = 256 - cpuspeed;

- sc->sc_pcc2reg->pcc2_t1irq &= ~PCC2_TTIRQ_IEN;

- sc->sc_pcc2reg->pcc2_t1cntr = 0;

- sc->sc_pcc2reg->pcc2_t1ctl |= PCC2_TICTL_CEN;

- delay(1000); /* delay for 1 ms */

- sc->sc_pcc2reg->pcc2_t1ctl &= ~PCC2_TICTL_CEN;

- elapsedtime = sc->sc_pcc2reg->pcc2_t1cntr;

- delay_factor = (u_long)(elapsedtime / 1000 + 1);

+ clockbus = ca->ca_bustype;

+ prof_reset = ca->ca_ipl | PCC2_IRQ_IEN | PCC2_IRQ_ICLR;

+ stat_reset = ca->ca_ipl | PCC2_IRQ_IEN | PCC2_IRQ_ICLR;

+ pcctwointr_establish(PCC2V_TIMER1, &sc->sc_profih);

+ pcctwointr_establish(PCC2V_TIMER2, &sc->sc_statih);

- /*

- * program clock to interrupt at IPL_CLOCK. Set everything

- * except compare registers, interrupt enable and counter

- * enable registers.

- */

- sc->sc_pcc2reg->pcc2_t1ctl &= ~(PCC2_TICTL_CEN);

- sc->sc_pcc2reg->pcc2_t1cntr= 0;

- sc->sc_pcc2reg->pcc2_t1ctl |= (PCC2_TICTL_COC|PCC2_TICTL_COVF);

- sc->sc_pcc2reg->pcc2_t1irq = (PCC2_TTIRQ_ICLR|IPL_CLOCK);

- sc->sc_pcc2reg->pcc2_t2ctl &= ~(PCC2_TICTL_CEN);

- sc->sc_pcc2reg->pcc2_t2cntr= 0;

- sc->sc_pcc2reg->pcc2_t2ctl |= (PCC2_TICTL_COC|PCC2_TICTL_COVF);

- sc->sc_pcc2reg->pcc2_t2irq = (PCC2_TTIRQ_ICLR|IPL_CLOCK);

+ printf("\n");

- * Establish inerrupt handlers.

+ * clockintr: ack intr and call hardclock

- clockintrhand.ih_fn = clockintr;

- clockintrhand.ih_arg = 0; /* don't want anything */

- clockintrhand.ih_ipl = IPL_CLOCK;

- clockintrhand.ih_wantframe = 1;

- intr_establish(PCC2_VECT+9, &clockintrhand);

- statintrhand.ih_fn = statintr;

- statintrhand.ih_arg = 0; /* don't want anything */

- statintrhand.ih_ipl = IPL_CLOCK;

- statintrhand.ih_wantframe = 1;

- intr_establish(PCC2_VECT+8, &statintrhand);

- timerok = 1;

+int

+clockintr(arg)

+ void *arg;

+ sys_pcc2->pcc2_t1irq = prof_reset;

+ hardclock(arg);

+#include "bugtty.h"

+#if NBUGTTY > 0

+ bugtty_chkinput();

+#endif /* NBUGTTY */

+ return (1);

}

- * Set up the real-time and statistics clocks. Leave stathz 0 only if

- * no alternative timer is available. mvme167/mvme187 has 2 tick timers

- * in pcc2 - we are using timer 1 for clock interrupt and timer 2 for

- * statistics.

- *

- * The frequencies of these clocks must be an even number of microseconds.

+ * Set up real-time clock; we don't have a statistics clock at

+ * present.

cpu_initclocks()

{

- volatile struct pcc2reg *pcc2reg;

- pcc2reg = ((struct clocksoftc *)clock_cd.cd_devs[0])->sc_pcc2reg;

if (1000000 % hz) {

printf("cannot get %d Hz clock; using 100 Hz\n", hz);

@@ -227,91 +231,41 @@ cpu_initclocks()

minint = statint / 2 + 100;

while (statvar > minint)

statvar >>= 1;

- /*

- * hz value 100 means we want the clock to interrupt 100

- * times a sec or 100 times in 1000000 us ie, 1 interrupt

- * every 10000 us. Program the tick timer compare register

- * to this value.

- */

- pcc2reg->pcc2_t1cmp = tick;

- pcc2reg->pcc2_t2cmp = statint;

- statmin = statint - (statvar >> 1);

- /* start the clocks ticking */

- pcc2reg->pcc2_t1ctl = (PCC2_TICTL_CEN|PCC2_TICTL_COC|PCC2_TICTL_COVF);

- pcc2reg->pcc2_t2ctl = (PCC2_TICTL_CEN|PCC2_TICTL_COC|PCC2_TICTL_COVF);

- /* and enable those interrupts */

- pcc2reg->pcc2_t1irq |= (PCC2_TTIRQ_IEN|PCC2_TTIRQ_ICLR);

- pcc2reg->pcc2_t2irq |= (PCC2_TTIRQ_IEN|PCC2_TTIRQ_ICLR);

+ /* profclock */

+ sys_pcc2->pcc2_t1ctl = 0;

+ sys_pcc2->pcc2_t1cmp = pcc2_timer_us2lim(tick);

+ sys_pcc2->pcc2_t1count = 0;

+ sys_pcc2->pcc2_t1ctl = PCC2_TCTL_CEN | PCC2_TCTL_COC |

+ PCC2_TCTL_COVF;

+ sys_pcc2->pcc2_t1irq = prof_reset;

+ /* statclock */

+ sys_pcc2->pcc2_t2ctl = 0;

+ sys_pcc2->pcc2_t2cmp = pcc2_timer_us2lim(statint);

+ sys_pcc2->pcc2_t2count = 0;

+ sys_pcc2->pcc2_t2ctl = PCC2_TCTL_CEN | PCC2_TCTL_COC |

+ PCC2_TCTL_COVF;

+ sys_pcc2->pcc2_t2irq = stat_reset;

-/*

- * Dummy setstatclockrate(), since we know profhz==hz.

- */

-/* ARGSUSED */

-void

-setstatclockrate(int newhz)

- /* nothing */

+ statmin = statint - (statvar >> 1);

}

-/*

- * Delay: wait for `about' n microseconds to pass.

- */

void

-delay(volatile u_long n)

- volatile u_long cnt = n * delay_factor;

- while (cnt-- > 0) {

- asm volatile("");

- }

-/*

- * Clock interrupt handler. Calls hardclock() after setting up a

- * clockframe.

- */

-int

-clockintr(void *cap, void *frame)

+setstatclockrate(newhz)

+ int newhz;

{

- volatile struct pcc2reg *reg;

- reg = ((struct clocksoftc *)clock_cd.cd_devs[0])->sc_pcc2reg;

- /* Clear the interrupt */

- reg->pcc2_t1irq = (PCC2_TTIRQ_IEN|PCC2_TTIRQ_ICLR|IPL_CLOCK);

-#if 0

- reg->pcc2_t1irq |= PCC2_TTIRQ_ICLR;

-#endif /* 0 */

- hardclock((struct clockframe *)frame);

-#include "bugtty.h"

-#if NBUGTTY > 0

- bugtty_chkinput();

-#endif /* NBUGTTY */

- return (1);

}

-/*

- * Stat clock interrupt handler.

- */

int

-statintr(void *cap, void *frame)

+statintr(cap)

+ void *cap;

{

- volatile struct pcc2reg *reg;

- reg = ((struct clocksoftc *)clock_cd.cd_devs[0])->sc_pcc2reg;

- /* Clear the interrupt */

-#if 0

- reg->pcc2_t2irq |= PCC2_TTIRQ_ICLR;

-#endif /* 0 */

- reg->pcc2_t2irq = (PCC2_TTIRQ_IEN|PCC2_TTIRQ_ICLR|IPL_CLOCK);

+ sys_pcc2->pcc2_t2irq = stat_reset;

- statclock((struct clockframe *)frame);

+ statclock((struct clockframe *)cap);

* Compute new randomized interval. The intervals are uniformly

@@ -324,48 +278,27 @@ statintr(void *cap, void *frame)

} while (r == 0);

newint = statmin + r;

- /*

- * reprogram statistics timer to interrupt at

- * newint us intervals.

- */

- reg->pcc2_t2ctl = ~(PCC2_TICTL_CEN);

- reg->pcc2_t2cntr = 0;

- reg->pcc2_t2cmp = newint;

- reg->pcc2_t2ctl = (PCC2_TICTL_CEN|PCC2_TICTL_COC|PCC2_TICTL_COVF);

- reg->pcc2_t2irq |= (PCC2_TTIRQ_ICLR|PCC2_TTIRQ_IEN);

+ sys_pcc2->pcc2_t2ctl = 0;

+ sys_pcc2->pcc2_t2cmp = pcc2_timer_us2lim(newint);

+ sys_pcc2->pcc2_t2count = 0; /* should I? */

+ sys_pcc2->pcc2_t2irq = stat_reset;

+ sys_pcc2->pcc2_t2ctl = PCC2_TCTL_CEN | PCC2_TCTL_COC;

return (1);

}

-/*

- * Return the best possible estimate of the time in the timeval

- * to which tvp points. We do this by returning the current time

- * plus the amount of time since the last clock interrupt.

- *

- * Check that this time is no less than any previously-reported time,

- * which could happen around the time of a clock adjustment. Just for

- * fun, we guarantee that the time will be greater than the value

- * obtained by a previous call.

- */

-void

-microtime(tvp)

- register struct timeval *tvp;

+delay(us)

+ register int us;

{

- int s;

- static struct timeval lasttime;

- s = splhigh();

- *tvp = time;

- while (tvp->tv_usec > 1000000) {

- tvp->tv_sec++;

- tvp->tv_usec -= 1000000;

- }

- if (tvp->tv_sec == lasttime.tv_sec &&

- tvp->tv_usec <= lasttime.tv_usec &&

- (tvp->tv_usec = lasttime.tv_usec + 1) > 1000000) {

- tvp->tv_sec++;

- tvp->tv_usec -= 1000000;

- }

- lasttime = *tvp;

- splx(s);

+ volatile register int c;

+ /*

+ * XXX MVME167 doesn't have a 3rd free-running timer,

+ * so we use a stupid loop. Fix the code to watch t1:

+ * the profiling timer.

+ */

+ c = 4 * us;

+ while (--c > 0)

+ ;

+ return (0);

}

diff --git a/sys/arch/mvme88k/dev/clockreg.h b/sys/arch/mvme88k/dev/clockreg.h
index e2222446f1c..cb66b35e243 100644
--- a/sys/arch/mvme88k/dev/clockreg.h
+++ b/sys/arch/mvme88k/dev/clockreg.h

@@ -1,4 +1,4 @@

-/* $NetBSD: clockreg.h,v 1.5 1994/11/20 20:54:07 deraadt Exp $ */

+/* $OpenBSD: clockreg.h,v 1.2 1998/12/15 05:52:30 smurph Exp $ */

diff --git a/sys/arch/mvme88k/dev/clreg.h b/sys/arch/mvme88k/dev/clreg.h
index e2aead59379..8377578d063 100644
--- a/sys/arch/mvme88k/dev/clreg.h
+++ b/sys/arch/mvme88k/dev/clreg.h

@@ -1,5 +1,5 @@

-/* $NetBSD$ */

-/*

+/* $OpenBSD: clreg.h,v 1.2 1998/12/15 05:52:30 smurph Exp $ */

@@ -30,136 +30,136 @@

struct clreg {

- volatile u_char anon1[0x7];

- volatile u_char cl_cor7; /* 0x07 */

- volatile u_char anon2[0x1];

- volatile u_char cl_livr; /* 0x09 */

+ volatile u_char anon1[0x7];

+ volatile u_char cl_cor7; /* 0x07 */

+ volatile u_char anon2[0x1];

+ volatile u_char cl_livr; /* 0x09 */

volatile u_char anon3[0x6];

- volatile u_char cl_cor1; /* 0x10 */

- volatile u_char cl_ier; /* 0x11 */

- volatile u_char cl_stcr; /* 0x12 */

- volatile u_char cl_ccr; /* 0x13 */

- volatile u_char cl_cor5; /* 0x14 */

- volatile u_char cl_cor4; /* 0x15 */

- volatile u_char cl_cor3; /* 0x16 */

- volatile u_char cl_cor2; /* 0x17 */

- volatile u_char cl_cor6; /* 0x18 */

- volatile u_char cl_dmabsts; /* 0x19 */

- volatile u_char cl_csr; /* 0x1a */

- volatile u_char cl_cmr; /* 0x1b */

- volatile u_char cl_schr4; /* 0x1c */

- volatile u_char cl_schr3; /* 0x1d */

- volatile u_char cl_schr2; /* 0x1e */

- volatile u_char cl_schr1; /* 0x1f */

- volatile u_char anon5[0x2];

- volatile u_char cl_scrh; /* 0x22 */

- volatile u_char cl_scrl; /* 0x23 */

+ volatile u_char cl_cor1; /* 0x10 */

+ volatile u_char cl_ier; /* 0x11 */

+ volatile u_char cl_stcr; /* 0x12 */

+ volatile u_char cl_ccr; /* 0x13 */

+ volatile u_char cl_cor5; /* 0x14 */

+ volatile u_char cl_cor4; /* 0x15 */

+ volatile u_char cl_cor3; /* 0x16 */

+ volatile u_char cl_cor2; /* 0x17 */

+ volatile u_char cl_cor6; /* 0x18 */

+ volatile u_char cl_dmabsts; /* 0x19 */

+ volatile u_char cl_csr; /* 0x1a */

+ volatile u_char cl_cmr; /* 0x1b */

+ volatile u_char cl_schr4; /* 0x1c */

+ volatile u_char cl_schr3; /* 0x1d */

+ volatile u_char cl_schr2; /* 0x1e */

+ volatile u_char cl_schr1; /* 0x1f */

+ volatile u_char anon5[0x2];

+ volatile u_char cl_scrh; /* 0x22 */

+ volatile u_char cl_scrl; /* 0x23 */

#define cl_rtpr rtpr.rtpr_rtpr

#define cl_rtprh rtpr.hl.rtpr_rtprh

#define cl_rtprl rtpr.hl.rtpr_rtprl

union {

- volatile u_short rtpr_rtpr; /* 0x24 */

+ volatile u_short rtpr_rtpr; /* 0x24 */

struct {

- volatile u_char rtpr_rtprh; /* 0x24 */

- volatile u_char rtpr_rtprl; /* 0x25 */

+ volatile u_char rtpr_rtprh; /* 0x24 */

+ volatile u_char rtpr_rtprl; /* 0x25 */

}hl;

}rtpr;

- volatile u_char cl_licr; /* 0x26 */

- volatile u_char anon6[0x7];

- volatile u_char cl_lnxt; /* 0x2e */

- volatile u_char anon7[0x1];

- volatile u_char cl_rfoc; /* 0x30 */

- volatile u_char anon8[0x7];

- volatile u_short cl_tcbadru; /* 0x38 */

- volatile u_short cl_tcbadrl; /* 0x3a */

- volatile u_short cl_rcbadru; /* 0x3c */

- volatile u_short cl_rcbadrl; /* 0x3e */

- volatile u_short cl_arbadru; /* 0x40 */

- volatile u_short cl_arbadrl; /* 0x42 */

- volatile u_short cl_brbadru; /* 0x44 */

- volatile u_short cl_brbadrl; /* 0x46 */

- volatile u_short cl_brbcnt; /* 0x48 */

- volatile u_short cl_arbcnt; /* 0x4a */

- volatile u_char anoni[0x2];

- volatile u_char cl_brbsts; /* 0x4e */

- volatile u_char cl_arbsts; /* 0x4f */

+ volatile u_char cl_licr; /* 0x26 */

+ volatile u_char anon6[0x7];

+ volatile u_char cl_lnxt; /* 0x2e */

+ volatile u_char anon7[0x1];

+ volatile u_char cl_rfoc; /* 0x30 */

+ volatile u_char anon8[0x7];

+ volatile u_short cl_tcbadru; /* 0x38 */

+ volatile u_short cl_tcbadrl; /* 0x3a */

+ volatile u_short cl_rcbadru; /* 0x3c */

+ volatile u_short cl_rcbadrl; /* 0x3e */

+ volatile u_short cl_arbadru; /* 0x40 */

+ volatile u_short cl_arbadrl; /* 0x42 */

+ volatile u_short cl_brbadru; /* 0x44 */

+ volatile u_short cl_brbadrl; /* 0x46 */

+ volatile u_short cl_brbcnt; /* 0x48 */

+ volatile u_short cl_arbcnt; /* 0x4a */

+ volatile u_char anoni[0x2];

+ volatile u_char cl_brbsts; /* 0x4e */

+ volatile u_char cl_arbsts; /* 0x4f */

#define cl_atbadr atbadr.atbadr

#define cl_atbadru atbadr.hl.atbadru

#define cl_atbadrl atbadr.hl.atbadrl

union {

struct {

- volatile u_short atbadru; /* 0x50 */

- volatile u_short atbadrl; /* 0x52 */

+ volatile u_short atbadru; /* 0x50 */

+ volatile u_short atbadrl; /* 0x52 */

}hl;

- volatile u_long atbadr; /* 0x50 */

+ volatile u_long atbadr; /* 0x50 */

}atbadr;

#define cl_btbadr btbadr.btbadr

#define cl_btbadru btbadr.hl.btbadru

#define cl_btbadrl btbadr.hl.btbadrl

union {

struct {

- volatile u_short btbadru; /* 0x54 */

- volatile u_short btbadrl; /* 0x56 */

+ volatile u_short btbadru; /* 0x54 */

+ volatile u_short btbadrl; /* 0x56 */

}hl;

- volatile u_long btbadr; /* 0x54 */

+ volatile u_long btbadr; /* 0x54 */

}btbadr;

- volatile u_short cl_btbcnt; /* 0x58 */

- volatile u_short cl_atbcnt; /* 0x5a */

- volatile u_char anono[0x2];

- volatile u_char cl_btbsts; /* 0x5e */

- volatile u_char cl_atbsts; /* 0x5f */

- volatile u_char anonp[0x20];

- volatile u_char cl_tftc; /* 0x80 */

- volatile u_char cl_gfrcr; /* 0x81 */

- volatile u_char anonq[0x2];

- volatile u_char cl_reoir; /* 0x84 */

- volatile u_char cl_teoir; /* 0x85 */

- volatile u_char cl_meoir; /* 0x86 */

- volatile u_char anonr[0x1];

+ volatile u_short cl_btbcnt; /* 0x58 */

+ volatile u_short cl_atbcnt; /* 0x5a */

+ volatile u_char anono[0x2];

+ volatile u_char cl_btbsts; /* 0x5e */

+ volatile u_char cl_atbsts; /* 0x5f */

+ volatile u_char anonp[0x20];

+ volatile u_char cl_tftc; /* 0x80 */

+ volatile u_char cl_gfrcr; /* 0x81 */

+ volatile u_char anonq[0x2];

+ volatile u_char cl_reoir; /* 0x84 */

+ volatile u_char cl_teoir; /* 0x85 */

+ volatile u_char cl_meoir; /* 0x86 */

+ volatile u_char anonr[0x1];

#define cl_risr risr.risr_risr

#define cl_risrl risr.hl.risr_risrl

#define cl_risrh risr.hl.risr_risrh

union {

- volatile u_short risr_risr; /* 0x88 */

+ volatile u_short risr_risr; /* 0x88 */

struct {

- volatile u_char risr_risrh; /* 0x88 */

- volatile u_char risr_risrl; /* 0x89 */

+ volatile u_char risr_risrh; /* 0x88 */

+ volatile u_char risr_risrl; /* 0x89 */

}hl;

}risr;

- volatile u_char cl_tisr; /* 0x8a */

- volatile u_char cl_misr; /* 0x8b */

- volatile u_char anons[0x2];

- volatile u_char cl_bercnt; /* 0x8e */

- volatile u_char anont[0x31];

- volatile u_char cl_tcor; /* 0xc0 */

- volatile u_char anonu[0x2];

- volatile u_char cl_tbpr; /* 0xc3 */

- volatile u_char anonv[0x4];

- volatile u_char cl_rcor; /* 0xc8 */

- volatile u_char anonw[0x2];

- volatile u_char cl_rbpr; /* 0xcb */

- volatile u_char anonx[0xa];

- volatile u_char cl_cpsr; /* 0xd6 */

- volatile u_char anony[0x3];

- volatile u_char cl_tpr; /* 0xda */

- volatile u_char anonz[0x3];

- volatile u_char cl_msvr_rts; /* 0xde */

- volatile u_char cl_msvr_dtr; /* 0xdf */

- volatile u_char cl_tpilr; /* 0xe0 */

- volatile u_char cl_rpilr; /* 0xe1 */

- volatile u_char cl_stk; /* 0xe2 */

- volatile u_char cl_mpilr; /* 0xe3 */

- volatile u_char anonA[0x8];

- volatile u_char cl_tir; /* 0xec */

- volatile u_char cl_rir; /* 0xed */

- volatile u_char cl_car; /* 0xee */

- volatile u_char cl_mir; /* 0xef */

- volatile u_char anonB[0x6];

- volatile u_char cl_dmr; /* 0xf6 */

- volatile u_char anonC[0x1];

+ volatile u_char cl_tisr; /* 0x8a */

+ volatile u_char cl_misr; /* 0x8b */

+ volatile u_char anons[0x2];

+ volatile u_char cl_bercnt; /* 0x8e */

+ volatile u_char anont[0x31];

+ volatile u_char cl_tcor; /* 0xc0 */

+ volatile u_char anonu[0x2];

+ volatile u_char cl_tbpr; /* 0xc3 */

+ volatile u_char anonv[0x4];

+ volatile u_char cl_rcor; /* 0xc8 */

+ volatile u_char anonw[0x2];

+ volatile u_char cl_rbpr; /* 0xcb */

+ volatile u_char anonx[0xa];

+ volatile u_char cl_cpsr; /* 0xd6 */

+ volatile u_char anony[0x3];

+ volatile u_char cl_tpr; /* 0xda */

+ volatile u_char anonz[0x3];

+ volatile u_char cl_msvr_rts; /* 0xde */

+ volatile u_char cl_msvr_dtr; /* 0xdf */

+ volatile u_char cl_tpilr; /* 0xe0 */

+ volatile u_char cl_rpilr; /* 0xe1 */

+ volatile u_char cl_stk; /* 0xe2 */

+ volatile u_char cl_mpilr; /* 0xe3 */

+ volatile u_char anonA[0x8];

+ volatile u_char cl_tir; /* 0xec */

+ volatile u_char cl_rir; /* 0xed */

+ volatile u_char cl_car; /* 0xee */

+ volatile u_char cl_mir; /* 0xef */

+ volatile u_char anonB[0x6];

+ volatile u_char cl_dmr; /* 0xf6 */

+ volatile u_char anonC[0x1];

#define cl_rdr cl_tdr

- volatile u_char cl_tdr; /* 0xf8 */

- volatile u_char anonD[7];

+ volatile u_char cl_tdr; /* 0xf8 */

+ volatile u_char anonD[7];

};

diff --git a/sys/arch/mvme88k/dev/i82586.h b/sys/arch/mvme88k/dev/i82586.h
index fb6e2b1090f..f0bf80ade44 100644
--- a/sys/arch/mvme88k/dev/i82586.h
+++ b/sys/arch/mvme88k/dev/i82586.h

@@ -1,6 +1,7 @@

-/* $Id: i82586.h,v 1.1 1997/03/03 19:32:07 rahnds Exp $ */

+/* $OpenBSD: i82586.h,v 1.2 1998/12/15 05:52:30 smurph Exp $ */

/*-

diff --git a/sys/arch/mvme88k/dev/if_ie.c b/sys/arch/mvme88k/dev/if_ie.c
index 859e26b41b0..b832953497a 100644
--- a/sys/arch/mvme88k/dev/if_ie.c
+++ b/sys/arch/mvme88k/dev/if_ie.c

@@ -1,6 +1,7 @@

-/* $Id: if_ie.c,v 1.1 1997/03/03 19:32:06 rahnds Exp $ */

+/* $Id: if_ie.c,v 1.2 1998/12/15 05:52:30 smurph Exp $ */

/*-

@@ -288,7 +289,7 @@ struct ie_softc {

struct mcreg *sc_mc;

#endif

#if NPCCTWO > 0

- struct pcc2reg *sc_pcc2;

+ struct pcctworeg *sc_pcc2;

#endif

};

@@ -339,13 +340,12 @@ struct cfdriver ie_cd = {

* MK_16 = KVA -> 16 bit address in INTEL byte order

* ST_24 = store a 24 bit address in SUN byte order to INTEL byte order

-#define MK_24(base, ptr) ((caddr_t)(((u_long)(ptr)) & 0x00ffffff))

+#define MK_24(base, ptr) ((caddr_t)((u_long)ptr))

#define MK_16(base, ptr) SWAP((u_short)( ((u_long)(ptr)) - ((u_long)(base)) ))

#define ST_24(to, from) { \

u_long fval = (u_long)(from); \

u_char *t = (u_char *)&(to), *f = (u_char *)&fval; \

- t[0] = f[2]; t[1] = f[3]; t[2] = 0; t[3] = f[1]; \

+ t[0] = f[2]; t[1] = f[3]; /*t[2] = f[0]*/; t[3] = f[1]; \

}

* Here are a few useful functions. We could have done these as macros, but

@@ -388,39 +388,13 @@ iematch(parent, vcf, args)

{

struct cfdata *cf = vcf;

struct confargs *ca = args;

-#if defined(MVME187)

- caddr_t base;

- if (cputyp != CPU_187)

- {

- return 0;

- }

- /*

- * If bus or name do not match, fail.

- */

- if (ca->ca_bustype != BUS_PCCTWO ||

- strcmp(cf->cf_driver->cd_name, "ie")) {

- return 0;

- }

- base = (caddr_t)cf->cf_loc[0];

- if (badpaddr(base, 1) == -1) {

- return 0;

+ int ret;

+ if ((ret = badvaddr(IIOV(ca->ca_vaddr), 1)) <=0){

+ printf("==> ie: failed address check returning %ld.\n", ret);

+ return(0);

}

- /*

- * tell our parent our requirements

- */

- ca->ca_paddr = (caddr_t)LANCE_ADDR;

- ca->ca_size = 0x1000;

- ca->ca_ipl = IPL_NET;

- return 1;

-#else

- return (!badvaddr(ca->ca_vaddr, 4));

-#endif

+ return (1);

}

@@ -433,25 +407,18 @@ ie_obreset(sc)

volatile struct ieob *ieo = (struct ieob *) sc->sc_reg;

volatile int t;

u_long a;

- u_long b;

- /*

- * Convert a to the format the chip expects before writing

- * the high and low (16 bit) words of the CPU port.

- */

a = IE_PORT_RESET;

- ST_24(b, a);

- ieo->porthigh = b >> 16;

+ ieo->porthigh = a & 0xffff;

t = 0; t = 1;

- ieo->portlow = b & 0xffff;

+ ieo->portlow = a >> 16;

delay(1000);

- a = (u_long)pmap_extract(pmap_kernel(), (vm_offset_t)sc->scp)

- | IE_PORT_NEWSCPADDR;

- ST_24(b, a);

- ieo->porthigh = b >> 16;

+ a = (u_long)pmap_extract(pmap_kernel(), (vm_offset_t)sc->scp) |

+ IE_PORT_NEWSCPADDR;

+ ieo->porthigh = a & 0xffff;

t = 0; t = 1;

- ieo->portlow = b & 0xffff;

+ ieo->portlow = a >> 16;

delay(1000);

}

@@ -496,14 +463,10 @@ ieattach(parent, self, aux)

sc->sc_reg = ca->ca_vaddr;

ieo = (volatile struct ieob *) sc->sc_reg;

-#if XXXX

- /* Don't know what this yet XXX nivas */

/* Are we the boot device? */

if (ca->ca_paddr == bootaddr)

bootdv = self;

-#endif

-#if 0

sc->sc_maddr = etherbuf; /* maddr = vaddr */

pa = pmap_extract(pmap_kernel(), (vm_offset_t)sc->sc_maddr);

if (pa == 0) panic("ie pmap_extract");

@@ -521,28 +484,6 @@ ieattach(parent, self, aux)

/*printf("scpV %x iscpV %x scbV %x\n", sc->scp, sc->iscp, sc->scb);*/

sc->scp->ie_bus_use = 0; /* 16-bit */

-#endif /* 0 */

- sc->sc_maddr = etherbuf; /* maddr = vaddr */

- pa = pmap_extract(pmap_kernel(), (vm_offset_t)sc->sc_maddr);

- if (pa == 0) panic("ie pmap_extract");

- sc->sc_iobase = (caddr_t)pa; /* iobase = paddr (24 bit) */

- (sc->memzero)(sc->sc_maddr, sc->sc_msize);

- sc->scb = (volatile struct ie_sys_ctl_block *)

- sc->sc_maddr; /* @ location zero */

- sc->scp = (struct ie_sys_conf_ptr *)

- roundup((int)sc->scb + sizeof(struct ie_sys_ctl_block), 16);

- sc->iscp = (volatile struct ie_int_sys_conf_ptr *)

- roundup((int)sc->scp + sizeof(struct ie_sys_conf_ptr), 16);

- /*printf("maddrV %x iobaseP %x\n", sc->sc_maddr, sc->sc_iobase);*/

- /*printf("scpV %x iscpV %x scbV %x\n", sc->scp, sc->iscp, sc->scb);*/

- /*

- * init scp; iscp will be inited later in ie_setupram().

- */

- sc->scp->ie_bus_use = 0; /* 8-bit */

ST_24(sc->scp->ie_iscp_ptr,

pmap_extract(pmap_kernel(), (vm_offset_t)sc->iscp));

@@ -603,13 +544,12 @@ ieattach(parent, self, aux)

#endif

#if NPCCTWO > 0

case BUS_PCCTWO:

- intr_establish(PCC2_VECT + LANCIRQ, &sc->sc_ih);

- sc->sc_pcc2 = (struct pcc2reg *)ca->ca_parent;

- sc->sc_pcc2->pcc2_lancirq = pri |

+ pcctwointr_establish(PCC2V_IE, &sc->sc_ih);

+ sc->sc_pcc2 = (struct pcctworeg *)ca->ca_master;

+ sc->sc_pcc2->pcc2_ieirq = pri | PCC2_SC_SNOOP |

PCC2_IRQ_IEN | PCC2_IRQ_ICLR;

- intr_establish(PCC2_VECT + LANCERR, &sc->sc_failih);

- sc->sc_pcc2->pcc2_lancerrirq = pri | PCC2_IRQ_IEN |

+ pcctwointr_establish(PCC2V_IEFAIL, &sc->sc_failih);

+ sc->sc_pcc2->pcc2_iefailirq = pri | PCC2_IRQ_IEN |

PCC2_IRQ_ICLR;

break;

#endif

@@ -650,9 +590,9 @@ void *v;

#endif

#if NPCCTWO > 0

case BUS_PCCTWO:

- sc->sc_pcc2->pcc2_lancirq |= PCC2_IRQ_ICLR; /* safe: clear irq */

- sc->sc_pcc2->pcc2_lancerrirq |= PCC2_IRQ_ICLR; /* clear failure */

- sc->sc_pcc2->pcc2_lancerrstat = PCC2_IEERR_SCLR; /* reset error */

+ sc->sc_pcc2->pcc2_ieirq |= PCC2_IRQ_ICLR; /* safe: clear irq */

+ sc->sc_pcc2->pcc2_iefailirq |= PCC2_IRQ_ICLR; /* clear failure */

+ sc->sc_pcc2->pcc2_ieerr = PCC2_IEERR_SCLR; /* reset error */

break;

#endif

}

@@ -685,7 +625,7 @@ loop:

#endif

#if NPCCTWO > 0

case BUS_PCCTWO:

- sc->sc_pcc2->pcc2_lancirq |= PCC2_IRQ_ICLR; /* clear irq */

+ sc->sc_pcc2->pcc2_ieirq |= PCC2_IRQ_ICLR; /* clear irq */

break;

#endif

}

diff --git a/sys/arch/mvme88k/dev/if_ie.h b/sys/arch/mvme88k/dev/if_ie.h
index 78d1301fcb3..42b1a0edae0 100644
--- a/sys/arch/mvme88k/dev/if_ie.h
+++ b/sys/arch/mvme88k/dev/if_ie.h

@@ -1,6 +1,6 @@

-/* $Id: if_ie.h,v 1.1 1997/03/03 19:32:05 rahnds Exp $ */

+/* $OpenBSD: if_ie.h,v 1.2 1998/12/15 05:52:30 smurph Exp $ */

-/*

diff --git a/sys/arch/mvme88k/dev/mainbus.c b/sys/arch/mvme88k/dev/mainbus.c
index e51e630493b..49e002f1075 100644
--- a/sys/arch/mvme88k/dev/mainbus.c
+++ b/sys/arch/mvme88k/dev/mainbus.c

@@ -1,3 +1,5 @@

+/* $OpenBSD: mainbus.c,v 1.2 1998/12/15 05:52:30 smurph Exp $ */

#include <sys/param.h>

#include <sys/systm.h>

#include <sys/reboot.h>

@@ -8,17 +10,11 @@

#include <machine/cpu.h>

#include <machine/autoconf.h>

-void mbattach __P((struct device *, struct device *, void *));

-int mbprint __P((void *, const char *));

-int mbmatch __P((struct device *, void *, void *));

-int submatch __P((struct device *, void *, void *));

-/*

- * mainbus driver

- */

+void mainbus_attach __P((struct device *, struct device *, void *));

+int mainbus_match __P((struct device *, void *, void *));

struct cfattach mainbus_ca = {

- sizeof(struct device), mbmatch, mbattach

+ sizeof(struct device), mainbus_match, mainbus_attach

};

struct cfdriver mainbus_cd = {

@@ -26,70 +22,59 @@ struct cfdriver mainbus_cd = {

};

int

-mbmatch(struct device *pdp, void *self, void *auxp)

+mainbus_match(parent, cf, args)

+ struct device *parent;

+ void *cf;

+ void *args;

{

- struct cfdata *cfp = self;

- if (cfp->cf_unit > 0)

- return(0);

- /*

- * We are always here

- */

- return(1);

+ return (1);

}

-/*

- * "find" all the things that should be there.

- */

-void

-mbattach(struct device *pdp, struct device *dp, void *auxp)

+int

+mainbus_print(args, bus)

+ void *args;

+ const char *bus;

{

- struct cfdata *cf;

- extern int cputyp;

- /* nothing to do for this bus */

- printf (" machine type %x\n", cputyp);

- if ((cf = config_search(submatch, dp, auxp)) != NULL) {

- return;

- }

+ struct confargs *ca = args;

+ if (ca->ca_paddr != (void *)-1)

+ printf(" addr 0x%x", (u_int32_t)ca->ca_paddr);

+ return (UNCONF);

}

int

-mbprint(void *auxp, const char *pnp)

+mainbus_scan(parent, child, args)

+ struct device *parent;

+ void *child, *args;

{

- if (pnp)

- printf("%s at %s", (char *)auxp, pnp);

- return(UNCONF);

+ struct cfdata *cf = child;

+ struct confargs oca;

+ bzero(&oca, sizeof oca);

+ oca.ca_paddr = (void *)cf->cf_loc[0];

+ oca.ca_vaddr = (void *)-1;

+ oca.ca_ipl = -1;

+ oca.ca_bustype = BUS_MAIN;

+ oca.ca_name = cf->cf_driver->cd_name;

+ if ((*cf->cf_attach->ca_match)(parent, cf, &oca) == 0)

+ return (0);

+ config_attach(parent, cf, &oca, mainbus_print);

+ return (1);

}

-int

-submatch(struct device *parent, void *self, void *aux)

+void

+mainbus_attach(parent, self, args)

+ struct device *parent, *self;

+ void *args;

{

- struct confargs *ca = aux;

- struct cfdata *cf = self;

- ca->ca_bustype = BUS_MAIN;

- ca->ca_paddr = (caddr_t)cf->cf_loc[0];

- ca->ca_size = cf->cf_loc[1];

- if (!(*cf->cf_attach->ca_match)(parent, cf, ca)) {

- if (!parent)

- cf->cf_fstate = FSTATE_FOUND;

- return 0;

- }

+ printf (" machine type %x\n", cputyp);

- /*

- * mapin the device memory of the child and call attach.

+ /* XXX

+ * should have a please-attach-first list for mainbus,

+ * to ensure that the pcc/vme2/mcc chips are attached

+ * first.

-#if 0

- ca->ca_vaddr = (caddr_t)iomap_mapin(ca->ca_paddr, ca->ca_size, 1);

-#endif /* 0 */

- ca->ca_vaddr = ca->ca_paddr;

- config_attach(parent, cf, ca, mbprint);

- return 1;

+ (void)config_search(mainbus_scan, self, args);

}

diff --git a/sys/arch/mvme88k/dev/memc.c b/sys/arch/mvme88k/dev/memc.c
index 0cffad3f64b..f07337d3aec 100644
--- a/sys/arch/mvme88k/dev/memc.c
+++ b/sys/arch/mvme88k/dev/memc.c

@@ -1,4 +1,4 @@

-/* $NetBSD$ */

+/* $OpenBSD: memc.c,v 1.2 1998/12/15 05:52:30 smurph Exp $ */

@@ -14,7 +14,8 @@

* 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 Theo de Raadt

+ * This product includes software developed under OpenBSD by

+ * Theo de Raadt for Willowglen Singapore.

* 4. The name of the author may not be used to endorse or promote products

* derived from this software without specific prior written permission.

@@ -31,11 +32,9 @@

- * MEMC chip

- * XXX:

- * the databooks say that you should only ever access the higher-numbered

- * MEMC chip's control & status registers. this is strange. I disobey the

- * rules, hopefully there won't be any spanking.

+ * MEMC/MCECC chips

+ * these chips are rather similar in appearance except that the MEMC

+ * does parity while the MCECC does ECC.

#include <sys/param.h>

#include <sys/conf.h>

@@ -58,7 +57,7 @@

struct memcsoftc {

struct device sc_dev;

- caddr_t sc_vaddr;

+ void * sc_vaddr;

struct memcreg *sc_memc;

struct intrhand sc_ih;

};

@@ -66,11 +65,16 @@ struct memcsoftc {

void memcattach __P((struct device *, struct device *, void *));

int memcmatch __P((struct device *, void *, void *));

-struct cfdriver memccd = {

- NULL, "memc", memcmatch, memcattach,

- DV_DULL, sizeof(struct memcsoftc), 0

+struct cfattach memc_ca = {

+ sizeof(struct memcsoftc), memcmatch, memcattach

};

+struct cfdriver memc_cd = {

+ NULL, "memc", DV_DULL, 0

+};

+/*int memcintr __P((struct frame *frame));*/

int

memcmatch(parent, vcf, args)

struct device *parent;

@@ -80,9 +84,11 @@ memcmatch(parent, vcf, args)

struct confargs *ca = args;

struct memcreg *memc = (struct memcreg *)ca->ca_vaddr;

- if (badvaddr(memc, 4) || memc->memc_chipid != MEMC_CHIPID)

+ if (badvaddr(memc, 1))

return (0);

- return (1);

+ if (memc->memc_chipid==MEMC_CHIPID || memc->memc_chipid==MCECC_CHIPID)

+ return (1);

+ return (0);

}

void

@@ -97,15 +103,33 @@ memcattach(parent, self, args)

* since we know ourself to land in intiobase land,

* we must adjust our address

- sc->sc_memc = (struct memcreg *)sc->sc_vaddr;

+ sc->sc_memc = (struct memcreg *)ca->ca_vaddr;

- printf(": rev %d, unsupported\n", sc->sc_memc->memc_chiprev);

+ printf(": %s rev %d",

+ (sc->sc_memc->memc_chipid == MEMC_CHIPID) ? "MEMC040" : "MCECC",

+ sc->sc_memc->memc_chiprev);

#if 0

- sc->sc_nmiih.ih_fn = memcabort;

- sc->sc_nmiih.ih_arg = 0;

- sc->sc_nmiih.ih_ipl = 7;

- sc->sc_nmiih.ih_wantframe = 1;

- mcintr_establish(xxx, &sc->sc_nmiih);

+ sc->sc_ih.ih_fn = memcintr;

+ sc->sc_ih.ih_arg = 0;

+ sc->sc_ih.ih_ipl = 7;

+ sc->sc_ih.ih_wantframe = 1;

+ mcintr_establish(xxx, &sc->sc_ih);

#endif

+ switch (sc->sc_memc->memc_chipid) {

+ case MEMC_CHIPID:

+ break;

+ case MCECC_CHIPID:

+ break;

+ }

+ printf("\n");

}

+/*int

+memcintr(frame)

+ struct frame *frame;

+ return (0);

+}*/

diff --git a/sys/arch/mvme88k/dev/memcreg.h b/sys/arch/mvme88k/dev/memcreg.h
index 304d35b6666..6295850a832 100644
--- a/sys/arch/mvme88k/dev/memcreg.h
+++ b/sys/arch/mvme88k/dev/memcreg.h

@@ -1,4 +1,4 @@

-/* $NetBSD$ */

+/* $OpenBSD: memcreg.h,v 1.2 1998/12/15 05:52:30 smurph Exp $ */

@@ -14,7 +14,8 @@

* 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 Theo de Raadt

+ * This product includes software developed under OpenBSD by

+ * Theo de Raadt for Willowglen Singapore.

* 4. The name of the author may not be used to endorse or promote products

* derived from this software without specific prior written permission.

@@ -31,7 +32,7 @@

- * the MEMC's registers are very similar to the MCECC chip

+ * the MEMC's registers are a subset of the MCECC chip

struct memcreg {

volatile u_char memc_chipid;

@@ -40,10 +41,7 @@ struct memcreg {

volatile u_char xx1[3];

volatile u_char memc_memconf;

#define MEMC_MEMCONF_MSIZ 0x07

-/*

-#define MEMC_MEMCONF_RTOB(x) (((x) & MEMC_MEMCONF_MSIZ) * 4*1024*1024)

-*/

-#define MEMC_MEMCONF_RTOB(x) (1 << (((x) & MEMC_MEMCONF_MSIZ) + 22))

+#define MEMC_MEMCONF_RTOB(x) ((4*1024*1024) << ((x) & MEMC_MEMCONF_MSIZ))

volatile u_char xx2[3];

volatile u_char memc_x0;

volatile u_char xx3[3];

@@ -55,6 +53,55 @@ struct memcreg {

volatile u_char xx6[3];

volatile u_char memc_bclk;

volatile u_char xx7[3];

+ /* the following registers only exist on the MCECC */

+ volatile u_char memc_datactl;

+ volatile u_char xx8[3];

+ volatile u_char memc_scrubctl;

+ volatile u_char xx9[3];

+ volatile u_char memc_scrubperh;

+ volatile u_char xx10[3];

+ volatile u_char memc_scrubperl;

+ volatile u_char xx11[3];

+ volatile u_char memc_chipprescale;

+ volatile u_char xx12[3];

+ volatile u_char memc_scrubtime;

+ volatile u_char xx13[3];

+ volatile u_char memc_scrubprescaleh;

+ volatile u_char xx14[3];

+ volatile u_char memc_scrubprescalem;

+ volatile u_char xx15[3];

+ volatile u_char memc_scrubprescalel;

+ volatile u_char xx16[3];

+ volatile u_char memc_scrubtimeh;

+ volatile u_char xx17[3];

+ volatile u_char memc_scrubtimel;

+ volatile u_char xx18[3];

+ volatile u_char memc_scrubaddrhh;

+ volatile u_char xx19[3];

+ volatile u_char memc_scrubaddrhm;

+ volatile u_char xx20[3];

+ volatile u_char memc_scrubaddrlm;

+ volatile u_char xx21[3];

+ volatile u_char memc_scrubaddrll;

+ volatile u_char xx22[3];

+ volatile u_char memc_errlog;

+ volatile u_char xx23[3];

+ volatile u_char memc_errloghh;

+ volatile u_char xx24[3];

+ volatile u_char memc_errloghm;

+ volatile u_char xx25[3];

+ volatile u_char memc_errloglm;

+ volatile u_char xx26[3];

+ volatile u_char memc_errlogll;

+ volatile u_char xx27[3];

+ volatile u_char memc_errsyndrome;

+ volatile u_char xx28[3];

+ volatile u_char memc_defaults1;

+ volatile u_char xx29[3];

+ volatile u_char memc_defaults2;

+ volatile u_char xx30[3];

};

-#define MEMC_CHIPID 0x81

+#define MEMC_CHIPID 0x80

+#define MCECC_CHIPID 0x81

diff --git a/sys/arch/mvme88k/dev/memdevs.c b/sys/arch/mvme88k/dev/memdevs.c
index a966b8778cc..bb3163cc130 100644
--- a/sys/arch/mvme88k/dev/memdevs.c
+++ b/sys/arch/mvme88k/dev/memdevs.c

@@ -1,4 +1,4 @@

-/* $NetBSD$ */

+/* $OpenBSD: memdevs.c,v 1.2 1998/12/15 05:52:30 smurph Exp $ */

diff --git a/sys/arch/mvme88k/dev/nvram.c b/sys/arch/mvme88k/dev/nvram.c
index 6a5a10c32c4..f34640f73f8 100644
--- a/sys/arch/mvme88k/dev/nvram.c
+++ b/sys/arch/mvme88k/dev/nvram.c

@@ -1,28 +1,62 @@

+/* $OpenBSD: nvram.c,v 1.2 1998/12/15 05:52:30 smurph Exp $ */