From owner-svn-src-head@FreeBSD.ORG Sat Jan 31 08:03:57 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D55228E5; Sat, 31 Jan 2015 08:03:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C0C47C29; Sat, 31 Jan 2015 08:03:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0V83v8J008638; Sat, 31 Jan 2015 08:03:57 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0V83vfg008636; Sat, 31 Jan 2015 08:03:57 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201501310803.t0V83vfg008636@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sat, 31 Jan 2015 08:03:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277964 - head/sys/dev/iscsi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Jan 2015 08:03:57 -0000 Author: trasz Date: Sat Jan 31 08:03:56 2015 New Revision: 277964 URL: https://svnweb.freebsd.org/changeset/base/277964 Log: Add two files missed in r277963. Sponsored by: The FreeBSD Foundation Added: head/sys/dev/iscsi/icl_conn_if.m (contents, props changed) head/sys/dev/iscsi/icl_wrappers.h (contents, props changed) Added: head/sys/dev/iscsi/icl_conn_if.m ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/iscsi/icl_conn_if.m Sat Jan 31 08:03:56 2015 (r277964) @@ -0,0 +1,87 @@ +#- +# Copyright (c) 2014 The FreeBSD Foundation +# All rights reserved. +# +# This software was developed by Edward Tomasz Napierala under sponsorship +# from the FreeBSD Foundation. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +#include + +INTERFACE icl_conn; + +METHOD size_t pdu_data_segment_length { + struct icl_conn *_ic; + const struct icl_pdu *_ip; +}; + +METHOD int pdu_append_data { + struct icl_conn *_ic; + struct icl_pdu *_ip; + const void *_addr; + size_t _len; + int _flags; +}; + +METHOD void pdu_get_data { + struct icl_conn *_ic; + struct icl_pdu *_ip; + size_t _off; + void *_addr; + size_t _len; +}; + +METHOD void pdu_queue { + struct icl_conn *_ic; + struct icl_pdu *_ip; +}; + +METHOD void pdu_free { + struct icl_conn *_ic; + struct icl_pdu *_ip; +}; + +METHOD struct icl_pdu * new_pdu { + struct icl_conn *_ic; + int _flags; +}; + +METHOD void free { + struct icl_conn *_ic; +}; + +METHOD int handoff { + struct icl_conn *_ic; + int _fd; +}; + +METHOD void close { + struct icl_conn *_ic; +}; + +METHOD bool connected { + struct icl_conn *_ic; +}; Added: head/sys/dev/iscsi/icl_wrappers.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/iscsi/icl_wrappers.h Sat Jan 31 08:03:56 2015 (r277964) @@ -0,0 +1,116 @@ +/*- + * Copyright (c) 2014 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Edward Tomasz Napierala under sponsorship + * from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* + * This file is used to provide the initiator and target with a prettier + * interface. It must not be included by ICL modules, such as icl_soft.c. + */ + +#ifndef ICL_WRAPPERS_H +#define ICL_WRAPPERS_H + +#include +#include + +#include +#include + +static inline struct icl_pdu * +icl_pdu_new(struct icl_conn *ic, int flags) +{ + + return (ICL_CONN_NEW_PDU(ic, flags)); +} + +static inline size_t +icl_pdu_data_segment_length(const struct icl_pdu *ip) +{ + + return (ICL_CONN_PDU_DATA_SEGMENT_LENGTH(ip->ip_conn, ip)); +} + +static inline int +icl_pdu_append_data(struct icl_pdu *ip, const void *addr, size_t len, int flags) +{ + + return (ICL_CONN_PDU_APPEND_DATA(ip->ip_conn, ip, addr, len, flags)); +} + +static inline void +icl_pdu_get_data(struct icl_pdu *ip, size_t off, void *addr, size_t len) +{ + + ICL_CONN_PDU_GET_DATA(ip->ip_conn, ip, off, addr, len); +} + +static inline void +icl_pdu_queue(struct icl_pdu *ip) +{ + + ICL_CONN_PDU_QUEUE(ip->ip_conn, ip); +} + +static inline void +icl_pdu_free(struct icl_pdu *ip) +{ + + ICL_CONN_PDU_FREE(ip->ip_conn, ip); +} + +static inline void +icl_conn_free(struct icl_conn *ic) +{ + + ICL_CONN_FREE(ic); +} + +static inline int +icl_conn_handoff(struct icl_conn *ic, int fd) +{ + + return (ICL_CONN_HANDOFF(ic, fd)); +} + +static inline void +icl_conn_close(struct icl_conn *ic) +{ + + ICL_CONN_CLOSE(ic); +} + +static inline bool +icl_conn_connected(struct icl_conn *ic) +{ + + return (ICL_CONN_CONNECTED(ic)); +} + +#endif /* !ICL_WRAPPERS_H */