Merge branch 'misc_changes' into 'main'

Misc changes

See merge request redox-os/base!43
This commit is contained in:
Jeremy Soller
2025-11-30 07:06:36 -07:00
7 changed files with 6 additions and 14 deletions
-3
View File
@@ -68,9 +68,6 @@ members = [
# Bootstrap needs it's own profile configuration
exclude = ["bootstrap"]
[profile.release]
lto = "fat"
[patch.crates-io]
# Needs libc 0.2 backport of https://github.com/rust-lang/libc/pull/4825
libc = { git = "https://gitlab.redox-os.org/redox-os/liblibc.git", branch = "redox-0.2" }
+1 -2
View File
@@ -1,6 +1,5 @@
#![allow(dead_code)]
use std::cmp;
use std::collections::BTreeMap;
use std::collections::HashMap;
use std::fmt::Write;
@@ -16,7 +15,7 @@ use common::timeout::Timeout;
use redox_scheme::scheme::SchemeSync;
use redox_scheme::CallerCtx;
use redox_scheme::OpenResult;
use syscall::error::{Error, Result, EACCES, EBADF, EINVAL, EIO, ENODEV, EWOULDBLOCK};
use syscall::error::{Error, Result, EACCES, EBADF, EIO, ENODEV, EWOULDBLOCK};
use spin::Mutex;
use syscall::schemev2::NewFdFlags;
+1 -2
View File
@@ -6,7 +6,6 @@ extern crate syscall;
use redox_scheme::wrappers::ReadinessBased;
use redox_scheme::Socket;
use std::cell::RefCell;
use std::fs::File;
use std::io::{Read, Write};
use std::os::unix::io::AsRawFd;
use std::usize;
@@ -44,7 +43,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
let address = unsafe { pcid_handle.map_bar(0) }.ptr.as_ptr() as usize;
let mut irq_file = pci_allocate_interrupt_vector(&mut pcid_handle, "ihdad");
let irq_file = pci_allocate_interrupt_vector(&mut pcid_handle, "ihdad");
{
let vend_prod: u32 = ((pci_config.func.full_device_id.vendor_id as u32) << 16)
+2 -2
View File
@@ -1,4 +1,4 @@
use std::{thread, time::{Duration, Instant}};
use std::time::{Duration, Instant};
pub struct Timeout {
instant: Instant,
@@ -42,4 +42,4 @@ impl Timeout {
Err(())
}
}
}
}
-3
View File
@@ -9,15 +9,12 @@ extern crate syscall;
use std::fs::File;
use std::io::{Read, Write};
use std::os::fd::AsRawFd;
use std::os::unix::io::{FromRawFd, RawFd};
use std::{env, iter};
use event::{user_data, EventQueue};
use libredox::flag;
use redox_scheme::wrappers::ReadinessBased;
use redox_scheme::Socket;
use std::cell::RefCell;
use syscall::error::EWOULDBLOCK;
pub mod device;
+1 -1
View File
@@ -55,7 +55,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
let bar = map_bar(&mut pcid_handle);
let mut irq_file = pci_allocate_interrupt_vector(&mut pcid_handle, "rtl8139d");
let irq_file = pci_allocate_interrupt_vector(&mut pcid_handle, "rtl8139d");
let mut scheme = NetworkScheme::new(
move || unsafe {
+1 -1
View File
@@ -55,7 +55,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
let bar = map_bar(&mut pcid_handle);
let mut irq_file = pci_allocate_interrupt_vector(&mut pcid_handle, "rtl8168d");
let irq_file = pci_allocate_interrupt_vector(&mut pcid_handle, "rtl8168d");
let mut scheme = NetworkScheme::new(
move || unsafe {