From 4f6489b17d92cf7119adb7cd75f382f303a62566 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Mon, 10 Mar 2014 22:21:16 +0100
Subject: [PATCH] Sync usbconfig(8) with FreeBSD.

---
 usr.sbin/usbconfig/Makefile    |  2 +-
 usr.sbin/usbconfig/dump.c      | 10 +++++++---
 usr.sbin/usbconfig/dump.h      |  2 +-
 usr.sbin/usbconfig/usbconfig.8 |  2 +-
 usr.sbin/usbconfig/usbconfig.c |  3 ++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/usr.sbin/usbconfig/Makefile b/usr.sbin/usbconfig/Makefile
index 40c800e5ea..23777a9075 100644
--- a/usr.sbin/usbconfig/Makefile
+++ b/usr.sbin/usbconfig/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/usr.sbin/usbconfig/Makefile,v 1.3 2010/01/09 18:59:03 antoine Exp $
+# $FreeBSD: head/usr.sbin/usbconfig/Makefile 201922 2010-01-09 18:59:03Z antoine $
 #
 PROG=	usbconfig
 MAN=	usbconfig.8
diff --git a/usr.sbin/usbconfig/dump.c b/usr.sbin/usbconfig/dump.c
index 0f188f1439..b62697cef1 100644
--- a/usr.sbin/usbconfig/dump.c
+++ b/usr.sbin/usbconfig/dump.c
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/usr.sbin/usbconfig/dump.c,v 1.7 2011/02/26 09:28:52 hselasky Exp $ */
+/* $FreeBSD: head/usr.sbin/usbconfig/dump.c 246789 2013-02-14 12:22:40Z hselasky $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *
@@ -225,13 +225,17 @@ dump_device_info(struct libusb20_device *pdev, uint8_t show_ifdrv)
 {
 	char buf[128];
 	uint8_t n;
+	unsigned int usage;
 
-	printf("%s, cfg=%u md=%s spd=%s pwr=%s\n",
+	usage = libusb20_dev_get_power_usage(pdev);
+
+	printf("%s, cfg=%u md=%s spd=%s pwr=%s (%umA)\n",
 	    libusb20_dev_get_desc(pdev),
 	    libusb20_dev_get_config_index(pdev),
 	    dump_mode(libusb20_dev_get_mode(pdev)),
 	    dump_speed(libusb20_dev_get_speed(pdev)),
-	    dump_power_mode(libusb20_dev_get_power_mode(pdev)));
+	    dump_power_mode(libusb20_dev_get_power_mode(pdev)),
+	    usage);
 
 	if (!show_ifdrv)
 		return;
diff --git a/usr.sbin/usbconfig/dump.h b/usr.sbin/usbconfig/dump.h
index c0ef239786..f140a3ead6 100644
--- a/usr.sbin/usbconfig/dump.h
+++ b/usr.sbin/usbconfig/dump.h
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/usr.sbin/usbconfig/dump.h,v 1.4 2010/01/07 00:50:45 thompsa Exp $ */
+/* $FreeBSD: head/usr.sbin/usbconfig/dump.h 201705 2010-01-07 00:50:45Z thompsa $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *
diff --git a/usr.sbin/usbconfig/usbconfig.8 b/usr.sbin/usbconfig/usbconfig.8
index a85371698b..06368c3587 100644
--- a/usr.sbin/usbconfig/usbconfig.8
+++ b/usr.sbin/usbconfig/usbconfig.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.sbin/usbconfig/usbconfig.8,v 1.5 2010/11/10 23:45:44 n_hibma Exp $
+.\" $FreeBSD: head/usr.sbin/usbconfig/usbconfig.8 215104 2010-11-10 23:45:44Z n_hibma $
 .\"
 .\" Copyright (c) 2008-2010 Hans Petter Selasky. All rights reserved.
 .\"
diff --git a/usr.sbin/usbconfig/usbconfig.c b/usr.sbin/usbconfig/usbconfig.c
index 3ce886c847..981730f281 100644
--- a/usr.sbin/usbconfig/usbconfig.c
+++ b/usr.sbin/usbconfig/usbconfig.c
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/usr.sbin/usbconfig/usbconfig.c,v 1.11 2010/10/24 13:48:11 hselasky Exp $ */
+/* $FreeBSD: head/usr.sbin/usbconfig/usbconfig.c 248236 2013-03-13 12:23:14Z hselasky $ */
 /*-
  * Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved.
  *
@@ -33,6 +33,7 @@
 #include <grp.h>
 #include <errno.h>
 #include <ctype.h>
+#include <sys/types.h>
 
 #include <libusb20_desc.h>
 #include <libusb20.h>
-- 
2.41.0