RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:37:44 +00:00
Code Issues Activity Actions

Kernel/Storage: Remove duplicate private declaration in NVMeQueue class

Browse source 
Also, the override of handle_irq method can be private too.
This commit is contained in:
Liav A 2022-01-23 20:23:19 +02:00 • committed by Linus Groh
parent 64adb2ef96
commit 4597e980fe
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Storage/NVMe/NVMeQueue.h
View file

@ -33,7 +33,6 @@ public:
ErrorOr<void> create(); ErrorOr<void> create();
explicit NVMeQueue(u16 qid, u8 irq, u32 q_depth, OwnPtr<Memory::Region> cq_dma_region, NonnullRefPtrVector<Memory::PhysicalPage> cq_dma_page, OwnPtr<Memory::Region> sq_dma_region, NonnullRefPtrVector<Memory::PhysicalPage> sq_dma_page, Memory::TypedMapping<volatile DoorbellRegister> db_regs); explicit NVMeQueue(u16 qid, u8 irq, u32 q_depth, OwnPtr<Memory::Region> cq_dma_region, NonnullRefPtrVector<Memory::PhysicalPage> cq_dma_page, OwnPtr<Memory::Region> sq_dma_region, NonnullRefPtrVector<Memory::PhysicalPage> sq_dma_page, Memory::TypedMapping<volatile DoorbellRegister> db_regs);
bool is_admin_queue() { return m_admin_queue; }; bool is_admin_queue() { return m_admin_queue; };
virtual bool handle_irq(const RegisterState&) override;
void submit_sqe(NVMeSubmission&); void submit_sqe(NVMeSubmission&);
u16 submit_sync_sqe(NVMeSubmission&); u16 submit_sync_sqe(NVMeSubmission&);
void read(AsyncBlockDeviceRequest& request, u16 nsid, u64 index, u32 count); void read(AsyncBlockDeviceRequest& request, u16 nsid, u64 index, u32 count);
@ -42,6 +41,8 @@ public:
void disable_interrupts() { disable_irq(); }; void disable_interrupts() { disable_irq(); };
private: private:
virtual bool handle_irq(const RegisterState&) override;
bool cqe_available(); bool cqe_available();
void update_cqe_head(); void update_cqe_head();
void complete_current_request(u16 status); void complete_current_request(u16 status);
@ -55,7 +56,6 @@ private:
m_db_regs->sq_tail = m_sq_tail; m_db_regs->sq_tail = m_sq_tail;
} }
private:
u16 m_qid {}; u16 m_qid {};
u8 m_cq_valid_phase { 1 }; u8 m_cq_valid_phase { 1 };
u16 m_sq_tail {}; u16 m_sq_tail {};