[Midnightbsd-cvs] src [10049] trunk/sys/dev/usb/storage: sync with freebsd 10 stable

[laffer1 at midnightbsd.org]

Revision: 10049
          http://svnweb.midnightbsd.org/src/?rev=10049
Author:   laffer1
Date:     2018-05-27 18:42:18 -0400 (Sun, 27 May 2018)
Log Message:
-----------
sync with freebsd 10 stable

Modified Paths:
--------------
    trunk/sys/dev/usb/storage/rio500_usb.h
    trunk/sys/dev/usb/storage/umass.c
    trunk/sys/dev/usb/storage/urio.c
    trunk/sys/dev/usb/storage/ustorage_fs.c

Modified: trunk/sys/dev/usb/storage/rio500_usb.h
===================================================================
--- trunk/sys/dev/usb/storage/rio500_usb.h	2018-05-27 22:42:00 UTC (rev 10048)
+++ trunk/sys/dev/usb/storage/rio500_usb.h	2018-05-27 22:42:18 UTC (rev 10049)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
     ----------------------------------------------------------------------
 
@@ -20,7 +21,7 @@
 
     ---------------------------------------------------------------------- */
 
-/*  $FreeBSD: stable/9/sys/dev/usb/storage/rio500_usb.h 196219 2009-08-14 20:03:53Z jhb $ */
+/*  $FreeBSD: stable/10/sys/dev/usb/storage/rio500_usb.h 196219 2009-08-14 20:03:53Z jhb $ */
 
 #include <sys/ioccom.h>
 #ifndef USB_VENDOR_DIAMOND

Modified: trunk/sys/dev/usb/storage/umass.c
===================================================================
--- trunk/sys/dev/usb/storage/umass.c	2018-05-27 22:42:00 UTC (rev 10048)
+++ trunk/sys/dev/usb/storage/umass.c	2018-05-27 22:42:18 UTC (rev 10049)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/9/sys/dev/usb/storage/umass.c 255663 2013-09-18 06:38:40Z hselasky $");
+__FBSDID("$FreeBSD: stable/10/sys/dev/usb/storage/umass.c 255472 2013-09-11 10:18:36Z hselasky $");
 
 /*-
  * Copyright (c) 1999 MAEKAWA Masahide <bishop at rr.iij4u.or.jp>,
@@ -27,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: stable/9/sys/dev/usb/storage/umass.c 255663 2013-09-18 06:38:40Z hselasky $
+ *	$FreeBSD: stable/10/sys/dev/usb/storage/umass.c 255472 2013-09-11 10:18:36Z hselasky $
  *	$NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
  */
 
@@ -698,7 +699,8 @@
 	DEVMETHOD(device_probe, umass_probe),
 	DEVMETHOD(device_attach, umass_attach),
 	DEVMETHOD(device_detach, umass_detach),
-	{0, 0}
+
+	DEVMETHOD_END
 };
 
 static driver_t umass_driver = {

Modified: trunk/sys/dev/usb/storage/urio.c
===================================================================
--- trunk/sys/dev/usb/storage/urio.c	2018-05-27 22:42:00 UTC (rev 10048)
+++ trunk/sys/dev/usb/storage/urio.c	2018-05-27 22:42:18 UTC (rev 10049)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2000 Iwasa Kazmi
  * All rights reserved.
@@ -29,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/9/sys/dev/usb/storage/urio.c 248085 2013-03-09 02:36:32Z marius $");
+__FBSDID("$FreeBSD: stable/10/sys/dev/usb/storage/urio.c 246128 2013-01-30 18:01:20Z sbz $");
 
 
 /*
@@ -185,7 +186,8 @@
 	DEVMETHOD(device_probe, urio_probe),
 	DEVMETHOD(device_attach, urio_attach),
 	DEVMETHOD(device_detach, urio_detach),
-	{0, 0}
+
+	DEVMETHOD_END
 };
 
 static driver_t urio_driver = {

Modified: trunk/sys/dev/usb/storage/ustorage_fs.c
===================================================================
--- trunk/sys/dev/usb/storage/ustorage_fs.c	2018-05-27 22:42:00 UTC (rev 10048)
+++ trunk/sys/dev/usb/storage/ustorage_fs.c	2018-05-27 22:42:18 UTC (rev 10049)
@@ -1,4 +1,5 @@
-/* $FreeBSD: stable/9/sys/dev/usb/storage/ustorage_fs.c 260575 2014-01-12 21:21:19Z hselasky $ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/dev/usb/storage/ustorage_fs.c 246128 2013-01-30 18:01:20Z sbz $ */
 /*-
  * Copyright (C) 2003-2005 Alan Stern
  * Copyright (C) 2008 Hans Petter Selasky
@@ -36,6 +37,9 @@
  * Linux USB gadget stack.
  */
 
+#ifdef USB_GLOBAL_INCLUDE_FILE
+#include USB_GLOBAL_INCLUDE_FILE
+#else
 #include <sys/stdint.h>
 #include <sys/stddef.h>
 #include <sys/param.h>
@@ -62,6 +66,7 @@
 
 #define	USB_DEBUG_VAR ustorage_fs_debug
 #include <dev/usb/usb_debug.h>
+#endif			/* USB_GLOBAL_INCLUDE_FILE */
 
 #ifdef USB_DEBUG
 static int ustorage_fs_debug = 0;
@@ -252,7 +257,7 @@
 	DEVMETHOD(device_suspend, ustorage_fs_suspend),
 	DEVMETHOD(device_resume, ustorage_fs_resume),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ustorage_fs_driver = {