vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Set mac address on boot

Browse source
This commit is contained in:
Jeremy Soller 2016-10-22 19:13:57 -06:00
parent df2327b175
commit 7e12dea0fe
6 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/e1000d/Cargo.toml
View file

@ -7,5 +7,5 @@ bitflags = "*"
dma = { path = "../../crates/dma/" } dma = { path = "../../crates/dma/" }
event = { path = "../../crates/event/" } event = { path = "../../crates/event/" }
io = { path = "../../crates/io/" } io = { path = "../../crates/io/" }
spin = "*" netutils = { path = "../../programs/netutils/" }
syscall = { path = "../../syscall/" } syscall = { path = "../../syscall/" }

2
drivers/e1000d/src/device.rs
View file

@ -1,6 +1,7 @@
use std::{cmp, mem, ptr, slice}; use std::{cmp, mem, ptr, slice};
use dma::Dma; use dma::Dma;
use netutils::setcfg;
use syscall::error::{Error, EACCES, EWOULDBLOCK, Result}; use syscall::error::{Error, EACCES, EWOULDBLOCK, Result};
use syscall::scheme::Scheme; use syscall::scheme::Scheme;
@ -272,6 +273,7 @@ impl Intel8254x {
mac_high as u8, mac_high as u8,
(mac_high >> 8) as u8]; (mac_high >> 8) as u8];
println!(" - MAC: {:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); println!(" - MAC: {:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
let _ = setcfg("mac", &format!("{:>02X}.{:>02X}.{:>02X}.{:>02X}.{:>02X}.{:>02X}", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]));
// //
// MTA => 0; // MTA => 0;

1
drivers/e1000d/src/main.rs
View file

@ -2,6 +2,7 @@
extern crate dma; extern crate dma;
extern crate event; extern crate event;
extern crate netutils;
extern crate syscall; extern crate syscall;
use std::cell::RefCell; use std::cell::RefCell;

2
drivers/rtl8168d/Cargo.toml
View file

@ -7,5 +7,5 @@ bitflags = "*"
dma = { path = "../../crates/dma/" } dma = { path = "../../crates/dma/" }
event = { path = "../../crates/event/" } event = { path = "../../crates/event/" }
io = { path = "../../crates/io/" } io = { path = "../../crates/io/" }
spin = "*" netutils = { path = "../../programs/netutils/" }
syscall = { path = "../../syscall/" } syscall = { path = "../../syscall/" }

2
drivers/rtl8168d/src/device.rs
View file

@ -2,6 +2,7 @@ use std::mem;
use dma::Dma; use dma::Dma;
use io::{Mmio, Io, ReadOnly}; use io::{Mmio, Io, ReadOnly};
use netutils::setcfg;
use syscall::error::{Error, EACCES, EWOULDBLOCK, Result}; use syscall::error::{Error, EACCES, EWOULDBLOCK, Result};
use syscall::scheme::SchemeMut; use syscall::scheme::SchemeMut;
@ -221,6 +222,7 @@ impl Rtl8168 {
mac_high as u8, mac_high as u8,
(mac_high >> 8) as u8]; (mac_high >> 8) as u8];
println!(" - MAC: {:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); println!(" - MAC: {:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
let _ = setcfg("mac", &format!("{:>02X}.{:>02X}.{:>02X}.{:>02X}.{:>02X}.{:>02X}", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]));
// Reset - this will disable tx and rx, reinitialize FIFOs, and set the system buffer pointer to the initial value // Reset - this will disable tx and rx, reinitialize FIFOs, and set the system buffer pointer to the initial value
self.regs.cmd.writef(1 << 4, true); self.regs.cmd.writef(1 << 4, true);

1
drivers/rtl8168d/src/main.rs
View file

@ -3,6 +3,7 @@
extern crate dma; extern crate dma;
extern crate event; extern crate event;
extern crate io; extern crate io;
extern crate netutils;
extern crate syscall; extern crate syscall;
use std::cell::RefCell; use std::cell::RefCell;