summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-01-27 23:05:06 +0100
committerSlávek Banko <slavek.banko@axis.cz>2016-01-27 23:05:06 +0100
commit6a2a9de49cc8987d0f43bc1076db81771fe2f50e (patch)
tree344e9648470e5854881d60460d55c00b8d53079d
parent98c2c3cb3086e6680be3ef463f16e1159c692b77 (diff)
downloadtdelibs-6a2a9de4.tar.gz
tdelibs-6a2a9de4.zip
Classify flash drives as HDD in tdehwlib
This relates to Bug 2473 Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--tdecore/tdehw/tdehardwaredevices.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index 533f212e0..6c51e7c31 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -1041,16 +1041,19 @@ TDEDiskDeviceType::TDEDiskDeviceType classifyDiskType(udev_device* dev, const TQ
if ((disktypestring.upper() == "COMPACT_FLASH")
|| (TQString(udev_device_get_property_value(dev, "ID_DRIVE_FLASH_CF")) == "1")) {
disktype = disktype | TDEDiskDeviceType::CompactFlash;
+ disktype = disktype | TDEDiskDeviceType::HDD;
}
if ((disktypestring.upper() == "MEMORY_STICK")
|| (TQString(udev_device_get_property_value(dev, "ID_DRIVE_FLASH_MS")) == "1")) {
disktype = disktype | TDEDiskDeviceType::MemoryStick;
+ disktype = disktype | TDEDiskDeviceType::HDD;
}
if ((disktypestring.upper() == "SMART_MEDIA")
|| (TQString(udev_device_get_property_value(dev, "ID_DRIVE_FLASH_SM")) == "1")) {
disktype = disktype | TDEDiskDeviceType::SmartMedia;
+ disktype = disktype | TDEDiskDeviceType::HDD;
}
if ((disktypestring.upper() == "SD_MMC")
@@ -1058,11 +1061,13 @@ TDEDiskDeviceType::TDEDiskDeviceType classifyDiskType(udev_device* dev, const TQ
|| (TQString(udev_device_get_property_value(dev, "ID_DRIVE_FLASH_SDHC")) == "1")
|| (TQString(udev_device_get_property_value(dev, "ID_DRIVE_FLASH_MMC")) == "1")) {
disktype = disktype | TDEDiskDeviceType::SDMMC;
+ disktype = disktype | TDEDiskDeviceType::HDD;
}
if ((disktypestring.upper() == "FLASHKEY")
- || (TQString(udev_device_get_property_value(dev, " ID_DRIVE_FLASH")) == "1")) {
+ || (TQString(udev_device_get_property_value(dev, "ID_DRIVE_FLASH")) == "1")) {
disktype = disktype | TDEDiskDeviceType::Flash;
+ disktype = disktype | TDEDiskDeviceType::HDD;
}
if (disktypestring.upper() == "OPTICAL") {