31c31
< __FBSDID("$FreeBSD: stable/10/sys/dev/isp/isp_freebsd.c 290779 2015-11-13 19:32:17Z mav $");
---
> __FBSDID("$FreeBSD: stable/10/sys/dev/isp/isp_freebsd.c 290785 2015-11-13 19:42:55Z mav $");
4523,4524c4523
< uint32_t isr;
< uint16_t sema, mbox;
---
> uint16_t isr, sema, info;
4526,4528c4525,4526
< if (ISP_READ_ISR(isp, &isr, &sema, &mbox)) {
< isp_intr(isp, isr, sema, mbox);
< }
---
> if (ISP_READ_ISR(isp, &isr, &sema, &info))
> isp_intr(isp, isr, sema, info);
4547,4551c4545,4547
< uint32_t isr;
< uint16_t sema, mbox;
< if (ISP_READ_ISR(isp, &isr, &sema, &mbox) != 0) {
< isp_intr(isp, isr, sema, mbox);
< }
---
> uint16_t isr, sema, info;
> if (ISP_READ_ISR(isp, &isr, &sema, &info) != 0)
> isp_intr(isp, isr, sema, info);
6280,6281c6276
< uint32_t isr;
< uint16_t sema, mbox;
---
> uint16_t isr, sema, info;
6285,6286c6280,6281
< if (ISP_READ_ISR(isp, &isr, &sema, &mbox)) {
< isp_intr(isp, isr, sema, mbox);
---
> if (ISP_READ_ISR(isp, &isr, &sema, &info)) {
> isp_intr(isp, isr, sema, info);
6354,6355c6349
< uint32_t isr;
< uint16_t sema, mbox;
---
> uint16_t isr, sema, info;
6359c6353,6355
< if (ISP_READ_ISR(isp, &isr, &sema, &mbox) == 0) {
---
> if (ISP_READ_ISR(isp, &isr, &sema, &info))
> isp_intr(isp, isr, sema, info);
> else
6361,6363d6356
< } else {
< isp_intr(isp, isr, sema, mbox);
< }