File tree Expand file tree Collapse file tree 6 files changed +8
-24
lines changed
Expand file tree Collapse file tree 6 files changed +8
-24
lines changed Original file line number Diff line number Diff line change @@ -175,7 +175,7 @@ fn detect_interrupt(
175175 // The 3rd cell is the flags, encoded as follows:
176176 // bits[3:0] trigger type and level flags.
177177 // 1 = low-to-high edge triggered
178- // 2 = high-to-low edge triggered (invalid for SPIs)
178+ // 2 = high-to-low edge triggered (invalid for SPIs)
179179 // 4 = active high level-sensitive
180180 // 8 = active low level-sensitive (invalid for SPIs).
181181 // bits[15:8] PPI interrupt cpu mask. Each bit corresponds to each of
Original file line number Diff line number Diff line change @@ -303,10 +303,8 @@ impl TaskFrame for Task {
303303 ( * state) . tpidr_el0 = tls. thread_ptr ( ) . expose_provenance ( ) as u64 ;
304304 }
305305
306- /*
307- * The elr_el1 needs to hold the address of the
308- * first function to be called when returning from exception handler.
309- */
306+ // The elr_el1 needs to hold the address of the
307+ // first function to be called when returning from exception handler.
310308 ( * state) . elr_el1 = task_start;
311309 ( * state) . x0 = func as usize as u64 ; // use second argument to transfer the entry point
312310 ( * state) . x1 = arg as u64 ;
Original file line number Diff line number Diff line change @@ -281,9 +281,9 @@ el1_error_invalid:
281281. global vector_table
282282vector_table:
283283/ * Current EL with SP0 * /
284- ventry el1_sp0_sync // Synchronous EL1t
285- ventry el1_sp0_irq // IRQ EL1t
286- ventry el1_sp0_fiq // FIQ EL1t
284+ ventry el1_sp0_sync // Synchronous EL1t
285+ ventry el1_sp0_irq // IRQ EL1t
286+ ventry el1_sp0_fiq // FIQ EL1t
287287ventry el1_sp0_error // Error EL1t
288288
289289/ * Current EL with SPx * /
Original file line number Diff line number Diff line change @@ -417,12 +417,6 @@ where
417417 ) {
418418 assert ! ( L :: LEVEL >= S :: MAP_LEVEL ) ;
419419
420- // trace!(
421- // "Mapping frame {:#X} to page {:#X}",
422- // physical_address,
423- // page.virtual_address,
424- // );
425-
426420 if L :: LEVEL > S :: MAP_LEVEL {
427421 let index = page. table_index :: < L > ( ) ;
428422
@@ -567,11 +561,6 @@ pub fn virtual_to_physical(virtual_address: VirtAddr) -> Option<PhysAddr> {
567561 }
568562 let ppn = pte. address ( ) . as_u64 ( ) ;
569563 for j in i..PAGE_LEVELS {
570- // trace!(
571- // "ppn: {:#X}, {:#X}",
572- // ppn,
573- // ppn & (PAGE_MAP_MASK << (PAGE_BITS + j * PAGE_MAP_BITS)) as u64
574- // );
575564 phys_address |= ppn & ( PAGE_MAP_MASK << ( PAGE_BITS + j * PAGE_MAP_BITS ) ) as u64 ;
576565 }
577566 return Some ( PhysAddr :: new ( phys_address) ) ;
Original file line number Diff line number Diff line change @@ -84,7 +84,7 @@ register_bitfields! [
8484 DBW64 = 1 ,
8585 DBW128 = 2
8686 ] ,
87- MDCCLKDIV OFFSET ( 18 ) NUMBITS ( 3 ) [
87+ MDCCLKDIV OFFSET ( 18 ) NUMBITS ( 3 ) [
8888 CLK_DIV8 = 0 ,
8989 CLK_DIV16 = 1 ,
9090 CLK_DIV32 = 2 ,
@@ -659,9 +659,6 @@ pub fn init_device(
659659 // Program the Network Control Register
660660
661661 // Enable MDIO and enable transmitter/receiver
662- // (*gem).network_control.modify(
663- // NetworkControl::MDEN::SET + NetworkControl::TXEN::SET + NetworkControl::RXEN::SET,
664- // );
665662 ( * gem) . network_control . modify ( NetworkControl :: MDEN :: SET ) ;
666663
667664 // PHY Initialization
Original file line number Diff line number Diff line change @@ -708,7 +708,7 @@ impl BlockedTaskQueue {
708708
709709 let new_task_wakeup_time = self . list . front ( ) . and_then ( |task| task. wakeup_time ) ;
710710 cfg_if:: cfg_if! {
711- if #[ cfg( feature = "net" ) ] {
711+ if #[ cfg( feature = "net" ) ] {
712712 let network_wakeup_time = self . network_wakeup_time;
713713 } else {
714714 let network_wakeup_time = None ;
You can’t perform that action at this time.
0 commit comments