Author: scottl
Date: Tue Oct 13 14:10:49 2020
New Revision: 366668
URL: https://svnweb.freebsd.org/changeset/base/366668
Log:
Bring the request_descriptor union into harmony internally. No
functional change.
Modified:
head/sys/dev/mpr/mpr.c
head/sys/dev/mps/mps.c
Modified: head/sys/dev/mpr/mpr.c
==============================================================================
--- head/sys/dev/mpr/mpr.c Tue Oct 13 11:04:00 2020 (r366667)
+++ head/sys/dev/mpr/mpr.c Tue Oct 13 14:10:49 2020 (r366668)
@@ -129,13 +129,13 @@ static char mpt2_reset_magic[] = { 0x00, 0x0f, 0x04, 0
* Otherwise it will throw this error:
* "aggregate value used where an integer was expected"
*/
-typedef union _reply_descriptor {
+typedef union {
u64 word;
struct {
u32 low;
u32 high;
} u;
-} reply_descriptor, request_descriptor;
+} request_descriptor_t;
/* Rate limit chain-fail messages to 1 per minute */
static struct timeval mpr_chainfail_interval = { 60, 0 };
@@ -1121,7 +1121,7 @@ mpr_request_sync(struct mpr_softc *sc, void *req, MPI2
static void
mpr_enqueue_request(struct mpr_softc *sc, struct mpr_command *cm)
{
- request_descriptor rd;
+ request_descriptor_t rd;
MPR_FUNCTRACE(sc);
mpr_dprint(sc, MPR_TRACE, "SMID %u cm %p ccb %p\n",
Modified: head/sys/dev/mps/mps.c
==============================================================================
--- head/sys/dev/mps/mps.c Tue Oct 13 11:04:00 2020 (r366667)
+++ head/sys/dev/mps/mps.c Tue Oct 13 14:10:49 2020 (r366668)
@@ -128,13 +128,13 @@ static char mpt2_reset_magic[] = { 0x00, 0x0f, 0x04, 0
* "aggregate value used where an integer was expected"
*/
-typedef union _reply_descriptor {
+typedef union {
u64 word;
struct {
u32 low;
u32 high;
} u;
-}reply_descriptor,address_descriptor;
+} request_descriptor_t;
/* Rate limit chain-fail messages to 1 per minute */
static struct timeval mps_chainfail_interval = { 60, 0 };
@@ -1098,7 +1098,7 @@ mps_request_sync(struct mps_softc *sc, void *req, MPI2
static void
mps_enqueue_request(struct mps_softc *sc, struct mps_command *cm)
{
- reply_descriptor rd;
+ request_descriptor_t rd;
MPS_FUNCTRACE(sc);
mps_dprint(sc, MPS_TRACE, "SMID %u cm %p ccb %p\n",
cm->cm_desc.Default.SMID, cm, cm->cm_ccb);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
