--- nono/vm/scsidev.h 2026/04/29 17:05:14 1.1.1.13 +++ nono/vm/scsidev.h 2026/04/29 17:05:21 1.1.1.15 @@ -36,7 +36,7 @@ class SCSIDevice : public IODevice { using inherited = IODevice; public: - SCSIDevice(const std::string& objname_); + SCSIDevice(int objid_); virtual ~SCSIDevice() override; // バスに接続 (SCSIBus::Attach から呼ばれる) @@ -129,7 +129,7 @@ class SCSIHostDevice : public SCSIDevice { using inherited = SCSIDevice; public: - SCSIHostDevice(const std::string& objname_); + SCSIHostDevice(int objid_); virtual ~SCSIHostDevice() override; bool Create() override; @@ -150,7 +150,7 @@ class SCSIHostDevice : public SCSIDevice } // SCSIBus を取得 (UI からインジケータ表示用) - std::shared_ptr GetSCSIBus() const { return scsibus; } + SCSIBus *GetSCSIBus() const { return scsibus.get(); } protected: DECLARE_MONITOR_CALLBACK(MonitorUpdateDevs); @@ -188,7 +188,7 @@ class SCSIHostDevice : public SCSIDevice // ID0 ||<----> bus |<----------+ // || +----------+ own // - std::shared_ptr scsibus {}; + std::unique_ptr scsibus {}; std::unique_ptr target[8] {}; // 接続中のデバイス(イニシエータ含む)を ID 順に並べたリスト (モニタ用) @@ -205,7 +205,7 @@ class SCSITarget : public SCSIDevice { using inherited = SCSIDevice; public: - SCSITarget(const std::string& objname_, SCSIHostDevice *h, int id); + SCSITarget(SCSIHostDevice *h, int id); virtual ~SCSITarget() override; void ResetHard(bool poweron) override;