Move devices into a separate module.

src/blk.rs → src/device/blk.rs

@@ -1,3 +1,5 @@
+//! Driver for VirtIO block devices.
+
 use crate::hal::Hal;
 use crate::queue::VirtQueue;
 use crate::transport::Transport;

src/console.rs → src/device/console.rs

@@ -1,3 +1,5 @@
+//! Driver for VirtIO console devices.
+
 use crate::hal::{Dma, Hal};
 use crate::queue::VirtQueue;
 use crate::transport::Transport;

src/gpu.rs → src/device/gpu.rs

@@ -1,3 +1,5 @@
+//! Driver for VirtIO GPU devices.
+
 use crate::hal::{Dma, Hal};
 use crate::queue::VirtQueue;
 use crate::transport::Transport;

src/input.rs → src/device/input.rs

@@ -1,3 +1,5 @@
+//! Driver for VirtIO input devices.
+
 use crate::hal::Hal;
 use crate::queue::VirtQueue;
 use crate::transport::Transport;

src/device/mod.rs

@@ -0,0 +1,8 @@
+//! Drivers for specific VirtIO devices.
+
+pub mod blk;
+pub mod console;
+pub mod gpu;
+#[cfg(feature = "alloc")]
+pub mod input;
+pub mod net;

src/net.rs → src/device/net.rs

@@ -1,3 +1,5 @@
+//! Driver for VirtIO network devices.
+
 use crate::hal::Hal;
 use crate::queue::VirtQueue;
 use crate::transport::Transport;

src/lib.rs

@@ -8,24 +8,19 @@
 #[cfg(any(feature = "alloc", test))]
 extern crate alloc;
 
-mod blk;
-mod console;
-mod gpu;
+mod device;
 mod hal;
-#[cfg(feature = "alloc")]
-mod input;
-mod net;
 mod queue;
 mod transport;
 mod volatile;
 
-pub use self::blk::{BlkReq, BlkResp, RespStatus, VirtIOBlk, SECTOR_SIZE};
-pub use self::console::VirtIOConsole;
-pub use self::gpu::VirtIOGpu;
-pub use self::hal::{Hal, PhysAddr, VirtAddr};
+pub use self::device::blk::{BlkReq, BlkResp, RespStatus, VirtIOBlk, SECTOR_SIZE};
+pub use self::device::console::VirtIOConsole;
+pub use self::device::gpu::VirtIOGpu;
 #[cfg(feature = "alloc")]
-pub use self::input::{InputConfigSelect, InputEvent, VirtIOInput};
-pub use self::net::VirtIONet;
+pub use self::device::input::{InputConfigSelect, InputEvent, VirtIOInput};
+pub use self::device::net::VirtIONet;
+pub use self::hal::{Hal, PhysAddr, VirtAddr};
 pub use self::transport::mmio::{MmioError, MmioTransport, MmioVersion, VirtIOHeader};
 pub use self::transport::pci;
 pub use self::transport::{DeviceStatus, DeviceType, Transport};