From owner-svn-src-user@FreeBSD.ORG  Thu Jun 21 04:28:58 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A255106566B;
	Thu, 21 Jun 2012 04:28:58 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 750A48FC14;
	Thu, 21 Jun 2012 04:28:58 +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 q5L4Swla088503;
	Thu, 21 Jun 2012 04:28:58 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5L4Swej088501;
	Thu, 21 Jun 2012 04:28:58 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201206210428.q5L4Swej088501@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 21 Jun 2012 04:28:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237353 - user/ae/bootcode/sys/boot/i386/libi386
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jun 2012 04:28:58 -0000

Author: ae
Date: Thu Jun 21 04:28:57 2012
New Revision: 237353
URL: http://svn.freebsd.org/changeset/base/237353

Log:
  Fix copy/paste bug. Also od_flags now in the bdinfo structure, fix this.

Modified:
  user/ae/bootcode/sys/boot/i386/libi386/biosdisk.c

Modified: user/ae/bootcode/sys/boot/i386/libi386/biosdisk.c
==============================================================================
--- user/ae/bootcode/sys/boot/i386/libi386/biosdisk.c	Thu Jun 21 04:02:07 2012	(r237352)
+++ user/ae/bootcode/sys/boot/i386/libi386/biosdisk.c	Thu Jun 21 04:28:57 2012	(r237353)
@@ -222,7 +222,7 @@ bd_int13probe(struct bdinfo *bd)
 
 	if (V86_CY(v86.efl) ||	/* carry set */
 	    (v86.ecx & 0x3f) == 0 || /* absurd sector number */
-	    (v86.edx & 0xff) <= (unsigned)(od->od_unit & 0x7f))	/* unit # bad */
+	    (v86.edx & 0xff) <= (unsigned)(bd->bd_unit & 0x7f))	/* unit # bad */
 		return (0);	/* skip device */
 
 	/* Convert max cyl # -> # of cylinders */
@@ -723,7 +723,7 @@ bd_io(struct open_disk *od, daddr_t dblk
 		v86int();
 	    }
 
-	    if (od->od_flags & BD_MODEEDD1)
+	    if (BD(od).bd_flags & BD_MODEEDD1)
 		result = bd_edd_io(od, dblk, x, xp, write);
 	    else
 		result = bd_chs_io(od, dblk, x, xp, write);