diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2017-02-07 07:07:30 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2017-02-07 07:07:30 +0000 |
| commit | 7aee40bf59be3f75b6d2e8b9127dfadbe12c2ef7 (patch) | |
| tree | 7f8d3b007ad41a0b05ec6bd2bf4b221473a84a8b /sys/dev/ic | |
| parent | 9aac9f2caee698396395a53e238bca2705c4b528 (diff) | |
pull struct mfi_evtarg_pd_state out of struct mfi_evt_detail.
this lets me pass the specific argument to an aen handler in mfii.
it also unbreaks the tree.
found by jmatthew@
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/mfireg.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/ic/mfireg.h b/sys/dev/ic/mfireg.h index 18c7f2a3feb..ed93402b98f 100644 --- a/sys/dev/ic/mfireg.h +++ b/sys/dev/ic/mfireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mfireg.h,v 1.47 2017/01/23 01:20:08 dlg Exp $ */ +/* $OpenBSD: mfireg.h,v 1.48 2017/02/07 07:07:29 dlg Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -489,6 +489,12 @@ struct mfi_evtarg_pd { uint8_t mep_slot_number; } __packed; +struct mfi_evtarg_pd_state { + struct mfi_evtarg_pd pd; + uint32_t prev_state; + uint32_t new_state; +} __packed; + struct mfi_evtarg_pd_address { uint16_t device_id; uint16_t encl_id; @@ -596,11 +602,7 @@ struct mfi_evt_detail { struct mfi_progress prog; } __packed pd_prog; - struct { - struct mfi_evtarg_pd pd; - uint32_t prev_state; - uint32_t new_state; - } __packed pd_state; + struct mfi_evtarg_pd_state pd_state; struct { uint16_t vendor_id; |