diff --git a/headers/private/storage/DiskDeviceTypes.h b/headers/private/storage/DiskDeviceTypes.h index adb9e5f67b..222d5a612e 100644 --- a/headers/private/storage/DiskDeviceTypes.h +++ b/headers/private/storage/DiskDeviceTypes.h @@ -1,5 +1,5 @@ /* - * Copyright 2003-2007, Haiku Inc. + * Copyright 2003-2009, Haiku Inc. * Distributed under the terms of the MIT License. */ #ifndef _DISK_DEVICE_TYPES_H @@ -16,7 +16,6 @@ extern const char *kDeviceTypeOptical; extern const char *kPartitionTypeUnrecognized; extern const char *kPartitionTypeMultisession; - extern const char *kPartitionTypeAudioSession; extern const char *kPartitionTypeDataSession; @@ -24,10 +23,8 @@ extern const char *kPartitionTypeAmiga; extern const char *kPartitionTypeApple; extern const char *kPartitionTypeEFI; extern const char *kPartitionTypeIntel; - -extern const char *kPartitionTypeIntelPrimary; extern const char *kPartitionTypeIntelExtended; -extern const char *kPartitionTypeIntelLogical; +extern const char *kPartitionTypeVMDK; extern const char *kPartitionTypeAmigaFFS; extern const char *kPartitionTypeBFS; diff --git a/headers/private/system/disk_device_types.h b/headers/private/system/disk_device_types.h new file mode 100644 index 0000000000..3cb9b7fd2b --- /dev/null +++ b/headers/private/system/disk_device_types.h @@ -0,0 +1,46 @@ +/* + * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de. + * Distributed under the terms of the MIT License. + * + * Disk device type macros for kernel and boot loader. In userland use + * . + */ +#ifndef _SYSTEM_DISK_DEVICE_TYPES_H +#define _SYSTEM_DISK_DEVICE_TYPES_H + + +// Device Types + +#define FLOPPY_DEVICE_NAME "Floppy Disk Media" +#define HARD_DISK_DEVICE_NAME "Hard Disk Media" +#define OPTICAL_DEVICE_NAME "Optical Media" + +// Partition types + +#define UNRECOGNIZED_PARTITION_NAME "Unrecognized" + +#define MULTISESSION_PARTITION_NAME "Multisession Storage Device" +#define AUDIO_SESSION_PARTITION_NAME "Audio Session" +#define DATA_SESSION_PARTITION_NAME "Data Session" + +#define AMIGA_PARTITION_NAME "Amiga Partition Map" +#define APPLE_PARTITION_NAME "Apple Partition Map" +#define EFI_PARTITION_NAME "EFI GUID Partition Map" +#define INTEL_PARTITION_NAME "Intel Partition Map" +#define INTEL_EXTENDED_PARTITION_NAME "Intel Extended Partition" +#define VMDK_PARTITION_NAME "VMDK Partition" + +#define AMIGA_FFS_NAME "AmigaFFS File System" +#define BFS_NAME "Be File System" +#define EXT2_FS_NAME "EXT2 File System" +#define EXT3_FS_NAME "EXT3 File System" +#define FAT12_FS_NAME "FAT12 File System" +#define FAT32_FS_NAME "FAT32 File System" +#define HFS_NAME "HFS File System" +#define HFS_PLUS_NAME "HFS+ File System" +#define ISO9660_FS_NAME "ISO9660 File System" +#define REISER_FS_NAME "Reiser File System" +#define UDF_FS_NAME "UDF File System" + + +#endif // _SYSTEM_DISK_DEVICE_TYPES_H diff --git a/src/add-ons/disk_systems/intel/Jamfile b/src/add-ons/disk_systems/intel/Jamfile index 88404a1e16..babf063258 100644 --- a/src/add-ons/disk_systems/intel/Jamfile +++ b/src/add-ons/disk_systems/intel/Jamfile @@ -1,6 +1,7 @@ SubDir HAIKU_TOP src add-ons disk_systems intel ; UsePrivateHeaders shared storage ; +UsePrivateSystemHeaders ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ] ; diff --git a/src/add-ons/kernel/partitioning_systems/amiga/Jamfile b/src/add-ons/kernel/partitioning_systems/amiga/Jamfile index bf47e6b40e..c3d9f84a94 100644 --- a/src/add-ons/kernel/partitioning_systems/amiga/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/amiga/Jamfile @@ -3,6 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel partitioning_systems amiga ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel ] ; UsePrivateHeaders [ FDirName storage ] ; +UsePrivateSystemHeaders ; KernelAddon amiga_rdb : amiga_rdb.cpp diff --git a/src/add-ons/kernel/partitioning_systems/amiga/amiga_rdb.cpp b/src/add-ons/kernel/partitioning_systems/amiga/amiga_rdb.cpp index 0c7bdd07b0..8660b56e0e 100644 --- a/src/add-ons/kernel/partitioning_systems/amiga/amiga_rdb.cpp +++ b/src/add-ons/kernel/partitioning_systems/amiga/amiga_rdb.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #ifdef _BOOT_MODE # include #else @@ -29,7 +30,6 @@ #define AMIGA_PARTITION_MODULE_NAME "partitioning_systems/amiga_rdb/v1" -#define AMIGA_PARTITION_NAME "Amiga Partition Map" template bool diff --git a/src/add-ons/kernel/partitioning_systems/apple/Jamfile b/src/add-ons/kernel/partitioning_systems/apple/Jamfile index b5ff6d46be..d928a166d6 100644 --- a/src/add-ons/kernel/partitioning_systems/apple/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/apple/Jamfile @@ -3,6 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel partitioning_systems apple ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel ] ; UsePrivateHeaders [ FDirName storage ] ; +UsePrivateSystemHeaders ; KernelAddon apple : apple.cpp diff --git a/src/add-ons/kernel/partitioning_systems/apple/apple.cpp b/src/add-ons/kernel/partitioning_systems/apple/apple.cpp index 828bc99ec5..848ac1a36b 100644 --- a/src/add-ons/kernel/partitioning_systems/apple/apple.cpp +++ b/src/add-ons/kernel/partitioning_systems/apple/apple.cpp @@ -7,6 +7,7 @@ #include "apple.h" #include +#include #include #ifdef _BOOT_MODE # include @@ -27,7 +28,6 @@ #endif #define APPLE_PARTITION_MODULE_NAME "partitioning_systems/apple/v1" -#define APPLE_PARTITION_NAME "Apple Partition Map" static const char *kApplePartitionTypes[] = { "partition_map", // the partition map itself diff --git a/src/add-ons/kernel/partitioning_systems/efi/Jamfile b/src/add-ons/kernel/partitioning_systems/efi/Jamfile index fb84a6d743..faa6305497 100644 --- a/src/add-ons/kernel/partitioning_systems/efi/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/efi/Jamfile @@ -2,6 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel partitioning_systems efi ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders interface kernel storage ; +UsePrivateSystemHeaders ; KernelAddon efi_gpt : efi_gpt.cpp 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 26fe9b482d..6794edd8d2 100644 --- a/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp +++ b/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp @@ -10,6 +10,7 @@ #include #include +#include #ifdef _BOOT_MODE # include #else @@ -33,7 +34,6 @@ #define EFI_PARTITION_MODULE_NAME "partitioning_systems/efi_gpt/v1" -#define EFI_PARTITION_NAME "EFI GUID Partition Map" struct static_guid { diff --git a/src/add-ons/kernel/partitioning_systems/intel/Jamfile b/src/add-ons/kernel/partitioning_systems/intel/Jamfile index aa2dceab73..846714fdb2 100644 --- a/src/add-ons/kernel/partitioning_systems/intel/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/intel/Jamfile @@ -4,6 +4,7 @@ UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders kernel ; UsePrivateHeaders shared ; UsePrivateHeaders storage ; +UsePrivateSystemHeaders ; KernelAddon intel : intel.cpp diff --git a/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h b/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h index 79cd0af22c..3712e87b25 100644 --- a/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h +++ b/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h @@ -16,17 +16,14 @@ #include #include +#include + #ifndef _USER_MODE # include #else # include #endif -// These match those in DiskDeviceTypes.cpp and *must* be kept in sync. -#define INTEL_PARTITION_NAME "Intel Partition Map" -#define INTEL_EXTENDED_PARTITION_NAME "Intel Extended Partition" -#define BFS_NAME "Be File System" - // partition_type struct partition_type { diff --git a/src/add-ons/kernel/partitioning_systems/session/Jamfile b/src/add-ons/kernel/partitioning_systems/session/Jamfile index 95e71fe9e0..eb20e2b934 100644 --- a/src/add-ons/kernel/partitioning_systems/session/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/session/Jamfile @@ -4,14 +4,15 @@ SubDir HAIKU_TOP src add-ons kernel partitioning_systems session ; UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel ] ; UsePrivateHeaders [ FDirName storage ] ; +UsePrivateSystemHeaders ; { -# local defines = [ FDefines USER ] ; +# local defines = [ FDefines USER ] ; # SubDirCcFlags $(defines) ; # SubDirC++Flags $(defines) ; } -local session_files = +local session_files = Debug.cpp Disc.cpp session.cpp diff --git a/src/add-ons/kernel/partitioning_systems/session/session.cpp b/src/add-ons/kernel/partitioning_systems/session/session.cpp index d30143c25a..d565dac016 100644 --- a/src/add-ons/kernel/partitioning_systems/session/session.cpp +++ b/src/add-ons/kernel/partitioning_systems/session/session.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include @@ -19,7 +20,6 @@ #define SESSION_PARTITION_MODULE_NAME "partitioning_systems/session/v1" -#define SESSION_PARTITION_NAME "Multisession Storage Device" static status_t @@ -115,7 +115,7 @@ static partition_module_info sSessionModule = { standard_operations }, "session", // short_name - SESSION_PARTITION_NAME, // pretty_name + MULTISESSION_PARTITION_NAME, // pretty_name 0, // flags // scanning diff --git a/src/bin/makebootable/platform/bios_ia32/Jamfile b/src/bin/makebootable/platform/bios_ia32/Jamfile index 1aecb510e3..b50a1ff227 100644 --- a/src/bin/makebootable/platform/bios_ia32/Jamfile +++ b/src/bin/makebootable/platform/bios_ia32/Jamfile @@ -3,6 +3,7 @@ SubDir HAIKU_TOP src bin makebootable platform bios_ia32 ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ; UsePrivateHeaders shared storage ; +UsePrivateSystemHeaders ; # write the stage 1 boot loader into the makebootable resources AddFileDataResource makebootable : RAWT:666:BootCode : stage1.bin ; diff --git a/src/kits/storage/disk_device/DiskDeviceTypes.cpp b/src/kits/storage/disk_device/DiskDeviceTypes.cpp index 9586c5cbb8..c0b90d3156 100644 --- a/src/kits/storage/disk_device/DiskDeviceTypes.cpp +++ b/src/kits/storage/disk_device/DiskDeviceTypes.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2003-2007, Haiku Inc. + * Copyright 2003-2009, Haiku Inc. * Distributed under the terms of the MIT License. * * Authors: @@ -9,39 +9,38 @@ #include +#include + // Device Types -const char *kDeviceTypeFloppyDisk = "Floppy Disk Media"; -const char *kDeviceTypeHardDisk = "Hard Disk Media"; -const char *kDeviceTypeOptical = "Optical Media"; +const char *kDeviceTypeFloppyDisk = FLOPPY_DEVICE_NAME; +const char *kDeviceTypeHardDisk = HARD_DISK_DEVICE_NAME; +const char *kDeviceTypeOptical = OPTICAL_DEVICE_NAME; // Partition types -const char *kPartitionTypeUnrecognized = "Unrecognized"; +const char *kPartitionTypeUnrecognized = UNRECOGNIZED_PARTITION_NAME; -const char *kPartitionTypeMultisession = "Multisession Storage Device"; +const char *kPartitionTypeMultisession = MULTISESSION_PARTITION_NAME; +const char *kPartitionTypeAudioSession = AUDIO_SESSION_PARTITION_NAME; +const char *kPartitionTypeDataSession = DATA_SESSION_PARTITION_NAME; -const char *kPartitionTypeAudioSession = "Audio Session"; -const char *kPartitionTypeDataSession = "Data Session"; +const char *kPartitionTypeAmiga = AMIGA_PARTITION_NAME; +const char *kPartitionTypeApple = APPLE_PARTITION_NAME; +const char *kPartitionTypeEFI = EFI_PARTITION_NAME; +const char *kPartitionTypeIntel = INTEL_PARTITION_NAME; +const char *kPartitionTypeIntelExtended = INTEL_EXTENDED_PARTITION_NAME; +const char *kPartitionTypeVMDK = VMDK_PARTITION_NAME; -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"; -const char *kPartitionTypeIntelExtended = "Intel Extended Partition"; -const char *kPartitionTypeIntelLogical = "Intel Logical Partition"; - -const char *kPartitionTypeAmigaFFS = "AmigaFFS File System"; -const char *kPartitionTypeBFS = "Be File System"; -const char *kPartitionTypeEXT2 = "EXT2 File System"; -const char *kPartitionTypeEXT3 = "EXT3 File System"; -const char *kPartitionTypeFAT12 = "FAT12 File System"; -const char *kPartitionTypeFAT32 = "FAT32 File System"; -const char *kPartitionTypeHFS = "HFS File System"; -const char *kPartitionTypeHFSPlus = "HFS+ File System"; -const char *kPartitionTypeISO9660 = "ISO9660 File System"; -const char *kPartitionTypeReiser = "Reiser File System"; -const char *kPartitionTypeUDF = "UDF File System"; +const char *kPartitionTypeAmigaFFS = AMIGA_FFS_NAME; +const char *kPartitionTypeBFS = BFS_NAME; +const char *kPartitionTypeEXT2 = EXT2_FS_NAME; +const char *kPartitionTypeEXT3 = EXT3_FS_NAME; +const char *kPartitionTypeFAT12 = FAT12_FS_NAME; +const char *kPartitionTypeFAT32 = FAT32_FS_NAME; +const char *kPartitionTypeHFS = HFS_NAME; +const char *kPartitionTypeHFSPlus = HFS_PLUS_NAME; +const char *kPartitionTypeISO9660 = ISO9660_FS_NAME; +const char *kPartitionTypeReiser = REISER_FS_NAME; +const char *kPartitionTypeUDF = UDF_FS_NAME; diff --git a/src/system/kernel/disk_device_manager/Jamfile b/src/system/kernel/disk_device_manager/Jamfile index b672a8ba24..3647afded3 100644 --- a/src/system/kernel/disk_device_manager/Jamfile +++ b/src/system/kernel/disk_device_manager/Jamfile @@ -9,6 +9,7 @@ UsePrivateHeaders [ FDirName kernel disk_device_manager ] ; UsePrivateHeaders [ FDirName kernel ] ; UsePrivateHeaders [ FDirName kernel fs ] ; UsePrivateHeaders [ FDirName kernel util ] ; +UsePrivateSystemHeaders ; UsePrivateHeaders shared ; UsePrivateHeaders storage ; diff --git a/src/tools/makebootable/platform/bios_ia32/Jamfile b/src/tools/makebootable/platform/bios_ia32/Jamfile index a5b87fd66f..e213a48ce2 100644 --- a/src/tools/makebootable/platform/bios_ia32/Jamfile +++ b/src/tools/makebootable/platform/bios_ia32/Jamfile @@ -3,6 +3,7 @@ SubDir HAIKU_TOP src tools makebootable platform bios_ia32 ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ; UsePrivateHeaders storage shared ; +UsePrivateSystemHeaders system ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin makebootable platform bios_ia32 ] ;