Ticket #9320: 0001-FileDevice-implement-icon-ioctls.patch

File 0001-FileDevice-implement-icon-ioctls.patch, 4.0 KB (added by pulkomandy, 9 years ago)

  • src/system/kernel/device_manager/FileDevice.cpp 

    From 38ec030acea301f4753364c54ecb19a3d6433cc7 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Tue, 2 Dec 2014 08:38:51 +0100
Subject: [PATCH 1/2] FileDevice: implement icon ioctls

Fixes #9320.
---
 src/system/kernel/device_manager/FileDevice.cpp | 64 +++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/src/system/kernel/device_manager/FileDevice.cpp b/src/system/kernel/device_manager/FileDevice.cpp
index 3522db5..826eb31 100644
    a b  
    1919
    2020static const uint32 kBlockSize = 512;
    2121
     22static const uint8 kDeviceIcon[] = {
     23    0x6e, 0x63, 0x69, 0x66, 0x08, 0x05, 0x00, 0x04, 0x00, 0x54, 0x02, 0x00,
     24    0x06, 0x02, 0x3b, 0x01, 0x9b, 0x3a, 0xa2, 0x35, 0xbc, 0x24, 0x3e, 0x3c,
     25    0x71, 0xd2, 0x48, 0xd1, 0x7c, 0x49, 0x84, 0x91, 0x00, 0xe7, 0xbb, 0x8f,
     26    0xff, 0xc9, 0x98, 0x67, 0x02, 0x00, 0x06, 0x02, 0x3b, 0xa7, 0x11, 0x38,
     27    0xd0, 0xc8, 0xbb, 0xf4, 0xb8, 0x3e, 0x90, 0xe6, 0x4a, 0xed, 0x7c, 0x48,
     28    0x5b, 0xd7, 0x00, 0x8a, 0x56, 0x1d, 0xff, 0xb5, 0x7a, 0x3a, 0x02, 0x00,
     29    0x06, 0x02, 0xbb, 0x6f, 0xcb, 0xb8, 0xd4, 0xc8, 0x39, 0xaa, 0x71, 0xbc,
     30    0x39, 0x92, 0x49, 0x2f, 0xf1, 0x48, 0xd9, 0x6a, 0x00, 0xff, 0xc7, 0x90,
     31    0xff, 0xff, 0xf4, 0xea, 0x03, 0x66, 0x33, 0x00, 0x03, 0xff, 0xdf, 0xc0,
     32    0x03, 0xad, 0x72, 0x38, 0x11, 0x0a, 0x06, 0x26, 0x54, 0x3a, 0x46, 0x4c,
     33    0x45, 0x5c, 0x4b, 0x4c, 0x60, 0x3e, 0x60, 0x0a, 0x06, 0x38, 0x22, 0x26,
     34    0x2e, 0x26, 0x4f, 0x3c, 0x5a, 0x4e, 0x48, 0x4e, 0x2a, 0x0a, 0x04, 0x26,
     35    0x2e, 0x26, 0x4f, 0x3c, 0x5a, 0x3c, 0x37, 0x0a, 0x04, 0x3c, 0x37, 0x3c,
     36    0x5a, 0x4e, 0x48, 0x4e, 0x2a, 0x0a, 0x04, 0x38, 0x22, 0x26, 0x2e, 0x3c,
     37    0x37, 0x4e, 0x2a, 0x0a, 0x04, 0x28, 0x32, 0x28, 0x4e, 0x3a, 0x57, 0x3a,
     38    0x39, 0x0a, 0x04, 0x2a, 0x4d, 0x2b, 0x46, 0x38, 0x49, 0x2a, 0x43, 0x0a,
     39    0x04, 0x2a, 0x4d, 0x36, 0x52, 0x38, 0x49, 0x2b, 0x46, 0x0a, 0x04, 0x2a,
     40    0x4d, 0x38, 0x54, 0x38, 0x49, 0x36, 0x52, 0x0a, 0x04, 0x2e, 0x4c, 0xbb,
     41    0x2b, 0xc5, 0xd3, 0xbb, 0x2b, 0xc5, 0x07, 0x2e, 0x4a, 0x0a, 0x04, 0x2c,
     42    0x49, 0x34, 0x4d, 0x34, 0x4b, 0x2c, 0x47, 0x0a, 0x04, 0x2a, 0x35, 0x2a,
     43    0x40, 0x2b, 0x38, 0x38, 0x3b, 0x0a, 0x04, 0x36, 0x44, 0x2a, 0x40, 0x38,
     44    0x46, 0x38, 0x3b, 0x0a, 0x04, 0x2b, 0x38, 0x2a, 0x40, 0x36, 0x44, 0x38,
     45    0x3b, 0x0a, 0x04, 0x2e, 0xbe, 0x67, 0x2e, 0xbf, 0x33, 0xbb, 0x2d, 0xc0,
     46    0x3f, 0xbb, 0x2d, 0xbf, 0x73, 0x0a, 0x04, 0x2c, 0xbd, 0x29, 0x2c, 0xbd,
     47    0xf5, 0x34, 0x3f, 0x34, 0x3d, 0x08, 0x02, 0x2a, 0x4e, 0x2a, 0x54, 0x0e,
     48    0x0a, 0x01, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x01, 0x10, 0x10, 0x01, 0x17,
     49    0x84, 0x20, 0x04, 0x0a, 0x00, 0x01, 0x10, 0x30, 0x30, 0x29, 0x01, 0x17,
     50    0x84, 0x20, 0x04, 0x0a, 0x00, 0x01, 0x10, 0x30, 0x40, 0x1b, 0x01, 0x17,
     51    0x84, 0x20, 0x04, 0x0a, 0x00, 0x01, 0x01, 0x10, 0x01, 0x17, 0x84, 0x00,
     52    0x04, 0x0a, 0x02, 0x01, 0x02, 0x00, 0x0a, 0x03, 0x01, 0x03, 0x00, 0x0a,
     53    0x04, 0x01, 0x04, 0x00, 0x0a, 0x05, 0x01, 0x05, 0x00, 0x0a, 0x06, 0x02,
     54    0x0b, 0x06, 0x00, 0x0a, 0x02, 0x02, 0x07, 0x0d, 0x00, 0x0a, 0x07, 0x02,
     55    0x0c, 0x08, 0x00, 0x0a, 0x03, 0x02, 0x09, 0x0e, 0x08, 0x15, 0xff, 0x0a,
     56    0x00, 0x02, 0x0a, 0x0f, 0x08, 0x15, 0xff
     57};
     58
    2259
    2360struct FileDevice::Cookie {
    2461    int fd;
    … … FileDevice::Control(void* _cookie, int32 op, void* buffer, size_t length)  
    248285        case B_GET_ICON:
    249286            return B_UNSUPPORTED;
    250287
     288        case B_GET_ICON_NAME:
     289            return user_strlcpy((char *)buffer, "devices/device-volume",
     290                B_FILE_NAME_LENGTH);
     291            break;
     292
     293        case B_GET_VECTOR_ICON:
     294        {
     295            if (length != sizeof(device_icon)) {
     296                return B_BAD_VALUE;
     297            }
     298
     299            device_icon iconData;
     300            if (user_memcpy(&iconData, buffer, sizeof(device_icon)) != B_OK) {
     301                return B_BAD_ADDRESS;
     302            }
     303
     304            if (iconData.icon_size >= (int32)sizeof(kDeviceIcon)) {
     305                if (user_memcpy(iconData.icon_data, kDeviceIcon,
     306                        sizeof(kDeviceIcon)) != B_OK) {
     307                    return B_BAD_ADDRESS;
     308                }
     309            }
     310
     311            iconData.icon_size = sizeof(kDeviceIcon);
     312            return user_memcpy(buffer, &iconData, sizeof(device_icon));
     313        }
     314
    251315        case B_GET_GEOMETRY:
    252316        case B_GET_BIOS_GEOMETRY:
    253317        {