[Midnightbsd-cvs] src [11285] trunk/usr.sbin/bluetooth/bt3cfw/bt3cfw.c: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Jul 4 09:29:48 EDT 2018
Revision: 11285
http://svnweb.midnightbsd.org/src/?rev=11285
Author: laffer1
Date: 2018-07-04 09:29:47 -0400 (Wed, 04 Jul 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/usr.sbin/bluetooth/ath3kfw/Makefile
trunk/usr.sbin/bluetooth/ath3kfw/ath3kfw.8
trunk/usr.sbin/bluetooth/ath3kfw/ath3kfw.c
trunk/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt
trunk/usr.sbin/bluetooth/bcmfw/Makefile
trunk/usr.sbin/bluetooth/bcmfw/README
trunk/usr.sbin/bluetooth/bcmfw/bcmfw.8
trunk/usr.sbin/bluetooth/bcmfw/bcmfw.c
trunk/usr.sbin/bluetooth/bt3cfw/Makefile
trunk/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
trunk/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
Property Changed:
----------------
trunk/usr.sbin/bluetooth/ath3kfw/ath3kfw.8
trunk/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt
trunk/usr.sbin/bluetooth/bcmfw/README
trunk/usr.sbin/bluetooth/bcmfw/bcmfw.8
trunk/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
Modified: trunk/usr.sbin/bluetooth/ath3kfw/Makefile
===================================================================
--- trunk/usr.sbin/bluetooth/ath3kfw/Makefile 2018-07-04 13:28:17 UTC (rev 11284)
+++ trunk/usr.sbin/bluetooth/ath3kfw/Makefile 2018-07-04 13:29:47 UTC (rev 11285)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/bluetooth/ath3kfw/Makefile 222772 2011-06-06 20:24:17Z ed $
PROG= ath3kfw
MAN= ath3kfw.8
Modified: trunk/usr.sbin/bluetooth/ath3kfw/ath3kfw.8
===================================================================
--- trunk/usr.sbin/bluetooth/ath3kfw/ath3kfw.8 2018-07-04 13:28:17 UTC (rev 11284)
+++ trunk/usr.sbin/bluetooth/ath3kfw/ath3kfw.8 2018-07-04 13:29:47 UTC (rev 11285)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2010 Maksim Yevmenkin <m_evmenkin at yahoo.com>
.\" All rights reserved.
.\"
@@ -22,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/bluetooth/ath3kfw/ath3kfw.8 233648 2012-03-29 05:02:12Z eadler $
.\"
-.Dd Novermber 9, 2010
+.Dd November 9, 2010
.Dt ATH3KFW 8
.Os
.Sh NAME
Property changes on: trunk/usr.sbin/bluetooth/ath3kfw/ath3kfw.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/bluetooth/ath3kfw/ath3kfw.c
===================================================================
--- trunk/usr.sbin/bluetooth/ath3kfw/ath3kfw.c 2018-07-04 13:28:17 UTC (rev 11284)
+++ trunk/usr.sbin/bluetooth/ath3kfw/ath3kfw.c 2018-07-04 13:29:47 UTC (rev 11285)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* ath3kfw.c
*/
@@ -27,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/bluetooth/ath3kfw/ath3kfw.c 249179 2013-04-05 23:42:22Z adrian $
*/
#include <sys/types.h>
@@ -59,6 +60,9 @@
char const *firmware);
static void usage (void);
+static int vendor_id = ATH3KFW_VENDOR_ID;
+static int product_id = ATH3KFW_PRODUCT_ID;
+
/*
* Firmware downloader for Atheros AR3011 based USB Bluetooth devices
*/
@@ -78,7 +82,7 @@
addr = 0;
firmware = ATH3KFW_FW;
- while ((n = getopt(argc, argv, "d:f:h")) != -1) {
+ while ((n = getopt(argc, argv, "d:f:hp:v:")) != -1) {
switch (n) {
case 'd': /* ugen device name */
if (parse_ugen_name(optarg, &bus, &addr) < 0)
@@ -88,7 +92,12 @@
case 'f': /* firmware file */
firmware = optarg;
break;
-
+ case 'p': /* product id */
+ product_id = strtol(optarg, NULL, 0);
+ break;
+ case 'v': /* vendor id */
+ vendor_id = strtol(optarg, NULL, 0);
+ break;
case 'h':
default:
usage();
@@ -166,8 +175,8 @@
if (desc == NULL)
continue;
- if (desc->idVendor != ATH3KFW_VENDOR_ID ||
- desc->idProduct != ATH3KFW_PRODUCT_ID)
+ if (desc->idVendor != vendor_id ||
+ desc->idProduct != product_id)
continue;
break;
@@ -280,6 +289,8 @@
"Where:\n" \
"\t-d ugenX.Y ugen device name\n" \
"\t-f firmware image firmware image file name for download\n" \
+"\t-v vendor_id vendor id\n" \
+"\t-p vendor_id product id\n" \
"\t-h display this message\n", ATH3KFW, ATH3KFW);
exit(255);
Modified: trunk/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt
===================================================================
--- trunk/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt 2018-07-04 13:28:17 UTC (rev 11284)
+++ trunk/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt 2018-07-04 13:29:47 UTC (rev 11285)
@@ -1,4 +1,5 @@
$MidnightBSD$
+$FreeBSD: stable/10/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt 114881 2003-05-10 22:03:45Z julian $
BCM firmware version 2.15
Copyright (c) 2000-2002 Broadcom Corporation
Property changes on: trunk/usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/bluetooth/bcmfw/Makefile
===================================================================
--- trunk/usr.sbin/bluetooth/bcmfw/Makefile 2018-07-04 13:28:17 UTC (rev 11284)
+++ trunk/usr.sbin/bluetooth/bcmfw/Makefile 2018-07-04 13:29:47 UTC (rev 11285)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.2 2013-01-01 17:41:47 laffer1 Exp $
# $MidnightBSD$
+# $Id: Makefile,v 1.6 2003/08/14 20:05:58 max Exp $
+# $FreeBSD: stable/10/usr.sbin/bluetooth/bcmfw/Makefile 140941 2005-01-28 16:08:11Z ru $
PROG= bcmfw
MAN= bcmfw.8
Modified: trunk/usr.sbin/bluetooth/bcmfw/README
===================================================================
--- trunk/usr.sbin/bluetooth/bcmfw/README 2018-07-04 13:28:17 UTC (rev 11284)
+++ trunk/usr.sbin/bluetooth/bcmfw/README 2018-07-04 13:29:47 UTC (rev 11285)
@@ -1,4 +1,5 @@
$MidnightBSD$
+$FreeBSD: stable/10/usr.sbin/bluetooth/bcmfw/README 114900 2003-05-11 02:19:10Z julian $
This directory will eventually also contain copies of the broadcom firmware.
Property changes on: trunk/usr.sbin/bluetooth/bcmfw/README
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/bluetooth/bcmfw/bcmfw.8
===================================================================
--- trunk/usr.sbin/bluetooth/bcmfw/bcmfw.8 2018-07-04 13:28:17 UTC (rev 11284)
+++ trunk/usr.sbin/bluetooth/bcmfw/bcmfw.8 2018-07-04 13:29:47 UTC (rev 11285)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2003 Maksim Yevmenkin <m_evmenkin at yahoo.com>
.\" All rights reserved.
.\"
@@ -22,8 +23,8 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Id: bcmfw.8,v 1.2 2013-01-01 17:41:47 laffer1 Exp $
-.\" $MidnightBSD$
+.\" $Id: bcmfw.8,v 1.7 2003/05/21 00:33:40 max Exp $
+.\" $FreeBSD: stable/10/usr.sbin/bluetooth/bcmfw/bcmfw.8 140442 2005-01-18 20:02:45Z ru $
.\"
.Dd March 31, 2003
.Dt BCMFW 8
Property changes on: trunk/usr.sbin/bluetooth/bcmfw/bcmfw.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/bluetooth/bcmfw/bcmfw.c
===================================================================
--- trunk/usr.sbin/bluetooth/bcmfw/bcmfw.c 2018-07-04 13:28:17 UTC (rev 11284)
+++ trunk/usr.sbin/bluetooth/bcmfw/bcmfw.c 2018-07-04 13:29:47 UTC (rev 11285)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* bcmfw.c
*
@@ -25,8 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: bcmfw.c,v 1.2 2013-01-01 17:41:47 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: bcmfw.c,v 1.4 2003/04/27 19:28:09 max Exp $
+ * $FreeBSD: stable/10/usr.sbin/bluetooth/bcmfw/bcmfw.c 188945 2009-02-23 18:36:54Z thompsa $
*
* Based on Linux BlueZ BlueFW-0.9 package
*
Modified: trunk/usr.sbin/bluetooth/bt3cfw/Makefile
===================================================================
--- trunk/usr.sbin/bluetooth/bt3cfw/Makefile 2018-07-04 13:28:17 UTC (rev 11284)
+++ trunk/usr.sbin/bluetooth/bt3cfw/Makefile 2018-07-04 13:29:47 UTC (rev 11285)
@@ -1,5 +1,6 @@
-# $Id: Makefile,v 1.2 2013-01-01 17:42:43 laffer1 Exp $
# $MidnightBSD$
+# $Id: Makefile,v 1.5 2003/08/14 20:06:00 max Exp $
+# $FreeBSD: stable/10/usr.sbin/bluetooth/bt3cfw/Makefile 140941 2005-01-28 16:08:11Z ru $
PROG= bt3cfw
MAN= bt3cfw.8
Modified: trunk/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
===================================================================
--- trunk/usr.sbin/bluetooth/bt3cfw/bt3cfw.8 2018-07-04 13:28:17 UTC (rev 11284)
+++ trunk/usr.sbin/bluetooth/bt3cfw/bt3cfw.8 2018-07-04 13:29:47 UTC (rev 11285)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin at yahoo.com>
.\" All rights reserved.
.\"
@@ -22,8 +23,8 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Id: bt3cfw.8,v 1.2 2013-01-01 17:42:43 laffer1 Exp $
-.\" $MidnightBSD$
+.\" $Id: bt3cfw.8,v 1.4 2003/05/21 00:34:51 max Exp $
+.\" $FreeBSD: stable/10/usr.sbin/bluetooth/bt3cfw/bt3cfw.8 140442 2005-01-18 20:02:45Z ru $
.\"
.Dd November 11, 2002
.Dt BT3CFW 8
Property changes on: trunk/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
===================================================================
--- trunk/usr.sbin/bluetooth/bt3cfw/bt3cfw.c 2018-07-04 13:28:17 UTC (rev 11284)
+++ trunk/usr.sbin/bluetooth/bt3cfw/bt3cfw.c 2018-07-04 13:29:47 UTC (rev 11285)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* bt3cfw.c
*
@@ -25,8 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: bt3cfw.c,v 1.2 2013-01-01 17:42:43 laffer1 Exp $
- * $MidnightBSD$
+ * $Id: bt3cfw.c,v 1.2 2003/05/21 22:40:29 max Exp $
+ * $FreeBSD: stable/10/usr.sbin/bluetooth/bt3cfw/bt3cfw.c 227876 2011-11-23 10:27:18Z kevlo $
*/
#include <sys/types.h>
@@ -221,6 +222,7 @@
free(firmware);
firmware = NULL;
+ fclose(firmware_file);
return (0);
}
More information about the Midnightbsd-cvs
mailing list