diff options
author | Alexander Yurchenko <grange@cvs.openbsd.org> | 2006-09-27 08:54:45 +0000 |
---|---|---|
committer | Alexander Yurchenko <grange@cvs.openbsd.org> | 2006-09-27 08:54:45 +0000 |
commit | 0b58f8252ddc218585e959a8b8f8a5e6b269a4d9 (patch) | |
tree | aba0802584ba2dae9c9f6de728d35e42efe8c198 /sys/dev | |
parent | 37bd670a754ae79c32a32aa3499a27ce62210856 (diff) |
Add Maxim/Dallas DS2490 USB 1-Wire adapter driver.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/usb/files.usb | 6 | ||||
-rw-r--r-- | sys/dev/usb/uow.c | 311 | ||||
-rw-r--r-- | sys/dev/usb/uowreg.h | 108 |
3 files changed, 424 insertions, 1 deletions
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb index f838a9cb94e..fbc792f5f7e 100644 --- a/sys/dev/usb/files.usb +++ b/sys/dev/usb/files.usb @@ -1,4 +1,4 @@ -# $OpenBSD: files.usb,v 1.63 2006/09/16 13:21:23 damien Exp $ +# $OpenBSD: files.usb,v 1.64 2006/09/27 08:54:44 grange Exp $ # $NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $ # # Config file and device description for machine-independent USB code. @@ -272,3 +272,7 @@ device uath: ether, ifnet, ifmedia, wlan, firmload attach uath at uhub file dev/usb/if_uath.c uath +# Maxim/Dallas DS2490 1-Wire adapter +device uow: onewirebus +attach uow at uhub +file dev/usb/uow.c uow diff --git a/sys/dev/usb/uow.c b/sys/dev/usb/uow.c new file mode 100644 index 00000000000..35f71f0e516 --- /dev/null +++ b/sys/dev/usb/uow.c @@ -0,0 +1,311 @@ +/* $OpenBSD: uow.c,v 1.1 2006/09/27 08:54:44 grange Exp $ */ + +/* + * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * Maxim/Dallas DS2490 USB 1-Wire adapter driver. + */ + +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <sys/proc.h> + +#include <dev/onewire/onewirevar.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdevs.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> + +#include <dev/usb/uowreg.h> + +#ifdef UOW_DEBUG +#define DPRINTF(x) printf x +#else +#define DPRINTF(x) +#endif + +#define UOW_TIMEOUT 1000 /* ms */ + +struct uow_softc { + USBBASEDEVICE sc_dev; + + struct onewire_bus sc_ow_bus; + struct device * sc_ow_dev; + + usbd_device_handle sc_udev; + usbd_interface_handle sc_iface; + usbd_pipe_handle sc_ph_ibulk; + usbd_pipe_handle sc_ph_obulk; + usbd_pipe_handle sc_ph_intr; + u_int8_t sc_regs[DS2490_NREGS]; +}; + +USB_DECLARE_DRIVER(uow); + +/* List of supported devices */ +static const struct usb_devno uow_devs[] = { + { USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_USB_FOB_IBUTTON } +}; + +Static int uow_ow_reset(void *); +Static int uow_ow_bit(void *, int); + +Static int uow_cmd(struct uow_softc *, int, int); +Static void uow_intr(usbd_xfer_handle, usbd_private_handle, usbd_status); + +USB_MATCH(uow) +{ + USB_MATCH_START(uow, uaa); + + if (uaa->iface != NULL) + return (UMATCH_NONE); + + return ((usb_lookup(uow_devs, uaa->vendor, uaa->product) != NULL) ? + UMATCH_VENDOR_PRODUCT : UMATCH_NONE); +} + +USB_ATTACH(uow) +{ + USB_ATTACH_START(uow, sc, uaa); + usb_interface_descriptor_t *id; + usb_endpoint_descriptor_t *ed; + char *devinfop; + int ep_ibulk = -1, ep_obulk = -1, ep_intr = -1; + struct onewirebus_attach_args oba; + usbd_status error; + int i; + + sc->sc_udev = uaa->device; + + /* Display device info string */ + USB_ATTACH_SETUP; + if ((devinfop = usbd_devinfo_alloc(uaa->device, 0)) != NULL) { + printf("%s: %s\n", USBDEVNAME(sc->sc_dev), devinfop); + usbd_devinfo_free(devinfop); + } + + /* Set USB configuration */ + if ((error = usbd_set_config_no(sc->sc_udev, + DS2490_USB_CONFIG, 0)) != 0) { + printf("%s: failed to set config %d: %s\n", + USBDEVNAME(sc->sc_dev), DS2490_USB_CONFIG, + usbd_errstr(error)); + USB_ATTACH_ERROR_RETURN; + } + + /* Get interface handle */ + if ((error = usbd_device2interface_handle(sc->sc_udev, + DS2490_USB_IFACE, &sc->sc_iface)) != 0) { + printf("%s: failed to get iface %d: %s\n", + USBDEVNAME(sc->sc_dev), DS2490_USB_IFACE, + usbd_errstr(error)); + USB_ATTACH_ERROR_RETURN; + } + + /* Find endpoints */ + id = usbd_get_interface_descriptor(sc->sc_iface); + for (i = 0; i < id->bNumEndpoints; i++) { + ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i); + if (ed == NULL) { + printf("%s: failed to get endpoint %d descriptor\n", + USBDEVNAME(sc->sc_dev), i); + USB_ATTACH_ERROR_RETURN; + } + + if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && + UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) + ep_ibulk = ed->bEndpointAddress; + if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT && + UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) + ep_obulk = ed->bEndpointAddress; + if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && + UE_GET_XFERTYPE(ed->bmAttributes) == UE_INTERRUPT) + ep_intr = ed->bEndpointAddress; + } + if (ep_ibulk == -1 || ep_obulk == -1 || ep_intr == -1) { + printf("%s: missing endpoint: ibulk %d, obulk %d, intr %d\n", + USBDEVNAME(sc->sc_dev), ep_ibulk, ep_obulk, ep_intr); + USB_ATTACH_ERROR_RETURN; + } + + /* Open pipes */ + if ((error = usbd_open_pipe(sc->sc_iface, ep_ibulk, USBD_EXCLUSIVE_USE, + &sc->sc_ph_ibulk)) != 0) { + printf("%s: failed to open bulk-in pipe: %s\n", + USBDEVNAME(sc->sc_dev), usbd_errstr(error)); + USB_ATTACH_ERROR_RETURN; + } + if ((error = usbd_open_pipe(sc->sc_iface, ep_obulk, USBD_EXCLUSIVE_USE, + &sc->sc_ph_obulk)) != 0) { + printf("%s: failed to open bulk-out pipe: %s\n", + USBDEVNAME(sc->sc_dev), usbd_errstr(error)); + goto fail; + } + if ((error = usbd_open_pipe_intr(sc->sc_iface, ep_intr, + USBD_SHORT_XFER_OK, &sc->sc_ph_intr, sc, + sc->sc_regs, sizeof(sc->sc_regs), uow_intr, + USBD_DEFAULT_INTERVAL)) != 0) { + printf("%s: failed to open intr pipe: %s\n", + USBDEVNAME(sc->sc_dev), usbd_errstr(error)); + goto fail; + } + + /* Attach 1-Wire bus */ + sc->sc_ow_bus.bus_cookie = sc; + sc->sc_ow_bus.bus_reset = uow_ow_reset; + sc->sc_ow_bus.bus_bit = uow_ow_bit; + + bzero(&oba, sizeof(oba)); + oba.oba_bus = &sc->sc_ow_bus; + sc->sc_ow_dev = config_found(self, &oba, onewirebus_print); + + USB_ATTACH_SUCCESS_RETURN; + +fail: + if (sc->sc_ph_ibulk != NULL) + usbd_close_pipe(sc->sc_ph_ibulk); + if (sc->sc_ph_obulk != NULL) + usbd_close_pipe(sc->sc_ph_obulk); + if (sc->sc_ph_intr != NULL) + usbd_close_pipe(sc->sc_ph_intr); + USB_ATTACH_ERROR_RETURN; +} + +USB_DETACH(uow) +{ + USB_DETACH_START(uow, sc); + int rv = 0; + + if (sc->sc_ph_ibulk != NULL) + usbd_close_pipe(sc->sc_ph_ibulk); + if (sc->sc_ph_obulk != NULL) + usbd_close_pipe(sc->sc_ph_obulk); + if (sc->sc_ph_intr != NULL) + usbd_close_pipe(sc->sc_ph_intr); + + if (sc->sc_ow_dev != NULL) + rv = config_detach(sc->sc_ow_dev, flags); + + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, + USBDEV(sc->sc_dev)); + + return (rv); +} + +int +uow_activate(device_ptr_t self, enum devact act) +{ + struct uow_softc *sc = (struct uow_softc *)self; + int rv = 0; + + switch (act) { + case DVACT_ACTIVATE: + break; + case DVACT_DEACTIVATE: + if (sc->sc_ow_dev != NULL) + rv = config_deactivate(sc->sc_ow_dev); + break; + } + + return (rv); +} + +Static int +uow_ow_reset(void *arg) +{ + struct uow_softc *sc = arg; + + if (uow_cmd(sc, DS2490_COMM_1WIRE_RESET | DS2490_BIT_IM, 0) != 0) + return (1); + + /* XXX: check presence pulse */ + return (0); +} + +Static int +uow_ow_bit(void *arg, int value) +{ + struct uow_softc *sc = arg; + usbd_xfer_handle xfer; + u_int8_t data; + usbd_status error; + + if (uow_cmd(sc, DS2490_COMM_BIT_IO | DS2490_BIT_IM | + (value ? DS2490_BIT_D : 0), 0) != 0) + return (1); + + if ((xfer = usbd_alloc_xfer(sc->sc_udev)) == NULL) { + printf("%s: failed to alloc xfer\n", USBDEVNAME(sc->sc_dev)); + return (1); + } + usbd_setup_xfer(xfer, sc->sc_ph_ibulk, sc, &data, sizeof(data), 0, + UOW_TIMEOUT, NULL); + error = usbd_sync_transfer(xfer); + usbd_free_xfer(xfer); + if (error != 0) { + printf("%s: failed to do xfer: %s\n", + USBDEVNAME(sc->sc_dev), usbd_errstr(error)); + return (1); + } + + return (data); +} + +Static int +uow_cmd(struct uow_softc *sc, int cmd, int param) +{ + usb_device_request_t req; + usbd_status error; + + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + req.bRequest = DS2490_COMM_CMD; + USETW(req.wValue, cmd); + USETW(req.wIndex, param); + USETW(req.wLength, 0); + if ((error = usbd_do_request(sc->sc_udev, &req, NULL)) != 0) { + printf("%s: failed to do request: %s\n", + USBDEVNAME(sc->sc_dev), usbd_errstr(error)); + return (1); + } + + bzero(sc->sc_regs, sizeof(sc->sc_regs)); + if (tsleep(sc->sc_regs, PRIBIO, "uowcmd", + (UOW_TIMEOUT * hz) / 1000) != 0) { + printf("%s: request timeout\n", USBDEVNAME(sc->sc_dev)); + return (1); + } + + return (0); +} + +Static void +uow_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) +{ + struct uow_softc *sc = priv; + + if (status != USBD_NORMAL_COMPLETION) { + if (status == USBD_NOT_STARTED || status == USBD_CANCELLED) + return; + if (status == USBD_STALLED) + usbd_clear_endpoint_stall_async(sc->sc_ph_intr); + return; + } + + wakeup(sc->sc_regs); +} diff --git a/sys/dev/usb/uowreg.h b/sys/dev/usb/uowreg.h new file mode 100644 index 00000000000..57327d0efdd --- /dev/null +++ b/sys/dev/usb/uowreg.h @@ -0,0 +1,108 @@ +/* $OpenBSD: uowreg.h,v 1.1 2006/09/27 08:54:44 grange Exp $ */ + +/* + * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef _DEV_USB_UOWREG_H_ +#define _DEV_USB_UOWREG_H_ + +/* + * Maxim/Dallas DS2490 USB 1-Wire adapter register definitions. + */ + +/* USB core interface */ +#define DS2490_USB_CONFIG 1 /* configuration */ +#define DS2490_USB_IFACE 0 /* interface */ + +/* Command type codes */ +#define DS2490_CONTROL_CMD 0x00 /* control */ +#define DS2490_COMM_CMD 0x01 /* communication */ +#define DS2490_MODE_CMD 0x02 /* mode */ + +/* Control command codes */ +#define DS2490_CTL_RESET_DEVICE 0x0000 +#define DS2490_CTL_START_EXE 0x0001 +#define DS2490_CTL_RESUME_EXE 0x0002 +#define DS2490_CTL_HALT_EXE_IDLE 0x0003 +#define DS2490_CTL_HALT_EXE_DONE 0x0004 +#define DS2490_CTL_FLUSH_COMM_CMDS 0x0007 +#define DS2490_CTL_FLUSH_RCV_BUFFER 0x0008 +#define DS2490_CTL_FLUSH_XMT_BUFFER 0x0009 +#define DS2490_CTL_GET_COMM_CMDS 0x000a + +/* Communication command codes */ +#define DS2490_COMM_SET_DURATION 0x0012 +#define DS2490_COMM_PULSE 0x0030 +#define DS2490_COMM_1WIRE_RESET 0x0042 +#define DS2490_COMM_BIT_IO 0x0020 + +/* Communication command embedded command parameter bits */ +#define DS2490_BIT_IM (1 << 0) +#define DS2490_BIT_D (1 << 3) +#define DS2490_BIT_SE (1 << 3) +#define DS2490_BIT_TYPE (1 << 3) +#define DS2490_BIT_ICP (1 << 9) +#define DS2490_BIT_NTF (1 << 10) +#define DS2490_BIT_F (1 << 11) +#define DS2490_BIT_SPU (1 << 12) +#define DS2490_BIT_CIB (1 << 14) +#define DS2490_BIT_PST (1 << 14) + +/* Mode command codes */ +#define DS2490_MOD_PULSE_EN 0x0000 +#define DS2490_MOD_SPEED_CHANGE_EN 0x0001 +#define DS2490_MOD_1WIRE_SPEED 0x0002 +#define DS2490_MOD_STRONG_PU_DURATION 0x0003 +#define DS2490_MOD_PULLDOWN_SLEWRATE 0x0004 +#define DS2490_MOD_PROG_PULSE_DURATION 0x0005 +#define DS2490_MOD_WRITE1_LOWTIME 0x0006 +#define DS2490_MOD_DSOW0_TREC 0x0007 + +/* State registers */ +#define DS2490_ST_BEGIN 0x00 +#define DS2490_ST_ENFL 0x00 /* enabled flags */ +#define DS2490_ST_ENFL_SPUE (1 << 0) /* strong pullup */ +#define DS2490_ST_ENFL_PRGE (1 << 1) /* programming pulse */ +#define DS2490_ST_ENFL_SPCE (1 << 2) /* speed change */ +#define DS2490_ST_SPEED 0x01 /* bus speed */ +#define DS2490_ST_SPUDUR 0x02 /* strong pullup duration */ +#define DS2490_ST_PRGDUR 0x03 /* programming pullup duration */ +#define DS2490_ST_PDSRC 0x04 /* pulldown slew rate control */ +#define DS2490_ST_W1LT 0x05 /* write-1 low time */ +#define DS2490_ST_DSO 0x06 /* data sample offset */ +#define DS2490_ST_STFL 0x08 /* status flags */ +#define DS2490_ST_STFL_SPUA (1 << 0) /* strong pullup */ +#define DS2490_ST_STFL_PRGA (1 << 1) /* programming pulse */ +#define DS2490_ST_STFL_12VP (1 << 2) /* 12V prog voltage */ +#define DS2490_ST_STFL_PMOD (1 << 3) /* ext power */ +#define DS2490_ST_STFL_HALT (1 << 4) /* halted */ +#define DS2490_ST_STFL_IDLE (1 << 5) /* idle */ +#define DS2490_ST_STFL_EP0F (1 << 7) /* EP0 FIFO status */ +#define DS2490_ST_CC1 0x09 /* communication command byte 1 */ +#define DS2490_ST_CC2 0x0a /* communication command byte 2 */ +#define DS2490_ST_CCBUF 0x0b /* communication command buf status */ +#define DS2490_ST_OBUF 0x0c /* data out buf status */ +#define DS2490_ST_IBUF 0x0d /* data in buf status */ +#define DS2490_ST_END 0x0f + +/* Result registers */ +#define DS2490_RES_BEGIN 0x10 +#define DS2490_RES_END 0x1f +#define DS2490_RES_DETECT 0xa5 /* device detect */ + +#define DS2490_NREGS (DS2490_RES_END + 1) + +#endif /* !_DEV_USB_UOWREG_H_ */ |