Merge #641

641: Remove some dependencies r=stlankes a=mkroening



Co-authored-by: Martin Kröning <mkroening@posteo.net>

Author: bors[bot]

Cargo.lock

@@ -51,7 +51,7 @@ harness = false
 default = ["pci", "pci-ids", "acpi", "fsgsbase", "smp", "tcp", "dhcpv4"]
 vga = []
 newlib = []
-pci = ["num-derive"]
+pci = []
 acpi = []
 smp = ["include-transformed"]
 fsgsbase = []
@@ -79,11 +79,7 @@ hermit-sync = "0.1.2"
 include-transformed = { version = "0.2", optional = true }
 linked_list_allocator = { version = "0.10", default-features = false }
 log = { version = "0.4", default-features = false }
-num = { version = "0.4", default-features = false }
-num-derive = { version = "0.3", optional = true }
-num-traits = { version = "0.2", default-features = false }
 pci-ids = { version = "0.2", optional = true }
-scopeguard = { version = "1.1", default-features = false }
 shell-words = { version = "1.1", default-features = false }
 qemu-exit = "3.0"
 rand_chacha = { version = "0.3", default-features = false }

Cargo.toml

@@ -2,7 +2,6 @@ use alloc::vec::Vec;
 use core::{fmt, u32, u8};
 
 use hermit_sync::{without_interrupts, InterruptTicketMutex};
-use num_derive::{FromPrimitive, ToPrimitive};
 use x86::io::*;
 
 use crate::arch::x86_64::mm::{PhysAddr, VirtAddr};
@@ -47,44 +46,6 @@ pub const PCI_CAP_ID_VNDR: u32 = 0x09;
 static mut PCI_ADAPTERS: Vec<PciAdapter> = Vec::new();
 static mut PCI_DRIVERS: Vec<PciDriver<'_>> = Vec::new();
 
-/// Classes of PCI nodes.
-#[derive(Copy, Clone, Debug, FromPrimitive, ToPrimitive, PartialEq, Eq)]
-pub enum PciClassCode {
-	TooOld = 0x00,
-	MassStorage = 0x01,
-	NetworkController = 0x02,
-	DisplayController = 0x03,
-	MultimediaController = 0x04,
-	MemoryController = 0x05,
-	BridgeDevice = 0x06,
-	SimpleCommunicationController = 0x07,
-	BaseSystemPeripheral = 0x08,
-	InputDevice = 0x09,
-	DockingStation = 0x0A,
-	Processor = 0x0B,
-	SerialBusController = 0x0C,
-	WirelessController = 0x0D,
-	IntelligentIoController = 0x0E,
-	EncryptionController = 0x0F,
-	DataAcquisitionSignalProcessing = 0x11,
-	Other = 0xFF,
-}
-
-/// Network Controller Sub Classes
-#[derive(Copy, Clone, Debug, FromPrimitive, ToPrimitive, PartialEq, Eq)]
-pub enum PciNetworkControllerSubclass {
-	Ethernet = 0x00,
-	TokenRing = 0x01,
-	Fddi = 0x02,
-	Atm = 0x03,
-	Isdn = 0x04,
-	WorldFip = 0x05,
-	Picmg = 0x06,
-	Infiniband = 0x07,
-	Fabric = 0x08,
-	Network = 0x80,
-}
-
 #[derive(Clone, Debug)]
 pub struct PciAdapter {
 	pub bus: u8,

src/arch/x86_64/kernel/pci.rs

@@ -620,40 +620,36 @@ impl BlockedTaskQueue {
 
 		// Shall the task automatically be woken up after a certain time?
 		if let Some(wt) = wakeup_time {
-			let first_task = true;
 			let mut cursor = self.list.cursor_front_mut();
-			let mut _guard = scopeguard::guard(first_task, |first_task| {
-				// If the task is the new first task in the list, update the one-shot timer
-				// to fire when this task shall be woken up.
+			let set_oneshot_timer = || {
 				#[cfg(not(feature = "tcp"))]
-				if first_task {
-					arch::set_oneshot_timer(wakeup_time);
-				}
+				arch::set_oneshot_timer(wakeup_time);
 				#[cfg(feature = "tcp")]
-				if first_task {
-					match self.network_wakeup_time {
-						Some(time) => {
-							if time > wt {
-								arch::set_oneshot_timer(wakeup_time);
-							} else {
-								arch::set_oneshot_timer(self.network_wakeup_time);
-							}
+				match self.network_wakeup_time {
+					Some(time) => {
+						if time > wt {
+							arch::set_oneshot_timer(wakeup_time);
+						} else {
+							arch::set_oneshot_timer(self.network_wakeup_time);
 						}
-						_ => arch::set_oneshot_timer(wakeup_time),
 					}
+					_ => arch::set_oneshot_timer(wakeup_time),
 				}
-			});
+			};
 
 			while let Some(node) = cursor.current() {
 				let node_wakeup_time = node.wakeup_time;
 				if node_wakeup_time.is_none() || wt < node_wakeup_time.unwrap() {
 					cursor.insert_before(new_node);
 
+					set_oneshot_timer();
 					return;
 				}
 
 				cursor.move_next();
 			}
+
+			set_oneshot_timer();
 		}
 
 		self.list.push_back(new_node);