Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Oct 2002 17:10:10 -0700 (PDT)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 20211 for review
Message-ID:  <200210270010.g9R0AADa049399@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210270010.g9R0AADa049399>