diff options
| -rw-r--r-- | sys/arch/vax/include/sgmap.h | 3 | ||||
| -rw-r--r-- | sys/arch/vax/vax/sgmap.c | 18 | ||||
| -rw-r--r-- | sys/arch/vax/vsa/asc_vsbus.c | 4 | ||||
| -rw-r--r-- | sys/arch/vax/vsa/vsbus_dma.c | 5 |
4 files changed, 7 insertions, 23 deletions
diff --git a/sys/arch/vax/include/sgmap.h b/sys/arch/vax/include/sgmap.h index 1bc50eac082..43042d05a7b 100644 --- a/sys/arch/vax/include/sgmap.h +++ b/sys/arch/vax/include/sgmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sgmap.h,v 1.3 2000/10/09 23:11:57 bjc Exp $ */ +/* $OpenBSD: sgmap.h,v 1.4 2001/02/06 04:27:44 hugh Exp $ */ /* $NetBSD: sgmap.h,v 1.3 2000/05/17 21:22:18 matt Exp $ */ /*- @@ -61,7 +61,6 @@ struct vax_sgmap { bus_size_t aps_sgvasize; /* size of the sgva space */ bus_addr_t aps_pa; /* Address in region */ unsigned int aps_flags; /* flags */ -#define SGMAP_KA49 0x01 /* KA49 SGMAP is weird */ }; void vax_sgmap_init __P((bus_dma_tag_t, struct vax_sgmap *, diff --git a/sys/arch/vax/vax/sgmap.c b/sys/arch/vax/vax/sgmap.c index 5b8cd210027..4d420a42b88 100644 --- a/sys/arch/vax/vax/sgmap.c +++ b/sys/arch/vax/vax/sgmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sgmap.c,v 1.2 2000/10/09 23:11:57 bjc Exp $ */ +/* $OpenBSD: sgmap.c,v 1.3 2001/02/06 04:27:45 hugh Exp $ */ /* $NetBSD: sgmap.c,v 1.8 2000/06/29 07:14:34 mrg Exp $ */ /*- @@ -250,21 +250,7 @@ vax_sgmap_load(t, map, buf, buflen, p, flags, sgmap) /* * Load the current PTE with this page. */ - if (sgmap->aps_flags & SGMAP_KA49) { - unsigned long tmp = pa >> VAX_PGSHIFT; - int cnt; - - for (cnt = 0; tmp != 0; tmp >>= 1) { - cnt += (tmp & 1); - } - *pte = pa | PG_V | ((cnt & 1) ? 0 : 0x10000000); -#if 0 - printf("[%d]: va=0x%08lx map=0x%08lx\n", - pteidx + map->_dm_ptecnt, va + dmaoffset, *pte); -#endif - } else { - *pte = (pa >> VAX_PGSHIFT) | PG_V; - } + *pte = (pa >> VAX_PGSHIFT) | PG_V; } /* The VS4000 SCSI prefetcher doesn't like to end on a page boundary * so add an extra page to quiet it down. diff --git a/sys/arch/vax/vsa/asc_vsbus.c b/sys/arch/vax/vsa/asc_vsbus.c index 1fd36564da9..a9ad9c1b431 100644 --- a/sys/arch/vax/vsa/asc_vsbus.c +++ b/sys/arch/vax/vsa/asc_vsbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc_vsbus.c,v 1.1 2000/10/11 05:45:30 bjc Exp $ */ +/* $OpenBSD: asc_vsbus.c,v 1.2 2001/02/06 04:27:45 hugh Exp $ */ /* $NetBSD: asc_vsbus.c,v 1.20 2000/07/26 21:50:48 matt Exp $ */ /*- @@ -169,7 +169,7 @@ asc_vsbus_match( struct device *parent, void *conf, void *aux) if (vax_boardtype == VAX_BTYP_46 || vax_boardtype == VAX_BTYP_48) { if (cf->cf_loc[0] != 0x200c0080) return 0; -#if 0 +#if 1 } else if (vax_boardtype == VAX_BTYP_49) { if (cf->cf_loc[0] != 0x26000080) return 0; diff --git a/sys/arch/vax/vsa/vsbus_dma.c b/sys/arch/vax/vsa/vsbus_dma.c index 6d1f445b691..3940e0e7d8a 100644 --- a/sys/arch/vax/vsa/vsbus_dma.c +++ b/sys/arch/vax/vsa/vsbus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vsbus_dma.c,v 1.1 2000/10/11 05:45:30 bjc Exp $ */ +/* $OpenBSD: vsbus_dma.c,v 1.2 2001/02/06 04:27:46 hugh Exp $ */ /* $NetBSD: vsbus_dma.c,v 1.7 2000/07/26 21:50:49 matt Exp $ */ /*- @@ -131,10 +131,9 @@ vsbus_dma_init(sc, ptecnt) memset(pte, 0, mapsize); *(int *) (sc->sc_vsregs + 8) = segs->ds_addr; /* set MAP BASE 0x2008008 */ } else { - sc->sc_sgmap.aps_flags |= SGMAP_KA49; pte = (struct pte *) vax_map_physmem(KA49_SCSIMAP, mapsize / VAX_NBPG); for (nsegs = ptecnt; nsegs > 0; ) { - ((u_int32_t *) pte)[--nsegs] = 0x88000000; + ((u_int32_t *) pte)[--nsegs] = 0; } segs->ds_addr = KA49_SCSIMAP; } |