]> xenbits.xensource.com Git - people/liuw/freebsd.git/commitdiff
Add new field to Abort IOCB.
authormav <mav@FreeBSD.org>
Sat, 24 Oct 2015 19:38:06 +0000 (19:38 +0000)
committermav <mav@FreeBSD.org>
Sat, 24 Oct 2015 19:38:06 +0000 (19:38 +0000)
sys/dev/isp/isp_library.c
sys/dev/isp/ispmbox.h

index 602a1ad6d991e1c7d9b7328079f7f4d643b60968..35d2c976b6d52154757bb7f85a5e33806cfa93df 100644 (file)
@@ -1071,6 +1071,7 @@ isp_put_24xx_abrt(ispsoftc_t *isp, isp24xx_abrt_t *src, isp24xx_abrt_t *dst)
        ISP_IOXPUT_16(isp, src->abrt_nphdl, &dst->abrt_nphdl);
        ISP_IOXPUT_16(isp, src->abrt_options, &dst->abrt_options);
        ISP_IOXPUT_32(isp, src->abrt_cmd_handle, &dst->abrt_cmd_handle);
+       ISP_IOXPUT_16(isp, src->abrt_queue_number, &dst->abrt_queue_number);
        for (i = 0; i < ASIZE(src->abrt_reserved); i++) {
                ISP_IOXPUT_8(isp, src->abrt_reserved[i], &dst->abrt_reserved[i]);
        }
@@ -1179,6 +1180,7 @@ isp_get_24xx_abrt(ispsoftc_t *isp, isp24xx_abrt_t *src, isp24xx_abrt_t *dst)
        ISP_IOXGET_16(isp, &src->abrt_nphdl, dst->abrt_nphdl);
        ISP_IOXGET_16(isp, &src->abrt_options, dst->abrt_options);
        ISP_IOXGET_32(isp, &src->abrt_cmd_handle, dst->abrt_cmd_handle);
+       ISP_IOXGET_16(isp, &src->abrt_queue_number, dst->abrt_queue_number);
        for (i = 0; i < ASIZE(src->abrt_reserved); i++) {
                ISP_IOXGET_8(isp, &src->abrt_reserved[i], dst->abrt_reserved[i]);
        }
index 27b65c7e5e97ae300a2b7041eb0921c108fd79e7..d89f330dc118f5d253b79fe5d83accc60d3a531b 100644 (file)
@@ -574,7 +574,8 @@ typedef struct {
        uint16_t        abrt_nphdl;
        uint16_t        abrt_options;
        uint32_t        abrt_cmd_handle;
-       uint8_t         abrt_reserved[32];
+       uint16_t        abrt_queue_number;
+       uint8_t         abrt_reserved[30];
        uint16_t        abrt_tidlo;
        uint8_t         abrt_tidhi;
        uint8_t         abrt_vpidx;