From owner-p4-projects@FreeBSD.ORG  Wed Aug 30 23:22:46 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 3E2FE16A4DF; Wed, 30 Aug 2006 23:22:46 +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 18A8A16A4DD
	for <perforce@freebsd.org>; Wed, 30 Aug 2006 23:22:46 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E799143D77
	for <perforce@freebsd.org>; Wed, 30 Aug 2006 23:22:41 +0000 (GMT)
	(envelope-from mjacob@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 k7UNMfYq046059
	for <perforce@freebsd.org>; Wed, 30 Aug 2006 23:22:41 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7UNMfcd046056
	for perforce@freebsd.org; Wed, 30 Aug 2006 23:22:41 GMT
	(envelope-from mjacob@freebsd.org)
Date: Wed, 30 Aug 2006 23:22:41 GMT
Message-Id: <200608302322.k7UNMfcd046056@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 105378 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: Wed, 30 Aug 2006 23:22:46 -0000

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

Change 105378 by mjacob@newisp on 2006/08/30 23:22:04

	Add a few missing 2400 specific register writes.
	
	At this point, the interrupt kick helper is gone, so the 24XX doesn't
	actually work at present (until we figure out how to re-arm interrupts).

Affected files ...

.. //depot/projects/newisp/dev/isp/isp.c#5 edit
.. //depot/projects/newisp/dev/isp/isp_freebsd.c#3 edit

Differences ...

==== //depot/projects/newisp/dev/isp/isp.c#5 (text+ko) ====

@@ -5714,8 +5714,12 @@
 	/*
 	 * Clear the previous interrupt.
 	 */
-	ISP_WRITE(isp, HCCR, HCCR_CMD_CLEAR_RISC_INT);
-	ISP_WRITE(isp, BIU_SEMA, 0);
+	if (IS_24XX(isp)) {
+		ISP_WRITE(isp, BIU2400_HCCR, HCCR_2400_CMD_CLEAR_RISC_INT);
+	} else {
+		ISP_WRITE(isp, HCCR, HCCR_CMD_CLEAR_RISC_INT);
+		ISP_WRITE(isp, BIU_SEMA, 0);
+	}
 
 	/*
 	 * Continue with next word.

==== //depot/projects/newisp/dev/isp/isp_freebsd.c#3 (text+ko) ====

@@ -3192,7 +3192,11 @@
 void
 isp_uninit(ispsoftc_t *isp)
 {
-	ISP_WRITE(isp, HCCR, HCCR_CMD_RESET);
+	if (IS_24XX(isp)) {
+		ISP_WRITE(isp, BIU2400_HCCR, HCCR_2400_CMD_RESET);
+	} else {
+		ISP_WRITE(isp, HCCR, HCCR_CMD_RESET);
+	}
 	DISABLE_INTS(isp);
 }