From owner-svn-src-head@freebsd.org  Thu Apr 16 03:33:47 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 62E4D2AD375;
 Thu, 16 Apr 2020 03:33:47 +0000 (UTC)
 (envelope-from scottl@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 492lF71wRmz3N46;
 Thu, 16 Apr 2020 03:33:47 +0000 (UTC)
 (envelope-from scottl@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3D2642027;
 Thu, 16 Apr 2020 03:33:47 +0000 (UTC)
 (envelope-from scottl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03G3XlSM068483;
 Thu, 16 Apr 2020 03:33:47 GMT (envelope-from scottl@FreeBSD.org)
Received: (from scottl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03G3XlTl068482;
 Thu, 16 Apr 2020 03:33:47 GMT (envelope-from scottl@FreeBSD.org)
Message-Id: <202004160333.03G3XlTl068482@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: scottl set sender to
 scottl@FreeBSD.org using -f
From: Scott Long <scottl@FreeBSD.org>
Date: Thu, 16 Apr 2020 03:33:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r360002 - head/usr.sbin/mpsutil
X-SVN-Group: head
X-SVN-Commit-Author: scottl
X-SVN-Commit-Paths: head/usr.sbin/mpsutil
X-SVN-Commit-Revision: 360002
X-SVN-Commit-Repository: base
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.29
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: Thu, 16 Apr 2020 03:33:47 -0000

Author: scottl
Date: Thu Apr 16 03:33:46 2020
New Revision: 360002
URL: https://svnweb.freebsd.org/changeset/base/360002

Log:
  Don't keep a private copy of mpr_ioctl.h and mps_ioctl.h, since they
  easily get out of sync with the real files from the driver.

Deleted:
  head/usr.sbin/mpsutil/mpr_ioctl.h
  head/usr.sbin/mpsutil/mps_ioctl.h
Modified:
  head/usr.sbin/mpsutil/mps_cmd.c

Modified: head/usr.sbin/mpsutil/mps_cmd.c
==============================================================================
--- head/usr.sbin/mpsutil/mps_cmd.c	Thu Apr 16 03:28:28 2020	(r360001)
+++ head/usr.sbin/mpsutil/mps_cmd.c	Thu Apr 16 03:33:46 2020	(r360002)
@@ -39,12 +39,6 @@ __RCSID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
-#if 0
-#include <sys/mps_ioctl.h>
-#else
-#include "mps_ioctl.h"
-#include "mpr_ioctl.h"
-#endif
 #include <sys/sysctl.h>
 #include <sys/uio.h>
 
@@ -56,6 +50,8 @@ __RCSID("$FreeBSD$");
 #include <unistd.h>
 
 #include "mpsutil.h"
+#include <dev/mps/mps_ioctl.h>
+#include <dev/mpr/mpr_ioctl.h>
 
 #ifndef USE_MPT_IOCTLS
 #define USE_MPT_IOCTLS