From owner-svn-src-head@FreeBSD.ORG Fri Apr 5 23:42:22 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B3395FAA; Fri, 5 Apr 2013 23:42:22 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8CFDE2A5; Fri, 5 Apr 2013 23:42:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r35NgMth055150; Fri, 5 Apr 2013 23:42:22 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r35NgMq9055149; Fri, 5 Apr 2013 23:42:22 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201304052342.r35NgMq9055149@svn.freebsd.org> From: Adrian Chadd Date: Fri, 5 Apr 2013 23:42:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r249179 - head/usr.sbin/bluetooth/ath3kfw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Apr 2013 23:42:22 -0000 Author: adrian Date: Fri Apr 5 23:42:22 2013 New Revision: 249179 URL: http://svnweb.freebsd.org/changeset/base/249179 Log: Extend ath3kfw to include overridable device / vendor IDs. This is required for ar3k series bluetooth devices who need firmware but have a different vendor ID than normal. Reviewed by: maksim Modified: head/usr.sbin/bluetooth/ath3kfw/ath3kfw.c Modified: head/usr.sbin/bluetooth/ath3kfw/ath3kfw.c ============================================================================== --- head/usr.sbin/bluetooth/ath3kfw/ath3kfw.c Fri Apr 5 23:41:38 2013 (r249178) +++ head/usr.sbin/bluetooth/ath3kfw/ath3kfw.c Fri Apr 5 23:42:22 2013 (r249179) @@ -59,6 +59,9 @@ static int download_firmware (struct lib 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 +81,7 @@ main(int argc, char **argv) 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 +91,12 @@ main(int argc, char **argv) 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 +174,8 @@ find_device(struct libusb20_backend *be, 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 +288,8 @@ usage(void) "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);