From 6fbdfddecc9771adb43b7c673a99c93e50c33dbc Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Wed, 16 Oct 2024 13:49:53 +0200 Subject: FIX: SCSI driver fixes regarding scsi_packet_type. Signed-off-by: Amlal El Mahrouss --- dev/modules/SCSI/SCSI.hxx | 3 ++- dev/zka/StorageKit/SCSI.hxx | 2 +- dev/zka/src/Storage/SCSIDeviceInterface.cxx | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dev/modules/SCSI/SCSI.hxx b/dev/modules/SCSI/SCSI.hxx index 5283bc01..92c588d2 100644 --- a/dev/modules/SCSI/SCSI.hxx +++ b/dev/modules/SCSI/SCSI.hxx @@ -11,4 +11,5 @@ /// @file SCSI.hxx /// @brief Serial SCSI driver. -typedef Kernel::UInt16 scsi_packet_type[12]; +template +using scsi_packet_type = Kernel::UInt16[PacketBitLen]; diff --git a/dev/zka/StorageKit/SCSI.hxx b/dev/zka/StorageKit/SCSI.hxx index 84da51be..0cb124c8 100644 --- a/dev/zka/StorageKit/SCSI.hxx +++ b/dev/zka/StorageKit/SCSI.hxx @@ -8,4 +8,4 @@ #include -extern const scsi_packet_type kCDRomPacketTemplate; +extern const scsi_packet_type<12> kCDRomPacketTemplate; diff --git a/dev/zka/src/Storage/SCSIDeviceInterface.cxx b/dev/zka/src/Storage/SCSIDeviceInterface.cxx index da75a181..380aa5c0 100644 --- a/dev/zka/src/Storage/SCSIDeviceInterface.cxx +++ b/dev/zka/src/Storage/SCSIDeviceInterface.cxx @@ -7,5 +7,5 @@ #include ///! @brief ATAPI SCSI packet. -const scsi_packet_type kCDRomPacketTemplate = {0x43, 0, 1, 0, 0, 0, +const scsi_packet_type<12> kCDRomPacketTemplate = {0x43, 0, 1, 0, 0, 0, 0, 12, 0x40, 0, 0}; -- cgit v1.2.3