Adapt firmware-binaries/ code to new numeric types

Author: rslawson

bittide-instances/src/Bittide/Instances/Hitl/SoftUgnDemo/Core.hs

@@ -73,7 +73,7 @@ muConfig ::
 muConfig =
   PeConfig
     { cpu = Riscv32imc.vexRiscv1
-    , depthI = SNat @(Div (64 * 1024) 4)
+    , depthI = SNat @(Div (80 * 1024) 4)
     , depthD = SNat @(Div (64 * 1024) 4)
     , initI = Nothing
     , initD = Nothing

bittide-instances/src/Bittide/Instances/Hitl/SwitchDemo/Core.hs

@@ -140,7 +140,7 @@ muConfig ::
 muConfig =
   PeConfig
     { cpu = Riscv32imc.vexRiscv1
-    , depthI = SNat @(Div (64 * 1024) 4)
+    , depthI = SNat @(Div (72 * 1024) 4)
     , depthD = SNat @(Div (64 * 1024) 4)
     , initI = Nothing
     , initD = Nothing
@@ -157,7 +157,7 @@ ccConfig ::
 ccConfig =
   PeConfig
     { cpu = Riscv32imc.vexRiscv2
-    , depthI = SNat @(Div (64 * 1024) 4)
+    , depthI = SNat @(Div (72 * 1024) 4)
     , depthD = SNat @(Div (64 * 1024) 4)
     , initI = Nothing
     , initD = Nothing

firmware-binaries/Cargo.lock

@@ -5,6 +5,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
+use bittide_hal::manual_additions::unsigned::Unsigned;
 use core::panic::PanicInfo;
 use itertools::izip;
 
@@ -68,7 +69,7 @@ fn main() -> ! {
                 )
                 .map(|(i, counter)| {
                     if domain_diff_counters.enable(i).unwrap_or(false) {
-                        Some(counter)
+                        Some(counter.into_inner())
                     } else {
                         None
                     }
@@ -81,7 +82,8 @@ fn main() -> ! {
 
         // Store debug information. Stop capturing samples if we are stable to
         // reduce plot sizes.
-        let has_sense_of_global_time = freeze.number_of_sync_pulses_seen() != 0;
+        let has_sense_of_global_time =
+            freeze.number_of_sync_pulses_seen() != Unsigned::new(0).unwrap();
         if !prev_all_stable && has_sense_of_global_time {
             sample_store.store(&freeze, stability, callisto.accumulated_speed_requests);
         }

firmware-binaries/demos/clock-control/src/main.rs

@@ -10,10 +10,11 @@ license = "Apache-2.0"
 authors = ["Google LLC"]
 
 [dependencies]
-riscv-rt = "0.11.0"
+bittide-macros = { path = "../../../firmware-support/bittide-macros" }
+bittide-hal = { path = "../../../firmware-support/bittide-hal" }
 bittide-sys = { path = "../../../firmware-support/bittide-sys" }
+riscv-rt = "0.11.0"
 ufmt = "0.2.0"
-bittide-hal = { path = "../../../firmware-support/bittide-hal" }
 
 [build-dependencies]
 memmap-generate = { path = "../../../firmware-support/memmap-generate" }

firmware-binaries/demos/soft-ugn-mu/Cargo.toml

@@ -5,9 +5,11 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-use bittide_hal::hals::soft_ugn_demo_mu::DeviceInstances;
-use bittide_hal::manual_additions::calendar::RingbufferCalendar;
-use bittide_hal::shared_devices::{Transceivers, Uart};
+use bittide_hal::{
+    hals::soft_ugn_demo_mu::DeviceInstances,
+    manual_additions::calendar::RingbufferCalendar,
+    shared_devices::{Transceivers, Uart},
+};
 use bittide_sys::stability_detector::Stability;
 use core::panic::PanicInfo;
 use ufmt::uwriteln;
@@ -132,7 +134,7 @@ fn main() -> ! {
                     "Capture UGN {}: local = {}, remote = {}",
                     i,
                     capture_ugn.local_counter(),
-                    capture_ugn.remote_counter()
+                    capture_ugn.remote_counter(),
                 )
                 .unwrap();
                 *done = true;
@@ -153,7 +155,7 @@ fn main() -> ! {
 
     loop {
         for (i, eb) in elastic_buffers.iter().enumerate() {
-            let occupancy = eb.data_count();
+            let occupancy = eb.data_count().into_inner();
             let (min, max) = occupancy_ranges[i];
 
             // Check if occupancy exceeds current range

firmware-binaries/demos/soft-ugn-mu/src/main.rs

@@ -5,8 +5,10 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-use bittide_hal::hals::switch_demo_mu::DeviceInstances;
-use bittide_hal::shared_devices::{ElasticBuffer, Transceivers};
+use bittide_hal::{
+    hals::switch_demo_mu::DeviceInstances,
+    shared_devices::{ElasticBuffer, Transceivers},
+};
 use bittide_sys::stability_detector::Stability;
 use core::panic::PanicInfo;
 use ufmt::uwriteln;

firmware-binaries/demos/switch-demo1-mu/src/main.rs

@@ -106,7 +106,7 @@ fn main() -> ! {
                     "Capture UGN {}: local = {}, remote = {}",
                     i,
                     capture_ugn.local_counter(),
-                    capture_ugn.remote_counter()
+                    capture_ugn.remote_counter(),
                 )
                 .unwrap();
                 *done = true;

firmware-binaries/demos/switch-demo2-mu/src/main.rs

@@ -78,7 +78,7 @@ fn check_frequency(
     domain_diff_counters.set_enable(0, false);
 
     let diff = match (start, end) {
-        (Some(s), Some(e)) => e - s,
+        (Some(s), Some(e)) => e.into_inner() - s.into_inner(),
         _ => return Err(FrequencyCheckError::CounterInaccessible),
     };
 

firmware-binaries/hitl-tests/clock-board/src/main.rs

@@ -26,9 +26,9 @@ fn main() -> ! {
     }
     uwriteln!(
         uart,
-        "(0x{:16X},0x{:16X})",
+        "({},{})",
         capture_ugn.local_counter(),
-        capture_ugn.remote_counter()
+        capture_ugn.remote_counter(),
     )
     .unwrap();
     loop {