d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
589f6ed8ce
freebsd-skq/sys/dev/usb/ums.c

822 lines
21 KiB
C
Raw Normal View History

1) textual changes 2) bug fix in handling of select (or presumed bug) 3) trigger a mouse packet on the Z direction as well (but Z still not working)
1999-01-12 01:21:15 +00:00
/* $FreeBSD$ */
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
* This code is derived from software contributed to The NetBSD Foundation
Change Lennart's e-mail address.
2000-05-14 16:43:10 +00:00
* by Lennart Augustsson (lennart@augustsson.net) at
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
* Carlstedt Research & Technology.
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
*
* 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.
*/
Z direction was upside down. Submitted By: MAEKAWA Masahide
1999-05-01 13:17:47 +00:00
/*
* HID spec: http://www.usb.org/developers/data/usbhid10.pdf
*/
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/bus.h>
#include <sys/ioccom.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/select.h>
#include <sys/vnode.h>
#include <sys/poll.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
#include <dev/usb/hid.h>
Initiate deorbit burn sequence for <machine/mouse.h>. Replace all in-tree uses with <sys/mouse.h> which repo-copied a few moments ago from src/sys/i386/include/mouse.h by peter. This is also the appropriate fix for exo-tree sources. Put warnings in <machine/mouse.h> to discourage use. November 15th 2000 the warnings will be converted to errors. January 15th 2001 the <machine/mouse.h> files will be removed.
2000-10-09 08:08:36 +00:00
#include <sys/mouse.h>
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
1) Make debugging more selective. 2) create function usbd_errstr which turns a usbd_status into a sensible error message 3) Change the printf in DPRINTF to logprintf which is a define for log(KERN_DEBUG, x)
1999-04-11 20:50:33 +00:00
#ifdef UMS_DEBUG
#define DPRINTF(x) if (umsdebug) logprintf x
#define DPRINTFN(n,x) if (umsdebug>(n)) logprintf x
forgotten in previous commit: Lowered default debug level
1999-01-22 01:02:24 +00:00
int umsdebug = 1;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
#else
#define DPRINTF(x)
#define DPRINTFN(n,x)
#endif
#define UMSUNIT(s) (minor(s)&0x1f)
The Qtronix keyboard has a built in PS/2 port for a mouse. It however posts a bogus button up event once in a while. Whenever we receive dx=dy=dz=buttons=0 we postpone adding it to the queue for 50msecs with a timeout. If in the meantime something else is posted the event is ignored. This avoids the problem Nik Sayer reported. He noticed that X windows would drop and pick up a window once in a while. Thanks, Nik, for supplying me with the keyboard to fix the problem!
1999-11-08 23:58:33 +00:00
#define MS_TO_TICKS(ms) ((ms) * hz / 1000)
make ums look like a Mouse Systems or Sysmouse mouse. Remove PS/2 interf. Supplied by MAEKAWA Masahide <bishop@rr.iij4u.or.jp>. Thanks! USB Mouse now supports up to 7 buttons and X,Y,Z (wheel) directions.
1999-02-21 16:20:19 +00:00
#define QUEUE_BUFSIZE 400 /* MUST be divisible by 5 _and_ 8 */
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
struct ums_softc {
Remove the last bits and pieces left over from porting the driver from NetBSD.
1999-10-07 18:50:46 +00:00
device_t sc_dev; /* base device */
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
usbd_interface_handle sc_iface; /* interface */
usbd_pipe_handle sc_intrpipe; /* interrupt pipe */
int sc_ep_addr;
u_char *sc_ibuf;
u_int8_t sc_iid;
int sc_isize;
struct hid_location sc_loc_x, sc_loc_y, sc_loc_z;
struct hid_location *sc_loc_btn;
The Qtronix keyboard has a built in PS/2 port for a mouse. It however posts a bogus button up event once in a while. Whenever we receive dx=dy=dz=buttons=0 we postpone adding it to the queue for 50msecs with a timeout. If in the meantime something else is posted the event is ignored. This avoids the problem Nik Sayer reported. He noticed that X windows would drop and pick up a window once in a while. Thanks, Nik, for supplying me with the keyboard to fix the problem!
1999-11-08 23:58:33 +00:00
struct callout_handle timeout_handle; /* for spurious button ups */
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
int sc_enabled;
int sc_disconnected; /* device is gone */
int flags; /* device configuration */
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
#define UMS_Z 0x01 /* z direction available */
The Qtronix keyboard has a built in PS/2 port for a mouse. It however posts a bogus button up event once in a while. Whenever we receive dx=dy=dz=buttons=0 we postpone adding it to the queue for 50msecs with a timeout. If in the meantime something else is posted the event is ignored. This avoids the problem Nik Sayer reported. He noticed that X windows would drop and pick up a window once in a while. Thanks, Nik, for supplying me with the keyboard to fix the problem!
1999-11-08 23:58:33 +00:00
#define UMS_SPUR_BUT_UP 0x02 /* spurious button up events */
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
int nbuttons;
Sync with NetBSD sources. Almost there. Mostly style fixes.
1999-01-10 18:42:54 +00:00
#define MAX_BUTTONS 7 /* chosen because sc_buttons is u_char */
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
1) textual changes 2) bug fix in handling of select (or presumed bug) 3) trigger a mouse packet on the Z direction as well (but Z still not working)
1999-01-12 01:21:15 +00:00
u_char qbuf[QUEUE_BUFSIZE]; /* must be divisable by 3&4 */
Sync with NetBSD sources. Almost there. Mostly style fixes.
1999-01-10 18:42:54 +00:00
u_char dummy[100]; /* XXX just for safety and for now */
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
int qcount, qhead, qtail;
mousehw_t hw;
mousemode_t mode;
mousestatus_t status;
int state;
# define UMS_ASLEEP 0x01 /* readFromDevice is waiting */
# define UMS_SELECT 0x02 /* select is waiting */
struct selinfo rsel; /* process waiting in select */
Add make_dev and remove_dev.
1999-10-07 21:06:52 +00:00
dev_t dev; /* specfs */
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
};
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
#define MOUSE_FLAGS_MASK (HIO_CONST|HIO_RELATIVE)
#define MOUSE_FLAGS (HIO_RELATIVE)
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
Remove __P prototypes to reduce diffs between the NetBSD and FreeBSD versions.
2000-07-17 18:41:20 +00:00
Static void ums_intr(usbd_xfer_handle xfer,
usbd_private_handle priv, usbd_status status);
The Qtronix keyboard has a built in PS/2 port for a mouse. It however posts a bogus button up event once in a while. Whenever we receive dx=dy=dz=buttons=0 we postpone adding it to the queue for 50msecs with a timeout. If in the meantime something else is posted the event is ignored. This avoids the problem Nik Sayer reported. He noticed that X windows would drop and pick up a window once in a while. Thanks, Nik, for supplying me with the keyboard to fix the problem!
1999-11-08 23:58:33 +00:00
Remove __P prototypes to reduce diffs between the NetBSD and FreeBSD versions.
2000-07-17 18:41:20 +00:00
Static void ums_add_to_queue(struct ums_softc *sc,
int dx, int dy, int dz, int buttons);
Static void ums_add_to_queue_timeout(void *priv);
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
Remove __P prototypes to reduce diffs between the NetBSD and FreeBSD versions.
2000-07-17 18:41:20 +00:00
Static int ums_enable(void *);
Static void ums_disable(void *);
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
OpenBSD has a broken debugger that does not grok static. Use a #define Static static that the OpenBSD folks can define it to be empty if they like.
2000-04-03 20:58:30 +00:00
Static d_open_t ums_open;
Static d_close_t ums_close;
Static d_read_t ums_read;
Static d_ioctl_t ums_ioctl;
Static d_poll_t ums_poll;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
Corrected the major number for usb and added ums as major 111
1999-01-03 16:48:03 +00:00
#define UMS_CDEV_MAJOR 111
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
OpenBSD has a broken debugger that does not grok static. Use a #define Static static that the OpenBSD folks can define it to be empty if they like.
2000-04-03 20:58:30 +00:00
Static struct cdevsw ums_cdevsw = {
This commit should be a extensive NO-OP: Reformat and initialize correctly all "struct cdevsw". Initialize the d_maj and d_bmaj fields. The d_reset field was not removed, although it is never used. I used a program to do most of this, so all the files now use the same consistent format. Please keep it that way. Vinum and i4b not modified, patches emailed to respective authors.
1999-05-30 16:53:49 +00:00
/* open */ ums_open,
/* close */ ums_close,
/* read */ ums_read,
/* write */ nowrite,
/* ioctl */ ums_ioctl,
/* poll */ ums_poll,
/* mmap */ nommap,
/* strategy */ nostrategy,
/* name */ "ums",
/* maj */ UMS_CDEV_MAJOR,
/* dump */ nodump,
/* psize */ nopsize,
/* flags */ 0,
/* bmaj */ -1
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
};
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
USB_DECLARE_DRIVER(ums);
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
USB_MATCH(ums)
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
{
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
USB_MATCH_START(ums, uaa);
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
usb_interface_descriptor_t *id;
int size, ret;
void *desc;
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
usbd_status err;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
if (!uaa->iface)
return (UMATCH_NONE);
id = usbd_get_interface_descriptor(uaa->iface);
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
if (!id || id->bInterfaceClass != UCLASS_HID)
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
return (UMATCH_NONE);
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
err = usbd_alloc_report_desc(uaa->iface, &desc, &size, M_TEMP);
if (err)
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
return (UMATCH_NONE);
if (hid_is_collection(desc, size,
HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE)))
ret = UMATCH_IFACECLASS;
else
ret = UMATCH_NONE;
free(desc, M_TEMP);
return (ret);
}
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
USB_ATTACH(ums)
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
{
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
USB_ATTACH_START(ums, sc, uaa);
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
usbd_interface_handle iface = uaa->iface;
usb_interface_descriptor_t *id;
usb_endpoint_descriptor_t *ed;
int size;
void *desc;
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
usbd_status err;
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
char devinfo[1024];
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
u_int32_t flags;
int i;
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
struct hid_location loc_btn;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
sc->sc_disconnected = 1;
sc->sc_iface = iface;
id = usbd_get_interface_descriptor(iface);
usbd_devinfo(uaa->device, 0, devinfo);
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
USB_ATTACH_SETUP;
printf("%s: %s, iclass %d/%d\n", USBDEVNAME(sc->sc_dev),
devinfo, id->bInterfaceClass, id->bInterfaceSubClass);
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
ed = usbd_interface2endpoint_descriptor(iface, 0);
if (!ed) {
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
printf("%s: could not read endpoint descriptor\n",
USBDEVNAME(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
}
DPRINTFN(10,("ums_attach: bLength=%d bDescriptorType=%d "
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
"bEndpointAddress=%d-%s bmAttributes=%d wMaxPacketSize=%d"
" bInterval=%d\n",
ed->bLength, ed->bDescriptorType,
Remove the last bits and pieces left over from porting the driver from NetBSD.
1999-10-07 18:50:46 +00:00
UE_GET_ADDR(ed->bEndpointAddress),
UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN ? "in":"out",
UE_GET_XFERTYPE(ed->bmAttributes),
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
UGETW(ed->wMaxPacketSize), ed->bInterval));
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
Remove the last bits and pieces left over from porting the driver from NetBSD.
1999-10-07 18:50:46 +00:00
if (UE_GET_DIR(ed->bEndpointAddress) != UE_DIR_IN ||
UE_GET_XFERTYPE(ed->bmAttributes) != UE_INTERRUPT) {
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
printf("%s: unexpected endpoint\n",
USBDEVNAME(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
}
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
err = usbd_alloc_report_desc(uaa->iface, &desc, &size, M_TEMP);
if (err)
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
USB_ATTACH_ERROR_RETURN;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
if (!hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X),
hid_input, &sc->sc_loc_x, &flags)) {
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
printf("%s: mouse has no X report\n", USBDEVNAME(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
if ((flags & MOUSE_FLAGS_MASK) != MOUSE_FLAGS) {
printf("%s: X report 0x%04x not supported\n",
USBDEVNAME(sc->sc_dev), flags);
USB_ATTACH_ERROR_RETURN;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
}
if (!hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y),
hid_input, &sc->sc_loc_y, &flags)) {
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
printf("%s: mouse has no Y report\n", USBDEVNAME(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
}
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
if ((flags & MOUSE_FLAGS_MASK) != MOUSE_FLAGS) {
printf("%s: Y report 0x%04x not supported\n",
USBDEVNAME(sc->sc_dev), flags);
USB_ATTACH_ERROR_RETURN;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
}
/* try to guess the Z activator: first check Z, then WHEEL */
if (hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Z),
hid_input, &sc->sc_loc_z, &flags) ||
hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL),
hid_input, &sc->sc_loc_z, &flags)) {
if ((flags & MOUSE_FLAGS_MASK) != MOUSE_FLAGS) {
sc->sc_loc_z.size = 0; /* Bad Z coord, ignore it */
} else {
sc->flags |= UMS_Z;
}
}
Sync with NetBSD sources. Almost there. Mostly style fixes.
1999-01-10 18:42:54 +00:00
/* figure out the number of buttons */
for (i = 1; i <= MAX_BUTTONS; i++)
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
if (!hid_locate(desc, size, HID_USAGE2(HUP_BUTTON, i),
hid_input, &loc_btn, 0))
break;
sc->nbuttons = i - 1;
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
sc->sc_loc_btn = malloc(sizeof(struct hid_location)*sc->nbuttons,
M_USBDEV, M_NOWAIT);
Cleaning up, improving _detach, removing ominous warning (msmith)
1999-01-21 23:06:02 +00:00
if (!sc->sc_loc_btn) {
printf("%s: no memory\n", USBDEVNAME(sc->sc_dev));
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
USB_ATTACH_ERROR_RETURN;
Cleaning up, improving _detach, removing ominous warning (msmith)
1999-01-21 23:06:02 +00:00
}
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
printf("%s: %d buttons%s\n", USBDEVNAME(sc->sc_dev),
Cleaning up, improving _detach, removing ominous warning (msmith)
1999-01-21 23:06:02 +00:00
sc->nbuttons, sc->flags & UMS_Z? " and Z dir." : "");
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
for (i = 1; i <= sc->nbuttons; i++)
hid_locate(desc, size, HID_USAGE2(HUP_BUTTON, i),
hid_input, &sc->sc_loc_btn[i-1], 0);
sc->sc_isize = hid_report_size(desc, size, hid_input, &sc->sc_iid);
sc->sc_ibuf = malloc(sc->sc_isize, M_USB, M_NOWAIT);
if (!sc->sc_ibuf) {
Cleaning up, improving _detach, removing ominous warning (msmith)
1999-01-21 23:06:02 +00:00
printf("%s: no memory\n", USBDEVNAME(sc->sc_dev));
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
free(sc->sc_loc_btn, M_USB);
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
USB_ATTACH_ERROR_RETURN;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
}
sc->sc_ep_addr = ed->bEndpointAddress;
sc->sc_disconnected = 0;
free(desc, M_TEMP);
1) Make debugging more selective. 2) create function usbd_errstr which turns a usbd_status into a sensible error message 3) Change the printf in DPRINTF to logprintf which is a define for log(KERN_DEBUG, x)
1999-04-11 20:50:33 +00:00
#ifdef UMS_DEBUG
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
DPRINTF(("ums_attach: sc=%p\n", sc));
DPRINTF(("ums_attach: X\t%d/%d\n",
sc->sc_loc_x.pos, sc->sc_loc_x.size));
DPRINTF(("ums_attach: Y\t%d/%d\n",
Typo: 'x' should be 'y' (only affects debugging output)
1999-09-01 21:37:56 +00:00
sc->sc_loc_y.pos, sc->sc_loc_y.size));
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
if (sc->flags & UMS_Z)
DPRINTF(("ums_attach: Z\t%d/%d\n",
sc->sc_loc_z.pos, sc->sc_loc_z.size));
for (i = 1; i <= sc->nbuttons; i++) {
DPRINTF(("ums_attach: B%d\t%d/%d\n",
i, sc->sc_loc_btn[i-1].pos,sc->sc_loc_btn[i-1].size));
}
DPRINTF(("ums_attach: size=%d, id=%d\n", sc->sc_isize, sc->sc_iid));
#endif
make ums look like a Mouse Systems or Sysmouse mouse. Remove PS/2 interf. Supplied by MAEKAWA Masahide <bishop@rr.iij4u.or.jp>. Thanks! USB Mouse now supports up to 7 buttons and X,Y,Z (wheel) directions.
1999-02-21 16:20:19 +00:00
if (sc->nbuttons > MOUSE_MSC_MAXBUTTON)
sc->hw.buttons = MOUSE_MSC_MAXBUTTON;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
else
make ums look like a Mouse Systems or Sysmouse mouse. Remove PS/2 interf. Supplied by MAEKAWA Masahide <bishop@rr.iij4u.or.jp>. Thanks! USB Mouse now supports up to 7 buttons and X,Y,Z (wheel) directions.
1999-02-21 16:20:19 +00:00
sc->hw.buttons = sc->nbuttons;
sc->hw.iftype = MOUSE_IF_USB;
sc->hw.type = MOUSE_MOUSE;
sc->hw.model = MOUSE_MODEL_GENERIC;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
sc->hw.hwid = 0;
make ums look like a Mouse Systems or Sysmouse mouse. Remove PS/2 interf. Supplied by MAEKAWA Masahide <bishop@rr.iij4u.or.jp>. Thanks! USB Mouse now supports up to 7 buttons and X,Y,Z (wheel) directions.
1999-02-21 16:20:19 +00:00
sc->mode.protocol = MOUSE_PROTO_MSC;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
sc->mode.rate = -1;
make ums look like a Mouse Systems or Sysmouse mouse. Remove PS/2 interf. Supplied by MAEKAWA Masahide <bishop@rr.iij4u.or.jp>. Thanks! USB Mouse now supports up to 7 buttons and X,Y,Z (wheel) directions.
1999-02-21 16:20:19 +00:00
sc->mode.resolution = MOUSE_RES_UNKNOWN;
sc->mode.accelfactor = 0;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
sc->mode.level = 0;
make ums look like a Mouse Systems or Sysmouse mouse. Remove PS/2 interf. Supplied by MAEKAWA Masahide <bishop@rr.iij4u.or.jp>. Thanks! USB Mouse now supports up to 7 buttons and X,Y,Z (wheel) directions.
1999-02-21 16:20:19 +00:00
sc->mode.packetsize = MOUSE_MSC_PACKETSIZE;
sc->mode.syncmask[0] = MOUSE_MSC_SYNCMASK;
sc->mode.syncmask[1] = MOUSE_MSC_SYNC;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
sc->status.flags = 0;
sc->status.button = sc->status.obutton = 0;
sc->status.dx = sc->status.dy = sc->status.dz = 0;
sc->rsel.si_flags = 0;
sc->rsel.si_pid = 0;
The Qtronix keyboard has a built in PS/2 port for a mouse. It however posts a bogus button up event once in a while. Whenever we receive dx=dy=dz=buttons=0 we postpone adding it to the queue for 50msecs with a timeout. If in the meantime something else is posted the event is ignored. This avoids the problem Nik Sayer reported. He noticed that X windows would drop and pick up a window once in a while. Thanks, Nik, for supplying me with the keyboard to fix the problem!
1999-11-08 23:58:33 +00:00
sc->dev = make_dev(&ums_cdevsw, device_get_unit(self),
UID_ROOT, GID_OPERATOR,
Add make_dev and remove_dev.
1999-10-07 21:06:52 +00:00
0644, "ums%d", device_get_unit(self));
The Qtronix keyboard has a built in PS/2 port for a mouse. It however posts a bogus button up event once in a while. Whenever we receive dx=dy=dz=buttons=0 we postpone adding it to the queue for 50msecs with a timeout. If in the meantime something else is posted the event is ignored. This avoids the problem Nik Sayer reported. He noticed that X windows would drop and pick up a window once in a while. Thanks, Nik, for supplying me with the keyboard to fix the problem!
1999-11-08 23:58:33 +00:00
if (usbd_get_quirks(uaa->device)->uq_flags & UQ_SPUR_BUT_UP) {
DPRINTF(("%s: Spurious button up events\n",
USBDEVNAME(sc->sc_dev)));
sc->flags |= UMS_SPUR_BUT_UP;
}
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
USB_ATTACH_SUCCESS_RETURN;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
}
OpenBSD has a broken debugger that does not grok static. Use a #define Static static that the OpenBSD folks can define it to be empty if they like.
2000-04-03 20:58:30 +00:00
Static int
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
ums_detach(device_t self)
{
struct ums_softc *sc = device_get_softc(self);
Revoke the vnodes on detach. This avoids the crashes people have seen when moused was still running when the mouse was detached. Convert uhid to use make_dev while I am there. Ugen still needs to be converted.
1999-11-21 17:25:30 +00:00
struct vnode *vp;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
When the mouse is being disconnected, do the followings: - Call ums_disable() to abort the pipe. - Do not wake up processes which has been waiting or polling for mouse data. It won't be available anymore. Submitted by: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
1999-05-30 12:48:49 +00:00
if (sc->sc_enabled)
ums_disable(sc);
Cleaning up, improving _detach, removing ominous warning (msmith)
1999-01-21 23:06:02 +00:00
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
We use device_set_desc_copy, so we do not need to free the copied text manually.
1999-08-28 11:35:36 +00:00
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
free(sc->sc_loc_btn, M_USB);
free(sc->sc_ibuf, M_USB);
Revoke the vnodes on detach. This avoids the crashes people have seen when moused was still running when the mouse was detached. Convert uhid to use make_dev while I am there. Ugen still needs to be converted.
1999-11-21 17:25:30 +00:00
vp = SLIST_FIRST(&sc->dev->si_hlist);
if (vp)
VOP_REVOKE(vp, REVOKEALL);
/* someone waiting for data */
When the mouse is being disconnected, do the followings: - Call ums_disable() to abort the pipe. - Do not wake up processes which has been waiting or polling for mouse data. It won't be available anymore. Submitted by: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
1999-05-30 12:48:49 +00:00
/*
* XXX If we wakeup the process here, the device will be gone by
* the time the process gets a chance to notice. *_close and friends
* should be fixed to handle this case.
* Or we should do a delayed detach for this.
1) Add non-blocking I/O on read 2) Add checks to make sure we do not dereference the softc when not found because the device has been removed.
1999-06-13 20:49:12 +00:00
* Does this delay now force tsleep to exit with an error?
When the mouse is being disconnected, do the followings: - Call ums_disable() to abort the pipe. - Do not wake up processes which has been waiting or polling for mouse data. It won't be available anymore. Submitted by: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
1999-05-30 12:48:49 +00:00
*/
Cleaning up, improving _detach, removing ominous warning (msmith)
1999-01-21 23:06:02 +00:00
if (sc->state & UMS_ASLEEP) {
make ums look like a Mouse Systems or Sysmouse mouse. Remove PS/2 interf. Supplied by MAEKAWA Masahide <bishop@rr.iij4u.or.jp>. Thanks! USB Mouse now supports up to 7 buttons and X,Y,Z (wheel) directions.
1999-02-21 16:20:19 +00:00
sc->state &= ~UMS_ASLEEP;
Cleaning up, improving _detach, removing ominous warning (msmith)
1999-01-21 23:06:02 +00:00
wakeup(sc);
}
if (sc->state & UMS_SELECT) {
make ums look like a Mouse Systems or Sysmouse mouse. Remove PS/2 interf. Supplied by MAEKAWA Masahide <bishop@rr.iij4u.or.jp>. Thanks! USB Mouse now supports up to 7 buttons and X,Y,Z (wheel) directions.
1999-02-21 16:20:19 +00:00
sc->state &= ~UMS_SELECT;
Cleaning up, improving _detach, removing ominous warning (msmith)
1999-01-21 23:06:02 +00:00
selwakeup(&sc->rsel);
}
Rename remove_dev() to destroy_dev(). Nagged about by: msmith
1999-11-08 07:44:01 +00:00
destroy_dev(sc->dev);
Add make_dev and remove_dev.
1999-10-07 21:06:52 +00:00
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
return 0;
}
void
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
ums_intr(xfer, addr, status)
usbd_xfer_handle xfer;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
usbd_private_handle addr;
usbd_status status;
{
struct ums_softc *sc = addr;
u_char *ibuf;
int dx, dy, dz;
u_char buttons = 0;
int i;
Sync with NetBSD sources. Almost there. Mostly style fixes.
1999-01-10 18:42:54 +00:00
make ums look like a Mouse Systems or Sysmouse mouse. Remove PS/2 interf. Supplied by MAEKAWA Masahide <bishop@rr.iij4u.or.jp>. Thanks! USB Mouse now supports up to 7 buttons and X,Y,Z (wheel) directions.
1999-02-21 16:20:19 +00:00
#define UMS_BUT(i) ((i) < 3 ? (((i) + 2) % 3) : (i))
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
DPRINTFN(5, ("ums_intr: sc=%p status=%d\n", sc, status));
DPRINTFN(5, ("ums_intr: data = %02x %02x %02x\n",
sc->sc_ibuf[0], sc->sc_ibuf[1], sc->sc_ibuf[2]));
if (status == USBD_CANCELLED)
return;
if (status != USBD_NORMAL_COMPLETION) {
DPRINTF(("ums_intr: status=%d\n", status));
usbd_clear_endpoint_stall_async(sc->sc_intrpipe);
return;
}
ibuf = sc->sc_ibuf;
if (sc->sc_iid) {
if (*ibuf++ != sc->sc_iid)
return;
}
Sync with NetBSD sources. Almost there. Mostly style fixes.
1999-01-10 18:42:54 +00:00
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
dx = hid_get_data(ibuf, &sc->sc_loc_x);
dy = -hid_get_data(ibuf, &sc->sc_loc_y);
Z direction was upside down. Submitted By: MAEKAWA Masahide
1999-05-01 13:17:47 +00:00
dz = -hid_get_data(ibuf, &sc->sc_loc_z);
Major synchronisation with NetBSD USB code
1999-01-07 23:07:57 +00:00
for (i = 0; i < sc->nbuttons; i++)
if (hid_get_data(ibuf, &sc->sc_loc_btn[i]))
buttons |= (1 << UMS_BUT(i));
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
make ums look like a Mouse Systems or Sysmouse mouse. Remove PS/2 interf. Supplied by MAEKAWA Masahide <bishop@rr.iij4u.or.jp>. Thanks! USB Mouse now supports up to 7 buttons and X,Y,Z (wheel) directions.
1999-02-21 16:20:19 +00:00
if (dx || dy || dz || (sc->flags & UMS_Z)
1) textual changes 2) bug fix in handling of select (or presumed bug) 3) trigger a mouse packet on the Z direction as well (but Z still not working)
1999-01-12 01:21:15 +00:00
|| buttons != sc->status.button) {
DPRINTFN(5, ("ums_intr: x:%d y:%d z:%d buttons:0x%x\n",
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
dx, dy, dz, buttons));
sc->status.button = buttons;
sc->status.dx += dx;
sc->status.dy += dy;
sc->status.dz += dz;
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
/* Discard data in case of full buffer */
if (sc->qcount == sizeof(sc->qbuf)) {
DPRINTF(("Buffer full, discarded packet"));
return;
}
The Qtronix keyboard has a built in PS/2 port for a mouse. It however posts a bogus button up event once in a while. Whenever we receive dx=dy=dz=buttons=0 we postpone adding it to the queue for 50msecs with a timeout. If in the meantime something else is posted the event is ignored. This avoids the problem Nik Sayer reported. He noticed that X windows would drop and pick up a window once in a while. Thanks, Nik, for supplying me with the keyboard to fix the problem!
1999-11-08 23:58:33 +00:00
/*
* The Qtronix keyboard has a built in PS/2 port for a mouse.
* The firmware once in a while posts a spurious button up
* event. This event we ignore by doing a timeout for 50 msecs.
* If we receive dx=dy=dz=buttons=0 before we add the event to
* the queue.
* In any other case we delete the timeout event.
*/
if (sc->flags & UMS_SPUR_BUT_UP &&
dx == 0 && dy == 0 && dz == 0 && buttons == 0) {
usb_timeout(ums_add_to_queue_timeout, (void *) sc,
MS_TO_TICKS(50 /*msecs*/), sc->timeout_handle);
} else {
usb_untimeout(ums_add_to_queue_timeout, (void *) sc,
sc->timeout_handle);
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
The Qtronix keyboard has a built in PS/2 port for a mouse. It however posts a bogus button up event once in a while. Whenever we receive dx=dy=dz=buttons=0 we postpone adding it to the queue for 50msecs with a timeout. If in the meantime something else is posted the event is ignored. This avoids the problem Nik Sayer reported. He noticed that X windows would drop and pick up a window once in a while. Thanks, Nik, for supplying me with the keyboard to fix the problem!
1999-11-08 23:58:33 +00:00
ums_add_to_queue(sc, dx, dy, dz, buttons);
1) textual changes 2) bug fix in handling of select (or presumed bug) 3) trigger a mouse packet on the Z direction as well (but Z still not working)
1999-01-12 01:21:15 +00:00
}
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
}
}
OpenBSD has a broken debugger that does not grok static. Use a #define Static static that the OpenBSD folks can define it to be empty if they like.
2000-04-03 20:58:30 +00:00
Static void
The Qtronix keyboard has a built in PS/2 port for a mouse. It however posts a bogus button up event once in a while. Whenever we receive dx=dy=dz=buttons=0 we postpone adding it to the queue for 50msecs with a timeout. If in the meantime something else is posted the event is ignored. This avoids the problem Nik Sayer reported. He noticed that X windows would drop and pick up a window once in a while. Thanks, Nik, for supplying me with the keyboard to fix the problem!
1999-11-08 23:58:33 +00:00
ums_add_to_queue_timeout(void *priv)
{
struct ums_softc *sc = priv;
int s;
s = splusb();
ums_add_to_queue(sc, 0, 0, 0, 0);
splx(s);
}
OpenBSD has a broken debugger that does not grok static. Use a #define Static static that the OpenBSD folks can define it to be empty if they like.
2000-04-03 20:58:30 +00:00
Static void
The Qtronix keyboard has a built in PS/2 port for a mouse. It however posts a bogus button up event once in a while. Whenever we receive dx=dy=dz=buttons=0 we postpone adding it to the queue for 50msecs with a timeout. If in the meantime something else is posted the event is ignored. This avoids the problem Nik Sayer reported. He noticed that X windows would drop and pick up a window once in a while. Thanks, Nik, for supplying me with the keyboard to fix the problem!
1999-11-08 23:58:33 +00:00
ums_add_to_queue(struct ums_softc *sc, int dx, int dy, int dz, int buttons)
{
/* Discard data in case of full buffer */
if (sc->qhead+sc->mode.packetsize > sizeof(sc->qbuf)) {
DPRINTF(("Buffer full, discarded packet"));
return;
}
if (dx > 254) dx = 254;
if (dx < -256) dx = -256;
if (dy > 254) dy = 254;
if (dy < -256) dy = -256;
if (dz > 126) dz = 126;
if (dz < -128) dz = -128;
sc->qbuf[sc->qhead] = sc->mode.syncmask[1];
sc->qbuf[sc->qhead] |= ~buttons & MOUSE_MSC_BUTTONS;
sc->qbuf[sc->qhead+1] = dx >> 1;
sc->qbuf[sc->qhead+2] = dy >> 1;
sc->qbuf[sc->qhead+3] = dx - (dx >> 1);
sc->qbuf[sc->qhead+4] = dy - (dy >> 1);
if (sc->mode.level == 1) {
sc->qbuf[sc->qhead+5] = dz >> 1;
sc->qbuf[sc->qhead+6] = dz - (dz >> 1);
sc->qbuf[sc->qhead+7] = ((~buttons >> 3)
& MOUSE_SYS_EXTBUTTONS);
}
sc->qhead += sc->mode.packetsize;
sc->qcount += sc->mode.packetsize;
/* wrap round at end of buffer */
if (sc->qhead >= sizeof(sc->qbuf))
sc->qhead = 0;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
The Qtronix keyboard has a built in PS/2 port for a mouse. It however posts a bogus button up event once in a while. Whenever we receive dx=dy=dz=buttons=0 we postpone adding it to the queue for 50msecs with a timeout. If in the meantime something else is posted the event is ignored. This avoids the problem Nik Sayer reported. He noticed that X windows would drop and pick up a window once in a while. Thanks, Nik, for supplying me with the keyboard to fix the problem!
1999-11-08 23:58:33 +00:00
/* someone waiting for data */
if (sc->state & UMS_ASLEEP) {
sc->state &= ~UMS_ASLEEP;
wakeup(sc);
}
if (sc->state & UMS_SELECT) {
sc->state &= ~UMS_SELECT;
selwakeup(&sc->rsel);
}
}
OpenBSD has a broken debugger that does not grok static. Use a #define Static static that the OpenBSD folks can define it to be empty if they like.
2000-04-03 20:58:30 +00:00
Static int
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
ums_enable(v)
void *v;
{
struct ums_softc *sc = v;
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
usbd_status err;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
if (sc->sc_enabled)
return EBUSY;
sc->sc_enabled = 1;
sc->qcount = 0;
sc->qhead = sc->qtail = 0;
sc->status.flags = 0;
sc->status.button = sc->status.obutton = 0;
sc->status.dx = sc->status.dy = sc->status.dz = 0;
The Qtronix keyboard has a built in PS/2 port for a mouse. It however posts a bogus button up event once in a while. Whenever we receive dx=dy=dz=buttons=0 we postpone adding it to the queue for 50msecs with a timeout. If in the meantime something else is posted the event is ignored. This avoids the problem Nik Sayer reported. He noticed that X windows would drop and pick up a window once in a while. Thanks, Nik, for supplying me with the keyboard to fix the problem!
1999-11-08 23:58:33 +00:00
callout_handle_init(&sc->timeout_handle);
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
/* Set up interrupt pipe. */
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
err = usbd_open_pipe_intr(sc->sc_iface, sc->sc_ep_addr,
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
USBD_SHORT_XFER_OK, &sc->sc_intrpipe, sc,
More USB ethernet tweaks: - Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the following improvements: o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP quirk. This allows drivers to specify busy waiting only for certain transfers (namely control transfers for reading/writing registers and stuff). o New USBD_FORCE_SHORT_XFER flag can be used to deal with devices like the ADMtek Pegasus that sense the end of bulk OUT transfers in a special way (if a transfer is exactly a multiple of 64 bytes in size, you need to send an extra empty packet to terminate the transfer). o usbd_open_pipe_intr() now accepts an interval argument which can be used to change the rate at which the interrupt callback routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the value specified in the device's config data, but drivers can override it if needed. - Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions. - Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all control transfers. We no longer force the non-tsleep hack for bulk transfers since these are done asynchronously anyway. - Removed quirk entry fiddling from if_aue and if_kue since we don't need it anymore now that we have the USBD_NO_TSLEEP flag. - Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to usbd_open_pipe_intr(). - Add a flag to the softc struct in the ethernet drivers to indicate when a device has been detached, and use this flag to perform tests to prevent the drivers from trying to do control transfers if this is the case. This is necessary because calling if_detach() with INET6 enabled will eventually result in a call to the driver's ioctl() routine to delete the multicast groups on the interface, which will result in attempts to perform control transfers. (It's possible this also happens even without INET6 support enabled.) This is pointless since we know that if the detach method has been called, the hardware has been unplugged. - Changed watchdog timeout routines to just call the driver init routines to initialize the device states without trying to close and re-open the pipes. This is partly because we don't want to frob things at interrupt context, but also because this doesn't seem to work right and I don't want to panic the system just because a USB device may have stopped responding. - Fix aue_rxeof() to be a little smarter about detecting when a double transfer is needed. Unfortunately, the design of the chip makes it hard to get this exactly right. Hopefully, this will go away once either Nick or Lennart finds the bug in the uhci driver that makes this ugly hack necessary. - Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
sc->sc_ibuf, sc->sc_isize, ums_intr,
USBD_DEFAULT_INTERVAL);
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
if (err) {
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
DPRINTF(("ums_enable: usbd_open_pipe_intr failed, error=%d\n",
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
err));
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
sc->sc_enabled = 0;
return (EIO);
}
return (0);
}
OpenBSD has a broken debugger that does not grok static. Use a #define Static static that the OpenBSD folks can define it to be empty if they like.
2000-04-03 20:58:30 +00:00
Static void
Remove the last bits and pieces left over from porting the driver from NetBSD.
1999-10-07 18:50:46 +00:00
ums_disable(priv)
void *priv;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
{
Remove the last bits and pieces left over from porting the driver from NetBSD.
1999-10-07 18:50:46 +00:00
struct ums_softc *sc = priv;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
The Qtronix keyboard has a built in PS/2 port for a mouse. It however posts a bogus button up event once in a while. Whenever we receive dx=dy=dz=buttons=0 we postpone adding it to the queue for 50msecs with a timeout. If in the meantime something else is posted the event is ignored. This avoids the problem Nik Sayer reported. He noticed that X windows would drop and pick up a window once in a while. Thanks, Nik, for supplying me with the keyboard to fix the problem!
1999-11-08 23:58:33 +00:00
usb_untimeout(ums_add_to_queue_timeout, sc, sc->timeout_handle);
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
/* Disable interrupts. */
usbd_abort_pipe(sc->sc_intrpipe);
usbd_close_pipe(sc->sc_intrpipe);
sc->sc_enabled = 0;
if (sc->qcount != 0)
DPRINTF(("Discarded %d bytes in queue\n", sc->qcount));
}
OpenBSD has a broken debugger that does not grok static. Use a #define Static static that the OpenBSD folks can define it to be empty if they like.
2000-04-03 20:58:30 +00:00
Static int
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
ums_open(dev_t dev, int flag, int fmt, struct proc *p)
{
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
struct ums_softc *sc;
1) textual changes 2) bug fix in handling of select (or presumed bug) 3) trigger a mouse packet on the Z direction as well (but Z still not working)
1999-01-12 01:21:15 +00:00
USB_GET_SC_OPEN(ums, UMSUNIT(dev), sc);
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
return ums_enable(sc);
}
OpenBSD has a broken debugger that does not grok static. Use a #define Static static that the OpenBSD folks can define it to be empty if they like.
2000-04-03 20:58:30 +00:00
Static int
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
ums_close(dev_t dev, int flag, int fmt, struct proc *p)
{
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
struct ums_softc *sc;
1) textual changes 2) bug fix in handling of select (or presumed bug) 3) trigger a mouse packet on the Z direction as well (but Z still not working)
1999-01-12 01:21:15 +00:00
USB_GET_SC(ums, UMSUNIT(dev), sc);
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
1) Add non-blocking I/O on read 2) Add checks to make sure we do not dereference the softc when not found because the device has been removed.
1999-06-13 20:49:12 +00:00
if (!sc)
When the mouse is being disconnected, do the followings: - Call ums_disable() to abort the pipe. - Do not wake up processes which has been waiting or polling for mouse data. It won't be available anymore. Submitted by: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
1999-05-30 12:48:49 +00:00
return 0;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
if (sc->sc_enabled)
ums_disable(sc);
1) textual changes 2) bug fix in handling of select (or presumed bug) 3) trigger a mouse packet on the Z direction as well (but Z still not working)
1999-01-12 01:21:15 +00:00
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
return 0;
}
OpenBSD has a broken debugger that does not grok static. Use a #define Static static that the OpenBSD folks can define it to be empty if they like.
2000-04-03 20:58:30 +00:00
Static int
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
ums_read(dev_t dev, struct uio *uio, int flag)
{
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
struct ums_softc *sc;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
int s;
char buf[sizeof(sc->qbuf)];
int l = 0;
int error;
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
USB_GET_SC(ums, UMSUNIT(dev), sc);
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
s = splusb();
1) Add non-blocking I/O on read 2) Add checks to make sure we do not dereference the softc when not found because the device has been removed.
1999-06-13 20:49:12 +00:00
if (!sc) {
splx(s);
return EIO;
}
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
while (sc->qcount == 0 ) {
1) Add non-blocking I/O on read 2) Add checks to make sure we do not dereference the softc when not found because the device has been removed.
1999-06-13 20:49:12 +00:00
if (flag & IO_NDELAY) { /* non-blocking I/O */
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
splx(s);
return EWOULDBLOCK;
1) Add non-blocking I/O on read 2) Add checks to make sure we do not dereference the softc when not found because the device has been removed.
1999-06-13 20:49:12 +00:00
}
sc->state |= UMS_ASLEEP; /* blocking I/O */
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
error = tsleep(sc, PZERO | PCATCH, "umsrea", 0);
if (error) {
splx(s);
return error;
Fixed disconnect for umouse
1999-01-22 00:59:52 +00:00
} else if (!sc->sc_enabled) {
splx(s);
return EINTR;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
}
1) Add non-blocking I/O on read 2) Add checks to make sure we do not dereference the softc when not found because the device has been removed.
1999-06-13 20:49:12 +00:00
/* check whether the device is still there */
sc = devclass_get_softc(ums_devclass, UMSUNIT(dev));
if (!sc) {
splx(s);
return EIO;
}
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
}
1) Add non-blocking I/O on read 2) Add checks to make sure we do not dereference the softc when not found because the device has been removed.
1999-06-13 20:49:12 +00:00
/*
* XXX we could optimise the use of splx/splusb somewhat. The writer
* process only extends qcount and qtail. We could copy them and use the copies
* to do the copying out of the queue.
*/
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
while ((sc->qcount > 0) && (uio->uio_resid > 0)) {
l = (sc->qcount < uio->uio_resid? sc->qcount:uio->uio_resid);
if (l > sizeof(buf))
l = sizeof(buf);
if (l > sizeof(sc->qbuf) - sc->qtail) /* transfer till end of buf */
l = sizeof(sc->qbuf) - sc->qtail;
splx(s);
uiomove(&sc->qbuf[sc->qtail], l, uio);
s = splusb();
if ( sc->qcount - l < 0 ) {
DPRINTF(("qcount below 0, count=%d l=%d\n", sc->qcount, l));
sc->qcount = l;
}
sc->qcount -= l; /* remove the bytes from the buffer */
sc->qtail = (sc->qtail + l) % sizeof(sc->qbuf);
}
splx(s);
return 0;
}
OpenBSD has a broken debugger that does not grok static. Use a #define Static static that the OpenBSD folks can define it to be empty if they like.
2000-04-03 20:58:30 +00:00
Static int
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
ums_poll(dev_t dev, int events, struct proc *p)
{
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
struct ums_softc *sc;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
int revents = 0;
int s;
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
USB_GET_SC(ums, UMSUNIT(dev), sc);
1) Add non-blocking I/O on read 2) Add checks to make sure we do not dereference the softc when not found because the device has been removed.
1999-06-13 20:49:12 +00:00
if (!sc)
return 0;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
s = splusb();
1) textual changes 2) bug fix in handling of select (or presumed bug) 3) trigger a mouse packet on the Z direction as well (but Z still not working)
1999-01-12 01:21:15 +00:00
if (events & (POLLIN | POLLRDNORM)) {
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
if (sc->qcount) {
revents = events & (POLLIN | POLLRDNORM);
} else {
sc->state |= UMS_SELECT;
selrecord(p, &sc->rsel);
}
1) textual changes 2) bug fix in handling of select (or presumed bug) 3) trigger a mouse packet on the Z direction as well (but Z still not working)
1999-01-12 01:21:15 +00:00
}
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
splx(s);
return revents;
}
int
ums_ioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
{
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
struct ums_softc *sc;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
int error = 0;
int s;
make ums look like a Mouse Systems or Sysmouse mouse. Remove PS/2 interf. Supplied by MAEKAWA Masahide <bishop@rr.iij4u.or.jp>. Thanks! USB Mouse now supports up to 7 buttons and X,Y,Z (wheel) directions.
1999-02-21 16:20:19 +00:00
mousemode_t mode;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
Synchronisation with NetBSD as of 1999/11/16: Cleaning up the code: - Declare many functions static - Change variable names to make them more self explanatory - Change usbd_request_handle -> usbd_xfer_handle - Syntactical changes - Remove some unused code - Other KNF changes Interrupt context handling - Change delay to usbd_delay_ms were possible (takes polling mode into account) - Change detection mechanism for interrupt context Add support for pre-allocation DMA-able memory by device driver Add preliminary support for isochronous to the UHCI driver (not for OHCI yet). usb.c, uhci.c, ohci.c - Initial attempt at detachable USB host controllers - Handle the use_polling flag with a lttle more care and only set it if we are cold booting. usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c - Make sure an aborted pipe is marked as not running. - Start queued request in the right order. - Insert some more DIAGNOSTIC sanity checks. - Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN. usb.c, usb_subr.c - Add an event mechanism so that a userland process can watch devices come and go. ohci.c - Handle the case when a USB transfer is so long that it crosses two page (4K) boundaries. OHCI cannot do that with a single TD so we make a chain. ulpt.c - Use a bigger buffer when transferring data. - Pre-allocate the DMA buffer. This makes the driver slightly more efficient. - Comment out the GET_DEVICE_ID code, because for some unknown reason it causes printing to fail sometimes. usb.h - Add a macro to extract the isoc type. - Add a macro to check whether the routine has been entered after splusb and if not, complain. usbdi.c - Fix a glitch in dequeueing and aborting requests on interrupt pipes. - Add a flag in the request to determine if the data copying is done by the driver or the usbdi layer.
1999-11-17 22:33:51 +00:00
USB_GET_SC(ums, UMSUNIT(dev), sc);
1) Add non-blocking I/O on read 2) Add checks to make sure we do not dereference the softc when not found because the device has been removed.
1999-06-13 20:49:12 +00:00
if (!sc)
return EIO;
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
switch(cmd) {
case MOUSE_GETHWINFO:
*(mousehw_t *)addr = sc->hw;
break;
case MOUSE_GETMODE:
*(mousemode_t *)addr = sc->mode;
make ums look like a Mouse Systems or Sysmouse mouse. Remove PS/2 interf. Supplied by MAEKAWA Masahide <bishop@rr.iij4u.or.jp>. Thanks! USB Mouse now supports up to 7 buttons and X,Y,Z (wheel) directions.
1999-02-21 16:20:19 +00:00
break;
case MOUSE_SETMODE:
mode = *(mousemode_t *)addr;
if (mode.level == -1)
/* don't change the current setting */
;
else if ((mode.level < 0) || (mode.level > 1))
return (EINVAL);
s = splusb();
sc->mode.level = mode.level;
if (sc->mode.level == 0) {
if (sc->nbuttons > MOUSE_MSC_MAXBUTTON)
sc->hw.buttons = MOUSE_MSC_MAXBUTTON;
else
sc->hw.buttons = sc->nbuttons;
sc->mode.protocol = MOUSE_PROTO_MSC;
sc->mode.packetsize = MOUSE_MSC_PACKETSIZE;
sc->mode.syncmask[0] = MOUSE_MSC_SYNCMASK;
sc->mode.syncmask[1] = MOUSE_MSC_SYNC;
} else if (sc->mode.level == 1) {
if (sc->nbuttons > MOUSE_SYS_MAXBUTTON)
sc->hw.buttons = MOUSE_SYS_MAXBUTTON;
else
sc->hw.buttons = sc->nbuttons;
sc->mode.protocol = MOUSE_PROTO_SYSMOUSE;
sc->mode.packetsize = MOUSE_SYS_PACKETSIZE;
sc->mode.syncmask[0] = MOUSE_SYS_SYNCMASK;
sc->mode.syncmask[1] = MOUSE_SYS_SYNC;
}
bzero(sc->qbuf, sizeof(sc->qbuf));
sc->qhead = sc->qtail = sc->qcount = 0;
splx(s);
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
break;
case MOUSE_GETLEVEL:
*(int *)addr = sc->mode.level;
make ums look like a Mouse Systems or Sysmouse mouse. Remove PS/2 interf. Supplied by MAEKAWA Masahide <bishop@rr.iij4u.or.jp>. Thanks! USB Mouse now supports up to 7 buttons and X,Y,Z (wheel) directions.
1999-02-21 16:20:19 +00:00
break;
case MOUSE_SETLEVEL:
if (*(int *)addr < 0 || *(int *)addr > 1)
return (EINVAL);
s = splusb();
sc->mode.level = *(int *)addr;
if (sc->mode.level == 0) {
if (sc->nbuttons > MOUSE_MSC_MAXBUTTON)
sc->hw.buttons = MOUSE_MSC_MAXBUTTON;
else
sc->hw.buttons = sc->nbuttons;
sc->mode.protocol = MOUSE_PROTO_MSC;
sc->mode.packetsize = MOUSE_MSC_PACKETSIZE;
sc->mode.syncmask[0] = MOUSE_MSC_SYNCMASK;
sc->mode.syncmask[1] = MOUSE_MSC_SYNC;
} else if (sc->mode.level == 1) {
if (sc->nbuttons > MOUSE_SYS_MAXBUTTON)
sc->hw.buttons = MOUSE_SYS_MAXBUTTON;
else
sc->hw.buttons = sc->nbuttons;
sc->mode.protocol = MOUSE_PROTO_SYSMOUSE;
sc->mode.packetsize = MOUSE_SYS_PACKETSIZE;
sc->mode.syncmask[0] = MOUSE_SYS_SYNCMASK;
sc->mode.syncmask[1] = MOUSE_SYS_SYNC;
}
bzero(sc->qbuf, sizeof(sc->qbuf));
sc->qhead = sc->qtail = sc->qcount = 0;
splx(s);
Initial commit of ported NetBSD USB stack
1998-11-26 23:13:13 +00:00
break;
case MOUSE_GETSTATUS: {
mousestatus_t *status = (mousestatus_t *) addr;
s = splusb();
*status = sc->status;
sc->status.obutton = sc->status.button;
sc->status.button = 0;
sc->status.dx = sc->status.dy = sc->status.dz = 0;
splx(s);
if (status->dx || status->dy || status->dz)
status->flags |= MOUSE_POSCHANGED;
if (status->button != status->obutton)
status->flags |= MOUSE_BUTTONSCHANGED;
break;
}
default:
error = ENOTTY;
}
return error;
}
ulpt.c and ums.c already uses make_dev(), so there's no need to use the (presently broken) DEV_DRIVER_MODULE(). Use DRIVER_MODULE() directly.
1999-11-08 07:10:48 +00:00
DRIVER_MODULE(ums, uhub, ums_driver, ums_devclass, usbd_driver_load, 0);
Reference in New Issue Copy Permalink