Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Changed scsi_disk/scsi_cd to return FreeDesktop.org compatible icon names,

Browse Source 
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
This commit is contained in:
Axel Dörfler 2008-08-17 17:17:36 +00:00
parent 878cc30445
commit 58f14b4cc7
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp
View File

@ -740,7 +740,8 @@ cd_ioctl(void* cookie, uint32 op, void* buffer, size_t length)
} }
case B_GET_ICON_NAME: 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: 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)); 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: case B_SCSI_GET_TOC:
// TODO: we pass a user buffer here! // TODO: we pass a user buffer here!
return get_toc(info, (scsi_toc *)buffer); return get_toc(info, (scsi_toc *)buffer);

3
src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp
View File

@ -347,7 +347,8 @@ das_ioctl(void* cookie, uint32 op, void* buffer, size_t length)
case B_GET_ICON_NAME: case B_GET_ICON_NAME:
// TODO: take device type into account! // 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); B_FILE_NAME_LENGTH);
case B_GET_VECTOR_ICON: case B_GET_VECTOR_ICON: