From owner-p4-projects  Sat Oct 26 17:11:10 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F32C537B404; Sat, 26 Oct 2002 17:11:07 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8B95437B401
	for <perforce@freebsd.org>; Sat, 26 Oct 2002 17:11:07 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4739843E4A
	for <perforce@freebsd.org>; Sat, 26 Oct 2002 17:11:07 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9R0AAmV049402
	for <perforce@freebsd.org>; Sat, 26 Oct 2002 17:10:10 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9R0AADa049399
	for perforce@freebsd.org; Sat, 26 Oct 2002 17:10:10 -0700 (PDT)
Date: Sat, 26 Oct 2002 17:10:10 -0700 (PDT)
Message-Id: <200210270010.g9R0AADa049399@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 20211 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=20211

Change 20211 by peter@peter_ia64 on 2002/10/26 17:09:44

	GRR.

Affected files ...

.. //depot/projects/ia64/lib/libdisk/Makefile#5 edit
.. //depot/projects/ia64/lib/libdisk/write_ia64_disk.c#3 edit

Differences ...

==== //depot/projects/ia64/lib/libdisk/Makefile#5 (text+ko) ====

@@ -12,11 +12,15 @@
 SRCS	+=	write_pc98_disk.c
 .endif
 
-.if ${MACHINE} == "i386" || ${MACHINE} == "ia64"
+.if ${MACHINE} == "i386"
 SRCS	+=	write_i386_disk.c
 .endif
 
-.if ${MACHINE} == "alpha"
+.if ${MACHINE_ARCH} == "ia64"
+SRCS	+=	write_ia64_disk.c
+.endif
+
+.if ${MACHINE_ARCH} == "alpha"
 SRCS	+=	write_alpha_disk.c
 .endif
 

==== //depot/projects/ia64/lib/libdisk/write_ia64_disk.c#3 (text+ko) ====

@@ -67,21 +67,21 @@
     bp[3] = (v >> 24) & 0xff;
 }
 
+#if !defined(__ia64__)
 /*
  * Special install-time configuration for the i386 boot0 boot manager.
  */
 static void
 Cfg_Boot_Mgr(u_char *mbr, int edd)
 {
-#if !defined(__ia64__)
     if (mbr[0x1b0] == 0x66 && mbr[0x1b1] == 0xbb) {
 	if (edd)
 	    mbr[0x1bb] |= 0x80;	/* Packet mode on */
 	else
 	    mbr[0x1bb] &= 0x7f;	/* Packet mode off */
     }
+}
 #endif
-}
 
 int
 Write_Disk(const struct disk *d1)

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message