From owner-p4-projects Tue Apr 2 16:33:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70D1537B41F; Tue, 2 Apr 2002 16:33:06 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AAE3537B41C for ; Tue, 2 Apr 2002 16:33:05 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g330X5D66867 for perforce@freebsd.org; Tue, 2 Apr 2002 16:33:05 -0800 (PST) (envelope-from jake@freebsd.org) Date: Tue, 2 Apr 2002 16:33:05 -0800 (PST) Message-Id: <200204030033.g330X5D66867@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8938 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8938 Change 8938 by jake@jake_sparc64 on 2002/04/02 16:32:42 Integ this. Affected files ... ... //depot/projects/sparc64/sys/dev/isp/isp_freebsd.h#9 integrate ... //depot/projects/sparc64/sys/dev/isp/isp_pci.c#8 integrate ... //depot/projects/sparc64/sys/dev/isp/ispvar.h#10 integrate Differences ... ==== //depot/projects/sparc64/sys/dev/isp/isp_freebsd.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.59 2002/03/20 02:07:25 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.60 2002/04/02 23:36:14 mjacob Exp $ */ /* * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * Copyright (c) 1997, 1998, 1999, 2000, 2001 by Matthew Jacob ==== //depot/projects/sparc64/sys/dev/isp/isp_pci.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.78 2002/02/18 00:00:34 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.79 2002/04/02 23:36:14 mjacob Exp $ */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. * FreeBSD Version. ==== //depot/projects/sparc64/sys/dev/isp/ispvar.h#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.55 2002/03/21 21:10:16 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.56 2002/04/02 23:36:14 mjacob Exp $ */ /* * Soft Definitions for for Qlogic ISP SCSI adapters. * @@ -149,8 +149,12 @@ #define QENTRY_LEN 64 /* Both request and result queue length must be a power of two */ #define RQUEST_QUEUE_LEN(x) MAXISPREQUEST(x) +#ifdef ISP_TARGET_MODE +#define RESULT_QUEUE_LEN(x) MAXISPREQUEST(x) +#else #define RESULT_QUEUE_LEN(x) \ (((MAXISPREQUEST(x) >> 2) < 64)? 64 : MAXISPREQUEST(x) >> 2) +#endif #define ISP_QUEUE_ENTRY(q, idx) ((q) + ((idx) * QENTRY_LEN)) #define ISP_QUEUE_SIZE(n) ((n) * QENTRY_LEN) #define ISP_NXT_QENTRY(idx, qlen) (((idx) + 1) & ((qlen)-1)) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message