From 5540bc4147f10198fc7e95eefbf4d2ba01c0f07b Mon Sep 17 00:00:00 2001 From: Bananymous Date: Thu, 2 Jul 2026 15:21:24 +0300 Subject: [PATCH] Kernel: Fix USB SCSI device naming --- kernel/include/kernel/USB/MassStorage/SCSIDevice.h | 2 +- kernel/kernel/USB/MassStorage/SCSIDevice.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel/include/kernel/USB/MassStorage/SCSIDevice.h b/kernel/include/kernel/USB/MassStorage/SCSIDevice.h index 3abd2db8..b1a8ef51 100644 --- a/kernel/include/kernel/USB/MassStorage/SCSIDevice.h +++ b/kernel/include/kernel/USB/MassStorage/SCSIDevice.h @@ -33,7 +33,7 @@ namespace Kernel const uint64_t m_block_count; const uint32_t m_block_size; - const char m_name[4]; + char m_name[4]; friend class BAN::RefPtr; }; diff --git a/kernel/kernel/USB/MassStorage/SCSIDevice.cpp b/kernel/kernel/USB/MassStorage/SCSIDevice.cpp index a3cdfa81..cdcc8be9 100644 --- a/kernel/kernel/USB/MassStorage/SCSIDevice.cpp +++ b/kernel/kernel/USB/MassStorage/SCSIDevice.cpp @@ -132,9 +132,12 @@ namespace Kernel , m_lun(lun) , m_block_count(block_count) , m_block_size(block_size) - , m_name { 's', 'd', (char)('a' + minor(m_rdev)), '\0' } { m_rdev = scsi_get_rdev(); + + strcpy(m_name, "sda"); + m_name[2] += minor(m_rdev); + } USBSCSIDevice::~USBSCSIDevice()