Date: Sat, 12 Jul 2014 06:23:42 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268564 - in head/sys: dev/drm2 dev/drm2/i915 dev/drm2/radeon dev/etherswitch/arswitch dev/etherswitch/rtl8366 dev/iicbus sys Message-ID: <201407120623.s6C6NgYw072804@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Sat Jul 12 06:23:42 2014 New Revision: 268564 URL: http://svnweb.freebsd.org/changeset/base/268564 Log: Revert r268543. We should probably fix sys/gpio.h instead. Added: head/sys/dev/iicbus/iic.h (contents, props changed) Deleted: head/sys/sys/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 05:59:19 2014 (r268563) +++ head/sys/dev/drm2/drm_dp_iic_helper.c Sat Jul 12 06:23:42 2014 (r268564) @@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/kobj.h> #include <sys/bus.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include "iicbus_if.h" #include <dev/iicbus/iiconf.h> #include <dev/drm2/drmP.h> Modified: head/sys/dev/drm2/drm_edid.c ============================================================================== --- head/sys/dev/drm2/drm_edid.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/drm2/drm_edid.c Sat Jul 12 06:23:42 2014 (r268564) @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include <dev/drm2/drmP.h> #include <dev/drm2/drm_edid.h> #include <dev/drm2/drm_edid_modes.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include "iicbus_if.h" Modified: head/sys/dev/drm2/i915/intel_iic.c ============================================================================== --- head/sys/dev/drm2/i915/intel_iic.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/drm2/i915/intel_iic.c Sat Jul 12 06:23:42 2014 (r268564) @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); #include <dev/drm2/i915/i915_drm.h> #include <dev/drm2/i915/i915_drv.h> #include <dev/drm2/i915/intel_drv.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> #include "iicbus_if.h" Modified: head/sys/dev/drm2/i915/intel_sdvo.c ============================================================================== --- head/sys/dev/drm2/i915/intel_sdvo.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/drm2/i915/intel_sdvo.c Sat Jul 12 06:23:42 2014 (r268564) @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <dev/drm2/i915/i915_drv.h> #include <dev/drm2/i915/intel_sdvo_regs.h> #include <dev/drm2/i915/intel_drv.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include "iicbus_if.h" Modified: head/sys/dev/drm2/radeon/atombios_i2c.c ============================================================================== --- head/sys/dev/drm2/radeon/atombios_i2c.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/drm2/radeon/atombios_i2c.c Sat Jul 12 06:23:42 2014 (r268564) @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); #include <dev/drm2/drmP.h> #include <dev/drm2/radeon/radeon_drm.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> #include "radeon.h" Modified: head/sys/dev/drm2/radeon/radeon_i2c.c ============================================================================== --- head/sys/dev/drm2/radeon/radeon_i2c.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/drm2/radeon/radeon_i2c.c Sat Jul 12 06:23:42 2014 (r268564) @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); #include <dev/drm2/drmP.h> #include <dev/drm2/drm_edid.h> #include <dev/drm2/radeon/radeon_drm.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> #include "radeon.h" Modified: head/sys/dev/etherswitch/arswitch/arswitch.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/etherswitch/arswitch/arswitch.c Sat Jul 12 06:23:42 2014 (r268564) @@ -47,7 +47,7 @@ #include <net/if_types.h> #include <machine/bus.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> #include <dev/mii/mii.h> Modified: head/sys/dev/etherswitch/arswitch/arswitch_7240.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_7240.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/etherswitch/arswitch/arswitch_7240.c Sat Jul 12 06:23:42 2014 (r268564) @@ -45,7 +45,7 @@ #include <net/if_types.h> #include <machine/bus.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> #include <dev/mii/mii.h> Modified: head/sys/dev/etherswitch/arswitch/arswitch_8216.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_8216.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/etherswitch/arswitch/arswitch_8216.c Sat Jul 12 06:23:42 2014 (r268564) @@ -45,7 +45,7 @@ #include <net/if_types.h> #include <machine/bus.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> #include <dev/mii/mii.h> Modified: head/sys/dev/etherswitch/arswitch/arswitch_8226.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_8226.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/etherswitch/arswitch/arswitch_8226.c Sat Jul 12 06:23:42 2014 (r268564) @@ -45,7 +45,7 @@ #include <net/if_types.h> #include <machine/bus.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> #include <dev/mii/mii.h> Modified: head/sys/dev/etherswitch/arswitch/arswitch_8316.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_8316.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/etherswitch/arswitch/arswitch_8316.c Sat Jul 12 06:23:42 2014 (r268564) @@ -45,7 +45,7 @@ #include <net/if_types.h> #include <machine/bus.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> #include <dev/mii/mii.h> Modified: head/sys/dev/etherswitch/arswitch/arswitch_8327.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_8327.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/etherswitch/arswitch/arswitch_8327.c Sat Jul 12 06:23:42 2014 (r268564) @@ -45,7 +45,7 @@ #include <net/if_types.h> #include <machine/bus.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> #include <dev/mii/mii.h> Modified: head/sys/dev/etherswitch/arswitch/arswitch_9340.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_9340.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/etherswitch/arswitch/arswitch_9340.c Sat Jul 12 06:23:42 2014 (r268564) @@ -45,7 +45,7 @@ #include <net/if_types.h> #include <machine/bus.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> #include <dev/mii/mii.h> Modified: head/sys/dev/etherswitch/arswitch/arswitch_phy.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_phy.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/etherswitch/arswitch/arswitch_phy.c Sat Jul 12 06:23:42 2014 (r268564) @@ -43,7 +43,7 @@ #include <net/if_media.h> #include <machine/bus.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> #include <dev/mii/mii.h> Modified: head/sys/dev/etherswitch/arswitch/arswitch_reg.c ============================================================================== --- head/sys/dev/etherswitch/arswitch/arswitch_reg.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/etherswitch/arswitch/arswitch_reg.c Sat Jul 12 06:23:42 2014 (r268564) @@ -44,7 +44,7 @@ #include <net/if_types.h> #include <machine/bus.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> #include <dev/mii/mii.h> Modified: head/sys/dev/etherswitch/rtl8366/rtl8366rb.c ============================================================================== --- head/sys/dev/etherswitch/rtl8366/rtl8366rb.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/etherswitch/rtl8366/rtl8366rb.c Sat Jul 12 06:23:42 2014 (r268564) @@ -46,7 +46,7 @@ #include <net/if_types.h> #include <machine/bus.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> #include <dev/mii/mii.h> Modified: head/sys/dev/iicbus/iic.c ============================================================================== --- head/sys/dev/iicbus/iic.c Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/iicbus/iic.c Sat Jul 12 06:23:42 2014 (r268564) @@ -37,10 +37,10 @@ #include <sys/sx.h> #include <sys/systm.h> #include <sys/uio.h> -#include <sys/iic.h> #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> +#include <dev/iicbus/iic.h> #include "iicbus_if.h" Added: head/sys/dev/iicbus/iic.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/iicbus/iic.h Sat Jul 12 06:23:42 2014 (r268564) @@ -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 <sys/ioccom.h> + +/* 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 Modified: head/sys/dev/iicbus/iicbus_if.m ============================================================================== --- head/sys/dev/iicbus/iicbus_if.m Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/iicbus/iicbus_if.m Sat Jul 12 06:23:42 2014 (r268564) @@ -27,7 +27,7 @@ # #include <sys/bus.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> INTERFACE iicbus; Modified: head/sys/dev/iicbus/iiconf.h ============================================================================== --- head/sys/dev/iicbus/iiconf.h Sat Jul 12 05:59:19 2014 (r268563) +++ head/sys/dev/iicbus/iiconf.h Sat Jul 12 06:23:42 2014 (r268564) @@ -29,7 +29,7 @@ #define __IICONF_H #include <sys/queue.h> -#include <sys/iic.h> +#include <dev/iicbus/iic.h> #define IICPRI (PZERO+8) /* XXX sleep/wakeup queue priority */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407120623.s6C6NgYw072804>