additional feedback from Matt

oxidecomputer · May 20, 2024 · e3a5ae6 · e3a5ae6
1 parent 88794ca
commit e3a5ae6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/build/fpga-regmap/src/lib.rs b/build/fpga-regmap/src/lib.rs
@@ -173,9 +173,7 @@ fn write_reg_fields(
                     writeln!(
                         output,
                         "
-{prefix}        use zerocopy::AsBytes;
-{prefix}        #[derive(Copy, Clone, Eq, PartialEq, AsBytes)]
-{prefix}        #[repr(C)]
+{prefix}        #[derive(Copy, Clone, Eq, PartialEq)]
 {prefix}        #[allow(dead_code)]
 {prefix}        pub enum {encode_name} {{"
                     )

diff --git a/drv/transceivers-server/src/main.rs b/drv/transceivers-server/src/main.rs
@@ -272,7 +272,7 @@ impl ServerImpl {
             // - SFF-8636 rev 2.10a, Section 6.2.4
             Ok(Celsius(out.temperature.get() as f32 / 256.0))
         } else {
-            Err(FpgaError::ImplError(status.error.as_bytes()[0]))
+            Err(FpgaError::ImplError(status.error as u8))
         }
     }
 
@@ -301,7 +301,7 @@ impl ServerImpl {
         } else {
             // TODO: how should we handle this?
             // Right now, we'll retry on the next pass through the loop.
-            Err(FpgaError::ImplError(status.error.as_bytes()[0]))
+            Err(FpgaError::ImplError(status.error as u8))
         }
     }