From owner-svn-src-head@freebsd.org  Wed Mar 23 04:18:58 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7285B9D9CBC;
 Wed, 23 Mar 2016 04:18:58 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4360F12D2;
 Wed, 23 Mar 2016 04:18:58 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2N4IviJ094045;
 Wed, 23 Mar 2016 04:18:57 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2N4Iv5Q094043;
 Wed, 23 Mar 2016 04:18:57 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201603230418.u2N4Iv5Q094043@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 23 Mar 2016 04:18:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297205 - in head: include usr.sbin/uathload
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.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Mar 2016 04:18:58 -0000

Author: imp
Date: Wed Mar 23 04:18:57 2016
New Revision: 297205
URL: https://svnweb.freebsd.org/changeset/base/297205

Log:
  Implement suggestion by jhb@ to have _PATH_FIRMWARE instead of hard
  coding it to be "/usr/share/firmware".

Modified:
  head/include/paths.h
  head/usr.sbin/uathload/uathload.c

Modified: head/include/paths.h
==============================================================================
--- head/include/paths.h	Wed Mar 23 00:53:31 2016	(r297204)
+++ head/include/paths.h	Wed Mar 23 04:18:57 2016	(r297205)
@@ -56,6 +56,7 @@
 #define	_PATH_DRUM	"/dev/drum"
 #define	_PATH_ESDB	"/usr/share/i18n/esdb"
 #define	_PATH_ETC	"/etc"
+#define	_PATH_FIRMWARE	"/usr/share/firmware"
 #define	_PATH_FTPUSERS	"/etc/ftpusers"
 #define	_PATH_FWMEM	"/dev/fwmem"
 #define	_PATH_GBDE	"/sbin/gbde"

Modified: head/usr.sbin/uathload/uathload.c
==============================================================================
--- head/usr.sbin/uathload/uathload.c	Wed Mar 23 00:53:31 2016	(r297204)
+++ head/usr.sbin/uathload/uathload.c	Wed Mar 23 04:18:57 2016	(r297205)
@@ -143,7 +143,7 @@ main(int argc, char *argv[])
 	if (argc == 1)
 		fwname = argv[0];
 	else
-		fwname = "/usr/share/firmware/ar5523.bin";
+		fwname = _PATH_FIRMWARE "/ar5523.bin";
 	fw = open(fwname, O_RDONLY, 0);
 	if (fw < 0)
 		err(-1, "open(%s)", fwname);