Thu Feb 7 13:37:44 2019 UTC ()
KNF


(skrll)
diff -r1.170 -r1.171 src/sys/dev/usb/umass.c

cvs diff -r1.170 -r1.171 src/sys/dev/usb/umass.c (expand / switch to unified diff)

--- src/sys/dev/usb/umass.c 2019/02/07 13:35:17 1.170
+++ src/sys/dev/usb/umass.c 2019/02/07 13:37:44 1.171
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: umass.c,v 1.170 2019/02/07 13:35:17 skrll Exp $ */ 1/* $NetBSD: umass.c,v 1.171 2019/02/07 13:37:44 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,44 +114,44 @@ @@ -114,44 +114,44 @@
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.170 2019/02/07 13:35:17 skrll Exp $"); 127__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.171 2019/02/07 13:37:44 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/systm.h> 
139#include <sys/kernel.h> 
140#include <sys/conf.h> 
141#include <sys/buf.h> 138#include <sys/buf.h>
 139#include <sys/conf.h>
142#include <sys/device.h> 140#include <sys/device.h>
 141#include <sys/kernel.h>
143#include <sys/malloc.h> 142#include <sys/malloc.h>
144#include <sys/sysctl.h> 143#include <sys/sysctl.h>
 144#include <sys/systm.h>
145 145
146#include <dev/usb/usb.h> 146#include <dev/usb/usb.h>
147#include <dev/usb/usbdi.h> 147#include <dev/usb/usbdi.h>
148#include <dev/usb/usbdi_util.h> 148#include <dev/usb/usbdi_util.h>
149#include <dev/usb/usbdevs.h> 149#include <dev/usb/usbdevs.h>
150#include <dev/usb/usbhist.h> 150#include <dev/usb/usbhist.h>
151 151
152#include <dev/usb/umassvar.h> 152#include <dev/usb/umassvar.h>
153#include <dev/usb/umass_quirks.h> 153#include <dev/usb/umass_quirks.h>
154#include <dev/usb/umass_scsipi.h> 154#include <dev/usb/umass_scsipi.h>
155#include <dev/usb/umass_isdata.h> 155#include <dev/usb/umass_isdata.h>
156 156
157#include <dev/scsipi/scsipi_all.h> 157#include <dev/scsipi/scsipi_all.h>