Sun Feb 5 09:02:38 2017 UTC ()
Fix build


(skrll)
diff -r1.149.2.19 -r1.149.2.20 src/sys/dev/usb/umass.c
diff -r1.49.2.9 -r1.49.2.10 src/sys/dev/usb/umass_scsipi.c
cvs diff -r1.149.2.19 -r1.149.2.20 src/sys/dev/usb/umass.c (expand / switch to unified diff)

--- src/sys/dev/usb/umass.c 2017/01/29 10:16:09 1.149.2.19
+++ src/sys/dev/usb/umass.c 2017/02/05 09:02:38 1.149.2.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: umass.c,v 1.149.2.19 2017/01/29 10:16:09 skrll Exp $ */ 1/* $NetBSD: umass.c,v 1.149.2.20 2017/02/05 09:02:38 skrll Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 The NetBSD Foundation, Inc. 4 * Copyright (c) 2003 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Charles M. Hannum. 8 * by Charles M. Hannum.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -114,41 +114,42 @@ @@ -114,41 +114,42 @@
114 114
115/* 115/*
116 * The SCSI related part of this driver has been derived from the 116 * The SCSI related part of this driver has been derived from the
117 * dev/ppbus/vpo.c driver, by Nicolas Souchu (nsouch@freebsd.org). 117 * dev/ppbus/vpo.c driver, by Nicolas Souchu (nsouch@freebsd.org).
118 * 118 *
119 * The CAM layer uses so called actions which are messages sent to the host 119 * The CAM layer uses so called actions which are messages sent to the host
120 * adapter for completion. The actions come in through umass_cam_action. The 120 * adapter for completion. The actions come in through umass_cam_action. The
121 * appropriate block of routines is called depending on the transport protocol 121 * appropriate block of routines is called depending on the transport protocol
122 * in use. When the transfer has finished, these routines call 122 * in use. When the transfer has finished, these routines call
123 * umass_cam_cb again to complete the CAM command. 123 * umass_cam_cb again to complete the CAM command.
124 */ 124 */
125 125
126#include <sys/cdefs.h> 126#include <sys/cdefs.h>
127__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.149.2.19 2017/01/29 10:16:09 skrll Exp $"); 127__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.149.2.20 2017/02/05 09:02:38 skrll Exp $");
128 128
129#ifdef _KERNEL_OPT 129#ifdef _KERNEL_OPT
130#include "opt_usb.h" 130#include "opt_usb.h"
131#endif 131#endif
132 132
133#include "atapibus.h" 133#include "atapibus.h"
134#include "scsibus.h" 134#include "scsibus.h"
135#include "wd.h" 135#include "wd.h"
136 136
137#include <sys/param.h> 137#include <sys/param.h>
138#include <sys/buf.h> 138#include <sys/buf.h>
139#include <sys/conf.h> 139#include <sys/conf.h>
140#include <sys/device.h> 140#include <sys/device.h>
141#include <sys/kernel.h> 141#include <sys/kernel.h>
 142#include <sys/kmem.h>
142#include <sys/sysctl.h> 143#include <sys/sysctl.h>
143#include <sys/systm.h> 144#include <sys/systm.h>
144 145
145#include <dev/usb/usb.h> 146#include <dev/usb/usb.h>
146#include <dev/usb/usbdi.h> 147#include <dev/usb/usbdi.h>
147#include <dev/usb/usbdi_util.h> 148#include <dev/usb/usbdi_util.h>
148#include <dev/usb/usbdevs.h> 149#include <dev/usb/usbdevs.h>
149#include <dev/usb/usbhist.h> 150#include <dev/usb/usbhist.h>
150 151
151#include <dev/usb/umassvar.h> 152#include <dev/usb/umassvar.h>
152#include <dev/usb/umass_quirks.h> 153#include <dev/usb/umass_quirks.h>
153#include <dev/usb/umass_scsipi.h> 154#include <dev/usb/umass_scsipi.h>
154#include <dev/usb/umass_isdata.h> 155#include <dev/usb/umass_isdata.h>
cvs diff -r1.49.2.9 -r1.49.2.10 src/sys/dev/usb/umass_scsipi.c (expand / switch to unified diff)

--- src/sys/dev/usb/umass_scsipi.c 2017/01/29 10:16:09 1.49.2.9
+++ src/sys/dev/usb/umass_scsipi.c 2017/02/05 09:02:38 1.49.2.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: umass_scsipi.c,v 1.49.2.9 2017/01/29 10:16:09 skrll Exp $ */ 1/* $NetBSD: umass_scsipi.c,v 1.49.2.10 2017/02/05 09:02:38 skrll Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc. 4 * Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Lennart Augustsson (lennart@augustsson.net) at 8 * by Lennart Augustsson (lennart@augustsson.net) at
9 * Carlstedt Research & Technology, Charles M. Hamnnum and Matthew R. Green. 9 * Carlstedt Research & Technology, Charles M. Hamnnum and Matthew R. Green.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -21,43 +21,44 @@ @@ -21,43 +21,44 @@
21 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 21 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
22 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 22 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
23 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 23 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 * POSSIBILITY OF SUCH DAMAGE. 30 * POSSIBILITY OF SUCH DAMAGE.
31 */ 31 */
32 32
33#include <sys/cdefs.h> 33#include <sys/cdefs.h>
34__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.49.2.9 2017/01/29 10:16:09 skrll Exp $"); 34__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.49.2.10 2017/02/05 09:02:38 skrll Exp $");
35 35
36#ifdef _KERNEL_OPT 36#ifdef _KERNEL_OPT
37#include "opt_usb.h" 37#include "opt_usb.h"
38#endif 38#endif
39 39
40#include "atapibus.h" 40#include "atapibus.h"
41#include "scsibus.h" 41#include "scsibus.h"
42 42
43#include <sys/param.h> 43#include <sys/param.h>
44#include <sys/buf.h> 44#include <sys/buf.h>
45#include <sys/bufq.h> 45#include <sys/bufq.h>
46#include <sys/conf.h> 46#include <sys/conf.h>
47#include <sys/device.h> 47#include <sys/device.h>
48#include <sys/disk.h> /* XXX */ 48#include <sys/disk.h> /* XXX */
49#include <sys/ioctl.h> 49#include <sys/ioctl.h>
50#include <sys/kernel.h> 50#include <sys/kernel.h>
 51#include <sys/kmem.h>
51#include <sys/lwp.h> 52#include <sys/lwp.h>
52#include <sys/malloc.h> 53#include <sys/malloc.h>
53#include <sys/systm.h> 54#include <sys/systm.h>
54 55
55/* SCSI & ATAPI */ 56/* SCSI & ATAPI */
56#include <sys/scsiio.h> 57#include <sys/scsiio.h>
57#include <dev/scsipi/scsi_spc.h> 58#include <dev/scsipi/scsi_spc.h>
58#include <dev/scsipi/scsi_all.h> 59#include <dev/scsipi/scsi_all.h>
59#include <dev/scsipi/scsipi_all.h> 60#include <dev/scsipi/scsipi_all.h>
60#include <dev/scsipi/scsiconf.h> 61#include <dev/scsipi/scsiconf.h>
61 62
62#include <dev/scsipi/atapiconf.h> 63#include <dev/scsipi/atapiconf.h>
63 64