change static type

andre-richter · andre-richter · commit 6a9af3c2020d · 2021-03-16T23:24:59.000+01:00
diff --git a/04_zero_overhead_abstraction/README.md b/04_zero_overhead_abstraction/README.md
@@ -165,7 +165,7 @@ diff -uNr 03_hacky_hello_world/src/bsp/raspberrypi/cpu.rs 04_zero_overhead_abstr
 +//--------------------------------------------------------------------------------------------------
 +
 +/// Used by `arch` code to find the early boot core.
-+pub const BOOT_CORE_ID: usize = 0;
++pub const BOOT_CORE_ID: u64 = 0;
 
 diff -uNr 03_hacky_hello_world/src/bsp/raspberrypi/link.ld 04_zero_overhead_abstraction/src/bsp/raspberrypi/link.ld
 --- 03_hacky_hello_world/src/bsp/raspberrypi/link.ld
diff --git a/04_zero_overhead_abstraction/src/bsp/raspberrypi/cpu.rs b/04_zero_overhead_abstraction/src/bsp/raspberrypi/cpu.rs
@@ -9,4 +9,4 @@
 //--------------------------------------------------------------------------------------------------
 
 /// Used by `arch` code to find the early boot core.
-pub const BOOT_CORE_ID: usize = 0;
+pub const BOOT_CORE_ID: u64 = 0;
diff --git a/05_safe_globals/src/bsp/raspberrypi/cpu.rs b/05_safe_globals/src/bsp/raspberrypi/cpu.rs
@@ -9,4 +9,4 @@
 //--------------------------------------------------------------------------------------------------
 
 /// Used by `arch` code to find the early boot core.
-pub const BOOT_CORE_ID: usize = 0;
+pub const BOOT_CORE_ID: u64 = 0;
diff --git a/06_drivers_gpio_uart/src/bsp/raspberrypi/cpu.rs b/06_drivers_gpio_uart/src/bsp/raspberrypi/cpu.rs
@@ -9,4 +9,4 @@
 //--------------------------------------------------------------------------------------------------
 
 /// Used by `arch` code to find the early boot core.
-pub const BOOT_CORE_ID: usize = 0;
+pub const BOOT_CORE_ID: u64 = 0;
diff --git a/07_uart_chainloader/src/bsp/raspberrypi/cpu.rs b/07_uart_chainloader/src/bsp/raspberrypi/cpu.rs
@@ -9,4 +9,4 @@
 //--------------------------------------------------------------------------------------------------
 
 /// Used by `arch` code to find the early boot core.
-pub const BOOT_CORE_ID: usize = 0;
+pub const BOOT_CORE_ID: u64 = 0;
diff --git a/08_timestamps/src/bsp/raspberrypi/cpu.rs b/08_timestamps/src/bsp/raspberrypi/cpu.rs
@@ -9,4 +9,4 @@
 //--------------------------------------------------------------------------------------------------
 
 /// Used by `arch` code to find the early boot core.
-pub const BOOT_CORE_ID: usize = 0;
+pub const BOOT_CORE_ID: u64 = 0;
diff --git a/09_hw_debug_JTAG/src/bsp/raspberrypi/cpu.rs b/09_hw_debug_JTAG/src/bsp/raspberrypi/cpu.rs
@@ -9,4 +9,4 @@
 //--------------------------------------------------------------------------------------------------
 
 /// Used by `arch` code to find the early boot core.
-pub const BOOT_CORE_ID: usize = 0;
+pub const BOOT_CORE_ID: u64 = 0;
diff --git a/10_privilege_level/src/bsp/raspberrypi/cpu.rs b/10_privilege_level/src/bsp/raspberrypi/cpu.rs
@@ -9,4 +9,4 @@
 //--------------------------------------------------------------------------------------------------
 
 /// Used by `arch` code to find the early boot core.
-pub const BOOT_CORE_ID: usize = 0;
+pub const BOOT_CORE_ID: u64 = 0;
diff --git a/11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/cpu.rs b/11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/cpu.rs
@@ -9,4 +9,4 @@
 //--------------------------------------------------------------------------------------------------
 
 /// Used by `arch` code to find the early boot core.
-pub const BOOT_CORE_ID: usize = 0;
+pub const BOOT_CORE_ID: u64 = 0;
diff --git a/12_exceptions_part1_groundwork/src/bsp/raspberrypi/cpu.rs b/12_exceptions_part1_groundwork/src/bsp/raspberrypi/cpu.rs
@@ -9,4 +9,4 @@
 //--------------------------------------------------------------------------------------------------
 
 /// Used by `arch` code to find the early boot core.
-pub const BOOT_CORE_ID: usize = 0;
+pub const BOOT_CORE_ID: u64 = 0;
diff --git a/13_integrated_testing/src/bsp/raspberrypi/cpu.rs b/13_integrated_testing/src/bsp/raspberrypi/cpu.rs
@@ -9,4 +9,4 @@
 //--------------------------------------------------------------------------------------------------
 
 /// Used by `arch` code to find the early boot core.
-pub const BOOT_CORE_ID: usize = 0;
+pub const BOOT_CORE_ID: u64 = 0;
diff --git a/14_exceptions_part2_peripheral_IRQs/README.md b/14_exceptions_part2_peripheral_IRQs/README.md
@@ -1357,7 +1357,7 @@ diff -uNr 13_integrated_testing/src/bsp/device_driver/arm/gicv2.rs 14_exceptions
 +    }
 +
 +    unsafe fn init(&self) -> Result<(), &'static str> {
-+        if cpu::smp::core_id::<usize>() == bsp::cpu::BOOT_CORE_ID {
++        if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
 +            self.gicd.boot_core_init();
 +        }
 +
