From owner-svn-src-projects@FreeBSD.ORG Sat Aug 27 13:05:39 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A3B71065674; Sat, 27 Aug 2011 13:05:39 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 217878FC17; Sat, 27 Aug 2011 13:05:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7RD5dSL004609; Sat, 27 Aug 2011 13:05:39 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7RD5djx004607; Sat, 27 Aug 2011 13:05:39 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201108271305.p7RD5djx004607@svn.freebsd.org> From: Alexander Motin Date: Sat, 27 Aug 2011 13:05:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225212 - projects/zfsd/head/sys/cam/scsi X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Aug 2011 13:05:39 -0000 Author: mav Date: Sat Aug 27 13:05:38 2011 New Revision: 225212 URL: http://svn.freebsd.org/changeset/base/225212 Log: Drop wrbuf16() function, not used any more. Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc_safte.c Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc_safte.c ============================================================================== --- projects/zfsd/head/sys/cam/scsi/scsi_enc_safte.c Sat Aug 27 12:10:12 2011 (r225211) +++ projects/zfsd/head/sys/cam/scsi/scsi_enc_safte.c Sat Aug 27 13:05:38 2011 (r225212) @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD: head/sys/cam/scsi/sc * SAF-TE Type Device Emulation */ -static int wrbuf16(enc_softc_t *, uint8_t, uint8_t, uint8_t, uint8_t, int); +static int safte_set_enc_status(enc_softc_t *enc, uint8_t encstat, int slpflag); #define ALL_ENC_STAT (SES_ENCSTAT_CRITICAL | SES_ENCSTAT_UNRECOV | \ SES_ENCSTAT_NONCRITICAL | SES_ENCSTAT_INFO) @@ -976,37 +976,6 @@ safte_process_control_request(enc_softc_ return (0); } -/* - * This function handles all of the 16 byte WRITE BUFFER commands. - */ -static int -wrbuf16(enc_softc_t *enc, uint8_t op, uint8_t b1, uint8_t b2, - uint8_t b3, int slp) -{ - int err, amt; - char *sdata; - struct scfg *cc = enc->enc_private; - static char cdb[10] = { WRITE_BUFFER, 1, 0, 0, 0, 0, 0, 0, 16, 0 }; - - if (cc == NULL) - return (0); - - sdata = ENC_MALLOCZ(16); - if (sdata == NULL) - return (ENOMEM); - - ENC_DLOG(enc, "saf_wrbuf16 %x %x %x %x\n", op, b1, b2, b3); - - sdata[0] = op; - sdata[1] = b1; - sdata[2] = b2; - sdata[3] = b3; - amt = -16; - err = enc_runcmd(enc, cdb, 10, sdata, &amt); - ENC_FREE(sdata); - return (err); -} - static void safte_softc_cleanup(struct cam_periph *periph) { @@ -1021,15 +990,22 @@ safte_softc_cleanup(struct cam_periph *p static int safte_init_enc(enc_softc_t *enc) { + struct scfg *cfg; int err; static char cdb0[6] = { SEND_DIAGNOSTIC }; + cfg = enc->enc_private; + if (cfg == NULL) + return (ENXIO); + err = enc_runcmd(enc, cdb0, 6, NULL, 0); if (err) { return (err); } DELAY(5000); - err = wrbuf16(enc, SAFTE_WT_GLOBAL, 0, 0, 0, 1); + cfg->flag1 = 0; + cfg->flag2 = 0; + err = safte_set_enc_status(enc, 0, 1); return (err); }