From d2d753669de39941b42ab13687f8ed329746f9c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 5 Jul 2007 19:41:47 +0000 Subject: [PATCH] * Renamed "EFI GUID Partition Table" to "EFI GUID Partition Map" to be consistent with the other partition types. * Added kPartitionTypeEFI to the constants. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21574 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/storage/DiskDeviceTypes.h | 18 +++++------------- .../partitioning_systems/efi/efi_gpt.cpp | 2 +- src/kits/storage/DiskDeviceTypes.cpp | 14 ++++++++++---- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/headers/private/storage/DiskDeviceTypes.h b/headers/private/storage/DiskDeviceTypes.h index fb5987627c..adb9e5f67b 100644 --- a/headers/private/storage/DiskDeviceTypes.h +++ b/headers/private/storage/DiskDeviceTypes.h @@ -1,15 +1,10 @@ -//---------------------------------------------------------------------- -// This software is part of the OpenBeOS distribution and is covered -// by the OpenBeOS license. -//--------------------------------------------------------------------- - +/* + * Copyright 2003-2007, Haiku Inc. + * Distributed under the terms of the MIT License. + */ #ifndef _DISK_DEVICE_TYPES_H #define _DISK_DEVICE_TYPES_H -#ifdef __cplusplus -extern "C" { -#endif - // Device Types extern const char *kDeviceTypeFloppyDisk; @@ -27,6 +22,7 @@ extern const char *kPartitionTypeDataSession; extern const char *kPartitionTypeAmiga; extern const char *kPartitionTypeApple; +extern const char *kPartitionTypeEFI; extern const char *kPartitionTypeIntel; extern const char *kPartitionTypeIntelPrimary; @@ -45,8 +41,4 @@ extern const char *kPartitionTypeISO9660; extern const char *kPartitionTypeReiser; extern const char *kPartitionTypeUDF; -#ifdef __cplusplus -} -#endif - #endif // _DISK_DEVICE_TYPES_H diff --git a/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp b/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp index da5f0481e6..f2a1460382 100644 --- a/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp +++ b/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp @@ -29,7 +29,7 @@ #define EFI_PARTITION_MODULE_NAME "partitioning_systems/efi_gpt/v1" -#define EFI_PARTITION_NAME "EFI GUID Partition Table" +#define EFI_PARTITION_NAME "EFI GUID Partition Map" struct static_guid { diff --git a/src/kits/storage/DiskDeviceTypes.cpp b/src/kits/storage/DiskDeviceTypes.cpp index b58027bf65..9586c5cbb8 100644 --- a/src/kits/storage/DiskDeviceTypes.cpp +++ b/src/kits/storage/DiskDeviceTypes.cpp @@ -1,10 +1,15 @@ -//---------------------------------------------------------------------- -// This software is part of the Haiku distribution and is covered -// by the MIT license. -//--------------------------------------------------------------------- +/* + * Copyright 2003-2007, Haiku Inc. + * Distributed under the terms of the MIT License. + * + * Authors: + * Tyler Akidau + */ + #include + // Device Types const char *kDeviceTypeFloppyDisk = "Floppy Disk Media"; @@ -22,6 +27,7 @@ const char *kPartitionTypeDataSession = "Data Session"; const char *kPartitionTypeAmiga = "Amiga Partition Map"; const char *kPartitionTypeApple = "Apple Partition Map"; +const char *kPartitionTypeEFI = "EFI GUID Partition Map"; const char *kPartitionTypeIntel = "Intel Partition Map"; const char *kPartitionTypeIntelPrimary = "Intel Primary Partition";