diff options
Diffstat (limited to 'sys/dev/iicbus/iic.c')
| -rw-r--r-- | sys/dev/iicbus/iic.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c index e41d08b8a2b77..45d551b8f5de8 100644 --- a/sys/dev/iicbus/iic.c +++ b/sys/dev/iicbus/iic.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: iic.c,v 1.5 1998/12/07 21:58:16 archie Exp $ + * $Id: iic.c,v 1.2 1998/09/04 17:53:35 nsouch Exp $ * */ #include <sys/param.h> @@ -40,7 +40,6 @@ #include <dev/iicbus/iiconf.h> #include <dev/iicbus/iicbus.h> - #include <machine/iic.h> #include "iicbus_if.h" @@ -118,6 +117,8 @@ iic_probe(device_t dev) static int iic_attach(device_t dev) { + struct iic_softc *sc = (struct iic_softc *)device_get_softc(dev); + return (0); } @@ -210,16 +211,15 @@ iicioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p) { device_t iicdev = IIC_DEVICE(minor(dev)); struct iic_softc *sc = IIC_SOFTC(minor(dev)); + int error; device_t parent = device_get_parent(iicdev); - struct iiccmd *s = (struct iiccmd *)data; - int error, count; if (!sc) return (EINVAL); switch (cmd) { case I2CSTART: - error = iicbus_start(parent, s->slave, 0); + error = iicbus_start(parent, sc->sc_addr); break; case I2CSTOP: @@ -227,15 +227,7 @@ iicioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p) break; case I2CRSTCARD: - error = iicbus_reset(parent, 0, 0, NULL); - break; - - case I2CWRITE: - error = iicbus_write(parent, s->buf, s->count, &count, 0); - break; - - case I2CREAD: - error = iicbus_read(parent, s->buf, s->count, &count, s->last, 0); + error = iicbus_reset(parent, 0); break; default: |