* Added BDiskSystem::ShortName() and everything needed to get it there.
* Added BDiskDeviceRoster::GetDiskSystem() method, that can get a disk system by short/pretty/module name - since they should all be unique, I put them in a single namespace, please complain if you don't like that :-) * Cleaned up DiskSystem.h and DiskDeviceRoster.h according to the updated header guidelines. * Renamed ntfs pretty name from "ntfs File System" to "Windows NT File System". git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25414 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
@@ -1,8 +1,7 @@
|
||||
//----------------------------------------------------------------------
|
||||
// This software is part of the OpenBeOS distribution and is covered
|
||||
// by the OpenBeOS license.
|
||||
//---------------------------------------------------------------------
|
||||
|
||||
/*
|
||||
* Copyright 2003-2008, Haiku Inc.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef _DISK_DEVICE_ROSTER_H
|
||||
#define _DISK_DEVICE_ROSTER_H
|
||||
|
||||
@@ -85,44 +84,51 @@ enum {
|
||||
|
||||
class BDiskDeviceRoster {
|
||||
public:
|
||||
BDiskDeviceRoster();
|
||||
~BDiskDeviceRoster();
|
||||
|
||||
status_t GetNextDevice(BDiskDevice *device);
|
||||
status_t RewindDevices();
|
||||
|
||||
status_t GetNextDiskSystem(BDiskSystem *system);
|
||||
status_t RewindDiskSystems();
|
||||
BDiskDeviceRoster();
|
||||
~BDiskDeviceRoster();
|
||||
|
||||
partition_id RegisterFileDevice(const char *filename);
|
||||
// publishes: /dev/disk/virtual/files/<disk device ID>/raw
|
||||
status_t UnregisterFileDevice(const char *filename);
|
||||
status_t UnregisterFileDevice(partition_id device);
|
||||
status_t GetNextDevice(BDiskDevice* device);
|
||||
status_t RewindDevices();
|
||||
|
||||
bool VisitEachDevice(BDiskDeviceVisitor *visitor,
|
||||
BDiskDevice *device = NULL);
|
||||
bool VisitEachPartition(BDiskDeviceVisitor *visitor,
|
||||
BDiskDevice *device = NULL,
|
||||
BPartition **partition = NULL);
|
||||
status_t GetNextDiskSystem(BDiskSystem* system);
|
||||
status_t RewindDiskSystems();
|
||||
|
||||
bool VisitEachMountedPartition(BDiskDeviceVisitor *visitor,
|
||||
BDiskDevice *device = NULL,
|
||||
BPartition **partition = NULL);
|
||||
bool VisitEachMountablePartition(BDiskDeviceVisitor *visitor,
|
||||
BDiskDevice *device = NULL,
|
||||
BPartition **partition = NULL);
|
||||
|
||||
status_t GetDeviceWithID(partition_id id, BDiskDevice *device) const;
|
||||
status_t GetPartitionWithID(partition_id id, BDiskDevice *device,
|
||||
BPartition **partition) const;
|
||||
status_t GetDiskSystem(BDiskSystem* system, const char* name);
|
||||
|
||||
status_t GetDeviceForPath(const char *filename, BDiskDevice *device);
|
||||
status_t GetPartitionForPath(const char *filename, BDiskDevice *device,
|
||||
BPartition **partition);
|
||||
partition_id RegisterFileDevice(const char* filename);
|
||||
// publishes: /dev/disk/virtual/files/<disk device ID>/raw
|
||||
status_t UnregisterFileDevice(const char* filename);
|
||||
status_t UnregisterFileDevice(partition_id device);
|
||||
|
||||
status_t StartWatching(BMessenger target,
|
||||
uint32 eventMask = B_DEVICE_REQUEST_ALL);
|
||||
status_t StopWatching(BMessenger target);
|
||||
bool VisitEachDevice(BDiskDeviceVisitor* visitor,
|
||||
BDiskDevice* device = NULL);
|
||||
bool VisitEachPartition(BDiskDeviceVisitor* visitor,
|
||||
BDiskDevice* device = NULL,
|
||||
BPartition** _partition = NULL);
|
||||
|
||||
bool VisitEachMountedPartition(
|
||||
BDiskDeviceVisitor* visitor,
|
||||
BDiskDevice* device = NULL,
|
||||
BPartition** _partition = NULL);
|
||||
bool VisitEachMountablePartition(
|
||||
BDiskDeviceVisitor* visitor,
|
||||
BDiskDevice* device = NULL,
|
||||
BPartition** _partition = NULL);
|
||||
|
||||
status_t GetDeviceWithID(partition_id id,
|
||||
BDiskDevice* device) const;
|
||||
status_t GetPartitionWithID(partition_id id,
|
||||
BDiskDevice* device,
|
||||
BPartition** _partition) const;
|
||||
|
||||
status_t GetDeviceForPath(const char* filename,
|
||||
BDiskDevice* device);
|
||||
status_t GetPartitionForPath(const char* filename,
|
||||
BDiskDevice* device, BPartition** _partition);
|
||||
|
||||
status_t StartWatching(BMessenger target,
|
||||
uint32 eventMask = B_DEVICE_REQUEST_ALL);
|
||||
status_t StopWatching(BMessenger target);
|
||||
|
||||
private:
|
||||
#if 0
|
||||
@@ -146,9 +152,9 @@ private:
|
||||
BDiskScannerPartitionAddOn **addOn);
|
||||
#endif // 0
|
||||
private:
|
||||
int32 fDeviceCookie;
|
||||
int32 fDiskSystemCookie;
|
||||
int32 fJobCookie;
|
||||
int32 fDeviceCookie;
|
||||
int32 fDiskSystemCookie;
|
||||
int32 fJobCookie;
|
||||
// BDirectory *fPartitionAddOnDir;
|
||||
// BDirectory *fFSAddOnDir;
|
||||
// int32 fPartitionAddOnDirIndex;
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
//----------------------------------------------------------------------
|
||||
// This software is part of the OpenBeOS distribution and is covered
|
||||
// by the OpenBeOS license.
|
||||
//---------------------------------------------------------------------
|
||||
|
||||
/*
|
||||
* Copyright 2003-2008, Haiku Inc.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef _DISK_SYSTEM_H
|
||||
#define _DISK_SYSTEM_H
|
||||
|
||||
|
||||
#include <DiskDeviceDefs.h>
|
||||
#include <String.h>
|
||||
|
||||
|
||||
class BPartition;
|
||||
class BString;
|
||||
struct user_disk_system_info;
|
||||
@@ -17,52 +16,58 @@ struct user_disk_system_info;
|
||||
|
||||
class BDiskSystem {
|
||||
public:
|
||||
BDiskSystem();
|
||||
BDiskSystem(const BDiskSystem& other);
|
||||
~BDiskSystem();
|
||||
BDiskSystem();
|
||||
BDiskSystem(const BDiskSystem& other);
|
||||
~BDiskSystem();
|
||||
|
||||
status_t InitCheck() const;
|
||||
status_t InitCheck() const;
|
||||
|
||||
const char *Name() const;
|
||||
const char *PrettyName() const;
|
||||
const char* Name() const;
|
||||
const char* ShortName() const;
|
||||
const char* PrettyName() const;
|
||||
|
||||
bool SupportsDefragmenting(bool *whileMounted) const;
|
||||
bool SupportsRepairing(bool checkOnly, bool *whileMounted) const;
|
||||
bool SupportsResizing(bool *whileMounted) const;
|
||||
bool SupportsResizingChild() const;
|
||||
bool SupportsMoving(bool *whileMounted) const;
|
||||
bool SupportsMovingChild() const;
|
||||
bool SupportsName() const;
|
||||
bool SupportsContentName() const;
|
||||
bool SupportsSettingName() const;
|
||||
bool SupportsSettingContentName(bool *whileMounted) const;
|
||||
bool SupportsSettingType() const;
|
||||
bool SupportsSettingParameters() const;
|
||||
bool SupportsSettingContentParameters(bool *whileMounted) const;
|
||||
bool SupportsCreatingChild() const;
|
||||
bool SupportsDeletingChild() const;
|
||||
bool SupportsInitializing() const;
|
||||
bool SupportsDefragmenting(bool* whileMounted) const;
|
||||
bool SupportsRepairing(bool checkOnly,
|
||||
bool* whileMounted) const;
|
||||
bool SupportsResizing(bool* whileMounted) const;
|
||||
bool SupportsResizingChild() const;
|
||||
bool SupportsMoving(bool* whileMounted) const;
|
||||
bool SupportsMovingChild() const;
|
||||
bool SupportsName() const;
|
||||
bool SupportsContentName() const;
|
||||
bool SupportsSettingName() const;
|
||||
bool SupportsSettingContentName(
|
||||
bool* whileMounted) const;
|
||||
bool SupportsSettingType() const;
|
||||
bool SupportsSettingParameters() const;
|
||||
bool SupportsSettingContentParameters(
|
||||
bool* whileMounted) const;
|
||||
bool SupportsCreatingChild() const;
|
||||
bool SupportsDeletingChild() const;
|
||||
bool SupportsInitializing() const;
|
||||
|
||||
status_t GetTypeForContentType(const char *contentType,
|
||||
BString* type) const;
|
||||
status_t GetTypeForContentType(const char* contentType,
|
||||
BString* type) const;
|
||||
|
||||
bool IsPartitioningSystem() const;
|
||||
bool IsFileSystem() const;
|
||||
bool IsPartitioningSystem() const;
|
||||
bool IsFileSystem() const;
|
||||
|
||||
BDiskSystem& operator=(const BDiskSystem& other);
|
||||
BDiskSystem& operator=(const BDiskSystem& other);
|
||||
|
||||
private:
|
||||
status_t _SetTo(disk_system_id id);
|
||||
status_t _SetTo(const user_disk_system_info *info);
|
||||
void _Unset();
|
||||
status_t _SetTo(disk_system_id id);
|
||||
status_t _SetTo(const user_disk_system_info* info);
|
||||
void _Unset();
|
||||
|
||||
private:
|
||||
friend class BDiskDeviceRoster;
|
||||
friend class BPartition;
|
||||
|
||||
disk_system_id fID;
|
||||
BString fName;
|
||||
BString fPrettyName;
|
||||
uint32 fFlags;
|
||||
disk_system_id fID;
|
||||
BString fName;
|
||||
BString fShortName;
|
||||
BString fPrettyName;
|
||||
uint32 fFlags;
|
||||
};
|
||||
|
||||
#endif // _DISK_SYSTEM_H
|
||||
|
||||
Reference in New Issue
Block a user