Simplified PCI device driver interface

Signed-off-by: SlyMarbo <[email protected]>

Author: SlyMarbo

kernel/src/drivers/mod.rs

@@ -3,22 +3,19 @@
 
 use crate::pci;
 
+/// PciDeviceDriver takes ownership of a PCI device.
+///
+pub type PciDeviceDriver = fn(device: pci::Device);
+
 /// device_supported is a callback called by the PCI module
 /// for each PCI device discovered. If the device is supported
 /// by a device driver, device_supported returns true and
 /// the device is passed to register_device, so the driver
 /// can take ownership.
 ///
-pub fn device_supported(device: &pci::Device) -> bool {
-    // TODO: once we have device drivers, ask them here.
-    false
-}
+pub fn device_supported(_device: &pci::Device) -> Option<PciDeviceDriver> {
+    // TODO: once we have device drivers, ask them here,
+    // returning their driver if so.
 
-/// register_device is a callback called by the PCI module
-/// for each PCI device discovered. If the device can be
-/// identified as a supported device, the corresponding
-/// driver is used to initialise the device.
-///
-pub fn register_device(device: pci::Device) {
-    // TODO: once we have device drivers, initialise them here.
+    None
 }

kernel/src/pci.rs

@@ -216,8 +216,8 @@ fn scan_slot(bus: u8, slot: u8) {
         devtype,
     };
 
-    if drivers::device_supported(&dev) {
-        drivers::register_device(dev);
+    if let Some(driver) = drivers::device_supported(&dev) {
+        driver(dev);
     } else {
         UNKNOWN_DEVICES.lock().push(dev);
     }