From 2dd63e33789d11a82f8c1df847624a3c562d979e Mon Sep 17 00:00:00 2001 From: gwr Date: Fri, 25 Apr 1997 18:45:39 +0000 Subject: [PATCH] Use bus_mapin, and minor tweaks. --- sys/arch/sun3/sun3x/iommu.c | 11 +++-------- sys/arch/sun3x/sun3x/iommu.c | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/sys/arch/sun3/sun3x/iommu.c b/sys/arch/sun3/sun3x/iommu.c index 34d09a748a14..a4eff85a04ee 100644 --- a/sys/arch/sun3/sun3x/iommu.c +++ b/sys/arch/sun3/sun3x/iommu.c @@ -1,4 +1,4 @@ -/* $NetBSD: iommu.c,v 1.4 1997/03/03 06:51:42 jeremy Exp $ */ +/* $NetBSD: iommu.c,v 1.5 1997/04/25 18:45:39 gwr Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ #include #include "iommu.h" -#define OBIO_IOMMU_SIZE (IOMMU_NENT * sizeof(iommu_pde_t)) +#define IOMMU_SIZE (IOMMU_NENT * sizeof(iommu_pde_t)) static int iommu_match __P((struct device *, struct cfdata *, void *)); static void iommu_attach __P((struct device *, struct device *, void *)); @@ -73,16 +73,11 @@ iommu_match(parent, cf, args) struct cfdata *cf; void *args; { - struct confargs *ca = args; /* This driver only supports one unit. */ if (cf->cf_unit != 0) return (0); - /* Validate the given address. */ - if (ca->ca_paddr != OBIO_IOMMU) - return (0); - return (1); } @@ -95,7 +90,7 @@ iommu_attach(parent, self, args) struct confargs *ca = args; iommu_va = (iommu_pde_t *) - obio_alloc(ca->ca_paddr, OBIO_IOMMU_SIZE); + bus_mapin(ca->ca_bustype, ca->ca_paddr, IOMMU_SIZE); printf(": range %dMB\n", IOMMU_NENT * IOMMU_PAGE_SIZE / (1024 * 1024)); } diff --git a/sys/arch/sun3x/sun3x/iommu.c b/sys/arch/sun3x/sun3x/iommu.c index 34d09a748a14..a4eff85a04ee 100644 --- a/sys/arch/sun3x/sun3x/iommu.c +++ b/sys/arch/sun3x/sun3x/iommu.c @@ -1,4 +1,4 @@ -/* $NetBSD: iommu.c,v 1.4 1997/03/03 06:51:42 jeremy Exp $ */ +/* $NetBSD: iommu.c,v 1.5 1997/04/25 18:45:39 gwr Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ #include #include "iommu.h" -#define OBIO_IOMMU_SIZE (IOMMU_NENT * sizeof(iommu_pde_t)) +#define IOMMU_SIZE (IOMMU_NENT * sizeof(iommu_pde_t)) static int iommu_match __P((struct device *, struct cfdata *, void *)); static void iommu_attach __P((struct device *, struct device *, void *)); @@ -73,16 +73,11 @@ iommu_match(parent, cf, args) struct cfdata *cf; void *args; { - struct confargs *ca = args; /* This driver only supports one unit. */ if (cf->cf_unit != 0) return (0); - /* Validate the given address. */ - if (ca->ca_paddr != OBIO_IOMMU) - return (0); - return (1); } @@ -95,7 +90,7 @@ iommu_attach(parent, self, args) struct confargs *ca = args; iommu_va = (iommu_pde_t *) - obio_alloc(ca->ca_paddr, OBIO_IOMMU_SIZE); + bus_mapin(ca->ca_bustype, ca->ca_paddr, IOMMU_SIZE); printf(": range %dMB\n", IOMMU_NENT * IOMMU_PAGE_SIZE / (1024 * 1024)); }