From 3d28434e81a65da6d1062ac16a63482c3cf4045f Mon Sep 17 00:00:00 2001 From: Dotan Barak Date: Sun, 10 May 2009 17:20:50 +0000 Subject: [PATCH] Worth pulling back into branch- 64 bit Type 3 request usage was massively broken. git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/1.0.1.x@832 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla_isp/common/isp_library.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/qla_isp/common/isp_library.c b/qla_isp/common/isp_library.c index 8a841cac2..f97036a51 100644 --- a/qla_isp/common/isp_library.c +++ b/qla_isp/common/isp_library.c @@ -140,7 +140,7 @@ isp_send_cmd(ispsoftc_t *isp, void *fqe, void *segp, uint32_t nsegs, uint32_t to seglim = ISP_RQDSEG_T3; break; case RQSTYPE_T3RQS: - ddf = (ddir == ISP_TO_DEVICE)? CT2_DATA_OUT : CT2_DATA_IN; + ddf = (ddir == ISP_TO_DEVICE)? REQFLAG_DATA_OUT : REQFLAG_DATA_IN; dsp64 = ((ispreqt3_t *)fqe)->req_dataseg; seglim = ISP_RQDSEG_T3; break; @@ -240,7 +240,7 @@ copy_and_sync: ((ispreqt2_t *)fqe)->req_flags |= ddf; ((ispreqt2_t *)fqe)->req_seg_count = nsegs; ((ispreqt2_t *)fqe)->req_totalcnt = totalcnt; - if (ISP_CAP_SCCFW(isp)) { + if (ISP_CAP_2KLOGIN(isp)) { isp_put_request_t2e(isp, fqe, qe0); } else { isp_put_request_t2(isp, fqe, qe0); @@ -251,7 +251,7 @@ copy_and_sync: ((ispreqt3_t *)fqe)->req_flags |= ddf; ((ispreqt3_t *)fqe)->req_seg_count = nsegs; ((ispreqt3_t *)fqe)->req_totalcnt = totalcnt; - if (ISP_CAP_SCCFW(isp)) { + if (ISP_CAP_2KLOGIN(isp)) { isp_put_request_t3e(isp, fqe, qe0); } else { isp_put_request_t3(isp, fqe, qe0); @@ -387,8 +387,9 @@ isp_print_bytes(ispsoftc_t *isp, const char *msg, int amt, void *arg) to = off; for (j = 0; j < 16; j++) { ISP_SNPRINTF(buf, 128, "%s %02x", buf, ptr[off++] & 0xff); - if (off == amt) + if (off == amt) { break; + } } isp_prt(isp, ISP_LOGALL, "0x%08x:%s", to, buf); buf[0] = 0;