diff options
| author | kstailey <kstailey@cvs.openbsd.org> | 1997-09-11 16:10:00 +0000 |
|---|---|---|
| committer | kstailey <kstailey@cvs.openbsd.org> | 1997-09-11 16:10:00 +0000 |
| commit | 9ac843e6f4236e4300c4d2570c5ebe9e18238e8f (patch) | |
| tree | 2a7bca5e5c0d7047c7b26edeaf75b858d95d7171 | |
| parent | ce37394e6c73504e7cadb58f6bc353002c793508 (diff) | |
activate sun3 SCSI DVMA
| -rw-r--r-- | sys/arch/sun3/dev/si_obio.c | 8 | ||||
| -rw-r--r-- | sys/arch/sun3/include/param.h | 26 | ||||
| -rw-r--r-- | sys/sys/param.h | 4 |
3 files changed, 29 insertions, 9 deletions
diff --git a/sys/arch/sun3/dev/si_obio.c b/sys/arch/sun3/dev/si_obio.c index 42b0a69d9da..8787786723a 100644 --- a/sys/arch/sun3/dev/si_obio.c +++ b/sys/arch/sun3/dev/si_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si_obio.c,v 1.7 1997/04/29 13:09:25 kstailey Exp $ */ +/* $OpenBSD: si_obio.c,v 1.8 1997/09/11 16:09:59 kstailey Exp $ */ /* $NetBSD: si_obio.c,v 1.7 1996/11/20 18:57:00 gwr Exp $ */ /*- @@ -135,7 +135,7 @@ struct cfattach si_obio_ca = { /* Options. Interesting values are: 1,3,7 */ /* XXX: Using 1 for now to mask a (pmap?) bug not yet found... */ -int si_obio_options = 0; /* XXX */ +int si_obio_options = 1; /* XXX */ static int @@ -255,13 +255,13 @@ si_obio_dma_setup(ncr_sc) data_pa = dvma_kvtopa(dh->dh_dvma, sc->sc_adapter_type); data_pa += (ncr_sc->sc_dataptr - dh->dh_addr); if (data_pa & 1) - panic("si_dma_start: bad pa=0x%x", data_pa); + panic("si_dma_start: bad pa=0x%lx", data_pa); xlen = ncr_sc->sc_datalen; sc->sc_reqlen = xlen; /* XXX: or less? */ #ifdef DEBUG if (si_debug & 2) { - printf("si_dma_setup: dh=%p, pa=0x%lx, xlen=%d\n", + printf("si_dma_setup: dh=%p, pa=0x%lx, xlen=0x%x\n", dh, data_pa, xlen); } #endif diff --git a/sys/arch/sun3/include/param.h b/sys/arch/sun3/include/param.h index 0e345080681..34bbc18e1c4 100644 --- a/sys/arch/sun3/include/param.h +++ b/sys/arch/sun3/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.16 1997/09/08 18:08:51 kstailey Exp $ */ +/* $OpenBSD: param.h,v 1.17 1997/09/11 16:09:58 kstailey Exp $ */ /* $NetBSD: param.h,v 1.34 1996/03/04 05:04:40 cgd Exp $ */ /* @@ -51,9 +51,6 @@ */ #define _MACHINE sun3 #define MACHINE "sun3" -#define _MACHINE_ARCH m68k -#define MACHINE_ARCH "m68k" -#define MID_MACHINE MID_M68K /* * Round p (pointer or byte index) up to a correctly-aligned value @@ -72,6 +69,27 @@ #include <m68k/param.h> +#define MAXBSIZE 0x8000 /* XXX temp until sun3 dma chaining */ + +/* + * Constants related to network buffer management. + * MCLBYTES must be no larger than CLBYTES (the software page size), and, + * on machines that exchange pages of input or output buffers with mbuf + * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple + * of the hardware page size. + */ +#define MSIZE 128 /* size of an mbuf */ +#define MCLSHIFT 11 +#define MCLBYTES (1 << MCLSHIFT) /* large enough for ether MTU */ +#define MCLOFSET (MCLBYTES - 1) +#ifndef NMBCLUSTERS +#ifdef GATEWAY +#define NMBCLUSTERS 512 /* map size, max cluster allocation */ +#else +#define NMBCLUSTERS 256 /* map size, max cluster allocation */ +#endif +#endif + /* * Size of kernel malloc arena in CLBYTES-sized logical pages */ diff --git a/sys/sys/param.h b/sys/sys/param.h index e2064d7a28e..98d9f026fa7 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.13 1997/05/22 06:55:59 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.14 1997/09/11 16:09:57 kstailey Exp $ */ /* $NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $ */ /*- @@ -156,7 +156,9 @@ * made larger without any effect on existing file systems; however making * it smaller makes some file systems unmountable. */ +#ifndef MAXBSIZE /* XXX temp until sun3 DMA chaining */ #define MAXBSIZE MAXPHYS +#endif #define MAXFRAG 8 /* |