From owner-p4-projects@FreeBSD.ORG Mon Apr 28 18:33:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B32AB37B404; Mon, 28 Apr 2003 18:33:14 -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 2F9C637B401 for ; Mon, 28 Apr 2003 18:33:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB61B43FAF for ; Mon, 28 Apr 2003 18:33:13 -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 h3T1XD0U088197 for ; Mon, 28 Apr 2003 18:33:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T1XDva088187 for perforce@freebsd.org; Mon, 28 Apr 2003 18:33:13 -0700 (PDT) Date: Mon, 28 Apr 2003 18:33:13 -0700 (PDT) Message-Id: <200304290133.h3T1XDva088187@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30020 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Apr 2003 01:33:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=30020 Change 30020 by peter@peter_daintree on 2003/04/28 18:32:56 Maybe port libdisk to amd64. Duplicate all the i386 cases and code. Affected files ... .. //depot/projects/hammer/lib/libdisk/chunk.c#6 edit .. //depot/projects/hammer/lib/libdisk/create_chunk.c#10 edit .. //depot/projects/hammer/lib/libdisk/disk.c#10 edit .. //depot/projects/hammer/lib/libdisk/libdisk.h#6 edit .. //depot/projects/hammer/lib/libdisk/rules.c#9 edit .. //depot/projects/hammer/lib/libdisk/write_amd64_disk.c#1 branch Differences ... ==== //depot/projects/hammer/lib/libdisk/chunk.c#6 (text+ko) ==== @@ -239,6 +239,7 @@ /* PLATFORM POLICY BEGIN ------------------------------------- */ switch(platform) { case p_i386: + case p_amd64: switch (type) { case fat: case mbr: @@ -317,7 +318,7 @@ if (platform == p_sparc64) { offset = Prev_Cyl_Aligned(d, offset); size = Next_Cyl_Aligned(d, size); - } else if (platform == p_i386 || platform == p_pc98) { + } else if (platform == p_i386 || platform == p_pc98 || platform == p_amd64) { if (type != freebsd) break; if (!(flags & CHUNK_ALIGN)) ==== //depot/projects/hammer/lib/libdisk/create_chunk.c#10 (text+ko) ==== @@ -138,7 +138,7 @@ Fixup_Names(struct disk *d) { struct chunk *c1, *c2; -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) struct chunk *c3; int j; #endif @@ -149,7 +149,7 @@ continue; if (strcmp(c2->name, "X")) continue; -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) c2->oname = malloc(12); if (!c2->oname) return -1; ==== //depot/projects/hammer/lib/libdisk/disk.c#10 (text+ko) ==== @@ -371,7 +371,7 @@ #if defined(PC98) printf(" boot1=%p, boot2=%p, bootipl=%p, bootmenu=%p\n", d->boot1, d->boot2, d->bootipl, d->bootmenu); -#elif defined(__i386__) +#elif defined(__i386__) || defined(__amd64__) printf(" boot1=%p, boot2=%p, bootmgr=%p\n", d->boot1, d->boot2, d->bootmgr); #elif defined(__alpha__) @@ -407,7 +407,7 @@ if (d->boot1) free(d->boot1); #endif -#if defined(__i386__) +#if defined(__i386__) || defined(__amd64__) if (d->boot2) free(d->boot2); #endif @@ -536,7 +536,7 @@ int Set_Boot_Blocks(struct disk *d, const u_char *b1, const u_char *b2) { -#if defined(__i386__) +#if defined(__i386__) || defined(__amd64__) if (d->boot1) free(d->boot1); d->boot1 = malloc(512); ==== //depot/projects/hammer/lib/libdisk/libdisk.h#6 (text+ko) ==== @@ -27,7 +27,8 @@ p_pc98, p_sparc64, p_ia64, - p_ppc + p_ppc, + p_amd64 } platform = #if defined (P_DEBUG) P_DEBUG @@ -43,6 +44,8 @@ p_ia64 #elif defined(__ppc__) p_ppc +#elif defined(__amd64__) + p_amd64 #else IHAVENOIDEA #endif ==== //depot/projects/hammer/lib/libdisk/rules.c#9 (text+ko) ==== @@ -242,6 +242,7 @@ switch (platform) { case p_i386: + case p_amd64: Rule_000(d, c, msg); Rule_001(d, c, msg); Rule_002(d, c, msg);