diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-10-27 11:45:49 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2000-10-27 11:45:49 +0000 |
| commit | 46aa3347cb72a78253d66cee79e17413af61804c (patch) | |
| tree | 5a6a7cebc3f9800c1819d1438e9a53e273da5747 /sys/dev/mly/mly.c | |
| parent | 303fd73aa775b9289ced7cc21fa3ad62d283450e (diff) | |
Notes
Diffstat (limited to 'sys/dev/mly/mly.c')
| -rw-r--r-- | sys/dev/mly/mly.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c index 15073f4e4a9f..91cec9c8a1ef 100644 --- a/sys/dev/mly/mly.c +++ b/sys/dev/mly/mly.c @@ -42,9 +42,6 @@ #include <cam/scsi/scsi_all.h> -/* XXX: This is not where we should get fldoff() from. */ -#include <struct.h> - #include <dev/mly/mlyreg.h> #include <dev/mly/mlyvar.h> #define MLY_DEFINE_TABLES @@ -442,9 +439,9 @@ mly_enable_mmbox(struct mly_softc *sc) bzero(&mci, sizeof(mci)); mci.sub_ioctl = MDACIOCTL_SETMEMORYMAILBOX; /* set buffer addresses */ - mci.param.setmemorymailbox.command_mailbox_physaddr = sc->mly_mmbox_busaddr + fldoff(mly_mmbox, mmm_command); - mci.param.setmemorymailbox.status_mailbox_physaddr = sc->mly_mmbox_busaddr + fldoff(mly_mmbox, mmm_status); - mci.param.setmemorymailbox.health_buffer_physaddr = sc->mly_mmbox_busaddr + fldoff(mly_mmbox, mmm_health); + mci.param.setmemorymailbox.command_mailbox_physaddr = sc->mly_mmbox_busaddr + offsetof(struct mly_mmbox, mmm_command); + mci.param.setmemorymailbox.status_mailbox_physaddr = sc->mly_mmbox_busaddr + offsetof(struct mly_mmbox, mmm_status); + mci.param.setmemorymailbox.health_buffer_physaddr = sc->mly_mmbox_busaddr + offsetof(struct mly_mmbox, mmm_health); /* set buffer sizes - abuse of data_size field is revolting */ sp = (u_int8_t *)&mci.data_size; |