From owner-p4-projects@FreeBSD.ORG  Fri Nov 10 18:50:48 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7AC2A16A415; Fri, 10 Nov 2006 18:50:48 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 51C3716A407
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 18:50:48 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1268243D46
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 18:50:48 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAAIol4D090173
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 18:50:47 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAAIol3a090170
	for perforce@freebsd.org; Fri, 10 Nov 2006 18:50:47 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 10 Nov 2006 18:50:47 GMT
Message-Id: <200611101850.kAAIol3a090170@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109695 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Nov 2006 18:50:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=109695

Change 109695 by sam@sam_ebb on 2006/11/10 18:50:41

	o setup all direct-mapped registers (was only doing up to
	  command but everything up to status is there)
	o don't call ata_default_registers; it clobbers register
	  mappings; not sure if we'll need to manually fixup IREASON
	  and ALTSTAT

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#4 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#4 (text+ko) ====

@@ -281,8 +281,13 @@
 {
 	struct ata_avila_softc *sc = t;
 
-printf("%s(%lx, %ld)\n", __func__, h, o);
+#if 0
 	return bus_space_read_1(sc->sc_iot, h, o);
+#else
+uint8_t v = bus_space_read_1(sc->sc_iot, h, o);
+printf("%s(%lx, %ld) => 0x%x\n", __func__, h, o, v);
+return v;
+#endif
 }
 
 void
@@ -413,16 +418,17 @@
 	struct ata_channel *ch = device_get_softc(dev);
 	int i;
 
-	for (i = ATA_DATA; i <= ATA_COMMAND; i++) {
+	/* registers up to ATA_STATUS map directly */
+	for (i = ATA_DATA; i <= ATA_STATUS; i++) {
 		ch->r_io[i].res = &sc->sc_ata;
 		ch->r_io[i].offset = i;
 	}
+	/* the control register is special */
 	ch->r_io[ATA_CONTROL].res = &sc->sc_ata;
 	ch->r_io[ATA_CONTROL].offset = AVILA_IDE_CTRL;
 	/* NB: by convention this points at the base of registers */
 	ch->r_io[ATA_IDX_ADDR].res = &sc->sc_ata;
 	ch->r_io[ATA_IDX_ADDR].offset = 0;
-	ata_default_registers(dev);
 
 	ata_generic_hw(dev);
 	return ata_attach(dev);