summaryrefslogtreecommitdiff
path: root/src/lib/cross.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-01-03 01:24:22 +0100
committerCarl Hetherington <cth@carlh.net>2025-01-07 00:41:32 +0100
commita52ccd4da36f22b33934c75c8f1c15daba4b4c00 (patch)
tree89ff59f8b24ab72774c9edf4f67ec8c857d6d822 /src/lib/cross.h
parent97254129aa39e8d06b0ff482e2b78c7ce33fa81b (diff)
Move OSXDisk out of common header.
Diffstat (limited to 'src/lib/cross.h')
-rw-r--r--src/lib/cross.h20
1 files changed, 6 insertions, 14 deletions
diff --git a/src/lib/cross.h b/src/lib/cross.h
index 10b0b113f..551895754 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -129,6 +129,12 @@ public:
private:
std::string _device;
+ /** Descriptions of how this drive is mounted. This is interpreted differently
+ * on different platforms.
+ *
+ * On macOS it's a list of device nodes e.g. /dev/disk8, /dev/disk8s2, /dev/disk7s5 or
+ * filesystem mount points (the contents are not important, just if any exist).
+ */
std::vector<boost::filesystem::path> _mount_points;
/** size in bytes */
uint64_t _size;
@@ -139,20 +145,6 @@ private:
void disk_write_finished ();
-struct OSXDisk
-{
- std::string bsd_name;
- std::string device;
- boost::optional<std::string> vendor;
- boost::optional<std::string> model;
- std::vector<boost::filesystem::path> mount_points;
- unsigned long size;
- bool system;
- bool writeable;
- bool partition;
-};
-
-
class ArgFixer
{
public: