Merge branch 'move_common_init' into 'main'
Move common::init call into pcid_interface::pci_daemon See merge request redox-os/base!102
This commit is contained in:
@@ -20,7 +20,6 @@ use std::cell::RefCell;
|
||||
pub mod device;
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon);
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,6 @@ QEMU ICH9 8086:293E
|
||||
*/
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon);
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ mod scheme;
|
||||
// FIXME add a driver-graphics implementation
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon);
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@ mod device;
|
||||
use self::device::Device;
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon);
|
||||
}
|
||||
|
||||
|
||||
@@ -476,7 +476,6 @@ impl MoveCursor {
|
||||
static DEVICE: spin::Once<virtio_core::Device> = spin::Once::new();
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon_runner);
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,6 @@ use pcid_interface::PciFunctionHandle;
|
||||
pub mod device;
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon);
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@ pub mod device;
|
||||
mod ixgbe;
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon);
|
||||
}
|
||||
|
||||
|
||||
@@ -36,7 +36,6 @@ fn map_bar(pcid_handle: &mut PciFunctionHandle) -> *mut u8 {
|
||||
}
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon);
|
||||
}
|
||||
|
||||
|
||||
@@ -36,7 +36,6 @@ fn map_bar(pcid_handle: &mut PciFunctionHandle) -> *mut u8 {
|
||||
}
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon);
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,6 @@ static_assertions::const_assert_eq!(core::mem::size_of::<VirtHeader>(), 12);
|
||||
|
||||
const MAX_BUFFER_LEN: usize = 65535;
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon_runner);
|
||||
}
|
||||
|
||||
|
||||
@@ -486,6 +486,7 @@ impl PciFunctionHandle {
|
||||
|
||||
pub fn pci_daemon<F: FnOnce(Daemon, PciFunctionHandle) -> !>(f: F) -> ! {
|
||||
Daemon::new(|daemon| {
|
||||
common::init();
|
||||
let pcid_handle = PciFunctionHandle::connect_default();
|
||||
f(daemon, pcid_handle)
|
||||
})
|
||||
|
||||
@@ -14,7 +14,6 @@ use log::{error, info};
|
||||
pub mod ahci;
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon);
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,6 @@ use crate::ide::{AtaCommand, AtaDisk, Channel};
|
||||
pub mod ide;
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon);
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,6 @@ fn time_arm(time_handle: &mut File, secs: i64) -> io::Result<()> {
|
||||
}
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon);
|
||||
}
|
||||
|
||||
|
||||
@@ -99,7 +99,6 @@ pub struct BlockVirtRequest {
|
||||
const_assert_eq!(core::mem::size_of::<BlockVirtRequest>(), 16);
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon_runner);
|
||||
}
|
||||
|
||||
|
||||
@@ -184,7 +184,6 @@ fn daemon_with_context_size<const N: usize>(
|
||||
}
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon);
|
||||
}
|
||||
|
||||
|
||||
@@ -190,7 +190,6 @@ impl VboxGuestInfo {
|
||||
}
|
||||
|
||||
fn main() {
|
||||
common::init();
|
||||
pcid_interface::pci_daemon(daemon);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user