From owner-p4-projects@FreeBSD.ORG Thu Nov 16 00:36:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C1DD16A417; Thu, 16 Nov 2006 00:36:09 +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 16FF916A412 for ; Thu, 16 Nov 2006 00:36:09 +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 59C8443D5C for ; Thu, 16 Nov 2006 00:36:08 +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 kAG0a8C6019917 for ; Thu, 16 Nov 2006 00:36:08 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAG0a85V019913 for perforce@freebsd.org; Thu, 16 Nov 2006 00:36:08 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 16 Nov 2006 00:36:08 GMT Message-Id: <200611160036.kAG0a85V019913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 110083 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Nov 2006 00:36:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=110083 Change 110083 by mjacob@newisp on 2006/11/16 00:35:52 Some minor diff reduction cleanups plus a new internal FC command data structure definition for SMI-S support. Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#37 edit .. //depot/projects/newisp/dev/isp/isp_library.c#20 edit .. //depot/projects/newisp/dev/isp/ispmbox.h#13 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#37 (text+ko) ==== @@ -26,8 +26,9 @@ /* * Machine and OS Independent (well, as best as possible) - * code for the Qlogic ISP SCSI adapters. + * code for the Qlogic ISP SCSI and FC-SCSI adapters. */ + /* * Inspiration and ideas about this driver are from Erik Moe's Linux driver * (qlogicisp.c) and Dave Miller's SBus version of same (qlogicisp.c). Some @@ -42,7 +43,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.129 2006/11/14 08:45:47 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.130 2006/11/16 00:31:46 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ ==== //depot/projects/newisp/dev/isp/isp_library.c#20 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2006 by Matthew Jacob + * Copyright (c) 2006 by Matthew Jacob * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,7 +32,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_library.c,v 1.7 2006/11/14 08:45:48 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_library.c,v 1.8 2006/11/16 00:31:46 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ ==== //depot/projects/newisp/dev/isp/ispmbox.h#13 (text+ko) ==== @@ -1347,4 +1347,30 @@ #define els_recv_dsd_a4732 inout.out._els_recv_dsd_a4732 #define els_recv_dsd_a6348 inout.out._els_recv_dsd_a6348 } els_t; + +/* + * A handy package structure for running FC-SCSI commands via RUN IOCB A64. + */ +typedef struct { + uint16_t handle; + uint16_t lun; + uint32_t portid; + uint32_t timeout; + union { + struct { + uint32_t data_length; + uint8_t do_read; + uint8_t pad[3]; + uint8_t cdb[16]; + void *data_ptr; + } beg; + struct { + uint32_t data_residual; + uint8_t status; + uint8_t pad; + uint16_t sense_length; + uint8_t sense_data[32]; + } end; + } fcd; +} isp_xcmd_t; #endif /* _ISPMBOX_H */