Author: scottl
Date: Thu Apr 16 03:28:28 2020
New Revision: 360001
URL: https://svnweb.freebsd.org/changeset/base/360001
Log:
Add a small hack to the ioctl header files so that both mpr and mps can
be included. This isn't a great solution, but fixing it correctly is a
bigger task and this is the lesser of the existing evils.
Modified:
head/sys/dev/mpr/mpr_ioctl.h
head/sys/dev/mps/mps_ioctl.h
Modified: head/sys/dev/mpr/mpr_ioctl.h
==============================================================================
--- head/sys/dev/mpr/mpr_ioctl.h Thu Apr 16 03:23:19 2020
(r360000)
+++ head/sys/dev/mpr/mpr_ioctl.h Thu Apr 16 03:28:28 2020
(r360001)
@@ -363,6 +363,7 @@ typedef struct mpr_btdh_mapping
#define MPRIO_RAID_ACTION _IOWR('M', 205, struct mpr_raid_action)
#define MPRIO_MPR_COMMAND _IOWR('M', 210, struct mpr_usr_command)
+#ifndef MPTIOCTL
#define MPTIOCTL ('I')
#define MPTIOCTL_GET_ADAPTER_DATA _IOWR(MPTIOCTL, 1,\
struct mpr_adapter_data)
@@ -385,5 +386,6 @@ typedef struct mpr_btdh_mapping
struct mpr_reg_access)
#define MPTIOCTL_BTDH_MAPPING _IOWR(MPTIOCTL, 11,\
struct mpr_btdh_mapping)
+#endif /* MPTIOCTL */
#endif /* !_MPR_IOCTL_H_ */
Modified: head/sys/dev/mps/mps_ioctl.h
==============================================================================
--- head/sys/dev/mps/mps_ioctl.h Thu Apr 16 03:23:19 2020
(r360000)
+++ head/sys/dev/mps/mps_ioctl.h Thu Apr 16 03:28:28 2020
(r360001)
@@ -364,6 +364,7 @@ typedef struct mps_btdh_mapping
#define MPSIO_RAID_ACTION _IOWR('M', 205, struct mps_raid_action)
#define MPSIO_MPS_COMMAND _IOWR('M', 210, struct mps_usr_command)
+#ifndef MPTIOCTL
#define MPTIOCTL ('I')
#define MPTIOCTL_GET_ADAPTER_DATA _IOWR(MPTIOCTL, 1,\
struct mps_adapter_data)
@@ -386,5 +387,6 @@ typedef struct mps_btdh_mapping
struct mps_reg_access)
#define MPTIOCTL_BTDH_MAPPING _IOWR(MPTIOCTL, 11,\
struct mps_btdh_mapping)
+#endif /* MPTIOCTL */
#endif /* !_MPS_IOCTL_H_ */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
