622a58e08c
usbdi.c (1.61): =================================================================== revision 1.61 date: 2000/01/31 20:13:07; author: augustss; lines: +20 -4 Change the way the HC done method is invoked a little. =================================================================== usbdi.c (1.65): =================================================================== revision 1.65 date: 2000/03/08 15:34:10; author: augustss; lines: +4 -2 Get the status right when a polled transfer times out. =================================================================== ohci.c (1.79), uhci.c (1.89), uhcivar.h (1.24), usb_port.h (1.22), usbdivar.h (1.48): =================================================================== date: 2000/03/23 07:01:46; author: thorpej; New callout mechanism with two major improvements over the old timeout()/untimeout() API: - Clients supply callout handle storage, thus eliminating problems of resource allocation. - Insertion and removal of callouts is constant time, important as this facility is used quite a lot in the kernel. The old timeout()/untimeout() API has been removed from the kernel. =================================================================== uhci.c (1.80), usbdi.c (1.66): =================================================================== date: 2000/03/23 18:59:10; author: thorpej; Shake out some bugs from the callout changes. =================================================================== ohci.c (1.80), uhci.c (1.91), uhcivar.h (1.25), usb_port.h (1.23), usbdi.c (1.67), usbdivar.h (1.49): =================================================================== date: 2000/03/24 22:03:30; author: augustss; Some cleanup and renaming of the callouts used in USB drivers. =================================================================== uhci.c (1.92), uhcivar.h (1.26): =================================================================== date: 2000/03/24 22:57:58; author: augustss; Two major changes: Make each xfer have its own intr_info. This is necessary if we want to queue multiple xfers on an endpoint. This should get rid of the (mostly harmless) DIAGNOSTICs about intr_infos (not) being done. Change (again!) how xfers are aborted. Aborting a TD is a nightmare on the braindead UHCI controller. (Unless you stop the HC, thereby losing isoc traffic.) Hopefully I got it right this time. =================================================================== usbdivar.h (1.50): =================================================================== revision 1.50 date: 2000/03/25 00:10:19; author: augustss; lines: +4 -2 GC an unsued field and add some DIAGNOSTIC in xfer. =================================================================== ums.c: Use the callout functions instead of the timeout ones. uhci.c (1.93): =================================================================== revision 1.93 date: 2000/03/25 00:11:21; author: augustss; lines: +26 -1 Add more DIAGNOSTIC when aborting isoc. =================================================================== uhci.c (1.94), usbdivar.h (1.51): =================================================================== date: 2000/03/25 07:13:05; author: augustss; More DIAGNOSTIC. Initialize a callout handle I forgot. =================================================================== uhci.c (1.95): =================================================================== revision 1.95 date: 2000/03/25 07:23:12; author: augustss; Exp; lines: +24 -7 Improve uhci_dump_ii(). =================================================================== ohci.c (1.81), uhci.c (1.96), uhcivar.h (1.27), usb_subr.c (1.68), usbdi.c (1.68), usbdivar.h (1.52): =================================================================== date: 2000/03/25 18:02:33; author: augustss; Rename and move around callout handles to make it more sane. Add some DIAGNOSTIC. Fix buglet in isoc abort on UHCI. =================================================================== uhci.c (1.98): =================================================================== revision 1.98 date: 2000/03/27 07:39:48; author: augustss; lines: +12 -4 Make it compile without DIAGNOSTIC. =================================================================== uhci.c (1.99): =================================================================== revision 1.99 date: 2000/03/27 08:01:09; author: augustss; lines: +1 -5 Remove some debug nonsense. =================================================================== uhci.c (1.100): =================================================================== revision 1.100 date: 2000/03/27 09:41:36; author: augustss; lines: +13 -3 Don't mess with QH in bulk abort for the moment. =================================================================== uhci.c (1.102): =================================================================== revision 1.102 date: 2000/03/27 22:42:57; author: augustss; lines: +66 -26 Be a little more careful when aborting. Preallocate some TDs for large buffers. =================================================================== uhci.c (1.103): =================================================================== date: 2000/03/28 09:47:10; author: augustss; lines: +11 -1 Another patch for xfer abort... XXX The current xfer queueing and aborting semantics should really XXX be changed. It cannot be implemented in a sane way on UHCI. XXX One day when I have lots of time I'll redesign it... =================================================================== uhci.c (1.104): Correct a debug message. uhci.c (1.105): Be more defensive in a DIAGNOSTIC test. uhci.c (1.106): =================================================================== revision 1.106 date: 2000/03/29 01:49:13; author: augustss; lines: +14 -309 *SIGH* Revert back to the old method of aborting xfers. I had tested the new stuff for two months now, but as soon as I commited it the problems started to appear. Murphy, no doubt... =================================================================== usb_subr.c (1.70), usbdi.c (1.71), usbdivar.h (1.53): =================================================================== revision 1.70 date: 2000/03/29 01:45:20; author: augustss; lines: +2 -1 Do not accept new xfers for queuing while a pipe is aborting. ===================================================================
435 lines
12 KiB
C
435 lines
12 KiB
C
/* $NetBSD: usb_port.h,v 1.23 2000/03/24 22:03:32 augustss Exp $ */
|
|
/* $FreeBSD$ */
|
|
|
|
/*
|
|
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to The NetBSD Foundation
|
|
* by Lennart Augustsson (lennart@augustsson.net) at
|
|
* Carlstedt Research & Technology.
|
|
*
|
|
* 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.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the NetBSD
|
|
* Foundation, Inc. and its contributors.
|
|
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
|
|
*/
|
|
|
|
#ifndef _USB_PORT_H
|
|
#define _USB_PORT_H
|
|
|
|
/*
|
|
* Macro's to cope with the differences between operating systems.
|
|
*/
|
|
|
|
#if defined(__NetBSD__)
|
|
/*
|
|
* NetBSD
|
|
*/
|
|
|
|
#include "opt_usbverbose.h"
|
|
|
|
#ifdef USB_DEBUG
|
|
#define UHID_DEBUG 1
|
|
#define OHCI_DEBUG 1
|
|
#define UGEN_DEBUG 1
|
|
#define UHCI_DEBUG 1
|
|
#define UHUB_DEBUG 1
|
|
#define ULPT_DEBUG 1
|
|
#define UAUDIO_DEBUG 1
|
|
#endif
|
|
|
|
#define Static static
|
|
|
|
typedef struct proc *usb_proc_ptr;
|
|
|
|
typedef struct device *device_ptr_t;
|
|
#define USBBASEDEVICE struct device
|
|
#define USBDEV(bdev) (&(bdev))
|
|
#define USBDEVNAME(bdev) ((bdev).dv_xname)
|
|
#define USBDEVUNIT(bdev) ((bdev).dv_unit)
|
|
#define USBDEVPTRNAME(bdevptr) ((bdevptr)->dv_xname)
|
|
#define USBDEVUNIT(bdev) ((bdev).dv_unit)
|
|
|
|
#define DECLARE_USB_DMA_T \
|
|
struct usb_dma_block; \
|
|
typedef struct { \
|
|
struct usb_dma_block *block; \
|
|
u_int offs; \
|
|
} usb_dma_t
|
|
|
|
typedef struct callout usb_callout_t;
|
|
#define usb_callout_init(h) callout_handle_init(&(h))
|
|
#define usb_callout(h, t, f, d) ((h) = timeout((f), (d), (t)))
|
|
#define usb_uncallout(h, f, d) untimeout((f), (d))
|
|
|
|
#define logprintf printf
|
|
|
|
#define USB_DECLARE_DRIVER(dname) \
|
|
int __CONCAT(dname,_match)(struct device *, struct cfdata *, void *); \
|
|
void __CONCAT(dname,_attach)(struct device *, struct device *, void *); \
|
|
int __CONCAT(dname,_detach)(struct device *, int); \
|
|
int __CONCAT(dname,_activate)(struct device *, enum devact); \
|
|
\
|
|
extern struct cfdriver __CONCAT(dname,_cd); \
|
|
\
|
|
struct cfattach __CONCAT(dname,_ca) = { \
|
|
sizeof(struct __CONCAT(dname,_softc)), \
|
|
__CONCAT(dname,_match), \
|
|
__CONCAT(dname,_attach), \
|
|
__CONCAT(dname,_detach), \
|
|
__CONCAT(dname,_activate), \
|
|
}
|
|
|
|
#define USB_MATCH(dname) \
|
|
int \
|
|
__CONCAT(dname,_match)(parent, match, aux) \
|
|
struct device *parent; \
|
|
struct cfdata *match; \
|
|
void *aux;
|
|
|
|
#define USB_MATCH_START(dname, uaa) \
|
|
struct usb_attach_arg *uaa = aux
|
|
|
|
#define USB_MATCH_SETUP /* nop */
|
|
|
|
#define USB_ATTACH(dname) \
|
|
void \
|
|
__CONCAT(dname,_attach)(parent, self, aux) \
|
|
struct device *parent; \
|
|
struct device *self; \
|
|
void *aux;
|
|
|
|
#define USB_ATTACH_START(dname, sc, uaa) \
|
|
struct __CONCAT(dname,_softc) *sc = \
|
|
(struct __CONCAT(dname,_softc) *)self; \
|
|
struct usb_attach_arg *uaa = aux
|
|
|
|
/* Returns from attach */
|
|
#define USB_ATTACH_ERROR_RETURN return
|
|
#define USB_ATTACH_SUCCESS_RETURN return
|
|
|
|
#define USB_ATTACH_SETUP printf("\n")
|
|
|
|
#define USB_DETACH(dname) \
|
|
int \
|
|
__CONCAT(dname,_detach)(self, flags) \
|
|
struct device *self; \
|
|
int flags;
|
|
|
|
#define USB_DETACH_START(dname, sc) \
|
|
struct __CONCAT(dname,_softc) *sc = \
|
|
(struct __CONCAT(dname,_softc) *)self
|
|
|
|
#define USB_GET_SC_OPEN(dname, unit, sc) \
|
|
if (unit >= __CONCAT(dname,_cd).cd_ndevs) \
|
|
return (ENXIO); \
|
|
sc = __CONCAT(dname,_cd).cd_devs[unit]; \
|
|
if (!sc) \
|
|
return (ENXIO)
|
|
|
|
#define USB_GET_SC(dname, unit, sc) \
|
|
sc = __CONCAT(dname,_cd).cd_devs[unit]
|
|
|
|
#define USB_DO_ATTACH(dev, bdev, parent, args, print, sub) \
|
|
(config_found_sm(parent, args, print, sub))
|
|
|
|
#elif defined(__OpenBSD__)
|
|
/*
|
|
* OpenBSD
|
|
*/
|
|
#ifdef USB_DEBUG
|
|
#define UHID_DEBUG 1
|
|
#define OHCI_DEBUG 1
|
|
#define UGEN_DEBUG 1
|
|
#define UHCI_DEBUG 1
|
|
#define UHUB_DEBUG 1
|
|
#define ULPT_DEBUG 1
|
|
#endif
|
|
|
|
#define Static static
|
|
|
|
typedef struct proc *usb_proc_ptr;
|
|
|
|
#define memcpy(d, s, l) bcopy((s),(d),(l))
|
|
#define memset(d, v, l) bzero((d),(l))
|
|
#define bswap32(x) swap32(x)
|
|
#define kthread_create1 kthread_create
|
|
#define kthread_create kthread_create_deferred
|
|
|
|
#define config_pending_incr()
|
|
#define config_pending_decr()
|
|
|
|
#define usbpoll usbselect
|
|
#define uhidpoll uhidselect
|
|
#define ugenpoll ugenselect
|
|
|
|
#define PWR_RESUME 0
|
|
#define PWR_SUSPEND 1
|
|
|
|
typedef struct device device_ptr_t;
|
|
#define USBBASEDEVICE struct device
|
|
#define USBDEV(bdev) (&(bdev))
|
|
#define USBDEVNAME(bdev) ((bdev).dv_xname)
|
|
#define USBDEVUNIT(bdev) ((bdev).dv_unit)
|
|
#define USBDEVPTRNAME(bdevptr) ((bdevptr)->dv_xname)
|
|
#define USBDEVUNIT(bdev) ((bdev).dv_unit)
|
|
|
|
#define DECLARE_USB_DMA_T \
|
|
struct usb_dma_block; \
|
|
typedef struct { \
|
|
struct usb_dma_block *block; \
|
|
u_int offs; \
|
|
} usb_dma_t
|
|
|
|
typedef char usb_callout_t;
|
|
#define usb_callout_init(h)
|
|
#define usb_callout(h, t, f, d) timeout((f), (d), (t))
|
|
#define usb_uncallout(h, f, d) untimeout((f), (d))
|
|
|
|
#define USB_DECLARE_DRIVER(dname) \
|
|
int __CONCAT(dname,_match)(struct device *, void *, void *); \
|
|
void __CONCAT(dname,_attach)(struct device *, struct device *, void *); \
|
|
int __CONCAT(dname,_detach)(struct device *, int); \
|
|
int __CONCAT(dname,_activate)(struct device *, enum devact); \
|
|
\
|
|
struct cfdriver __CONCAT(dname,_cd) = { \
|
|
NULL, #dname, DV_DULL \
|
|
}; \
|
|
\
|
|
struct cfattach __CONCAT(dname,_ca) = { \
|
|
sizeof(struct __CONCAT(dname,_softc)), \
|
|
__CONCAT(dname,_match), \
|
|
__CONCAT(dname,_attach), \
|
|
__CONCAT(dname,_detach), \
|
|
__CONCAT(dname,_activate), \
|
|
}
|
|
|
|
#define USB_MATCH(dname) \
|
|
int \
|
|
__CONCAT(dname,_match)(parent, match, aux) \
|
|
struct device *parent; \
|
|
void *match; \
|
|
void *aux;
|
|
|
|
#define USB_MATCH_START(dname, uaa) \
|
|
struct usb_attach_arg *uaa = aux
|
|
|
|
#define USB_MATCH_SETUP /* nop */
|
|
|
|
#define USB_ATTACH(dname) \
|
|
void \
|
|
__CONCAT(dname,_attach)(parent, self, aux) \
|
|
struct device *parent; \
|
|
struct device *self; \
|
|
void *aux;
|
|
|
|
#define USB_ATTACH_START(dname, sc, uaa) \
|
|
struct __CONCAT(dname,_softc) *sc = \
|
|
(struct __CONCAT(dname,_softc) *)self; \
|
|
struct usb_attach_arg *uaa = aux
|
|
|
|
/* Returns from attach */
|
|
#define USB_ATTACH_ERROR_RETURN return
|
|
#define USB_ATTACH_SUCCESS_RETURN return
|
|
|
|
#define USB_ATTACH_SETUP printf("\n")
|
|
|
|
#define USB_DETACH(dname) \
|
|
int \
|
|
__CONCAT(dname,_detach)(self, flags) \
|
|
struct device *self; \
|
|
int flags;
|
|
|
|
#define USB_DETACH_START(dname, sc) \
|
|
struct __CONCAT(dname,_softc) *sc = \
|
|
(struct __CONCAT(dname,_softc) *)self
|
|
|
|
#define USB_GET_SC_OPEN(dname, unit, sc) \
|
|
if (unit >= __CONCAT(dname,_cd).cd_ndevs) \
|
|
return (ENXIO); \
|
|
sc = __CONCAT(dname,_cd).cd_devs[unit]; \
|
|
if (!sc) \
|
|
return (ENXIO)
|
|
|
|
#define USB_GET_SC(dname, unit, sc) \
|
|
sc = __CONCAT(dname,_cd).cd_devs[unit]
|
|
|
|
#define USB_DO_ATTACH(dev, bdev, parent, args, print, sub) \
|
|
(config_found_sm(parent, args, print, sub))
|
|
|
|
#elif defined(__FreeBSD__)
|
|
/*
|
|
* FreeBSD
|
|
*/
|
|
|
|
#include "opt_usb.h"
|
|
|
|
#if defined(_KERNEL)
|
|
#include <sys/malloc.h>
|
|
|
|
MALLOC_DECLARE(M_USB);
|
|
MALLOC_DECLARE(M_USBDEV);
|
|
MALLOC_DECLARE(M_USBHC);
|
|
|
|
#endif
|
|
|
|
#define USBVERBOSE
|
|
|
|
#define Static static
|
|
|
|
#define device_ptr_t device_t
|
|
#define USBBASEDEVICE device_t
|
|
#define USBDEV(bdev) (bdev)
|
|
#define USBDEVNAME(bdev) device_get_nameunit(bdev)
|
|
#define USBDEVUNIT(bdev) device_get_unit(bdev)
|
|
#define USBDEVPTRNAME(bdev) device_get_nameunit(bdev)
|
|
#define USBDEVUNIT(bdev) device_get_unit(bdev)
|
|
|
|
#define DECLARE_USB_DMA_T typedef char * usb_dma_t
|
|
|
|
typedef struct thread *usb_proc_ptr;
|
|
|
|
#define uio_procp uio_td
|
|
|
|
/* XXX Change this when FreeBSD has memset */
|
|
#define memcpy(d, s, l) bcopy((s),(d),(l))
|
|
#define memset(d, v, l) bzero((d),(l))
|
|
#define kthread_create1(f, s, p, a0, a1) \
|
|
kthread_create((f), (s), (p), RFHIGHPID, (a0), (a1))
|
|
|
|
#define config_pending_incr()
|
|
#define config_pending_decr()
|
|
|
|
typedef struct callout usb_callout_t;
|
|
#define usb_callout_init(h) callout_init(&(h), 0)
|
|
#define usb_callout(h, t, f, d) callout_reset(&(h), (t), (f), (d))
|
|
#define usb_uncallout(h, f, d) callout_stop(&(h))
|
|
|
|
#define clalloc(p, s, x) (clist_alloc_cblocks((p), (s), (s)), 0)
|
|
#define clfree(p) clist_free_cblocks((p))
|
|
|
|
#define PWR_RESUME 0
|
|
#define PWR_SUSPEND 1
|
|
|
|
#define USB_DECLARE_DRIVER_INIT(dname, init...) \
|
|
Static device_probe_t __CONCAT(dname,_match); \
|
|
Static device_attach_t __CONCAT(dname,_attach); \
|
|
Static device_detach_t __CONCAT(dname,_detach); \
|
|
\
|
|
Static devclass_t __CONCAT(dname,_devclass); \
|
|
\
|
|
Static device_method_t __CONCAT(dname,_methods)[] = { \
|
|
DEVMETHOD(device_probe, __CONCAT(dname,_match)), \
|
|
DEVMETHOD(device_attach, __CONCAT(dname,_attach)), \
|
|
DEVMETHOD(device_detach, __CONCAT(dname,_detach)), \
|
|
init, \
|
|
{0,0} \
|
|
}; \
|
|
\
|
|
Static driver_t __CONCAT(dname,_driver) = { \
|
|
#dname, \
|
|
__CONCAT(dname,_methods), \
|
|
sizeof(struct __CONCAT(dname,_softc)) \
|
|
}; \
|
|
MODULE_DEPEND(dname, usb, 1, 1, 1)
|
|
|
|
|
|
#define METHODS_NONE {0,0}
|
|
#define USB_DECLARE_DRIVER(dname) USB_DECLARE_DRIVER_INIT(dname, METHODS_NONE)
|
|
|
|
#define USB_MATCH(dname) \
|
|
Static int \
|
|
__CONCAT(dname,_match)(device_t self)
|
|
|
|
#define USB_MATCH_START(dname, uaa) \
|
|
struct usb_attach_arg *uaa = device_get_ivars(self)
|
|
|
|
#define USB_MATCH_SETUP \
|
|
sc->sc_dev = self
|
|
|
|
#define USB_ATTACH(dname) \
|
|
Static int \
|
|
__CONCAT(dname,_attach)(device_t self)
|
|
|
|
#define USB_ATTACH_START(dname, sc, uaa) \
|
|
struct __CONCAT(dname,_softc) *sc = device_get_softc(self); \
|
|
struct usb_attach_arg *uaa = device_get_ivars(self)
|
|
|
|
/* Returns from attach */
|
|
#define USB_ATTACH_ERROR_RETURN return ENXIO
|
|
#define USB_ATTACH_SUCCESS_RETURN return 0
|
|
|
|
#define USB_ATTACH_SETUP \
|
|
sc->sc_dev = self; \
|
|
device_set_desc_copy(self, devinfo)
|
|
|
|
#define USB_DETACH(dname) \
|
|
Static int \
|
|
__CONCAT(dname,_detach)(device_t self)
|
|
|
|
#define USB_DETACH_START(dname, sc) \
|
|
struct __CONCAT(dname,_softc) *sc = device_get_softc(self)
|
|
|
|
#define USB_GET_SC_OPEN(dname, unit, sc) \
|
|
sc = devclass_get_softc(__CONCAT(dname,_devclass), unit); \
|
|
if (!sc) \
|
|
return (ENXIO)
|
|
|
|
#define USB_GET_SC(dname, unit, sc) \
|
|
sc = devclass_get_softc(__CONCAT(dname,_devclass), unit)
|
|
|
|
#define USB_DO_ATTACH(dev, bdev, parent, args, print, sub) \
|
|
(device_probe_and_attach((bdev)) == 0 ? (bdev) : 0)
|
|
|
|
/* conversion from one type of queue to the other */
|
|
/* XXX In FreeBSD SIMPLEQ_REMOVE_HEAD only removes the head element.
|
|
*/
|
|
#define SIMPLEQ_REMOVE_HEAD(h, e, f) do { \
|
|
if ( (e) != SIMPLEQ_FIRST((h)) ) \
|
|
panic("Removing other than first element"); \
|
|
STAILQ_REMOVE_HEAD(h, f); \
|
|
} while (0)
|
|
#define SIMPLEQ_INSERT_HEAD STAILQ_INSERT_HEAD
|
|
#define SIMPLEQ_INSERT_TAIL STAILQ_INSERT_TAIL
|
|
#define SIMPLEQ_NEXT STAILQ_NEXT
|
|
#define SIMPLEQ_FIRST STAILQ_FIRST
|
|
#define SIMPLEQ_HEAD STAILQ_HEAD
|
|
#define SIMPLEQ_INIT STAILQ_INIT
|
|
#define SIMPLEQ_HEAD_INITIALIZER STAILQ_HEAD_INITIALIZER
|
|
#define SIMPLEQ_ENTRY STAILQ_ENTRY
|
|
|
|
#include <sys/syslog.h>
|
|
/*
|
|
#define logprintf(args...) log(LOG_DEBUG, args)
|
|
*/
|
|
#define logprintf printf
|
|
|
|
#endif /* __FreeBSD__ */
|
|
|
|
#endif /* _USB_PORT_H */
|
|
|