From owner-p4-projects@FreeBSD.ORG  Wed Oct 18 20:24:18 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 3CA3E16A494; Wed, 18 Oct 2006 20:24:18 +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 192F516A416
	for <perforce@freebsd.org>; Wed, 18 Oct 2006 20:24:18 +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 B445B43D82
	for <perforce@freebsd.org>; Wed, 18 Oct 2006 20:24:03 +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 k9IKO3bC000172
	for <perforce@freebsd.org>; Wed, 18 Oct 2006 20:24:03 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9IKO3mc000166
	for perforce@freebsd.org; Wed, 18 Oct 2006 20:24:03 GMT
	(envelope-from mjacob@freebsd.org)
Date: Wed, 18 Oct 2006 20:24:03 GMT
Message-Id: <200610182024.k9IKO3mc000166@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 108061 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, 18 Oct 2006 20:24:18 -0000

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

Change 108061 by mjacob@newisp on 2006/10/18 20:23:22

	Put ISR read arguments for mailbox and semaphore pointers
	back to pointers to shorts. 

Affected files ...

.. //depot/projects/newisp/dev/isp/isp_pci.c#14 edit

Differences ...

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

@@ -69,11 +69,11 @@
 static uint32_t isp_pci_rd_reg_2400(ispsoftc_t *, int);
 static void isp_pci_wr_reg_2400(ispsoftc_t *, int, uint32_t);
 static int
-isp_pci_rd_isr(ispsoftc_t *, uint32_t *, uint32_t *, uint32_t *);
+isp_pci_rd_isr(ispsoftc_t *, uint32_t *, uint16_t *, uint16_t *);
 static int
-isp_pci_rd_isr_2300(ispsoftc_t *, uint32_t *, uint32_t *, uint32_t *);
+isp_pci_rd_isr_2300(ispsoftc_t *, uint32_t *, uint16_t *, uint16_t *);
 static int
-isp_pci_rd_isr_2400(ispsoftc_t *, uint32_t *, uint32_t *, uint32_t *);
+isp_pci_rd_isr_2400(ispsoftc_t *, uint32_t *, uint16_t *, uint16_t *);
 static int isp_pci_mbxdma(ispsoftc_t *);
 static int
 isp_pci_dmasetup(ispsoftc_t *, XS_T *, ispreq_t *, uint32_t *, uint32_t);
@@ -1216,7 +1216,8 @@
 isp_pci_intr(void *arg)
 {
 	ispsoftc_t *isp = arg;
-	uint32_t isr, sema, mbox;
+	uint32_t isr;
+	uint16_t sema, mbox;
 
 	ISP_LOCK(isp);
 	isp->isp_intcnt++;
@@ -1247,7 +1248,7 @@
 
 
 static __inline int
-isp_pci_rd_debounced(ispsoftc_t *isp, int off, uint32_t *rp)
+isp_pci_rd_debounced(ispsoftc_t *isp, int off, uint16_t *rp)
 {
 	struct isp_pcisoftc *pcs = (struct isp_pcisoftc *) isp;
 	uint32_t val0, val1;
@@ -1266,10 +1267,10 @@
 
 static int
 isp_pci_rd_isr(ispsoftc_t *isp, uint32_t *isrp,
-    uint32_t *semap, uint32_t *mbp)
+    uint16_t *semap, uint16_t *mbp)
 {
 	struct isp_pcisoftc *pcs = (struct isp_pcisoftc *) isp;
-	uint32_t isr, sema;
+	uint16_t isr, sema;
 
 	if (IS_2100(isp)) {
 		if (isp_pci_rd_debounced(isp, BIU_ISR, &isr)) {
@@ -1303,7 +1304,7 @@
 
 static int
 isp_pci_rd_isr_2300(ispsoftc_t *isp, uint32_t *isrp,
-    uint32_t *semap, uint32_t *mbox0p)
+    uint16_t *semap, uint16_t *mbox0p)
 {
 	struct isp_pcisoftc *pcs = (struct isp_pcisoftc *) isp;
 	uint32_t hccr;
@@ -1366,7 +1367,7 @@
 
 static int
 isp_pci_rd_isr_2400(ispsoftc_t *isp, uint32_t *isrp,
-    uint32_t *semap, uint32_t *mbox0p)
+    uint16_t *semap, uint16_t *mbox0p)
 {
 	struct isp_pcisoftc *pcs = (struct isp_pcisoftc *) isp;
 	uint32_t r2hisr;