From owner-svn-src-user@FreeBSD.ORG Fri Aug 3 04:54:37 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9816F106564A; Fri, 3 Aug 2012 04:54:37 +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 6A8668FC08; Fri, 3 Aug 2012 04:54:37 +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 q734sbGW072707; Fri, 3 Aug 2012 04:54:37 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q734sb4K072704; Fri, 3 Aug 2012 04:54:37 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201208030454.q734sb4K072704@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Fri, 3 Aug 2012 04:54:37 +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: r239000 - user/ae/bootcode/sys/boot/common X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Aug 2012 04:54:37 -0000 Author: ae Date: Fri Aug 3 04:54:36 2012 New Revision: 239000 URL: http://svn.freebsd.org/changeset/base/239000 Log: Add nandfs partition type. Modified: user/ae/bootcode/sys/boot/common/part.c user/ae/bootcode/sys/boot/common/part.h Modified: user/ae/bootcode/sys/boot/common/part.c ============================================================================== --- user/ae/bootcode/sys/boot/common/part.c Fri Aug 3 03:30:49 2012 (r238999) +++ user/ae/bootcode/sys/boot/common/part.c Fri Aug 3 04:54:36 2012 (r239000) @@ -54,6 +54,7 @@ static const uuid_t gpt_uuid_ms_basic_da static const uuid_t gpt_uuid_freebsd_ufs = GPT_ENT_TYPE_FREEBSD_UFS; static const uuid_t gpt_uuid_efi = GPT_ENT_TYPE_EFI; static const uuid_t gpt_uuid_freebsd_boot = GPT_ENT_TYPE_FREEBSD_BOOT; +static const uuid_t gpt_uuid_freebsd_nandfs = GPT_ENT_TYPE_FREEBSD_NANDFS; static const uuid_t gpt_uuid_freebsd_swap = GPT_ENT_TYPE_FREEBSD_SWAP; static const uuid_t gpt_uuid_freebsd_zfs = GPT_ENT_TYPE_FREEBSD_ZFS; static const uuid_t gpt_uuid_freebsd_vinum = GPT_ENT_TYPE_FREEBSD_VINUM; @@ -87,6 +88,7 @@ static struct parttypes { { PART_EFI, "EFI" }, { PART_FREEBSD, "FreeBSD" }, { PART_FREEBSD_BOOT, "FreeBSD boot" }, + { PART_FREEBSD_NANDFS, "FreeBSD nandfs" }, { PART_FREEBSD_UFS, "FreeBSD UFS" }, { PART_FREEBSD_ZFS, "FreeBSD ZFS" }, { PART_FREEBSD_SWAP, "FreeBSD swap" }, @@ -135,6 +137,8 @@ gpt_parttype(uuid_t type) return (PART_FREEBSD_SWAP); else if (uuid_equal(&type, &gpt_uuid_freebsd_vinum, NULL)) return (PART_FREEBSD_VINUM); + else if (uuid_equal(&type, &gpt_uuid_freebsd_nandfs, NULL)) + return (PART_FREEBSD_NANDFS); return (PART_UNKNOWN); } @@ -407,6 +411,8 @@ bsd_parttype(uint8_t type) { switch (type) { + case FS_NANDFS: + return (PART_FREEBSD_NANDFS); case FS_SWAP: return (PART_FREEBSD_SWAP); case FS_BSDFFS: @@ -486,6 +492,8 @@ vtoc8_parttype(uint16_t type) { switch (type) { + case VTOC_TAG_FREEBSD_NANDFS: + return (PART_FREEBSD_NANDFS); case VTOC_TAG_FREEBSD_SWAP: return (PART_FREEBSD_SWAP); case VTOC_TAG_FREEBSD_UFS: Modified: user/ae/bootcode/sys/boot/common/part.h ============================================================================== --- user/ae/bootcode/sys/boot/common/part.h Fri Aug 3 03:30:49 2012 (r238999) +++ user/ae/bootcode/sys/boot/common/part.h Fri Aug 3 04:54:36 2012 (r239000) @@ -44,6 +44,7 @@ enum partition_type { PART_EFI, PART_FREEBSD, PART_FREEBSD_BOOT, + PART_FREEBSD_NANDFS, PART_FREEBSD_UFS, PART_FREEBSD_ZFS, PART_FREEBSD_SWAP,