From e9785c0e6a72efc9f771762b539591fbcfd45a1c Mon Sep 17 00:00:00 2001
From: Pat Pannuto <pat.pannuto@gmail.com>
Date: Fri, 17 May 2024 10:13:50 -0700
Subject: [PATCH] rf233 component: replace integer with constant

and fix typo in comment
---
 boards/components/src/rf233.rs | 16 +++++++++-------
 capsules/extra/src/rf233.rs    |  6 ++++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/boards/components/src/rf233.rs b/boards/components/src/rf233.rs
index 7e83a79e03..51c8eaa56f 100644
--- a/boards/components/src/rf233.rs
+++ b/boards/components/src/rf233.rs
@@ -39,7 +39,7 @@ macro_rules! rf233_component_static {
                 capsules_core::virtualizers::virtual_spi::VirtualSpiMasterDevice<'static, $S>,
             >
         );
-        // The RF233 radio stack requires our buffers for its SPI operations:
+        // The RF233 radio stack requires four buffers for its SPI operations:
         //
         //   1. buf: a packet-sized buffer for SPI operations, which is
         //      used as the read buffer when it writes a packet passed to it and the write
@@ -48,8 +48,10 @@ macro_rules! rf233_component_static {
         //   3 + 4: two small buffers for performing registers
         //      operations (one read, one write).
         let rf233_buf = kernel::static_buf!([u8; kernel::hil::radio::MAX_BUF_SIZE]);
-        let rf233_reg_write = kernel::static_buf!([u8; 2]);
-        let rf233_reg_read = kernel::static_buf!([u8; 2]);
+        let rf233_reg_write =
+            kernel::static_buf!([u8; capsules_extra::rf233::SPI_REGISTER_TRANSACTION_LENGTH]);
+        let rf233_reg_read =
+            kernel::static_buf!([u8; capsules_extra::rf233::SPI_REGISTER_TRANSACTION_LENGTH]);
 
         (spi_device, rf233_buf, rf233_reg_write, rf233_reg_read)
     };};
@@ -88,15 +90,15 @@ impl<S: SpiMaster<'static> + 'static> Component for RF233Component<S> {
     type StaticInput = (
         &'static mut MaybeUninit<RF233<'static, VirtualSpiMasterDevice<'static, S>>>,
         &'static mut MaybeUninit<[u8; hil::radio::MAX_BUF_SIZE]>,
-        &'static mut MaybeUninit<[u8; 2]>,
-        &'static mut MaybeUninit<[u8; 2]>,
+        &'static mut MaybeUninit<[u8; SPI_REGISTER_TRANSACTION_LENGTH]>,
+        &'static mut MaybeUninit<[u8; SPI_REGISTER_TRANSACTION_LENGTH]>,
     );
     type Output = &'static RF233<'static, VirtualSpiMasterDevice<'static, S>>;
 
     fn finalize(self, s: Self::StaticInput) -> Self::Output {
         let rf233_buf = s.1.write([0; hil::radio::MAX_BUF_SIZE]);
-        let rf233_reg_write = s.2.write([0; 2]);
-        let rf233_reg_read = s.3.write([0; 2]);
+        let rf233_reg_write = s.2.write([0; SPI_REGISTER_TRANSACTION_LENGTH]);
+        let rf233_reg_read = s.3.write([0; SPI_REGISTER_TRANSACTION_LENGTH]);
         let rf233 = s.0.write(RF233::new(
             self.spi,
             rf233_buf,
diff --git a/capsules/extra/src/rf233.rs b/capsules/extra/src/rf233.rs
index 1b9ae7bdb4..fcfc63cd41 100644
--- a/capsules/extra/src/rf233.rs
+++ b/capsules/extra/src/rf233.rs
@@ -189,6 +189,8 @@ enum InternalState {
 // and waits for the interrupt specifying the entire packet has been
 // received.
 
+pub const SPI_REGISTER_TRANSACTION_LENGTH: usize = 2;
+
 pub struct RF233<'a, S: spi::SpiMasterDevice<'a>> {
     spi: &'a S,
     radio_on: Cell<bool>,
@@ -1034,8 +1036,8 @@ impl<'a, S: spi::SpiMasterDevice<'a>> RF233<'a, S> {
     pub fn new(
         spi: &'a S,
         spi_buf: &'static mut [u8],
-        reg_write: &'static mut [u8; 2],
-        reg_read: &'static mut [u8; 2],
+        reg_write: &'static mut [u8; SPI_REGISTER_TRANSACTION_LENGTH],
+        reg_read: &'static mut [u8; SPI_REGISTER_TRANSACTION_LENGTH],
         reset: &'a dyn gpio::Pin,
         sleep: &'a dyn gpio::Pin,
         irq: &'a dyn gpio::InterruptPin<'a>,