From 58f14b4cc7059b81eb37ca44273f5be0a121bffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 17 Aug 2008 17:17:36 +0000 Subject: [PATCH] * Changed scsi_disk/scsi_cd to return FreeDesktop.org compatible icon names, see http://www.freedesktop.org/wiki/Specifications/icon-naming-spec for more info. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27008 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp | 7 ++----- .../kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp b/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp index 4f6d244135..f80cd8ee80 100644 --- a/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp +++ b/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp @@ -740,7 +740,8 @@ cd_ioctl(void* cookie, uint32 op, void* buffer, size_t length) } case B_GET_ICON_NAME: - return user_strlcpy((char*)buffer, "device-cd", B_FILE_NAME_LENGTH); + return user_strlcpy((char*)buffer, "devices/drive-optical", + B_FILE_NAME_LENGTH); case B_GET_VECTOR_ICON: { @@ -760,10 +761,6 @@ cd_ioctl(void* cookie, uint32 op, void* buffer, size_t length) return user_memcpy(buffer, &iconData, sizeof(device_icon)); } - case B_GET_ICON: - return sSCSIPeripheral->get_icon(icon_type_cd, - (device_icon *)buffer); - case B_SCSI_GET_TOC: // TODO: we pass a user buffer here! return get_toc(info, (scsi_toc *)buffer); diff --git a/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp b/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp index 933a84796b..72dec27aca 100644 --- a/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp +++ b/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp @@ -347,7 +347,8 @@ das_ioctl(void* cookie, uint32 op, void* buffer, size_t length) case B_GET_ICON_NAME: // TODO: take device type into account! - return user_strlcpy((char*)buffer, "device-harddisk", + return user_strlcpy((char*)buffer, info->removable + ? "devices/drive-removable-media" : "devices/drive-harddisk", B_FILE_NAME_LENGTH); case B_GET_VECTOR_ICON: