Fix ZIP drive classification in tdehwlib

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 6dfc04c51a)
pull/16/head
Slávek Banko 9 years ago
parent 107e863644
commit 111cc009ea

@ -1014,16 +1014,21 @@ TDEDiskDeviceType::TDEDiskDeviceType classifyDiskType(udev_device* dev, const TQ
disktype = disktype | TDEDiskDeviceType::USB;
}
if (disktypestring.upper() == "DISK") {
disktype = disktype | TDEDiskDeviceType::HDD;
}
if ((disktypestring.upper() == "FLOPPY")
|| (TQString(udev_device_get_property_value(dev, "ID_DRIVE_FLOPPY")) == "1")) {
disktype = disktype | TDEDiskDeviceType::Floppy;
disktype = disktype & ~TDEDiskDeviceType::HDD;
}
if (disktypestring.upper() == "ZIP") {
disktype = disktype | TDEDiskDeviceType::Zip;
}
if ((devicevendor.upper() == "IOMEGA") && (devicemodel.upper().contains("ZIP"))) {
if ((disktypestring.upper() == "ZIP")
|| (TQString(udev_device_get_property_value(dev, "ID_DRIVE_FLOPPY_ZIP")) == "1")
|| ((devicevendor.upper() == "IOMEGA") && (devicemodel.upper().contains("ZIP")))) {
disktype = disktype | TDEDiskDeviceType::Zip;
disktype = disktype & ~TDEDiskDeviceType::HDD;
}
if ((devicevendor.upper() == "APPLE") && (devicemodel.upper().contains("IPOD"))) {
@ -1077,10 +1082,6 @@ TDEDiskDeviceType::TDEDiskDeviceType classifyDiskType(udev_device* dev, const TQ
disktype = disktype | TDEDiskDeviceType::Jaz;
}
if (disktypestring.upper() == "DISK") {
disktype = disktype | TDEDiskDeviceType::HDD;
}
if (disktypestring.upper() == "CD") {
disktype = disktype | TDEDiskDeviceType::Optical;

Loading…
Cancel
Save