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

Added SupportsSetting[Content]Parameters() to the KDiskSystem interface and respective functions to the module interface. Some re-ordering of methods/functions for aesthetical reasons. :-)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4019 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2003-07-19 20:29:58 +00:00
parent 24fa6c601b
commit 708a31badf
9 changed files with 248 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/disk_device_manager/KDiskSystem.h
+19 -16
View File
@@ -54,17 +54,20 @@ public:
bool *whileMounted);
virtual bool SupportsResizing(KPartition *partition, bool *whileMounted);
virtual bool SupportsResizingChild(KPartition *child);
virtual bool SupportsMoving(KPartition *partition, bool *whileMounted);
virtual bool SupportsMoving(KPartition *partition, bool *isNoOp);
virtual bool SupportsMovingChild(KPartition *child);
virtual bool SupportsSettingName(KPartition *partition);
virtual bool SupportsSettingContentName(KPartition *partition,
bool *whileMounted);
virtual bool SupportsSettingType(KPartition *partition);
virtual bool SupportsCreatingChild(KPartition *partition);
virtual bool SupportsDeletingChild(KPartition *child);
virtual bool SupportsSettingParameters(KPartition *partition);
virtual bool SupportsSettingContentParameters(KPartition *partition,
bool *whileMounted);
virtual bool SupportsInitializing(KPartition *partition);
virtual bool SupportsInitializingChild(KPartition *child,
const char *diskSystem);
virtual bool SupportsCreatingChild(KPartition *partition);
virtual bool SupportsDeletingChild(KPartition *child);
virtual bool IsSubSystemFor(KPartition *partition);
virtual bool ValidateResize(KPartition *partition, off_t *size);
@@ -74,15 +77,15 @@ public:
virtual bool ValidateSetName(KPartition *partition, char *name);
virtual bool ValidateSetContentName(KPartition *partition, char *name);
virtual bool ValidateSetType(KPartition *partition, const char *type);
virtual bool ValidateCreateChild(KPartition *partition, off_t *start,
off_t *size, const char *type,
const char *parameters);
virtual bool ValidateInitialize(KPartition *partition, char *name,
const char *parameters);
virtual bool ValidateSetParameters(KPartition *partition,
const char *parameters);
virtual bool ValidateSetContentParameters(KPartition *child,
const char *parameters);
virtual bool ValidateInitialize(KPartition *partition, char *name,
const char *parameters);
virtual bool ValidateCreateChild(KPartition *partition, off_t *start,
off_t *size, const char *type,
const char *parameters);
virtual int32 CountPartitionableSpaces(KPartition *partition);
virtual bool GetPartitionableSpaces(KPartition *partition,
partitionable_space_data *spaces,
@@ -114,20 +117,20 @@ public:
KDiskDeviceJob *job);
virtual status_t SetType(KPartition *partition, char *type,
KDiskDeviceJob *job);
virtual status_t CreateChild(KPartition *partition, off_t offset,
off_t size, const char *type,
const char *parameters, KDiskDeviceJob *job,
KPartition **child = NULL,
partition_id childID = -1);
virtual status_t DeleteChild(KPartition *child, 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);
virtual status_t SetContentParameters(KPartition *partition,
const char *parameters,
KDiskDeviceJob *job);
virtual status_t Initialize(KPartition *partition, const char *name,
const char *parameters, KDiskDeviceJob *job);
virtual status_t CreateChild(KPartition *partition, off_t offset,
off_t size, const char *type,
const char *parameters, KDiskDeviceJob *job,
KPartition **child = NULL,
partition_id childID = -1);
virtual status_t DeleteChild(KPartition *child, KDiskDeviceJob *job);
// The KPartition* parameters for the writing methods are a bit `volatile',
// since the device will not be locked, when they are called. The KPartition
// is registered though, so that it is at least guaranteed that the object
headers/private/kernel/disk_device_manager/KFileSystem.h
+7 -5
View File
@@ -34,19 +34,21 @@ public:
virtual bool SupportsRepairing(KPartition *partition, bool checkOnly,
bool *whileMounted);
virtual bool SupportsResizing(KPartition *partition, bool *whileMounted);
virtual bool SupportsMoving(KPartition *partition, bool *whileMounted);
virtual bool SupportsMoving(KPartition *partition, bool *isNoOp);
virtual bool SupportsSettingContentName(KPartition *partition,
bool *whileMounted);
virtual bool SupportsSettingContentParameters(KPartition *partition,
bool *whileMounted);
virtual bool SupportsInitializing(KPartition *partition);
virtual bool IsSubSystemFor(KPartition *partition);
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, char *name,
const char *parameters);
virtual bool ValidateSetContentParameters(KPartition *child,
const char *parameters);
virtual bool ValidateInitialize(KPartition *partition, char *name,
const char *parameters);
// Writing
@@ -59,11 +61,11 @@ public:
KDiskDeviceJob *job);
virtual status_t SetContentName(KPartition *partition, char *name,
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);
virtual status_t Initialize(KPartition *partition, const char *name,
const char *parameters, KDiskDeviceJob *job);
protected:
virtual status_t LoadModule();
headers/private/kernel/disk_device_manager/KPartitioningSystem.h
+17 -14
View File
@@ -31,17 +31,20 @@ public:
bool *whileMounted);
virtual bool SupportsResizing(KPartition *partition, bool *whileMounted);
virtual bool SupportsResizingChild(KPartition *child);
virtual bool SupportsMoving(KPartition *partition, bool *whileMounted);
virtual bool SupportsMoving(KPartition *partition, bool *isNoOp);
virtual bool SupportsMovingChild(KPartition *child);
virtual bool SupportsSettingName(KPartition *partition);
virtual bool SupportsSettingContentName(KPartition *partition,
bool *whileMounted);
virtual bool SupportsSettingType(KPartition *partition);
virtual bool SupportsCreatingChild(KPartition *partition);
virtual bool SupportsDeletingChild(KPartition *child);
virtual bool SupportsSettingParameters(KPartition *partition);
virtual bool SupportsSettingContentParameters(KPartition *partition,
bool *whileMounted);
virtual bool SupportsInitializing(KPartition *partition);
virtual bool SupportsInitializingChild(KPartition *child,
const char *diskSystem);
virtual bool SupportsCreatingChild(KPartition *partition);
virtual bool SupportsDeletingChild(KPartition *child);
virtual bool IsSubSystemFor(KPartition *partition);
virtual bool ValidateResize(KPartition *partition, off_t *size);
@@ -51,15 +54,15 @@ public:
virtual bool ValidateSetName(KPartition *partition, char *name);
virtual bool ValidateSetContentName(KPartition *partition, char *name);
virtual bool ValidateSetType(KPartition *partition, const char *type);
virtual bool ValidateCreateChild(KPartition *partition, off_t *start,
off_t *size, const char *type,
const char *parameters);
virtual bool ValidateInitialize(KPartition *partition, char *name,
const char *parameters);
virtual bool ValidateSetParameters(KPartition *partition,
const char *parameters);
virtual bool ValidateSetContentParameters(KPartition *child,
const char *parameters);
virtual bool ValidateInitialize(KPartition *partition, char *name,
const char *parameters);
virtual bool ValidateCreateChild(KPartition *partition, off_t *start,
off_t *size, const char *type,
const char *parameters);
virtual int32 CountPartitionableSpaces(KPartition *partition);
virtual bool GetPartitionableSpaces(KPartition *partition,
partitionable_space_data *spaces,
@@ -89,6 +92,12 @@ public:
KDiskDeviceJob *job);
virtual status_t SetType(KPartition *partition, char *type,
KDiskDeviceJob *job);
virtual status_t SetParameters(KPartition *partition,
const char *parameters,
KDiskDeviceJob *job);
virtual status_t SetContentParameters(KPartition *partition,
const char *parameters,
KDiskDeviceJob *job);
virtual status_t CreateChild(KPartition *partition, off_t offset,
off_t size, const char *type,
const char *parameters, KDiskDeviceJob *job,
@@ -97,12 +106,6 @@ public:
virtual status_t DeleteChild(KPartition *child, 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);
virtual status_t SetContentParameters(KPartition *partition,
const char *parameters,
KDiskDeviceJob *job);
protected:
virtual status_t LoadModule();
headers/private/kernel/disk_device_manager/ddm_modules.h
+43 -32
View File
@@ -39,14 +39,18 @@ typedef bool (*partition_supports_setting_name)(partition_data *partition);
typedef bool (*partition_supports_setting_content_name)(
partition_data *partition);
typedef bool (*partition_supports_setting_type)(partition_data *partition);
typedef bool (*partition_supports_creating_child_partition)(
typedef bool (*partition_supports_setting_parameters)(
partition_data *partition);
typedef bool (*partition_supports_setting_content_parameters)(
partition_data *partition);
typedef bool (*partition_supports_deleting_child_partition)(
partition_data *partition, partition_data *child);
typedef bool (*partition_supports_initializing_partition)(
partition_data *partition);
typedef bool (*partition_supports_initializing_child_partition)(
partition_data *partition, const char *system);
typedef bool (*partition_supports_creating_child_partition)(
partition_data *partition);
typedef bool (*partition_supports_deleting_child_partition)(
partition_data *partition, partition_data *child);
typedef bool (*partition_is_sub_system_for)(partition_data *partition);
typedef bool (*partition_validate_resize_partition)(partition_data *partition,
@@ -63,15 +67,15 @@ typedef bool (*partition_validate_set_content_name)(partition_data *partition,
char *name);
typedef bool (*partition_validate_set_type)(partition_data *partition,
const char *type);
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, 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)(
partition_data *partition, const char *parameters);
typedef bool (*partition_validate_initialize_partition)(
partition_data *partition, char *name, const char *parameters);
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_get_partitionable_spaces)(partition_data *partition,
partitionable_space_data *spaces, int32 count, int32 *actualCount);
// When not implemented, a standard algorithm is used.
@@ -99,6 +103,13 @@ typedef status_t (*partition_set_content_name)(int fd, partition_id partition,
const char *name, disk_job_id job);
typedef status_t (*partition_set_type)(int fd, partition_id partition,
const char *type, 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,
partition_id partition, const char *parameters, disk_job_id job);
typedef status_t (*partition_initialize_partition)(int fd,
partition_id partition, const char *name, const char *parameters,
disk_job_id job);
typedef status_t (*partition_create_child_partition)(int fd,
partition_id partition, off_t offset, off_t size, const char *type,
const char *parameters, disk_job_id job, partition_id *childID);
@@ -106,13 +117,6 @@ typedef status_t (*partition_create_child_partition)(int fd,
// parameter -- -1 to be ignored
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 *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,
partition_id partition, const char *parameters, disk_job_id job);
typedef struct partition_module_info {
module_info module;
@@ -137,14 +141,17 @@ typedef struct partition_module_info {
partition_supports_setting_name supports_setting_name;
partition_supports_setting_content_name supports_setting_content_name;
partition_supports_setting_type supports_setting_type;
partition_supports_creating_child_partition
supports_creating_child_partition;
partition_supports_deleting_child_partition
supports_deleting_child_partition;
partition_supports_setting_parameters supports_setting_parameters;
partition_supports_setting_content_parameters
supports_setting_content_parameters;
partition_supports_initializing_partition
supports_initializing_partition;
partition_supports_initializing_child_partition
supports_initializing_child_partition;
partition_supports_creating_child_partition
supports_creating_child_partition;
partition_supports_deleting_child_partition
supports_deleting_child_partition;
partition_is_sub_system_for is_sub_system_for;
partition_validate_resize_partition validate_resize_partition;
@@ -155,13 +162,13 @@ typedef struct partition_module_info {
partition_validate_set_name validate_set_name;
partition_validate_set_content_name validate_set_content_name;
partition_validate_set_type validate_set_type;
partition_validate_create_child_partition
validate_create_child_partition;
partition_validate_initialize_partition validate_initialize_partition;
partition_validate_set_partition_parameters
validate_set_partition_parameters;
partition_validate_set_partition_content_parameters
validate_set_partition_content_parameters;
partition_validate_initialize_partition validate_initialize_partition;
partition_validate_create_child_partition
validate_create_child_partition;
partition_get_partitionable_spaces get_partitionable_spaces;
partition_get_next_supported_type get_next_supported_type;
partition_get_type_for_content_type get_type_for_content_type;
@@ -175,12 +182,12 @@ typedef struct partition_module_info {
partition_set_name set_name;
partition_set_content_name set_content_name;
partition_set_type set_type;
partition_create_child_partition create_child_partition;
partition_delete_child_partition delete_child_partition;
partition_initialize_partition initialize_partition;
partition_set_parameters_partition set_parameters_partition;
partition_set_partition_content_parameters
set_partition_content_parameters;
partition_initialize_partition initialize_partition;
partition_create_child_partition create_child_partition;
partition_delete_child_partition delete_child_partition;
} partition_module_info;
@@ -205,9 +212,11 @@ typedef bool (*fs_supports_reparing_partition)(partition_data *partition,
typedef bool (*fs_supports_resizing_partition)(partition_data *partition,
bool *whileMounted);
typedef bool (*fs_supports_moving_partition)(partition_data *partition,
bool *whileMounted);
bool *isNoOp);
typedef bool (*fs_supports_setting_content_name)(partition_data *partition,
bool *whileMounted);
typedef bool (*fs_supports_setting_content_parameters)(
partition_data *partition, bool *whileMounted);
typedef bool (*fs_supports_initializing_partition)(partition_data *partition);
typedef bool (*fs_is_sub_system_for)(partition_data *partition);
@@ -217,10 +226,10 @@ typedef bool (*fs_validate_move_partition)(partition_data *partition,
off_t *start);
typedef bool (*fs_validate_set_content_name)(partition_data *partition,
char *name);
typedef bool (*fs_validate_initialize_partition)(partition_data *partition,
char *name, const char *parameters);
typedef bool (*fs_validate_set_partition_content_parameters)(
partition_data *partition, const char *parameters);
typedef bool (*fs_validate_initialize_partition)(partition_data *partition,
char *name, const char *parameters);
// writing
// (the device is NOT locked)
@@ -234,12 +243,12 @@ typedef status_t (*fs_move_partition)(int fd, partition_id partition,
off_t offset, disk_job_id job);
typedef status_t (*fs_set_content_name)(int fd, partition_id partition,
const char *name, disk_job_id job);
typedef status_t (*fs_set_partition_content_parameters)(int fd,
partition_id partition, const char *parameters, disk_job_id job);
typedef status_t (*fs_initialize_partition)(const char *partition,
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,
partition_id partition, const char *parameters, disk_job_id job);
typedef struct fs_module_info {
module_info module;
@@ -259,6 +268,8 @@ typedef struct fs_module_info {
fs_supports_resizing_partition supports_resizing_partition;
fs_supports_moving_partition supports_moving_partition;
fs_supports_setting_content_name supports_setting_content_name;
fs_supports_setting_content_parameters
supports_setting_content_parameters;
fs_supports_initializing_partition
supports_initializing_partition;
fs_is_sub_system_for is_sub_system_for;
@@ -266,9 +277,9 @@ typedef struct fs_module_info {
fs_validate_resize_partition validate_resize_partition;
fs_validate_move_partition validate_move_partition;
fs_validate_set_content_name validate_set_content_name;
fs_validate_initialize_partition validate_initialize_partition;
fs_validate_set_partition_content_parameters
validate_set_partition_content_parameters;
fs_validate_initialize_partition validate_initialize_partition;
// writing
fs_defragment_partition defragment_partition;
@@ -276,9 +287,9 @@ typedef struct fs_module_info {
fs_resize_partition resize_partition;
fs_move_partition move_partition;
fs_set_content_name set_content_name;
fs_initialize_partition initialize_partition;
fs_set_partition_content_parameters
set_partition_content_parameters;
fs_initialize_partition initialize_partition;
} fs_module_info;
#endif // _K_DISK_DEVICE_MODULES_H