From 1adab2b4e37232e1c18246ef5e503bc4b64dfd92 Mon Sep 17 00:00:00 2001 From: aymeric Date: Mon, 27 Mar 2006 19:35:33 +0000 Subject: [PATCH] as far as control registers are concerned, the A1200 behaves the same as the A4000. This allows the use of ATAPI drives on the A1200. Idesc can really rest in peace now. --- sys/arch/amiga/dev/wdc_amiga.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/arch/amiga/dev/wdc_amiga.c b/sys/arch/amiga/dev/wdc_amiga.c index 8bd77a079703..8770ed294536 100644 --- a/sys/arch/amiga/dev/wdc_amiga.c +++ b/sys/arch/amiga/dev/wdc_amiga.c @@ -1,4 +1,4 @@ -/* $NetBSD: wdc_amiga.c,v 1.28 2006/01/29 21:42:41 dsl Exp $ */ +/* $NetBSD: wdc_amiga.c,v 1.29 2006/03/27 19:35:33 aymeric Exp $ */ /*- * Copyright (c) 2000, 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wdc_amiga.c,v 1.28 2006/01/29 21:42:41 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wdc_amiga.c,v 1.29 2006/03/27 19:35:33 aymeric Exp $"); #include #include @@ -104,7 +104,6 @@ wdc_amiga_attach(struct device *parent, struct device *self, void *aux) sc->sc_a1200 = 0; } else { sc->cmd_iot.base = (u_long) ztwomap(0xda0000 + 2); - sc->ctl_iot.base = (u_long) ztwomap(0xda4000); gayle_init(); sc->sc_intreg = &gayle.intreq; sc->sc_a1200 = 1; @@ -133,9 +132,7 @@ wdc_amiga_attach(struct device *parent, struct device *self, void *aux) } } - if (sc->sc_a1200) - wdr->ctl_ioh = sc->ctl_iot.base; - else if (bus_space_subregion(wdr->cmd_iot, + if (bus_space_subregion(wdr->cmd_iot, wdr->cmd_baseioh, 0x406, 1, &wdr->ctl_ioh)) return;