|
@@ -13,11 +13,13 @@
|
|
#include <AK/RefPtr.h>
|
|
#include <AK/RefPtr.h>
|
|
#include <AK/Time.h>
|
|
#include <AK/Time.h>
|
|
#include <AK/Types.h>
|
|
#include <AK/Types.h>
|
|
|
|
+#include <Kernel/API/DeviceEvent.h>
|
|
#include <Kernel/API/TimePage.h>
|
|
#include <Kernel/API/TimePage.h>
|
|
#include <Kernel/Arch/RegisterState.h>
|
|
#include <Kernel/Arch/RegisterState.h>
|
|
#include <Kernel/Devices/CharacterDevice.h>
|
|
#include <Kernel/Devices/CharacterDevice.h>
|
|
#include <Kernel/Devices/ConsoleDevice.h>
|
|
#include <Kernel/Devices/ConsoleDevice.h>
|
|
#include <Kernel/Devices/Device.h>
|
|
#include <Kernel/Devices/Device.h>
|
|
|
|
+#include <Kernel/Devices/DeviceControlDevice.h>
|
|
#include <Kernel/Devices/NullDevice.h>
|
|
#include <Kernel/Devices/NullDevice.h>
|
|
#include <Kernel/UnixTypes.h>
|
|
#include <Kernel/UnixTypes.h>
|
|
|
|
|
|
@@ -31,12 +33,17 @@ public:
|
|
static DeviceManagement& the();
|
|
static DeviceManagement& the();
|
|
void attach_null_device(NullDevice const&);
|
|
void attach_null_device(NullDevice const&);
|
|
|
|
|
|
|
|
+ void attach_device_control_device(DeviceControlDevice const&);
|
|
|
|
+
|
|
bool is_console_device_attached() const { return !m_console_device.is_null(); }
|
|
bool is_console_device_attached() const { return !m_console_device.is_null(); }
|
|
void attach_console_device(ConsoleDevice const&);
|
|
void attach_console_device(ConsoleDevice const&);
|
|
|
|
|
|
// FIXME: Once we have a singleton for managing many sound cards, remove this from here
|
|
// FIXME: Once we have a singleton for managing many sound cards, remove this from here
|
|
void attach_audio_device(CharacterDevice const&);
|
|
void attach_audio_device(CharacterDevice const&);
|
|
|
|
|
|
|
|
+ bool is_device_event_queue_ready_to_read() const;
|
|
|
|
+ Optional<DeviceEvent> dequeue_top_device_event(Badge<DeviceControlDevice>);
|
|
|
|
+
|
|
void after_inserting_device(Badge<Device>, Device&);
|
|
void after_inserting_device(Badge<Device>, Device&);
|
|
void before_device_removal(Badge<Device>, Device&);
|
|
void before_device_removal(Badge<Device>, Device&);
|
|
|
|
|
|
@@ -60,9 +67,13 @@ public:
|
|
private:
|
|
private:
|
|
RefPtr<NullDevice> m_null_device;
|
|
RefPtr<NullDevice> m_null_device;
|
|
RefPtr<ConsoleDevice> m_console_device;
|
|
RefPtr<ConsoleDevice> m_console_device;
|
|
|
|
+ RefPtr<DeviceControlDevice> m_device_control_device;
|
|
// FIXME: Once we have a singleton for managing many sound cards, remove this from here
|
|
// FIXME: Once we have a singleton for managing many sound cards, remove this from here
|
|
NonnullRefPtrVector<CharacterDevice, 1> m_audio_devices;
|
|
NonnullRefPtrVector<CharacterDevice, 1> m_audio_devices;
|
|
MutexProtected<HashMap<u64, Device*>> m_devices;
|
|
MutexProtected<HashMap<u64, Device*>> m_devices;
|
|
|
|
+
|
|
|
|
+ mutable Spinlock m_event_queue_lock;
|
|
|
|
+ CircularQueue<DeviceEvent, 100> m_event_queue;
|
|
};
|
|
};
|
|
|
|
|
|
}
|
|
}
|