From owner-svn-src-all@FreeBSD.ORG  Thu Apr 14 07:14:22 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 69179106566C;
	Thu, 14 Apr 2011 07:14:22 +0000 (UTC) (envelope-from ru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 598928FC1A;
	Thu, 14 Apr 2011 07:14:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3E7EM7q024430;
	Thu, 14 Apr 2011 07:14:22 GMT (envelope-from ru@svn.freebsd.org)
Received: (from ru@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3E7EM31024428;
	Thu, 14 Apr 2011 07:14:22 GMT (envelope-from ru@svn.freebsd.org)
Message-Id: <201104140714.p3E7EM31024428@svn.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Thu, 14 Apr 2011 07:14:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220614 - head/sys/dev/ipmi
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Apr 2011 07:14:22 -0000

Author: ru
Date: Thu Apr 14 07:14:22 2011
New Revision: 220614
URL: http://svn.freebsd.org/changeset/base/220614

Log:
  Fixed firmware revision decoding:
  - the major is 7-bit binary encoded
  - the minor is BCD encoded
  
  PR:		kern/151586
  MFC after:	3 days

Modified:
  head/sys/dev/ipmi/ipmi.c

Modified: head/sys/dev/ipmi/ipmi.c
==============================================================================
--- head/sys/dev/ipmi/ipmi.c	Thu Apr 14 00:07:08 2011	(r220613)
+++ head/sys/dev/ipmi/ipmi.c	Thu Apr 14 07:14:22 2011	(r220614)
@@ -713,10 +713,10 @@ ipmi_startup(void *arg)
 		return;
 	}
 
-	device_printf(dev, "IPMI device rev. %d, firmware rev. %d.%d, "
+	device_printf(dev, "IPMI device rev. %d, firmware rev. %d.%d%d, "
 	    "version %d.%d\n",
 	     req->ir_reply[1] & 0x0f,
-	     req->ir_reply[2] & 0x0f, req->ir_reply[4],
+	     req->ir_reply[2] & 0x7f, req->ir_reply[3] >> 4, req->ir_reply[3] & 0x0f,
 	     req->ir_reply[4] & 0x0f, req->ir_reply[4] >> 4);
 
 	ipmi_free_request(req);