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

Kernel/SysFS: Adapt USB plug code to work with SysFS patterns

Browse source
This commit is contained in:
Liav A 2022-04-23 09:45:31 +03:00 • committed by Andreas Kling
parent 70afa0b171
commit cdab213750
6 changed files with 36 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Kernel/Bus/USB/USBDevice.cpp
View file

@ -11,6 +11,7 @@
#include <Kernel/Bus/USB/USBDescriptors.h>
#include <Kernel/Bus/USB/USBDevice.h>
#include <Kernel/Bus/USB/USBRequest.h>
#include <Kernel/FileSystem/SysFS/Subsystems/Bus/USB/DeviceInformation.h>
#include <Kernel/StdLib.h>
namespace Kernel::USB {

10
Kernel/Bus/USB/USBDevice.h
View file

@ -12,6 +12,10 @@
#include <Kernel/Bus/USB/USBConfiguration.h>
#include <Kernel/Bus/USB/USBPipe.h>
namespace Kernel {
class SysFSUSBDeviceInformation;
}
namespace Kernel::USB {
class USBController;
@ -22,6 +26,7 @@ class USBConfiguration;
// glues together:
//
// https://www.ftdichip.com/Support/Documents/TechnicalNotes/TN_113_Simplified%20Description%20of%20USB%20Device%20Enumeration.pdf
class Hub;
class Device : public RefCounted<Device> {
public:
enum class DeviceSpeed : u8 {
@ -51,6 +56,8 @@ public:
Vector<USBConfiguration> const& configurations() const { return m_configurations; }
SysFSUSBDeviceInformation& sysfs_device_info_node(Badge<USB::Hub>) { return *m_sysfs_device_info_node; }
protected:
Device(NonnullRefPtr<USBController> controller, u8 address, u8 port, DeviceSpeed speed, NonnullOwnPtr<Pipe> default_pipe);
@ -70,6 +77,9 @@ protected:
private:
IntrusiveListNode<Device, NonnullRefPtr<Device>> m_hub_child_node;
protected:
RefPtr<SysFSUSBDeviceInformation> m_sysfs_device_info_node;
public:
using List = IntrusiveList<&Device::m_hub_child_node>;
};

13
Kernel/Bus/USB/USBHub.cpp
View file

@ -45,6 +45,8 @@ ErrorOr<void> Hub::enumerate_and_power_on_hub()
// USBDevice::enumerate_device must be called before this.
VERIFY(m_address > 0);
m_sysfs_device_info_node = TRY(SysFSUSBDeviceInformation::create(*this));
if (m_device_descriptor.device_class != USB_CLASS_HUB) {
dbgln("USB Hub: Trying to enumerate and power on a device that says it isn't a hub.");
return EINVAL;
@ -131,7 +133,7 @@ ErrorOr<void> Hub::set_port_feature(u8 port, HubFeatureSelector feature_selector
void Hub::remove_children_from_sysfs()
{
for (auto& child : m_children)
SysFSUSBBusDirectory::the().unplug(child);
SysFSUSBBusDirectory::the().unplug({}, child.sysfs_device_info_node({}));
}
void Hub::check_for_port_updates()
@ -257,10 +259,10 @@ void Hub::check_for_port_updates()
auto hub = hub_or_error.release_value();
m_children.append(hub);
SysFSUSBBusDirectory::the().plug(hub);
SysFSUSBBusDirectory::the().plug({}, hub->sysfs_device_info_node({}));
} else {
m_children.append(device);
SysFSUSBBusDirectory::the().plug(device);
SysFSUSBBusDirectory::the().plug({}, device->sysfs_device_info_node({}));
}
} else {
@ -275,13 +277,12 @@ void Hub::check_for_port_updates()
}
if (device_to_remove) {
m_children.remove(*device_to_remove);
SysFSUSBBusDirectory::the().unplug(*device_to_remove);
SysFSUSBBusDirectory::the().unplug({}, device_to_remove->sysfs_device_info_node({}));
if (device_to_remove->device_descriptor().device_class == USB_CLASS_HUB) {
auto* hub_child = static_cast<Hub*>(device_to_remove.ptr());
hub_child->remove_children_from_sysfs();
}
m_children.remove(*device_to_remove);
} else {
dbgln_if(USB_DEBUG, "USB Hub: No child set up on port {}, ignoring detachment.", port_number);
}