From owner-svn-src-stable-8@FreeBSD.ORG  Tue Apr 19 07:44:12 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CEE93106566B;
	Tue, 19 Apr 2011 07:44:12 +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 BD0D38FC13;
	Tue, 19 Apr 2011 07:44:12 +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 p3J7iCMB098670;
	Tue, 19 Apr 2011 07:44:12 GMT (envelope-from ru@svn.freebsd.org)
Received: (from ru@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3J7iC8d098668;
	Tue, 19 Apr 2011 07:44:12 GMT (envelope-from ru@svn.freebsd.org)
Message-Id: <201104190744.p3J7iC8d098668@svn.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Tue, 19 Apr 2011 07:44:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220816 - stable/8/sys/dev/ipmi
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Apr 2011 07:44:12 -0000

Author: ru
Date: Tue Apr 19 07:44:12 2011
New Revision: 220816
URL: http://svn.freebsd.org/changeset/base/220816

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

Modified:
  stable/8/sys/dev/ipmi/ipmi.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/dev/ipmi/ipmi.c
==============================================================================
--- stable/8/sys/dev/ipmi/ipmi.c	Tue Apr 19 07:36:53 2011	(r220815)
+++ stable/8/sys/dev/ipmi/ipmi.c	Tue Apr 19 07:44:12 2011	(r220816)
@@ -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);