From owner-svn-src-user@FreeBSD.ORG  Tue Mar 25 03:58:14 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2DE0DCFA;
 Tue, 25 Mar 2014 03:58:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1BBBA113;
 Tue, 25 Mar 2014 03:58:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2P3wDkk066514;
 Tue, 25 Mar 2014 03:58:13 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2P3wDHm066513;
 Tue, 25 Mar 2014 03:58:13 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201403250358.s2P3wDHm066513@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 25 Mar 2014 03:58:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r263706 - user/marcel/mkimg
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Tue, 25 Mar 2014 03:58:14 -0000

Author: marcel
Date: Tue Mar 25 03:58:13 2014
New Revision: 263706
URL: http://svnweb.freebsd.org/changeset/base/263706

Log:
  Move setting CHS fields to mbr_chs() in preparation of ...

Modified:
  user/marcel/mkimg/mbr.c

Modified: user/marcel/mkimg/mbr.c
==============================================================================
--- user/marcel/mkimg/mbr.c	Tue Mar 25 03:30:44 2014	(r263705)
+++ user/marcel/mkimg/mbr.c	Tue Mar 25 03:58:13 2014	(r263706)
@@ -54,6 +54,15 @@ mbr_metadata(u_int where)
 	return (secs);
 }
 
+static void
+mbr_chs(u_char *cyl, u_char *hd, u_char *sec, uint32_t lba __unused)
+{
+
+	*cyl = 0xff;		/* XXX */
+	*hd = 0xff;		/* XXX */
+	*sec = 0xff;		/* XXX */
+}
+
 static int
 mbr_write(int fd, lba_t imgsz __unused, void *bootcode)
 {
@@ -75,9 +84,11 @@ mbr_write(int fd, lba_t imgsz __unused, 
 	STAILQ_FOREACH(part, &partlist, link) {
 		dp = dpbase + part->index;
 		dp->dp_flag = (part->index == 0 && bootcode != NULL) ? 0x80 : 0;
-		dp->dp_shd = dp->dp_ssect = dp->dp_scyl = 0xff;	/* XXX */
+		mbr_chs(&dp->dp_scyl, &dp->dp_shd, &dp->dp_ssect,
+		    part->block);
 		dp->dp_typ = ALIAS_TYPE2INT(part->type);
-		dp->dp_ehd = dp->dp_esect = dp->dp_ecyl = 0xff;	/* XXX */
+		mbr_chs(&dp->dp_ecyl, &dp->dp_ehd, &dp->dp_esect,
+		    part->block + part->size - 1);
 		le32enc(&dp[part->index].dp_start, part->block);
 		le32enc(&dp[part->index].dp_size, part->size);
 	}