diff --git a/14_exceptions_part2_peripheral_IRQs/src/bsp/device_driver/arm/gicv2.rs b/14_exceptions_part2_peripheral_IRQs/src/bsp/device_driver/arm/gicv2.rs
@@ -139,7 +139,7 @@ impl driver::interface::DeviceDriver for GICv2 {
     }
 
     unsafe fn init(&self) -> Result<(), &'static str> {
-        if cpu::smp::core_id::<usize>() == bsp::cpu::BOOT_CORE_ID {
+        if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
             self.gicd.boot_core_init();
         }
 
diff --git a/14_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/cpu.rs b/14_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/cpu.rs
@@ -9,4 +9,4 @@
 //--------------------------------------------------------------------------------------------------
 
 /// Used by `arch` code to find the early boot core.
-pub const BOOT_CORE_ID: usize = 0;
+pub const BOOT_CORE_ID: u64 = 0;
diff --git a/15_virtual_mem_part2_mmio_remap/README.md b/15_virtual_mem_part2_mmio_remap/README.md
@@ -1077,7 +1077,7 @@ diff -uNr 14_exceptions_part2_peripheral_IRQs/src/bsp/device_driver/arm/gicv2.rs
 +            self.is_mmio_remapped.store(true, Ordering::Relaxed);
 +        }
 +
-         if cpu::smp::core_id::<usize>() == bsp::cpu::BOOT_CORE_ID {
+         if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
              self.gicd.boot_core_init();
          }
 
diff --git a/15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm/gicv2.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm/gicv2.rs
@@ -168,7 +168,7 @@ impl driver::interface::DeviceDriver for GICv2 {
             self.is_mmio_remapped.store(true, Ordering::Relaxed);
         }
 
-        if cpu::smp::core_id::<usize>() == bsp::cpu::BOOT_CORE_ID {
+        if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {
             self.gicd.boot_core_init();
         }
 
diff --git a/15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/cpu.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/cpu.rs
@@ -9,4 +9,4 @@
 //--------------------------------------------------------------------------------------------------
 
 /// Used by `arch` code to find the early boot core.
-pub const BOOT_CORE_ID: usize = 0;
+pub const BOOT_CORE_ID: u64 = 0;
diff --git a/X1_JTAG_boot/src/bsp/raspberrypi/cpu.rs b/X1_JTAG_boot/src/bsp/raspberrypi/cpu.rs
@@ -9,4 +9,4 @@
 //--------------------------------------------------------------------------------------------------
 
 /// Used by `arch` code to find the early boot core.
-pub const BOOT_CORE_ID: usize = 0;
+pub const BOOT_CORE_ID: u64 = 0;

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ diff -uNr 03_hacky_hello_world/src/bsp/raspberrypi/cpu.rs 04_zero_overhead_abstr`
`165`	`165`	`+//--------------------------------------------------------------------------------------------------`
`166`	`166`	`+`
`167`	`167`	+/// Used by `arch` code to find the early boot core.
`168`		`-+pub const BOOT_CORE_ID: usize = 0;`
	`168`	`++pub const BOOT_CORE_ID: u64 = 0;`
`169`	`169`
`170`	`170`	`diff -uNr 03_hacky_hello_world/src/bsp/raspberrypi/link.ld 04_zero_overhead_abstraction/src/bsp/raspberrypi/link.ld`
`171`	`171`	`--- 03_hacky_hello_world/src/bsp/raspberrypi/link.ld`
Original file line number	Diff line number	Diff line change
`@@ -1357,7 +1357,7 @@ diff -uNr 13_integrated_testing/src/bsp/device_driver/arm/gicv2.rs 14_exceptions`
`1357`	`1357`	`+ }`
`1358`	`1358`	`+`
`1359`	`1359`	`+ unsafe fn init(&self) -> Result<(), &'static str> {`
`1360`		`-+ if cpu::smp::core_id::<usize>() == bsp::cpu::BOOT_CORE_ID {`
	`1360`	`++ if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {`
`1361`	`1361`	`+ self.gicd.boot_core_init();`
`1362`	`1362`	`+ }`
`1363`	`1363`	`+`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ impl driver::interface::DeviceDriver for GICv2 {`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`unsafe fn init(&self) -> Result<(), &'static str> {`
`142`		`- if cpu::smp::core_id::<usize>() == bsp::cpu::BOOT_CORE_ID {`
	`142`	`+ if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {`
`143`	`143`	`self.gicd.boot_core_init();`
`144`	`144`	`}`
`145`	`145`
Original file line number	Diff line number	Diff line change
`@@ -1077,7 +1077,7 @@ diff -uNr 14_exceptions_part2_peripheral_IRQs/src/bsp/device_driver/arm/gicv2.rs`
`1077`	`1077`	`+ self.is_mmio_remapped.store(true, Ordering::Relaxed);`
`1078`	`1078`	`+ }`
`1079`	`1079`	`+`
`1080`		`- if cpu::smp::core_id::<usize>() == bsp::cpu::BOOT_CORE_ID {`
	`1080`	`+ if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {`
`1081`	`1081`	`self.gicd.boot_core_init();`
`1082`	`1082`	`}`
`1083`	`1083`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ impl driver::interface::DeviceDriver for GICv2 {`
`168`	`168`	`self.is_mmio_remapped.store(true, Ordering::Relaxed);`
`169`	`169`	`}`
`170`	`170`
`171`		`- if cpu::smp::core_id::<usize>() == bsp::cpu::BOOT_CORE_ID {`
	`171`	`+ if bsp::cpu::BOOT_CORE_ID == cpu::smp::core_id() {`
`172`	`172`	`self.gicd.boot_core_init();`
`173`	`173`	`}`
`174`	`174`