From owner-p4-projects@FreeBSD.ORG  Fri Feb 23 21:55:44 2007
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 9175716A405; Fri, 23 Feb 2007 21:55:44 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6FFEC16A400
	for <perforce@freebsd.org>; Fri, 23 Feb 2007 21:55:44 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 6058913C47E
	for <perforce@freebsd.org>; Fri, 23 Feb 2007 21:55:44 +0000 (UTC)
	(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 l1NLti3v014563
	for <perforce@freebsd.org>; Fri, 23 Feb 2007 21:55:44 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NLth82014560
	for perforce@freebsd.org; Fri, 23 Feb 2007 21:55:43 GMT
	(envelope-from mjacob@freebsd.org)
Date: Fri, 23 Feb 2007 21:55:43 GMT
Message-Id: <200702232155.l1NLth82014560@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 114913 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, 23 Feb 2007 21:55:44 -0000

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

Change 114913 by mjacob@mjexp on 2007/02/23 21:54:59

	
	       Compilation fixes from Solaris port.

Affected files ...

.. //depot/projects/mjexp/sys/dev/isp/ispmbox.h#5 edit
.. //depot/projects/mjexp/sys/dev/isp/ispreg.h#3 edit

Differences ...

==== //depot/projects/mjexp/sys/dev/isp/ispmbox.h#5 (text+ko) ====

@@ -643,7 +643,7 @@
 	uint16_t	ms_flags;
 	uint16_t	ms_reserved1;	/* low 8 bits */
 	uint16_t	ms_time;
-	uint16_t	ms_cmd_cnt;	/* Command DSD count */;
+	uint16_t	ms_cmd_cnt;	/* Command DSD count */
 	uint16_t	ms_tot_cnt;	/* Total DSD Count */
 	uint8_t		ms_type;	/* MS type */
 	uint8_t		ms_r_ctl;	/* R_CTL */

==== //depot/projects/mjexp/sys/dev/isp/ispreg.h#3 (text+ko) ====

@@ -409,14 +409,14 @@
 
 /* BIU2400_HCCR definitions */
 
-#define	HCCR_2400_CMD_NOP		(0x0 << 28)
-#define	HCCR_2400_CMD_RESET		(0x1 << 28)
-#define	HCCR_2400_CMD_CLEAR_RESET	(0x2 << 28)
-#define	HCCR_2400_CMD_PAUSE		(0x3 << 28)
-#define	HCCR_2400_CMD_RELEASE		(0x4 << 28)
-#define	HCCR_2400_CMD_SET_HOST_INT	(0x5 << 28)
-#define	HCCR_2400_CMD_CLEAR_HOST_INT	(0x6 << 28)
-#define	HCCR_2400_CMD_CLEAR_RISC_INT	(0xA << 28)
+#define	HCCR_2400_CMD_NOP		0x00000000
+#define	HCCR_2400_CMD_RESET		0x10000000
+#define	HCCR_2400_CMD_CLEAR_RESET	0x20000000
+#define	HCCR_2400_CMD_PAUSE		0x30000000
+#define	HCCR_2400_CMD_RELEASE		0x40000000
+#define	HCCR_2400_CMD_SET_HOST_INT	0x50000000
+#define	HCCR_2400_CMD_CLEAR_HOST_INT	0x60000000
+#define	HCCR_2400_CMD_CLEAR_RISC_INT	0xA0000000
 
 #define	HCCR_2400_RISC_ERR(x)		(((x) >> 12) & 0x7)	/* RO */
 #define	HCCR_2400_RISC2HOST_INT		(1 << 6)		/* RO */