From owner-p4-projects@FreeBSD.ORG Thu Sep 8 07:46:00 2005 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 3743F16A423; Thu, 8 Sep 2005 07:46:00 +0000 (GMT) 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 E2ADE16A42D for ; Thu, 8 Sep 2005 07:45:59 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8DC2143D45 for ; Thu, 8 Sep 2005 07:45:59 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j887jxiZ009940 for ; Thu, 8 Sep 2005 07:45:59 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j887jxsj009937 for perforce@freebsd.org; Thu, 8 Sep 2005 07:45:59 GMT (envelope-from scottl@freebsd.org) Date: Thu, 8 Sep 2005 07:45:59 GMT Message-Id: <200509080745.j887jxsj009937@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 83252 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, 08 Sep 2005 07:46:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=83252 Change 83252 by scottl@scottl-junior on 2005/09/08 07:45:49 Adjust include paths and fix some minor compile warnings. Affected files ... .. //depot/projects/iscsi/src/sys/dev/iscsi/isc_cam.c#2 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/isc_sm.c#2 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/isc_soc.c#2 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/isc_subr.c#2 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/iscsi.c#2 edit .. //depot/projects/iscsi/src/sys/dev/iscsi/iscsi_subr.c#2 edit .. //depot/projects/iscsi/src/sys/modules/iscsi_initiator/Makefile#2 edit Differences ... ==== //depot/projects/iscsi/src/sys/dev/iscsi/isc_cam.c#2 (text+ko) ==== @@ -42,8 +42,8 @@ #include #include -#include "iscsi.h" -#include "iscsivar.h" +#include +#include // XXX: untested/incomplete void ==== //depot/projects/iscsi/src/sys/dev/iscsi/isc_sm.c#2 (text+ko) ==== @@ -56,8 +56,8 @@ #include -#include "iscsi.h" -#include "iscsivar.h" +#include +#include static void _async(isc_session_t *sp, pduq_t *pq) @@ -260,7 +260,7 @@ #if __FreeBSD_version < 600000 xdebug("%d] pdu len=%d > %d", #else - xdebug("%d] pdu len=%ld > %d", + xdebug("%d] pdu len=%zd > %d", #endif sp->sid, len, sp->opt.maxXmitDataSegmentLength); return E2BIG; ==== //depot/projects/iscsi/src/sys/dev/iscsi/isc_soc.c#2 (text+ko) ==== @@ -50,8 +50,8 @@ #include #include -#include "iscsi.h" -#include "iscsivar.h" +#include +#include /* | wait till a PDU header is received | from the socket. @@ -81,7 +81,7 @@ #if __FreeBSD_version < 600000 debug(5, "so_error=%d uio.uio_resid=%d iov.iov_len=%d", #else - debug(5, "so_error=%d uio.uio_resid=%d iov.iov_len=%ld", + debug(5, "so_error=%d uio.uio_resid=%d iov.iov_len=%zd", #endif so->so_error, uio.uio_resid, iov.iov_len); error = EPIPE; ==== //depot/projects/iscsi/src/sys/dev/iscsi/isc_subr.c#2 (text+ko) ==== @@ -48,8 +48,8 @@ #include #include -#include "iscsi.h" -#include "iscsivar.h" +#include +#include MALLOC_DEFINE(M_PDU, "iSCSI pdu", "iSCSI driver"); ==== //depot/projects/iscsi/src/sys/dev/iscsi/iscsi.c#2 (text+ko) ==== @@ -49,13 +49,9 @@ #include #include #include -#if 0 + #include #include -#else -#include "iscsi.h" -#include "iscsivar.h" -#endif struct isc isc; ==== //depot/projects/iscsi/src/sys/dev/iscsi/iscsi_subr.c#2 (text+ko) ==== @@ -43,8 +43,8 @@ #include #include -#include "iscsi.h" -#include "iscsivar.h" +#include +#include /* | Interface to the SCSI layer ==== //depot/projects/iscsi/src/sys/modules/iscsi_initiator/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -KMOD=iscsi +KMOD=iscsi_initiator + SRCS=iscsi.c isc_cam.c isc_soc.c isc_sm.c isc_subr.c iscsi_subr.c SRCS+=iscsi.h iscsivar.h -#SRCS+=device_if.h bus_if.h SRCS+=opt_cam.h .PATH: ${.CURDIR}/../../dev/iscsi @@ -9,5 +9,4 @@ # Debugging CFLAGS+= -DISCSI_DEBUG=9 - .include