i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Replaced kernel_cpp.h with util/kernel_cpp.h

Browse Source 
* Removed Udf namespace
* Clean up


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27023 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Salvatore Benedetto
2008-08-18 09:53:28 +00:00
parent 4b2b0bdc48
commit deac135d7c
6 changed files with 31 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/udf/MetadataPartition.cpp
-1
View File
@@ -2,7 +2,6 @@
#define B_NOT_IMPLEMENTED B_ERROR #define B_NOT_IMPLEMENTED B_ERROR
using namespace Udf;
/*! \brief Creates a new MetadataPartition object. /*! \brief Creates a new MetadataPartition object.
*/ */
src/add-ons/kernel/file_systems/udf/Partition.h
-4
View File
@@ -12,8 +12,6 @@
#include <SupportDefs.h> #include <SupportDefs.h>
namespace Udf {
/*! \brief Abstract base class for various UDF partition types. /*! \brief Abstract base class for various UDF partition types.
*/ */
class Partition { class Partition {
@@ -24,6 +22,4 @@ public:
// uint32 &physicalBlock, uint32 &physicalLength) = 0; // uint32 &physicalBlock, uint32 &physicalLength) = 0;
}; };
}; // namespace Udf
#endif // _UDF_PARTITION_H #endif // _UDF_PARTITION_H
src/add-ons/kernel/file_systems/udf/PhysicalPartition.h
+1 -5
View File
@@ -10,13 +10,11 @@
/*! \file PhysicalPartition.h /*! \file PhysicalPartition.h
*/ */
#include <kernel_cpp.h> #include <util/kernel_cpp.h>
#include "Partition.h" #include "Partition.h"
#include "UdfDebug.h" #include "UdfDebug.h"
namespace Udf {
/*! \brief Standard type 1 physical partition /*! \brief Standard type 1 physical partition
PhysicalPartitions map logical block numbers directly to physical PhysicalPartitions map logical block numbers directly to physical
@@ -39,6 +37,4 @@ private:
uint32 fLength; uint32 fLength;
}; };
}; // namespace Udf
#endif // _UDF_PHYSICAL_PARTITION_H #endif // _UDF_PHYSICAL_PARTITION_H
src/add-ons/kernel/file_systems/udf/SparablePartition.h
+1 -5
View File
@@ -10,14 +10,12 @@
/*! \file SparablePartition.h /*! \file SparablePartition.h
*/ */
#include <kernel_cpp.h> #include <util/kernel_cpp.h>
#include "UdfStructures.h" #include "UdfStructures.h"
#include "Partition.h" #include "Partition.h"
#include "UdfDebug.h" #include "UdfDebug.h"
namespace Udf {
/*! \brief Type 2 sparable partition /*! \brief Type 2 sparable partition
Sparable partitions provide a defect-managed partition Sparable partitions provide a defect-managed partition
@@ -58,6 +56,4 @@ private:
status_t fInitStatus; status_t fInitStatus;
}; };
}; // namespace Udf
#endif // _UDF_SPARABLE_PARTITION_H #endif // _UDF_SPARABLE_PARTITION_H
src/add-ons/kernel/file_systems/udf/UdfStructures.cpp
+28 -29
View File
@@ -17,13 +17,12 @@
#include "UdfString.h" #include "UdfString.h"
#include "Utils.h" #include "Utils.h"
using namespace Udf;
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Constants // Constants
//---------------------------------------------------------------------- //----------------------------------------------------------------------
const charspec Udf::kCs0CharacterSet(0, "OSTA Compressed Unicode"); const charspec kCs0CharacterSet(0, "OSTA Compressed Unicode");
//const charspec kCs0Charspec = { _character_set_type: 0, //const charspec kCs0Charspec = { _character_set_type: 0,
// _character_set_info: "OSTA Compressed Unicode" // _character_set_info: "OSTA Compressed Unicode"
// "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" // "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
@@ -31,30 +30,30 @@ const charspec Udf::kCs0CharacterSet(0, "OSTA Compressed Unicode");
// }; // };
// Volume structure descriptor ids // Volume structure descriptor ids
const char* Udf::kVSDID_BEA = "BEA01"; const char* kVSDID_BEA = "BEA01";
const char* Udf::kVSDID_TEA = "TEA01"; const char* kVSDID_TEA = "TEA01";
const char* Udf::kVSDID_BOOT = "BOOT2"; const char* kVSDID_BOOT = "BOOT2";
const char* Udf::kVSDID_ISO = "CD001"; const char* kVSDID_ISO = "CD001";
const char* Udf::kVSDID_ECMA167_2 = "NSR02"; const char* kVSDID_ECMA167_2 = "NSR02";
const char* Udf::kVSDID_ECMA167_3 = "NSR03"; const char* kVSDID_ECMA167_3 = "NSR03";
const char* Udf::kVSDID_ECMA168 = "CDW02"; const char* kVSDID_ECMA168 = "CDW02";
// entity_ids // entity_ids
const entity_id Udf::kMetadataPartitionMapId(0, "*UDF Metadata Partition"); const entity_id kMetadataPartitionMapId(0, "*UDF Metadata Partition");
const entity_id Udf::kSparablePartitionMapId(0, "*UDF Sparable Partition"); const entity_id kSparablePartitionMapId(0, "*UDF Sparable Partition");
const entity_id Udf::kVirtualPartitionMapId(0, "*UDF Virtual Partition"); const entity_id kVirtualPartitionMapId(0, "*UDF Virtual Partition");
const entity_id Udf::kImplementationId(0, "*OpenBeOS UDF", implementation_id_suffix(OS_BEOS, BEOS_GENERIC)); const entity_id kImplementationId(0, "*OpenBeOS UDF", implementation_id_suffix(OS_BEOS, BEOS_GENERIC));
const entity_id Udf::kPartitionContentsId1xx(0, "+NSR02"); const entity_id kPartitionContentsId1xx(0, "+NSR02");
const entity_id Udf::kPartitionContentsId2xx(0, "+NSR03"); const entity_id kPartitionContentsId2xx(0, "+NSR03");
const entity_id Udf::kLogicalVolumeInfoId150(0, "*UDF LV Info", udf_id_suffix(0x0150, OS_BEOS, BEOS_GENERIC)); const entity_id kLogicalVolumeInfoId150(0, "*UDF LV Info", udf_id_suffix(0x0150, OS_BEOS, BEOS_GENERIC));
const entity_id Udf::kLogicalVolumeInfoId201(0, "*UDF LV Info", udf_id_suffix(0x0201, OS_BEOS, BEOS_GENERIC)); const entity_id kLogicalVolumeInfoId201(0, "*UDF LV Info", udf_id_suffix(0x0201, OS_BEOS, BEOS_GENERIC));
const entity_id Udf::kDomainId150(0, "*OSTA UDF Compliant", domain_id_suffix(0x0150, const entity_id kDomainId150(0, "*OSTA UDF Compliant", domain_id_suffix(0x0150,
DF_HARD_WRITE_PROTECT)); DF_HARD_WRITE_PROTECT));
const entity_id Udf::kDomainId201(0, "*OSTA UDF Compliant", domain_id_suffix(0x0201, const entity_id kDomainId201(0, "*OSTA UDF Compliant", domain_id_suffix(0x0201,
DF_HARD_WRITE_PROTECT)); DF_HARD_WRITE_PROTECT));
//! crc 010041 table, as generated by crc_table.cpp //! crc 010041 table, as generated by crc_table.cpp
const uint16 Udf::kCrcTable[256] = { const uint16 kCrcTable[256] = {
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
@@ -89,7 +88,7 @@ const uint16 Udf::kCrcTable[256] = {
0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
}; };
const uint32 Udf::kLogicalVolumeDescriptorBaseSize = sizeof(logical_volume_descriptor) const uint32 kLogicalVolumeDescriptorBaseSize = sizeof(logical_volume_descriptor)
- (UDF_MAX_PARTITION_MAPS - (UDF_MAX_PARTITION_MAPS
* UDF_MAX_PARTITION_MAP_SIZE); * UDF_MAX_PARTITION_MAP_SIZE);
@@ -98,7 +97,7 @@ const uint32 Udf::kLogicalVolumeDescriptorBaseSize = sizeof(logical_volume_descr
// Helper functions // Helper functions
//---------------------------------------------------------------------- //----------------------------------------------------------------------
const char *Udf::tag_id_to_string(tag_id id) const char *tag_id_to_string(tag_id id)
{ {
switch (id) { switch (id) {
case TAGID_UNDEFINED: case TAGID_UNDEFINED:
@@ -532,7 +531,7 @@ descriptor_tag::init_check(uint32 block, bool calculateCrc)
PRINT(("location (in structure) == %ld\n", location())); PRINT(("location (in structure) == %ld\n", location()));
if (calculateCrc) { if (calculateCrc) {
PRINT(("crc (calculated) == %d\n", PRINT(("crc (calculated) == %d\n",
Udf::calculate_crc(reinterpret_cast<uint8*>(this)+sizeof(descriptor_tag), calculate_crc(reinterpret_cast<uint8*>(this)+sizeof(descriptor_tag),
crc_length()))) crc_length())))
} else { } else {
PRINT(("crc (calculated) == (not calculated)\n")); PRINT(("crc (calculated) == (not calculated)\n"));
@@ -552,7 +551,7 @@ descriptor_tag::init_check(uint32 block, bool calculateCrc)
} }
// crc // crc
if (!error && calculateCrc) { if (!error && calculateCrc) {
uint16 _crc = Udf::calculate_crc(reinterpret_cast<uint8*>(this) uint16 _crc = calculate_crc(reinterpret_cast<uint8*>(this)
+ sizeof(descriptor_tag), crc_length()); + sizeof(descriptor_tag), crc_length());
error = _crc == crc() ? B_OK : B_NO_INIT; error = _crc == crc() ? B_OK : B_NO_INIT;
} }
@@ -568,7 +567,7 @@ primary_volume_descriptor::dump() const
{ {
DUMP_INIT("primary_volume_descriptor"); DUMP_INIT("primary_volume_descriptor");
String string; UdfString string;
PRINT(("tag:\n")); PRINT(("tag:\n"));
DUMP(tag()); DUMP(tag());
@@ -629,7 +628,7 @@ anchor_volume_descriptor::dump() const
void void
logical_volume_info::dump() const logical_volume_info::dump() const
{ {
String string; UdfString string;
DUMP_INIT("logical_volume_information"); DUMP_INIT("logical_volume_information");
PRINT(("character_set:\n")); PRINT(("character_set:\n"));
DUMP(character_set()); DUMP(character_set());
@@ -666,7 +665,7 @@ implementation_use_descriptor::dump() const
// partition_descriptor // partition_descriptor
//---------------------------------------------------------------------- //----------------------------------------------------------------------
const uint8 Udf::kMaxPartitionDescriptors = 2; const uint8 kMaxPartitionDescriptors = 2;
void void
partition_descriptor::dump() const partition_descriptor::dump() const
@@ -704,7 +703,7 @@ logical_volume_descriptor::dump() const
PRINT(("vds_number: %ld\n", vds_number())); PRINT(("vds_number: %ld\n", vds_number()));
PRINT(("character_set:\n")); PRINT(("character_set:\n"));
DUMP(character_set()); DUMP(character_set());
String string(logical_volume_identifier()); UdfString string(logical_volume_identifier());
PRINT(("logical_volume_identifier: `%s'\n", string.Utf8())); PRINT(("logical_volume_identifier: `%s'\n", string.Utf8()));
PRINT(("logical_block_size: %ld\n", logical_block_size())); PRINT(("logical_block_size: %ld\n", logical_block_size()));
PRINT(("domain_id:\n")); PRINT(("domain_id:\n"));
@@ -957,7 +956,7 @@ file_id_descriptor::dump() const
PRINT(("icb:\n")); PRINT(("icb:\n"));
DUMP(icb()); DUMP(icb());
PRINT(("implementation_use_length: %d\n", is_parent())); PRINT(("implementation_use_length: %d\n", is_parent()));
String fileId(id()); UdfString fileId(id());
PRINT(("id: `%s'", fileId.Utf8())); PRINT(("id: `%s'", fileId.Utf8()));
} }
src/add-ons/kernel/file_systems/udf/VirtualPartition.h
+1 -5
View File
@@ -10,14 +10,12 @@
/*! \file VirtualPartition.h /*! \file VirtualPartition.h
*/ */
#include <kernel_cpp.h> #include <util/kernel_cpp.h>
#include "Partition.h" #include "Partition.h"
#include "PhysicalPartition.h" #include "PhysicalPartition.h"
#include "UdfDebug.h" #include "UdfDebug.h"
namespace Udf {
/*! \brief Type 2 virtual partition /*! \brief Type 2 virtual partition
VirtualPartitions add an extra layer of indirection between logical VirtualPartitions add an extra layer of indirection between logical
@@ -41,6 +39,4 @@ private:
PhysicalPartition fPhysicalPartition; PhysicalPartition fPhysicalPartition;
}; };
}; // namespace Udf
#endif // _UDF_VIRTUAL_PARTITION_H #endif // _UDF_VIRTUAL_PARTITION_H