From owner-svn-src-user@FreeBSD.ORG  Mon Jun 25 08:34:15 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1147C1065676;
	Mon, 25 Jun 2012 08:34:15 +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 F0B748FC18;
	Mon, 25 Jun 2012 08:34:14 +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 q5P8YELL060776;
	Mon, 25 Jun 2012 08:34:14 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5P8YEcr060773;
	Mon, 25 Jun 2012 08:34:14 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201206250834.q5P8YEcr060773@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Mon, 25 Jun 2012 08:34:14 +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: r237558 - in user/ae/bootcode/sys/boot: common
	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: Mon, 25 Jun 2012 08:34:15 -0000

Author: ae
Date: Mon Jun 25 08:34:14 2012
New Revision: 237558
URL: http://svn.freebsd.org/changeset/base/237558

Log:
  Change the type of d_offset field to off_t.
  In preparation to moving of the MI code from biosdisk.c to disk.c,
  add CTASSERT to check that size of struct i386_devdesc is enough to
  store disk_devdesc.

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

Modified: user/ae/bootcode/sys/boot/common/disk.h
==============================================================================
--- user/ae/bootcode/sys/boot/common/disk.h	Mon Jun 25 08:15:59 2012	(r237557)
+++ user/ae/bootcode/sys/boot/common/disk.h	Mon Jun 25 08:34:14 2012	(r237558)
@@ -84,7 +84,7 @@ struct disk_devdesc
 	void		*d_opendata;
 	int		d_slice;
 	int		d_partition;
-	int		d_offset;
+	off_t		d_offset;
 };
 
 /*

Modified: user/ae/bootcode/sys/boot/i386/libi386/biosdisk.c
==============================================================================
--- user/ae/bootcode/sys/boot/i386/libi386/biosdisk.c	Mon Jun 25 08:15:59 2012	(r237557)
+++ user/ae/bootcode/sys/boot/i386/libi386/biosdisk.c	Mon Jun 25 08:34:14 2012	(r237558)
@@ -47,8 +47,11 @@ __FBSDID("$FreeBSD$");
 #include <bootstrap.h>
 #include <btxv86.h>
 #include <edd.h>
+#include "disk.h"
 #include "libi386.h"
 
+CTASSERT(sizeof(struct i386_devdesc) >= sizeof(struct disk_devdesc));
+
 #define BIOS_NUMDRIVES		0x475
 #define BIOSDISK_SECSIZE	512
 #define BUFSIZE			(1 * BIOSDISK_SECSIZE)