From 107e863644c853db9239eae62e3ad62758f0d724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 27 Jan 2016 23:05:06 +0100 Subject: Classify flash drives as HDD in tdehwlib This relates to Bug 2473 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 6a2a9de49cc8987d0f43bc1076db81771fe2f50e) --- tdecore/tdehw/tdehardwaredevices.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp index 1ad200c68..89d9232ee 100644 --- a/tdecore/tdehw/tdehardwaredevices.cpp +++ b/tdecore/tdehw/tdehardwaredevices.cpp @@ -1040,16 +1040,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") @@ -1057,11 +1060,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") { -- cgit v1.2.1