From 3f60a0136937cf3288d0e730aa84efa3cf4a90cc Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 17 Jul 2003 00:03:17 +0000 Subject: [PATCH] Added "name" parameter to KDiskSystem::[Validate]Initialize() and the respective module API functions. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3999 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/disk_device_manager/KDiskSystem.h | 6 +++--- headers/private/kernel/disk_device_manager/KFileSystem.h | 6 +++--- .../kernel/disk_device_manager/KPartitioningSystem.h | 6 +++--- headers/private/kernel/disk_device_manager/ddm_modules.h | 9 +++++---- src/kernel/core/disk_device_manager/KDiskSystem.cpp | 7 ++++--- src/kernel/core/disk_device_manager/KFileSystem.cpp | 7 ++++--- .../core/disk_device_manager/KPartitioningSystem.cpp | 6 +++--- 7 files changed, 25 insertions(+), 22 deletions(-) diff --git a/headers/private/kernel/disk_device_manager/KDiskSystem.h b/headers/private/kernel/disk_device_manager/KDiskSystem.h index a93ae903dc..2335258c47 100644 --- a/headers/private/kernel/disk_device_manager/KDiskSystem.h +++ b/headers/private/kernel/disk_device_manager/KDiskSystem.h @@ -76,7 +76,7 @@ public: virtual bool ValidateCreateChild(KPartition *partition, off_t *start, off_t *size, const char *type, const char *parameters); - virtual bool ValidateInitialize(KPartition *partition, + virtual bool ValidateInitialize(KPartition *partition, char *name, const char *parameters); virtual bool ValidateSetParameters(KPartition *partition, const char *parameters); @@ -119,8 +119,8 @@ public: KPartition **child = NULL, partition_id childID = -1); virtual status_t DeleteChild(KPartition *child, KDiskDeviceJob *job); - virtual status_t Initialize(KPartition *partition, const char *parameters, - KDiskDeviceJob *job); + virtual status_t Initialize(KPartition *partition, const char *name, + const char *parameters, KDiskDeviceJob *job); virtual status_t SetParameters(KPartition *partition, const char *parameters, KDiskDeviceJob *job); diff --git a/headers/private/kernel/disk_device_manager/KFileSystem.h b/headers/private/kernel/disk_device_manager/KFileSystem.h index da679ce60c..c90590ab16 100644 --- a/headers/private/kernel/disk_device_manager/KFileSystem.h +++ b/headers/private/kernel/disk_device_manager/KFileSystem.h @@ -45,7 +45,7 @@ public: virtual bool ValidateResize(KPartition *partition, off_t *size); virtual bool ValidateMove(KPartition *partition, off_t *start); virtual bool ValidateSetContentName(KPartition *partition, char *name); - virtual bool ValidateInitialize(KPartition *partition, + virtual bool ValidateInitialize(KPartition *partition, char *name, const char *parameters); virtual bool ValidateSetContentParameters(KPartition *child, const char *parameters); @@ -61,8 +61,8 @@ public: KDiskDeviceJob *job); virtual status_t SetContentName(KPartition *partition, char *name, KDiskDeviceJob *job); - virtual status_t Initialize(KPartition *partition, const char *parameters, - KDiskDeviceJob *job); + virtual status_t Initialize(KPartition *partition, const char *name, + const char *parameters, KDiskDeviceJob *job); virtual status_t SetContentParameters(KPartition *partition, const char *parameters, KDiskDeviceJob *job); diff --git a/headers/private/kernel/disk_device_manager/KPartitioningSystem.h b/headers/private/kernel/disk_device_manager/KPartitioningSystem.h index b5cef38a32..6bd976c2e9 100644 --- a/headers/private/kernel/disk_device_manager/KPartitioningSystem.h +++ b/headers/private/kernel/disk_device_manager/KPartitioningSystem.h @@ -56,7 +56,7 @@ public: virtual bool ValidateCreateChild(KPartition *partition, off_t *start, off_t *size, const char *type, const char *parameters); - virtual bool ValidateInitialize(KPartition *partition, + virtual bool ValidateInitialize(KPartition *partition, char *name, const char *parameters); virtual bool ValidateSetParameters(KPartition *partition, const char *parameters); @@ -97,8 +97,8 @@ public: KPartition **child = NULL, partition_id childID = -1); virtual status_t DeleteChild(KPartition *child, KDiskDeviceJob *job); - virtual status_t Initialize(KPartition *partition, const char *parameters, - KDiskDeviceJob *job); + virtual status_t Initialize(KPartition *partition, const char *name, + const char *parameters, KDiskDeviceJob *job); virtual status_t SetParameters(KPartition *partition, const char *parameters, KDiskDeviceJob *job); diff --git a/headers/private/kernel/disk_device_manager/ddm_modules.h b/headers/private/kernel/disk_device_manager/ddm_modules.h index 2feca52cae..642e4070d5 100644 --- a/headers/private/kernel/disk_device_manager/ddm_modules.h +++ b/headers/private/kernel/disk_device_manager/ddm_modules.h @@ -67,7 +67,7 @@ typedef bool (*partition_validate_create_child_partition)( partition_data *partition, partition_data *child, off_t *start, off_t *size, const char *type, const char *parameters); typedef bool (*partition_validate_initialize_partition)( - partition_data *partition, const char *parameters); + partition_data *partition, char *name, const char *parameters); typedef bool (*partition_validate_set_partition_parameters)( partition_data *partition, const char *parameters); typedef bool (*partition_validate_set_partition_content_parameters)( @@ -107,7 +107,8 @@ typedef status_t (*partition_create_child_partition)(int fd, typedef status_t (*partition_delete_child_partition)(int fd, partition_id partition, partition_id child, disk_job_id job); typedef status_t (*partition_initialize_partition)(int fd, - partition_id partition, const char *parameters, disk_job_id job); + partition_id partition, const char *name, const char *parameters, + disk_job_id job); typedef status_t (*partition_set_parameters_partition)(int fd, partition_id partition, const char *parameters, disk_job_id job); typedef status_t (*partition_set_partition_content_parameters)(int fd, @@ -216,7 +217,7 @@ typedef bool (*fs_validate_move_partition)(partition_data *partition, typedef bool (*fs_validate_set_content_name)(partition_data *partition, char *name); typedef bool (*fs_validate_initialize_partition)(partition_data *partition, - const char *parameters); + char *name, const char *parameters); typedef bool (*fs_validate_set_partition_content_parameters)( partition_data *partition, const char *parameters); @@ -233,7 +234,7 @@ typedef status_t (*fs_move_partition)(int fd, partition_id partition, typedef status_t (*fs_set_content_name)(int fd, partition_id partition, const char *name, disk_job_id job); typedef status_t (*fs_initialize_partition)(const char *partition, - const char *parameters, disk_job_id job); + const char *name, const char *parameters, disk_job_id job); // This is pretty close to how the hook in R5 looked. Save the job ID, of // course and that the parameters were given as (void*, size_t) pair. typedef status_t (*fs_set_partition_content_parameters)(int fd, diff --git a/src/kernel/core/disk_device_manager/KDiskSystem.cpp b/src/kernel/core/disk_device_manager/KDiskSystem.cpp index 10e7aaafaf..945408f549 100644 --- a/src/kernel/core/disk_device_manager/KDiskSystem.cpp +++ b/src/kernel/core/disk_device_manager/KDiskSystem.cpp @@ -347,7 +347,8 @@ KDiskSystem::ValidateCreateChild(KPartition *partition, off_t *start, // ValidateInitialize bool -KDiskSystem::ValidateInitialize(KPartition *partition, const char *parameters) +KDiskSystem::ValidateInitialize(KPartition *partition, char *name, + const char *parameters) { // to be implemented by derived classes return false; @@ -501,8 +502,8 @@ KDiskSystem::DeleteChild(KPartition *child, KDiskDeviceJob *job) // Initialize status_t -KDiskSystem::Initialize(KPartition *partition, const char *parameters, - KDiskDeviceJob *job) +KDiskSystem::Initialize(KPartition *partition, const char *name, + const char *parameters, KDiskDeviceJob *job) { // to be implemented by derived classes return B_ERROR; diff --git a/src/kernel/core/disk_device_manager/KFileSystem.cpp b/src/kernel/core/disk_device_manager/KFileSystem.cpp index 9057b43e37..56de11db81 100644 --- a/src/kernel/core/disk_device_manager/KFileSystem.cpp +++ b/src/kernel/core/disk_device_manager/KFileSystem.cpp @@ -184,7 +184,8 @@ KFileSystem::ValidateSetContentName(KPartition *partition, char *name) // ValidateInitialize bool -KFileSystem::ValidateInitialize(KPartition *partition, const char *parameters) +KFileSystem::ValidateInitialize(KPartition *partition, char *name, + const char *parameters) { // to be implemented return false; @@ -242,8 +243,8 @@ KFileSystem::SetContentName(KPartition *partition, char *name, // Initialize status_t -KFileSystem::Initialize(KPartition *partition, const char *parameters, - KDiskDeviceJob *job) +KFileSystem::Initialize(KPartition *partition, const char *name, + const char *parameters, KDiskDeviceJob *job) { // to be implemented return B_ERROR; diff --git a/src/kernel/core/disk_device_manager/KPartitioningSystem.cpp b/src/kernel/core/disk_device_manager/KPartitioningSystem.cpp index 448e213ae3..386421df46 100644 --- a/src/kernel/core/disk_device_manager/KPartitioningSystem.cpp +++ b/src/kernel/core/disk_device_manager/KPartitioningSystem.cpp @@ -281,7 +281,7 @@ KPartitioningSystem::ValidateCreateChild(KPartition *partition, off_t *start, // ValidateInitialize bool -KPartitioningSystem::ValidateInitialize(KPartition *partition, +KPartitioningSystem::ValidateInitialize(KPartition *partition, char *name, const char *parameters) { // to be implemented @@ -434,8 +434,8 @@ KPartitioningSystem::DeleteChild(KPartition *child, KDiskDeviceJob *job) // Initialize status_t -KPartitioningSystem::Initialize(KPartition *partition, const char *parameters, - KDiskDeviceJob *job) +KPartitioningSystem::Initialize(KPartition *partition, const char *name, + const char *parameters, KDiskDeviceJob *job) { // to be implemented return B_ERROR;