| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: ubt.c,v 1.33 2008/07/16 08:43:01 tonnerre Exp $ */ | | 1 | /* $NetBSD: ubt.c,v 1.34 2008/07/26 20:16:10 plunky Exp $ */ |
2 | | | 2 | |
3 | /*- | | 3 | /*- |
4 | * Copyright (c) 2006 Itronix Inc. | | 4 | * Copyright (c) 2006 Itronix Inc. |
5 | * All rights reserved. | | 5 | * All rights reserved. |
6 | * | | 6 | * |
7 | * Written by Iain Hibbert for Itronix Inc. | | 7 | * Written by Iain Hibbert for Itronix Inc. |
8 | * | | 8 | * |
9 | * Redistribution and use in source and binary forms, with or without | | 9 | * Redistribution and use in source and binary forms, with or without |
10 | * modification, are permitted provided that the following conditions | | 10 | * modification, are permitted provided that the following conditions |
11 | * are met: | | 11 | * are met: |
12 | * 1. Redistributions of source code must retain the above copyright | | 12 | * 1. Redistributions of source code must retain the above copyright |
13 | * notice, this list of conditions and the following disclaimer. | | 13 | * notice, this list of conditions and the following disclaimer. |
14 | * 2. Redistributions in binary form must reproduce the above copyright | | 14 | * 2. Redistributions in binary form must reproduce the above copyright |
| @@ -57,27 +57,27 @@ | | | @@ -57,27 +57,27 @@ |
57 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | | 57 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
58 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | | 58 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
59 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | | 59 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
60 | * POSSIBILITY OF SUCH DAMAGE. | | 60 | * POSSIBILITY OF SUCH DAMAGE. |
61 | */ | | 61 | */ |
62 | /* | | 62 | /* |
63 | * This driver originally written by Lennart Augustsson and David Sainty, | | 63 | * This driver originally written by Lennart Augustsson and David Sainty, |
64 | * but was mostly rewritten for the NetBSD Bluetooth protocol stack by | | 64 | * but was mostly rewritten for the NetBSD Bluetooth protocol stack by |
65 | * Iain Hibbert for Itronix, Inc using the FreeBSD ng_ubt.c driver as a | | 65 | * Iain Hibbert for Itronix, Inc using the FreeBSD ng_ubt.c driver as a |
66 | * reference. | | 66 | * reference. |
67 | */ | | 67 | */ |
68 | | | 68 | |
69 | #include <sys/cdefs.h> | | 69 | #include <sys/cdefs.h> |
70 | __KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.33 2008/07/16 08:43:01 tonnerre Exp $"); | | 70 | __KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.34 2008/07/26 20:16:10 plunky Exp $"); |
71 | | | 71 | |
72 | #include <sys/param.h> | | 72 | #include <sys/param.h> |
73 | #include <sys/device.h> | | 73 | #include <sys/device.h> |
74 | #include <sys/ioctl.h> | | 74 | #include <sys/ioctl.h> |
75 | #include <sys/kernel.h> | | 75 | #include <sys/kernel.h> |
76 | #include <sys/malloc.h> | | 76 | #include <sys/malloc.h> |
77 | #include <sys/mbuf.h> | | 77 | #include <sys/mbuf.h> |
78 | #include <sys/proc.h> | | 78 | #include <sys/proc.h> |
79 | #include <sys/sysctl.h> | | 79 | #include <sys/sysctl.h> |
80 | #include <sys/systm.h> | | 80 | #include <sys/systm.h> |
81 | | | 81 | |
82 | #include <dev/usb/usb.h> | | 82 | #include <dev/usb/usb.h> |
83 | #include <dev/usb/usbdi.h> | | 83 | #include <dev/usb/usbdi.h> |
| @@ -815,27 +815,26 @@ ubt_abortdealloc(struct ubt_softc *sc) | | | @@ -815,27 +815,26 @@ ubt_abortdealloc(struct ubt_softc *sc) |
815 | sc->sc_scowr_mbuf = NULL; | | 815 | sc->sc_scowr_mbuf = NULL; |
816 | } | | 816 | } |
817 | | | 817 | |
818 | /* Empty mbuf queues */ | | 818 | /* Empty mbuf queues */ |
819 | MBUFQ_DRAIN(&sc->sc_cmd_queue); | | 819 | MBUFQ_DRAIN(&sc->sc_cmd_queue); |
820 | MBUFQ_DRAIN(&sc->sc_aclwr_queue); | | 820 | MBUFQ_DRAIN(&sc->sc_aclwr_queue); |
821 | MBUFQ_DRAIN(&sc->sc_scowr_queue); | | 821 | MBUFQ_DRAIN(&sc->sc_scowr_queue); |
822 | } | | 822 | } |
823 | | | 823 | |
824 | /******************************************************************************* | | 824 | /******************************************************************************* |
825 | * | | 825 | * |
826 | * Bluetooth Unit/USB callbacks | | 826 | * Bluetooth Unit/USB callbacks |
827 | * | | 827 | * |
828 | * All of this will be called at the IPL_ we specified above | | | |
829 | */ | | 828 | */ |
830 | static int | | 829 | static int |
831 | ubt_enable(device_ptr_t self) | | 830 | ubt_enable(device_ptr_t self) |
832 | { | | 831 | { |
833 | struct ubt_softc *sc = USBGETSOFTC(self); | | 832 | struct ubt_softc *sc = USBGETSOFTC(self); |
834 | usbd_status err; | | 833 | usbd_status err; |
835 | int s, i, error; | | 834 | int s, i, error; |
836 | | | 835 | |
837 | DPRINTFN(1, "sc=%p\n", sc); | | 836 | DPRINTFN(1, "sc=%p\n", sc); |
838 | | | 837 | |
839 | if (sc->sc_enabled) | | 838 | if (sc->sc_enabled) |
840 | return 0; | | 839 | return 0; |
841 | | | 840 | |