From 9219768a974ab8dfef2cc24fb34f9ad8a7d7095a Mon Sep 17 00:00:00 2001 From: X512 Date: Thu, 16 Apr 2020 17:36:17 +0900 Subject: [PATCH] scsi: add device names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifca8911a095ee93daf1b4976a037dbd7c016e923 Reviewed-on: https://review.haiku-os.org/c/haiku/+/2494 Reviewed-by: Jérôme Duval --- src/add-ons/kernel/bus_managers/scsi/sim_interface.cpp | 3 +++ src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp | 1 + 2 files changed, 4 insertions(+) diff --git a/src/add-ons/kernel/bus_managers/scsi/sim_interface.cpp b/src/add-ons/kernel/bus_managers/scsi/sim_interface.cpp index 30b3fcc7fd..af6a519be4 100644 --- a/src/add-ons/kernel/bus_managers/scsi/sim_interface.cpp +++ b/src/add-ons/kernel/bus_managers/scsi/sim_interface.cpp @@ -46,6 +46,9 @@ scsi_controller_added(device_node *parent) { device_attr attrs[] = { + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, + { string: "SCSI Controller" }}, + // remember who we are // (could use the controller name, but probably some software would choke) // TODO create_id() generates a 32 bit ranged integer but we need only 8 bits 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 5d6e0619ad..05246eb063 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 @@ -556,6 +556,7 @@ das_register_device(device_node *node) // ready to register device_attr attrs[] = { + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "SCSI Disk" }}, // tell block_io whether the device is removable {"removable", B_UINT8_TYPE, {ui8: deviceInquiry->removable_medium}}, // impose own max block restriction