Index: head/sys/dev/iicbus/iic.c =================================================================== --- head/sys/dev/iicbus/iic.c (revision 43975) +++ head/sys/dev/iicbus/iic.c (revision 43976) @@ -1,265 +1,283 @@ /*- * 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. * - * $Id: iic.c,v 1.5 1998/12/07 21:58:16 archie Exp $ + * $Id: iic.c,v 1.6 1999/01/09 18:08:24 nsouch Exp $ * */ #include #include #include #include #include #include #include #include #include +#include #include #include #include #include #include "iicbus_if.h" #define BUFSIZE 1024 struct iic_softc { u_char sc_addr; /* address on iicbus */ int sc_count; /* >0 if device opened */ char sc_buffer[BUFSIZE]; /* output buffer */ char sc_inbuf[BUFSIZE]; /* input buffer */ }; #define IIC_SOFTC(unit) \ ((struct iic_softc *)devclass_get_softc(iic_devclass, (unit))) #define IIC_DEVICE(unit) \ (devclass_get_device(iic_devclass, (unit))) static int iic_probe(device_t); static int iic_attach(device_t); static devclass_t iic_devclass; static device_method_t iic_methods[] = { /* device interface */ DEVMETHOD(device_probe, iic_probe), DEVMETHOD(device_attach, iic_attach), /* iicbus interface */ DEVMETHOD(iicbus_intr, iicbus_generic_intr), { 0, 0 } }; static driver_t iic_driver = { "iic", iic_methods, DRIVER_TYPE_MISC, sizeof(struct iic_softc), }; static d_open_t iicopen; static d_close_t iicclose; static d_write_t iicwrite; static d_read_t iicread; static d_ioctl_t iicioctl; #define CDEV_MAJOR 105 static struct cdevsw iic_cdevsw = { iicopen, iicclose, iicread, iicwrite, /*105*/ iicioctl, nullstop, nullreset, nodevtotty, /*iic*/ seltrue, nommap, nostrat, "iic", NULL, -1 }; /* * iicprobe() */ static int iic_probe(device_t dev) { struct iic_softc *sc = (struct iic_softc *)device_get_softc(dev); sc->sc_addr = iicbus_get_addr(dev); /* XXX detect chip with start/stop conditions */ return (0); } /* * iicattach() */ static int iic_attach(device_t dev) { return (0); } static int iicopen (dev_t dev, int flags, int fmt, struct proc *p) { struct iic_softc *sc = IIC_SOFTC(minor(dev)); if (!sc) return (EINVAL); if (sc->sc_count > 0) return (EBUSY); sc->sc_count++; return (0); } static int iicclose(dev_t dev, int flags, int fmt, struct proc *p) { struct iic_softc *sc = IIC_SOFTC(minor(dev)); if (!sc) return (EINVAL); if (!sc->sc_count) return (EINVAL); sc->sc_count--; if (sc->sc_count < 0) panic("%s: iic_count < 0!", __FUNCTION__); return (0); } static int iicwrite(dev_t dev, struct uio * uio, int ioflag) { device_t iicdev = IIC_DEVICE(minor(dev)); struct iic_softc *sc = IIC_SOFTC(minor(dev)); int sent, error, count; if (!sc || !iicdev) return (EINVAL); if (sc->sc_count == 0) return (EINVAL); + if ((error = iicbus_request_bus(device_get_parent(iicdev), iicdev, IIC_DONTWAIT))) + return (error); + count = min(uio->uio_resid, BUFSIZE); uiomove(sc->sc_buffer, count, uio); error = iicbus_block_write(device_get_parent(iicdev), sc->sc_addr, sc->sc_buffer, count, &sent); + iicbus_release_bus(device_get_parent(iicdev), iicdev); + return(error); } static int iicread(dev_t dev, struct uio * uio, int ioflag) { device_t iicdev = IIC_DEVICE(minor(dev)); struct iic_softc *sc = IIC_SOFTC(minor(dev)); int len, error = 0; int bufsize; if (!sc || !iicdev) return (EINVAL); if (sc->sc_count == 0) return (EINVAL); + if ((error = iicbus_request_bus(device_get_parent(iicdev), iicdev, IIC_DONTWAIT))) + return (error); + /* max amount of data to read */ len = min(uio->uio_resid, BUFSIZE); if ((error = iicbus_block_read(device_get_parent(iicdev), sc->sc_addr, sc->sc_inbuf, len, &bufsize))) return (error); if (bufsize > uio->uio_resid) panic("%s: too much data read!", __FUNCTION__); + iicbus_release_bus(device_get_parent(iicdev), iicdev); + return (uiomove(sc->sc_inbuf, bufsize, uio)); } static int 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)); device_t parent = device_get_parent(iicdev); struct iiccmd *s = (struct iiccmd *)data; int error, count; if (!sc) return (EINVAL); + if ((error = iicbus_request_bus(device_get_parent(iicdev), iicdev, + (flags & O_NONBLOCK) ? IIC_DONTWAIT : + (IIC_WAIT | IIC_INTR)))) + return (error); + switch (cmd) { case I2CSTART: error = iicbus_start(parent, s->slave, 0); break; case I2CSTOP: error = iicbus_stop(parent); 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); break; default: error = ENODEV; } + + iicbus_release_bus(device_get_parent(iicdev), iicdev); return (error); } static int iic_devsw_installed = 0; static void iic_drvinit(void *unused) { dev_t dev; if( ! iic_devsw_installed ) { dev = makedev(CDEV_MAJOR,0); cdevsw_add(&dev,&iic_cdevsw,NULL); iic_devsw_installed = 1; } } CDEV_DRIVER_MODULE(iic, iicbus, iic_driver, iic_devclass, CDEV_MAJOR, iic_cdevsw, 0, 0); SYSINIT(iicdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,iic_drvinit,NULL) Index: head/sys/dev/iicbus/iiconf.c =================================================================== --- head/sys/dev/iicbus/iiconf.c (revision 43975) +++ head/sys/dev/iicbus/iiconf.c (revision 43976) @@ -1,362 +1,363 @@ /*- * 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. * - * $Id: iiconf.c,v 1.5 1999/01/28 15:59:15 roger Exp $ + * $Id: iiconf.c,v 1.6 1999/02/06 10:56:09 roger Exp $ * */ #include #include #include #include #include #include #include #include #include "iicbus_if.h" /* * iicbus_intr() */ void iicbus_intr(device_t bus, int event, char *buf) { struct iicbus_softc *sc = (struct iicbus_softc *)device_get_softc(bus); /* call owner's intr routine */ if (sc->owner) IICBUS_INTR(sc->owner, event, buf); return; } /* * iicbus_alloc_bus() * * Allocate a new bus connected to the given parent device */ device_t iicbus_alloc_bus(device_t parent) { device_t child; /* add the bus to the parent */ child = device_add_child(parent, "iicbus", -1, NULL); return (child); } static int iicbus_poll(struct iicbus_softc *sc, int how) { int error; switch (how) { case (IIC_WAIT | IIC_INTR): error = tsleep(sc, IICPRI|PCATCH, "iicreq", 0); break; case (IIC_WAIT | IIC_NOINTR): error = tsleep(sc, IICPRI, "iicreq", 0); break; default: return (EWOULDBLOCK); break; } return (error); } /* * iicbus_request_bus() * * Allocate the device to perform transfers. * * how : IIC_WAIT or IIC_DONTWAIT */ int iicbus_request_bus(device_t bus, device_t dev, int how) { struct iicbus_softc *sc = (struct iicbus_softc *)device_get_softc(bus); int s, error = 0; /* first, ask the underlying layers if the request is ok */ - do { - error = IICBUS_CALLBACK(device_get_parent(bus), - IIC_REQUEST_BUS, (caddr_t)&how); - if (error) - error = iicbus_poll(sc, how); - } while (error); + error = IICBUS_CALLBACK(device_get_parent(bus), IIC_REQUEST_BUS, + (caddr_t)&how); while (!error) { s = splhigh(); - if (sc->owner) { + if (sc->owner && sc->owner != dev) { splx(s); error = iicbus_poll(sc, how); } else { sc->owner = dev; splx(s); return (0); } + + /* free any allocated resource */ + if (error) + IICBUS_CALLBACK(device_get_parent(bus), IIC_RELEASE_BUS, + (caddr_t)&how); } return (error); } /* * iicbus_release_bus() * * Release the device allocated with iicbus_request_dev() */ int iicbus_release_bus(device_t bus, device_t dev) { struct iicbus_softc *sc = (struct iicbus_softc *)device_get_softc(bus); int s, error; /* first, ask the underlying layers if the release is ok */ error = IICBUS_CALLBACK(device_get_parent(bus), IIC_RELEASE_BUS, NULL); if (error) return (error); s = splhigh(); if (sc->owner != dev) { splx(s); return (EACCES); } sc->owner = 0; splx(s); /* wakeup waiting processes */ wakeup(sc); return (0); } /* * iicbus_started() * * Test if the iicbus is started by the controller */ int iicbus_started(device_t bus) { struct iicbus_softc *sc = (struct iicbus_softc *)device_get_softc(bus); return (sc->started); } /* * iicbus_start() * * Send start condition to the slave addressed by 'slave' */ int iicbus_start(device_t bus, u_char slave, int timeout) { struct iicbus_softc *sc = (struct iicbus_softc *)device_get_softc(bus); int error = 0; if (sc->started) return (EINVAL); /* bus already started */ if (!(error = IICBUS_START(device_get_parent(bus), slave, timeout))) sc->started = slave; else sc->started = 0; return (error); } /* * iicbus_repeated_start() * * Send start condition to the slave addressed by 'slave' */ int iicbus_repeated_start(device_t bus, u_char slave, int timeout) { struct iicbus_softc *sc = (struct iicbus_softc *)device_get_softc(bus); int error = 0; if (!sc->started) return (EINVAL); /* bus should have been already started */ if (!(error = IICBUS_REPEATED_START(device_get_parent(bus), slave, timeout))) sc->started = slave; else sc->started = 0; return (error); } /* * iicbus_stop() * * Send stop condition to the bus */ int iicbus_stop(device_t bus) { struct iicbus_softc *sc = (struct iicbus_softc *)device_get_softc(bus); int error = 0; if (!sc->started) return (EINVAL); /* bus not started */ error = IICBUS_STOP(device_get_parent(bus)); /* refuse any further access */ sc->started = 0; return (error); } /* * iicbus_write() * * Write a block of data to the slave previously started by * iicbus_start() call */ int iicbus_write(device_t bus, char *buf, int len, int *sent, int timeout) { struct iicbus_softc *sc = (struct iicbus_softc *)device_get_softc(bus); /* a slave must have been started with the appropriate address */ if (!sc->started || (sc->started & LSB)) return (EINVAL); return (IICBUS_WRITE(device_get_parent(bus), buf, len, sent, timeout)); } /* * iicbus_read() * * Read a block of data from the slave previously started by * iicbus_read() call */ int iicbus_read(device_t bus, char *buf, int len, int *read, int last, int delay) { struct iicbus_softc *sc = (struct iicbus_softc *)device_get_softc(bus); /* a slave must have been started with the appropriate address */ if (!sc->started || !(sc->started & LSB)) return (EINVAL); return (IICBUS_READ(device_get_parent(bus), buf, len, read, last, delay)); } /* * iicbus_write_byte() * * Write a byte to the slave previously started by iicbus_start() call */ int iicbus_write_byte(device_t bus, char byte, int timeout) { char data = byte; int sent; return (iicbus_write(bus, &data, 1, &sent, timeout)); } /* * iicbus_read_byte() * * Read a byte from the slave previously started by iicbus_start() call */ int iicbus_read_byte(device_t bus, char *byte, int timeout) { int read; return (iicbus_read(bus, byte, 1, &read, IIC_LAST_READ, timeout)); } /* * iicbus_block_write() * * Write a block of data to slave ; start/stop protocol managed */ int iicbus_block_write(device_t bus, u_char slave, char *buf, int len, int *sent) { u_char addr = slave & ~LSB; int error; if ((error = iicbus_start(bus, addr, 0))) return (error); error = iicbus_write(bus, buf, len, sent, 0); iicbus_stop(bus); return (error); } /* * iicbus_block_read() * * Read a block of data from slave ; start/stop protocol managed */ int iicbus_block_read(device_t bus, u_char slave, char *buf, int len, int *read) { u_char addr = slave | LSB; int error; if ((error = iicbus_start(bus, addr, 0))) return (error); error = iicbus_read(bus, buf, len, read, IIC_LAST_READ, 0); iicbus_stop(bus); return (error); } /* * iicbus_get_addr() * * Get the I2C 7 bits address of the device */ u_char iicbus_get_addr(device_t dev) { uintptr_t addr; device_t parent = device_get_parent(dev); BUS_READ_IVAR(parent, dev, IICBUS_IVAR_ADDR, &addr); return ((u_char)addr); }