@@ -369,11 +369,11 @@ fn search_mp_floating(memory_range: AddrRange<PhysAddr>) -> Result<&'static Apic
369
369
/// Helper function to detect APIC by the Multiprocessor Specification
370
370
fn detect_from_mp ( ) -> Result < PhysAddr , ( ) > {
371
371
let mp_float = if let Ok ( mpf) = search_mp_floating (
372
- AddrRange :: new ( PhysAddr :: new ( 0x9F000u64 ) , PhysAddr :: new ( 0xA0000u64 ) ) . unwrap ( ) ,
372
+ AddrRange :: new ( PhysAddr :: new ( 0x9f000u64 ) , PhysAddr :: new ( 0xa0000u64 ) ) . unwrap ( ) ,
373
373
) {
374
374
Ok ( mpf)
375
375
} else if let Ok ( mpf) = search_mp_floating (
376
- AddrRange :: new ( PhysAddr :: new ( 0xF0000u64 ) , PhysAddr :: new ( 0x10_0000u64 ) ) . unwrap ( ) ,
376
+ AddrRange :: new ( PhysAddr :: new ( 0xf0000u64 ) , PhysAddr :: new ( 0x10_0000u64 ) ) . unwrap ( ) ,
377
377
) {
378
378
Ok ( mpf)
379
379
} else {
@@ -415,7 +415,7 @@ fn detect_from_mp() -> Result<PhysAddr, ()> {
415
415
416
416
if mp_config. entry_count == 0 {
417
417
warn ! ( "No MP table entries! Guess IO-APIC!" ) ;
418
- let default_address = PhysAddr :: new ( 0xFEC0_0000 ) ;
418
+ let default_address = PhysAddr :: new ( 0xfec0_0000 ) ;
419
419
420
420
init_ioapic_address ( default_address) ;
421
421
} else {
@@ -455,7 +455,7 @@ fn detect_from_mp() -> Result<PhysAddr, ()> {
455
455
fn default_apic ( ) -> PhysAddr {
456
456
warn ! ( "Try to use default APIC address" ) ;
457
457
458
- let default_address = PhysAddr :: new ( 0xFEE0_0000 ) ;
458
+ let default_address = PhysAddr :: new ( 0xfee0_0000 ) ;
459
459
460
460
// currently, uhyve doesn't support an IO-APIC
461
461
if !env:: is_uhyve ( ) {
@@ -866,7 +866,7 @@ pub fn wakeup_core(core_id_to_wakeup: CoreId) {
866
866
/// Translate the x2APIC MSR into an xAPIC memory address.
867
867
#[ inline]
868
868
fn translate_x2apic_msr_to_xapic_address ( x2apic_msr : u32 ) -> VirtAddr {
869
- * LOCAL_APIC_ADDRESS . get ( ) . unwrap ( ) + ( ( u64:: from ( x2apic_msr) & 0xFF ) << 4 )
869
+ * LOCAL_APIC_ADDRESS . get ( ) . unwrap ( ) + ( ( u64:: from ( x2apic_msr) & 0xff ) << 4 )
870
870
}
871
871
872
872
fn local_apic_read ( x2apic_msr : u32 ) -> u32 {
@@ -902,11 +902,11 @@ fn ioapic_read(reg: u32) -> u32 {
902
902
}
903
903
904
904
fn ioapic_version ( ) -> u32 {
905
- ioapic_read ( IOAPIC_REG_VER ) & 0xFF
905
+ ioapic_read ( IOAPIC_REG_VER ) & 0xff
906
906
}
907
907
908
908
fn ioapic_max_redirection_entry ( ) -> u8 {
909
- ( ( ioapic_read ( IOAPIC_REG_VER ) >> 16 ) & 0xFF ) as u8
909
+ ( ( ioapic_read ( IOAPIC_REG_VER ) >> 16 ) & 0xff ) as u8
910
910
}
911
911
912
912
fn local_apic_write ( x2apic_msr : u32 , value : u64 ) {
@@ -934,7 +934,7 @@ fn local_apic_write(x2apic_msr: u32, value: u64) {
934
934
935
935
// Instead of a single 64-bit ICR register, xAPIC has two 32-bit registers (ICR1 and ICR2).
936
936
// There is a gap between them and the destination field in ICR2 is also 8 bits instead of 32 bits.
937
- let destination = ( ( value >> 8 ) & 0xFF00_0000 ) as u32 ;
937
+ let destination = ( ( value >> 8 ) & 0xff00_0000 ) as u32 ;
938
938
let icr2 = unsafe {
939
939
& mut * ( ( * LOCAL_APIC_ADDRESS . get ( ) . unwrap ( ) + APIC_ICR2 ) . as_mut_ptr :: < u32 > ( ) )
940
940
} ;
0 commit comments