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.
This commit is contained in:
Scott Long 2020-04-16 03:28:28 +00:00
parent 02371ceb33
commit 8fae77f50c
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=360001
2 changed files with 4 additions and 0 deletions

View File

@ -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_ */

View File

@ -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_ */