diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 1999-01-07 23:07:57 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 1999-01-07 23:07:57 +0000 |
| commit | f85edabd28f8c9ebaeed20a6bdb7ddef1ff1c098 (patch) | |
| tree | c8f677155dd2322c9b2477c85e8f2959ef963429 /sys/dev/usb/hid.c | |
| parent | b118bd4907acdfd7a8cb3f83f50f0219e395b4a3 (diff) | |
| download | FreeBSD-src-f85edabd28f8c9ebaeed20a6bdb7ddef1ff1c098.zip FreeBSD-src-f85edabd28f8c9ebaeed20a6bdb7ddef1ff1c098.tar.gz | |
Major synchronisation with NetBSD USB code
Diffstat (limited to 'sys/dev/usb/hid.c')
| -rw-r--r-- | sys/dev/usb/hid.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c index a96da40..b03f749 100644 --- a/sys/dev/usb/hid.c +++ b/sys/dev/usb/hid.c @@ -1,12 +1,13 @@ -/* $NetBSD: hid.c,v 1.2 1998/07/24 20:57:46 augustss Exp $ */ -/* FreeBSD $Id: hid.c,v 1.2 1998/12/14 09:32:23 n_hibma Exp $ */ +/* $NetBSD: hid.c,v 1.5 1998/12/26 12:53:00 augustss Exp $ */ +/* FreeBSD $Id$ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. * - * Author: Lennart Augustsson <augustss@carlstedt.se> - * Carlstedt Research & Technology + * This code is derived from software contributed to The NetBSD Foundation + * by Lennart Augustsson (augustss@carlstedt.se) at + * Carlstedt Research & Technology. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,12 +38,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <dev/usb/usb_port.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> +#if defined(__FreeBSD__) +#include <sys/bus.h> +#endif #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> @@ -442,8 +444,8 @@ hid_get_data(buf, loc) hsize = 32 - hsize; /* Sign extend */ data = ((int32_t)data << hsize) >> hsize; - DPRINTFN(10, ("hid_get_data: loc %d/%d = %lu\n", - loc->pos, loc->size, (long)data)); + DPRINTFN(10,("hid_get_data: loc %d/%d = %lu\n", + loc->pos, loc->size, (long)data)); return (data); } |
