From owner-svn-src-all@FreeBSD.ORG Sat Jul 12 01:04:15 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BDD8DF31; Sat, 12 Jul 2014 01:04:15 +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 8D69B2B11; Sat, 12 Jul 2014 01:04:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6C14FMo080687; Sat, 12 Jul 2014 01:04:15 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6C14BYo080629; Sat, 12 Jul 2014 01:04:11 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201407120104.s6C14BYo080629@svn.freebsd.org> From: Rui Paulo Date: Sat, 12 Jul 2014 01:04:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268543 - in head/sys: dev/drm2 dev/drm2/i915 dev/drm2/radeon dev/etherswitch/arswitch dev/etherswitch/rtl8366 dev/iicbus sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jul 2014 01:04:15 -0000 Author: rpaulo Date: Sat Jul 12 01:04:10 2014 New Revision: 268543 URL: http://svnweb.freebsd.org/changeset/base/268543 Log: Move iic.h to sys/ so that it's automatically installed in /usr/include/sys. This lets us call iic(4) ioctls without needing the kernel source code and follows the same model of GPIO. MFC after: 3 weeks Added: head/sys/sys/iic.h - copied unchanged from r268542, head/sys/dev/iicbus/iic.h Deleted: head/sys/dev/iicbus/iic.h Modified: head/sys/dev/drm2/drm_dp_iic_helper.c head/sys/dev/drm2/drm_edid.c head/sys/dev/drm2/i915/intel_iic.c head/sys/dev/drm2/i915/intel_sdvo.c head/sys/dev/drm2/radeon/atombios_i2c.c head/sys/dev/drm2/radeon/radeon_i2c.c head/sys/dev/etherswitch/arswitch/arswitch.c head/sys/dev/etherswitch/arswitch/arswitch_7240.c head/sys/dev/etherswitch/arswitch/arswitch_8216.c head/sys/dev/etherswitch/arswitch/arswitch_8226.c head/sys/dev/etherswitch/arswitch/arswitch_8316.c head/sys/dev/etherswitch/arswitch/arswitch_8327.c head/sys/dev/etherswitch/arswitch/arswitch_9340.c head/sys/dev/etherswitch/arswitch/arswitch_phy.c head/sys/dev/etherswitch/arswitch/arswitch_reg.c head/sys/dev/etherswitch/rtl8366/rtl8366rb.c head/sys/dev/iicbus/iic.c head/sys/dev/iicbus/iicbus_if.m head/sys/dev/iicbus/iiconf.h Modified: head/sys/dev/drm2/drm_dp_iic_helper.c ============================================================================== --- head/sys/dev/drm2/drm_dp_iic_helper.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/drm2/drm_dp_iic_helper.c Sat Jul 12 01:04:10 2014 (r268543) @@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include "iicbus_if.h" #include #include Modified: head/sys/dev/drm2/drm_edid.c ============================================================================== --- head/sys/dev/drm2/drm_edid.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/drm2/drm_edid.c Sat Jul 12 01:04:10 2014 (r268543) @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include "iicbus_if.h" Modified: head/sys/dev/drm2/i915/intel_iic.c ============================================================================== --- head/sys/dev/drm2/i915/intel_iic.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/drm2/i915/intel_iic.c Sat Jul 12 01:04:10 2014 (r268543) @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include #include "iicbus_if.h" Modified: head/sys/dev/drm2/i915/intel_sdvo.c ============================================================================== --- head/sys/dev/drm2/i915/intel_sdvo.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/drm2/i915/intel_sdvo.c Sat Jul 12 01:04:10 2014 (r268543) @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include "iicbus_if.h" Modified: head/sys/dev/drm2/radeon/atombios_i2c.c ============================================================================== --- head/sys/dev/drm2/radeon/atombios_i2c.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/drm2/radeon/atombios_i2c.c Sat Jul 12 01:04:10 2014 (r268543) @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include #include #include "radeon.h" Modified: head/sys/dev/drm2/radeon/radeon_i2c.c ============================================================================== --- head/sys/dev/drm2/radeon/radeon_i2c.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/drm2/radeon/radeon_i2c.c Sat Jul 12 01:04:10 2014 (r268543) @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include #include "radeon.h" Modified: head/sys/dev/etherswitch/arswitch/arswitch.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/etherswitch/arswitch/arswitch.c Sat Jul 12 01:04:10 2014 (r268543) @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include #include Modified: head/sys/dev/etherswitch/arswitch/arswitch_7240.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_7240.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/etherswitch/arswitch/arswitch_7240.c Sat Jul 12 01:04:10 2014 (r268543) @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include Modified: head/sys/dev/etherswitch/arswitch/arswitch_8216.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_8216.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/etherswitch/arswitch/arswitch_8216.c Sat Jul 12 01:04:10 2014 (r268543) @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include Modified: head/sys/dev/etherswitch/arswitch/arswitch_8226.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_8226.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/etherswitch/arswitch/arswitch_8226.c Sat Jul 12 01:04:10 2014 (r268543) @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include Modified: head/sys/dev/etherswitch/arswitch/arswitch_8316.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_8316.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/etherswitch/arswitch/arswitch_8316.c Sat Jul 12 01:04:10 2014 (r268543) @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include Modified: head/sys/dev/etherswitch/arswitch/arswitch_8327.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_8327.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/etherswitch/arswitch/arswitch_8327.c Sat Jul 12 01:04:10 2014 (r268543) @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include Modified: head/sys/dev/etherswitch/arswitch/arswitch_9340.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_9340.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/etherswitch/arswitch/arswitch_9340.c Sat Jul 12 01:04:10 2014 (r268543) @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include Modified: head/sys/dev/etherswitch/arswitch/arswitch_phy.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_phy.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/etherswitch/arswitch/arswitch_phy.c Sat Jul 12 01:04:10 2014 (r268543) @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include #include Modified: head/sys/dev/etherswitch/arswitch/arswitch_reg.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_reg.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/etherswitch/arswitch/arswitch_reg.c Sat Jul 12 01:04:10 2014 (r268543) @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include #include Modified: head/sys/dev/etherswitch/rtl8366/rtl8366rb.c ============================================================================== --- head/sys/dev/etherswitch/rtl8366/rtl8366rb.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/etherswitch/rtl8366/rtl8366rb.c Sat Jul 12 01:04:10 2014 (r268543) @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include #include Modified: head/sys/dev/iicbus/iic.c ============================================================================== --- head/sys/dev/iicbus/iic.c Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/iicbus/iic.c Sat Jul 12 01:04:10 2014 (r268543) @@ -37,10 +37,10 @@ #include #include #include +#include #include #include -#include #include "iicbus_if.h" Modified: head/sys/dev/iicbus/iicbus_if.m ============================================================================== --- head/sys/dev/iicbus/iicbus_if.m Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/iicbus/iicbus_if.m Sat Jul 12 01:04:10 2014 (r268543) @@ -27,7 +27,7 @@ # #include -#include +#include INTERFACE iicbus; Modified: head/sys/dev/iicbus/iiconf.h ============================================================================== --- head/sys/dev/iicbus/iiconf.h Sat Jul 12 00:57:00 2014 (r268542) +++ head/sys/dev/iicbus/iiconf.h Sat Jul 12 01:04:10 2014 (r268543) @@ -29,7 +29,7 @@ #define __IICONF_H #include -#include +#include #define IICPRI (PZERO+8) /* XXX sleep/wakeup queue priority */ Copied: head/sys/sys/iic.h (from r268542, head/sys/dev/iicbus/iic.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/sys/iic.h Sat Jul 12 01:04:10 2014 (r268543, copy of r268542, head/sys/dev/iicbus/iic.h) @@ -0,0 +1,67 @@ +/*- + * Copyright (c) 1998 Nicolas Souchu + * All rights reserved. + * + * 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$ + * + */ +#ifndef __IIC_H +#define __IIC_H + +#include + +/* Designed to be compatible with linux's struct i2c_msg */ +struct iic_msg +{ + uint16_t slave; + uint16_t flags; +#define IIC_M_WR 0 /* Fake flag for write */ +#define IIC_M_RD 0x0001 /* read vs write */ +#define IIC_M_NOSTOP 0x0002 /* do not send a I2C stop after message */ +#define IIC_M_NOSTART 0x0004 /* do not send a I2C start before message */ + uint16_t len; /* msg length */ + uint8_t * buf; +}; + +struct iiccmd { + u_char slave; + int count; + int last; + char *buf; +}; + +struct iic_rdwr_data { + struct iic_msg *msgs; + uint32_t nmsgs; +}; + +#define I2CSTART _IOW('i', 1, struct iiccmd) /* start condition */ +#define I2CSTOP _IO('i', 2) /* stop condition */ +#define I2CRSTCARD _IOW('i', 3, struct iiccmd) /* reset the card */ +#define I2CWRITE _IOW('i', 4, struct iiccmd) /* send data */ +#define I2CREAD _IOW('i', 5, struct iiccmd) /* receive data */ +#define I2CRDWR _IOW('i', 6, struct iic_rdwr_data) /* General read/write interface */ +#define I2CRPTSTART _IOW('i', 7, struct iiccmd) /* repeated start */ + +#endif