From owner-svn-src-all@FreeBSD.ORG Thu Nov 4 20:24:18 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 395EB106566B; Thu, 4 Nov 2010 20:24:18 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54]) by mx1.freebsd.org (Postfix) with ESMTP id A64F88FC08; Thu, 4 Nov 2010 20:24:17 +0000 (UTC) Received: by gwj16 with SMTP id 16so1824297gwj.13 for ; Thu, 04 Nov 2010 13:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:content-type:content-transfer-encoding; bh=3g7QLFyMYJK0+n8VsxAckrvvGn/Gk4xo4aNTMFgmL3M=; b=xbPtcCL4iPk32MdlzODk963Yll3yQVRt0Y1L9kgizrkcq3bAE65QeqrKnrFfW+nCZ+ udHFuSx1JodzkNVHlaZBa+rKkc8GWCR7ex8VY45Z/sJnPPvn/+OQLDZDQbnQGdHeFQEn zqCV6801qSKLTHVtOS6YcIEbVgDo3taQpP7Wc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; b=kphl/cbBnDyVCqOe9eT00wxmiK6xBD4kSgD3CkkS4lm4JIr1q+xXfMErmWIUrI1ga2 lvWjPcC0xx3mDKFErFdMOVH5dbvyFH06KVTwe1cYUSHZ8YsYvyjNjMRZ4g7pS2m+wB5/ vOgrfl7A94qFFMbK9RLkfTKjFIJ/bj9kS8X7I= Received: by 10.204.68.142 with SMTP id v14mr1043503bki.106.1288902255715; Thu, 04 Nov 2010 13:24:15 -0700 (PDT) Received: from mavbook.mavhome.dp.ua (pc.mavhome.dp.ua [212.86.226.226]) by mx.google.com with ESMTPS id d12sm335120bkw.7.2010.11.04.13.24.13 (version=SSLv3 cipher=RC4-MD5); Thu, 04 Nov 2010 13:24:14 -0700 (PDT) Sender: Alexander Motin Message-ID: <4CD3166C.4030003@FreeBSD.org> Date: Thu, 04 Nov 2010 22:24:12 +0200 From: Alexander Motin User-Agent: Thunderbird 2.0.0.24 (X11/20100402) MIME-Version: 1.0 To: Bruce Cran References: <201011041524.oA4FOWd7063812@svn.freebsd.org> <4CD2F224.1040008@FreeBSD.org> <20101104202203.000043a6@unknown> In-Reply-To: <20101104202203.000043a6@unknown> X-Enigmail-Version: 0.96.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Bruce Cran Subject: Re: svn commit: r214781 - head/sbin/camcontrol X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2010 20:24:18 -0000 Bruce Cran wrote: > On Thu, 04 Nov 2010 19:49:24 +0200 > Alexander Motin wrote: > >> This will round period down. You will get 30 minutes instead of 59. In >> this case rounding up IMHO more appropriate. I agree that previous >> rounding up was over aggressive. I would prefer something like: >> sc = (t - 1) / (30 * 60) + 241; >> or at least >> sc = (t + 15 * 60) / (30 * 60) + 240; >> This will also make previous range unneeded. >> >> Range "t <= (240 * 5)" probably also should be corrected to round up >> or at least closest. >> > > Of course rounding up is more suitable. Would the following patch be > ok: > > Index: camcontrol.c > =================================================================== > --- camcontrol.c (revision 214793) > +++ camcontrol.c (working copy) > @@ -4312,18 +4312,16 @@ > cmd = ATA_SLEEP; > t = -1; > } > + > if (t < 0) > sc = 0; > else if (t <= (240 * 5)) > - sc = t / 5; > - else if (t == (252 * 5)) > + sc = (t + 4) / 5; > + else if (t <= (252 * 5)) > /* special encoding for 21 minutes */ > sc = 252; > - else if (t < (30 * 60)) > - /* no encoding exists for 22-29 minutes, so set to 30 > mins */ > - sc = 241; > else if (t <= (11 * 30 * 60)) > - sc = t / (30 * 60) + 240; > + sc = (t - 1) / (30 * 60) + 241; > else > sc = 253; It seems so. Thank you. -- Alexander Motin