diff options
author | rpaulo <rpaulo@FreeBSD.org> | 2014-07-12 01:04:10 +0000 |
---|---|---|
committer | rpaulo <rpaulo@FreeBSD.org> | 2014-07-12 01:04:10 +0000 |
commit | 94e9ac21253398e72e800f2f5a256496643f663d (patch) | |
tree | c215214ad735744c6d7a1907629fc535aec35740 /sys/dev/iicbus | |
parent | 79010cf32db8d4e0e3868dd4efd36be122416183 (diff) | |
download | FreeBSD-src-94e9ac21253398e72e800f2f5a256496643f663d.zip FreeBSD-src-94e9ac21253398e72e800f2f5a256496643f663d.tar.gz |
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
Diffstat (limited to 'sys/dev/iicbus')
-rw-r--r-- | sys/dev/iicbus/iic.c | 2 | ||||
-rw-r--r-- | sys/dev/iicbus/iic.h | 67 | ||||
-rw-r--r-- | sys/dev/iicbus/iicbus_if.m | 2 | ||||
-rw-r--r-- | sys/dev/iicbus/iiconf.h | 2 |
4 files changed, 3 insertions, 70 deletions
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c index 16d113ee..5d63060 100644 --- a/sys/dev/iicbus/iic.c +++ b/sys/dev/iicbus/iic.c @@ -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" diff --git a/sys/dev/iicbus/iic.h b/sys/dev/iicbus/iic.h deleted file mode 100644 index ab58abf..0000000 --- a/sys/dev/iicbus/iic.h +++ /dev/null @@ -1,67 +0,0 @@ -/*- - * 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 diff --git a/sys/dev/iicbus/iicbus_if.m b/sys/dev/iicbus/iicbus_if.m index c57fac5..d0d83a3 100644 --- a/sys/dev/iicbus/iicbus_if.m +++ b/sys/dev/iicbus/iicbus_if.m @@ -27,7 +27,7 @@ # #include <sys/bus.h> -#include <dev/iicbus/iic.h> +#include <sys/iic.h> INTERFACE iicbus; diff --git a/sys/dev/iicbus/iiconf.h b/sys/dev/iicbus/iiconf.h index 092ba8d..68ca83f 100644 --- a/sys/dev/iicbus/iiconf.h +++ b/sys/dev/iicbus/iiconf.h @@ -29,7 +29,7 @@ #define __IICONF_H #include <sys/queue.h> -#include <dev/iicbus/iic.h> +#include <sys/iic.h> #define IICPRI (PZERO+8) /* XXX sleep/wakeup queue priority */ |