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

Use mmio, disable timer interrupt

Browse source
This commit is contained in:
Jeremy Soller 2016-11-22 17:05:23 -07:00
parent 796120e60d
commit 6821ed6bf5
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ struct Regs {
cmd_9346: Mmio<u8>, cmd_9346: Mmio<u8>,
_config: [Mmio<u8>; 6], _config: [Mmio<u8>; 6],
_rsv4: Mmio<u8>, _rsv4: Mmio<u8>,
_timer_int: Mmio<u32>, timer_int: Mmio<u32>,
_rsv5: Mmio<u32>, _rsv5: Mmio<u32>,
_phys_ar: Mmio<u32>, _phys_ar: Mmio<u32>,
_rsv6: [Mmio<u32>; 2], _rsv6: [Mmio<u32>; 2],
@ -67,11 +67,11 @@ struct Td {
pub struct Rtl8168 { pub struct Rtl8168 {
regs: &'static mut Regs, regs: &'static mut Regs,
receive_buffer: [Dma<[u8; 0x1FF8]>; 16], receive_buffer: [Dma<[Mmio<u8>; 0x1FF8]>; 16],
receive_ring: Dma<[Rd; 16]>, receive_ring: Dma<[Rd; 16]>,
transmit_buffer: [Dma<[u8; 7552]>; 16], transmit_buffer: [Dma<[Mmio<u8>; 7552]>; 16],
transmit_ring: Dma<[Td; 16]>, transmit_ring: Dma<[Td; 16]>,
transmit_buffer_h: [Dma<[u8; 7552]>; 1], transmit_buffer_h: [Dma<[Mmio<u8>; 7552]>; 1],
transmit_ring_h: Dma<[Td; 1]> transmit_ring_h: Dma<[Td; 1]>
} }
@ -97,7 +97,7 @@ impl SchemeMut for Rtl8168 {
let mut i = 0; let mut i = 0;
while i < buf.len() && i < rd_len as usize { while i < buf.len() && i < rd_len as usize {
buf[i] = data[i]; buf[i] = data[i].read();
i += 1; i += 1;
} }
@ -124,7 +124,7 @@ impl SchemeMut for Rtl8168 {
let mut i = 0; let mut i = 0;
while i < buf.len() && i < data.len() { while i < buf.len() && i < data.len() {
data[i] = buf[i]; data[i].write(buf[i]);
i += 1; i += 1;
} }
@ -231,8 +231,8 @@ impl Rtl8168 {
for i in 0..self.receive_ring.len() { for i in 0..self.receive_ring.len() {
let rd = &mut self.receive_ring[i]; let rd = &mut self.receive_ring[i];
let data = &mut self.receive_buffer[i]; let data = &mut self.receive_buffer[i];
rd.ctrl.write(OWN | data.len() as u32);
rd.buffer.write(data.physical() as u64); rd.buffer.write(data.physical() as u64);
rd.ctrl.write(OWN | data.len() as u32);
} }
if let Some(mut rd) = self.receive_ring.last_mut() { if let Some(mut rd) = self.receive_ring.last_mut() {
rd.ctrl.writef(EOR, true); rd.ctrl.writef(EOR, true);
@ -278,6 +278,9 @@ impl Rtl8168 {
self.regs.rdsar[0].write(self.receive_ring.physical() as u32); self.regs.rdsar[0].write(self.receive_ring.physical() as u32);
self.regs.rdsar[1].write((self.receive_ring.physical() >> 32) as u32); self.regs.rdsar[1].write((self.receive_ring.physical() >> 32) as u32);
// Disable timer interrupt
self.regs.timer_int.write(0);
//Clear ISR //Clear ISR
let isr = self.regs.isr.read(); let isr = self.regs.isr.read();
self.regs.isr.write(isr); self.regs.isr.write(isr);