From 57c8af057e8d05d737c74c32ffb02a22976e795d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 31 Jul 2003 22:45:26 +0000 Subject: [PATCH] Replaced the Vector parameter of CreateMoveJob() by a simple array. Added CreateUninitializeJob() (empty implementation). git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4171 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../disk_device_manager/KDiskDeviceJobFactory.h | 8 ++++---- .../KDiskDeviceJobFactory.cpp | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/headers/private/kernel/disk_device_manager/KDiskDeviceJobFactory.h b/headers/private/kernel/disk_device_manager/KDiskDeviceJobFactory.h index 29ff0c262b..6868162cb7 100644 --- a/headers/private/kernel/disk_device_manager/KDiskDeviceJobFactory.h +++ b/headers/private/kernel/disk_device_manager/KDiskDeviceJobFactory.h @@ -1,10 +1,8 @@ -// KDiskDeviceJob.h +// KDiskDeviceJobFactory.h #ifndef _K_DISK_DEVICE_JOB_FACTORY_H #define _K_DISK_DEVICE_JOB_FACTORY_H -#include - #include "disk_device_manager.h" namespace BPrivate { @@ -24,7 +22,8 @@ public: bool resizeContents); KDiskDeviceJob *CreateMoveJob(partition_id parentID, partition_id partitionID, off_t offset, - Vector *contentsToMove); + const partition_id *contentsToMove, + int32 contentsToMoveCount); KDiskDeviceJob *CreateSetNameJob(partition_id parentID, partition_id partitionID, const char *name); @@ -42,6 +41,7 @@ public: disk_system_id diskSystemID, const char *name, const char *parameters); + KDiskDeviceJob *CreateUninitializeJob(partition_id partitionID); KDiskDeviceJob *CreateCreateChildJob(partition_id partitionID, partition_id child, off_t offset, off_t size, const char *type, diff --git a/src/kernel/core/disk_device_manager/KDiskDeviceJobFactory.cpp b/src/kernel/core/disk_device_manager/KDiskDeviceJobFactory.cpp index d2b9d7243e..97def76c5e 100644 --- a/src/kernel/core/disk_device_manager/KDiskDeviceJobFactory.cpp +++ b/src/kernel/core/disk_device_manager/KDiskDeviceJobFactory.cpp @@ -1,9 +1,13 @@ -// KDiskDeviceJob.cpp +// KDiskDeviceJobFactory.cpp + +#include #include "KDiskDeviceJob.h" #include "KDiskDeviceJobFactory.h" #include "KScanPartitionJob.h" +using namespace std; + // constructor KDiskDeviceJobFactory::KDiskDeviceJobFactory() { @@ -45,7 +49,8 @@ KDiskDeviceJobFactory::CreateResizeJob(partition_id parentID, KDiskDeviceJob * KDiskDeviceJobFactory::CreateMoveJob(partition_id parentID, partition_id partitionID, off_t offset, - Vector *contentsToMove) + const partition_id *contentsToMove, + int32 contentsToMoveCount) { // not implemented return NULL; @@ -110,6 +115,14 @@ KDiskDeviceJobFactory::CreateInitializeJob(partition_id partitionID, return NULL; } +// CreateUninitializeJob +KDiskDeviceJob * +KDiskDeviceJobFactory::CreateUninitializeJob(partition_id partitionID) +{ + // not implemented + return NULL; +} + // CreateCreateChildJob KDiskDeviceJob * KDiskDeviceJobFactory::CreateCreateChildJob(partition_id partitionID,