thermosphere: add singleton define

2020-02-11 22:57:12 +00:00
parent c99a77a0c3
commit b21c75b22b
5 changed files with 12 additions and 22 deletions
--- a/thermosphere/src/hvisor_irq_manager.hpp
+++ b/thermosphere/src/hvisor_irq_manager.hpp
@@ -25,11 +25,9 @@
 namespace ams::hvisor {

    class IrqManager final {
-        NON_COPYABLE(IrqManager);
-        NON_MOVEABLE(IrqManager);
+        SINGLETON(IrqManager);
        friend class VirtualGic;
        private:
-            static IrqManager instance;
            static constexpr u8 hostPriority = 0;
            static constexpr u8 guestPriority = 1;

@@ -92,8 +90,6 @@ namespace ams::hvisor {
                gicd->sgir = GicV2Distributor::ForwardToAllOthers << 24 | id;
            }

-            static IrqManager &GetInstance() { return instance; }
-
            static void HandleInterrupt(ExceptionStackFrame *frame);

        public: