31c31
< __FBSDID("$FreeBSD: stable/10/sys/dev/isp/isp_pci.c 290782 2015-11-13 19:36:43Z mav $");
---
> __FBSDID("$FreeBSD: stable/10/sys/dev/isp/isp_pci.c 290785 2015-11-13 19:42:55Z mav $");
62,64c62,64
< static int isp_pci_rd_isr(ispsoftc_t *, uint32_t *, uint16_t *, uint16_t *);
< static int isp_pci_rd_isr_2300(ispsoftc_t *, uint32_t *, uint16_t *, uint16_t *);
< static int isp_pci_rd_isr_2400(ispsoftc_t *, uint32_t *, uint16_t *, uint16_t *);
---
> static int isp_pci_rd_isr(ispsoftc_t *, uint16_t *, uint16_t *, uint16_t *);
> static int isp_pci_rd_isr_2300(ispsoftc_t *, uint16_t *, uint16_t *, uint16_t *);
> static int isp_pci_rd_isr_2400(ispsoftc_t *, uint16_t *, uint16_t *, uint16_t *);
1115c1115
< isp_pci_rd_isr(ispsoftc_t *isp, uint32_t *isrp, uint16_t *semap, uint16_t *mbp)
---
> isp_pci_rd_isr(ispsoftc_t *isp, uint16_t *isrp, uint16_t *semap, uint16_t *info)
1139c1139
< if (isp_pci_rd_debounced(isp, OUTMAILBOX0, mbp)) {
---
> if (isp_pci_rd_debounced(isp, OUTMAILBOX0, info)) {
1143c1143
< *mbp = BXR2(isp, IspVirt2Off(isp, OUTMAILBOX0));
---
> *info = BXR2(isp, IspVirt2Off(isp, OUTMAILBOX0));
1150c1150
< isp_pci_rd_isr_2300(ispsoftc_t *isp, uint32_t *isrp, uint16_t *semap, uint16_t *mbox0p)
---
> isp_pci_rd_isr_2300(ispsoftc_t *isp, uint16_t *isrp, uint16_t *semap, uint16_t *info)
1152,1153c1152
< uint32_t hccr;
< uint32_t r2hisr;
---
> uint32_t hccr, r2hisr;
1165c1164
< switch (r2hisr & BIU_R2HST_ISTAT_MASK) {
---
> switch ((*isrp = r2hisr & BIU_R2HST_ISTAT_MASK)) {
1171,1172d1169
< *isrp = r2hisr & 0xffff;
< *mbox0p = (r2hisr >> 16);
1174c1171
< return (1);
---
> break;
1176,1177c1173
< *isrp = r2hisr & 0xffff;
< *mbox0p = ASYNC_RIO16_1;
---
> *info = ASYNC_RIO16_1;
1181,1182c1177
< *isrp = r2hisr & 0xffff;
< *mbox0p = ASYNC_CMD_CMPLT;
---
> *info = ASYNC_CMD_CMPLT;
1186,1187c1181
< *isrp = r2hisr & 0xffff;
< *mbox0p = ASYNC_CTIO_DONE;
---
> *info = ASYNC_CTIO_DONE;
1191,1192d1184
< *isrp = r2hisr & 0xffff;
< *mbox0p = 0;
1194c1186
< return (1);
---
> break;
1205a1198,1199
> *info = (r2hisr >> 16);
> return (1);
1209c1203
< isp_pci_rd_isr_2400(ispsoftc_t *isp, uint32_t *isrp, uint16_t *semap, uint16_t *mbox0p)
---
> isp_pci_rd_isr_2400(ispsoftc_t *isp, uint16_t *isrp, uint16_t *semap, uint16_t *info)
1215c1209
< if ((r2hisr & BIU2400_R2HST_INTR) == 0) {
---
> if ((r2hisr & BIU_R2HST_INTR) == 0) {
1219,1226c1213,1218
< switch (r2hisr & BIU2400_R2HST_ISTAT_MASK) {
< case ISP2400R2HST_ROM_MBX_OK:
< case ISP2400R2HST_ROM_MBX_FAIL:
< case ISP2400R2HST_MBX_OK:
< case ISP2400R2HST_MBX_FAIL:
< case ISP2400R2HST_ASYNC_EVENT:
< *isrp = r2hisr & 0xffff;
< *mbox0p = (r2hisr >> 16);
---
> switch ((*isrp = r2hisr & BIU_R2HST_ISTAT_MASK)) {
> case ISPR2HST_ROM_MBX_OK:
> case ISPR2HST_ROM_MBX_FAIL:
> case ISPR2HST_MBX_OK:
> case ISPR2HST_MBX_FAIL:
> case ISPR2HST_ASYNC_EVENT:
1228,1233c1220,1225
< return (1);
< case ISP2400R2HST_RSPQ_UPDATE:
< case ISP2400R2HST_ATIO_RSPQ_UPDATE:
< case ISP2400R2HST_ATIO_RQST_UPDATE:
< *isrp = r2hisr & 0xffff;
< *mbox0p = 0;
---
> break;
> case ISPR2HST_RSPQ_UPDATE:
> case ISPR2HST_RSPQ_UPDATE2:
> case ISPR2HST_ATIO_UPDATE:
> case ISPR2HST_ATIO_RSPQ_UPDATE:
> case ISPR2HST_ATIO_UPDATE2:
1235c1227
< return (1);
---
> break;
1240a1233,1234
> *info = (r2hisr >> 16);
> return (1);