mpr: fix copying of event_mask
Before the commit 6cc44223cb
the
field event_mask was fully copied to the EventMasks field.
After this commit the event_mask (uint8_t) is 4 times casted to
EventMask (uint32_t). Because of that 24 bits of each event_mask array
is lost.
This commits brings back simple copying of field, and after words
converting 32 bits field to the requested endian.
I don't think we need more sophisticated method,
as the array is of size 4 (for 32 bits version).
Reviewed by: imp
MFC after: 1 week
Sponsored by: Klara Inc.
Differential Revision: https://reviews.freebsd.org/D39562
This commit is contained in:
parent
3f686532c9
commit
ea6597c38c
@ -2764,8 +2764,9 @@ mpr_update_events(struct mpr_softc *sc, struct mpr_event_handle *handle,
|
||||
bcopy(fullmask, (uint8_t *)&evtreq->EventMasks, 16);
|
||||
}
|
||||
#else
|
||||
bcopy(sc->event_mask, (uint8_t *)&evtreq->EventMasks, sizeof(sc->event_mask));
|
||||
for (i = 0; i < MPI2_EVENT_NOTIFY_EVENTMASK_WORDS; i++)
|
||||
evtreq->EventMasks[i] = htole32(sc->event_mask[i]);
|
||||
evtreq->EventMasks[i] = htole32(evtreq->EventMasks[i]);
|
||||
#endif
|
||||
cm->cm_desc.Default.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE;
|
||||
cm->cm_data = NULL;
|
||||
@ -2819,8 +2820,9 @@ mpr_reregister_events(struct mpr_softc *sc)
|
||||
bcopy(fullmask, (uint8_t *)&evtreq->EventMasks, 16);
|
||||
}
|
||||
#else
|
||||
bcopy(sc->event_mask, (uint8_t *)&evtreq->EventMasks, sizeof(sc->event_mask));
|
||||
for (i = 0; i < MPI2_EVENT_NOTIFY_EVENTMASK_WORDS; i++)
|
||||
evtreq->EventMasks[i] = htole32(sc->event_mask[i]);
|
||||
evtreq->EventMasks[i] = htole32(evtreq->EventMasks[i]);
|
||||
#endif
|
||||
cm->cm_desc.Default.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE;
|
||||
cm->cm_data = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user