Remove raw from trait function naming

tyler-potyondy · tyler-potyondy · commit c8be365d11ca · 2024-04-10T10:32:15.000-07:00
diff --git a/boards/components/src/ieee802154.rs b/boards/components/src/ieee802154.rs
@@ -324,7 +324,7 @@ impl<
             ));
         mac_device.set_transmit_client(mux_mac);
         mac_device.set_receive_client(mux_mac);
-        mac_device.set_receive_raw_client(mux_mac);
+        mac_device.set_receive_secured_frame_no_decrypt_client(mux_mac);
 
         let userspace_mac =
             static_buffer
@@ -348,7 +348,7 @@ impl<
         mac_device.set_device_procedure(radio_driver);
         userspace_mac.set_transmit_client(radio_driver);
         userspace_mac.set_receive_client(radio_driver);
-        userspace_mac.set_receive_raw_client(radio_driver);
+        userspace_mac.set_receive_secured_frame_no_decrypt_client(radio_driver);
         userspace_mac.set_pan(self.pan_id);
         userspace_mac.set_address(self.short_addr);
         userspace_mac.set_address_long(self.long_addr);
diff --git a/capsules/extra/src/ieee802154/device.rs b/capsules/extra/src/ieee802154/device.rs
@@ -24,8 +24,11 @@ pub trait MacDevice<'a> {
     fn set_transmit_client(&self, client: &'a dyn TxClient);
     /// Sets the receive client of this MAC device
     fn set_receive_client(&self, client: &'a dyn RxClient);
-    /// Sets the raw receive client of this MAC device
-    fn set_receive_raw_client(&self, client: &'a dyn SecuredFrameNoDecryptRxClient);
+    /// Sets the secure frame no decrypt receive client of this MAC device
+    fn set_receive_secured_frame_no_decrypt_client(
+        &self,
+        client: &'a dyn SecuredFrameNoDecryptRxClient,
+    );
 
     /// The short 16-bit address of the MAC device
     fn get_address(&self) -> u16;
@@ -158,7 +161,7 @@ pub trait SecuredFrameNoDecryptRxClient {
     /// `buf`, so that the payload of the frame is contained in
     /// `buf[data_offset..data_offset + data_len]`.
     /// - `data_len`: Length of the data payload
-    fn receive_raw<'a>(
+    fn receive_secured_frame<'a>(
         &self,
         buf: &'a [u8],
         header: Header<'a>,
diff --git a/capsules/extra/src/ieee802154/driver.rs b/capsules/extra/src/ieee802154/driver.rs
@@ -1085,7 +1085,7 @@ fn encode_address(addr: &Option<MacAddress>) -> usize {
 }
 
 impl<'a, M: device::MacDevice<'a>> device::SecuredFrameNoDecryptRxClient for RadioDriver<'a, M> {
-    fn receive_raw<'b>(
+    fn receive_secured_frame<'b>(
         &self,
         buf: &'b [u8],
         header: Header<'b>,
diff --git a/capsules/extra/src/ieee802154/framer.rs b/capsules/extra/src/ieee802154/framer.rs
@@ -501,7 +501,7 @@ impl<'a, M: Mac<'a>, A: AES128CCM<'a>> Framer<'a, M, A> {
                             None => {
                                 // Key not found -- pass raw encrypted packet to client
                                 self.raw_rx_client.map(|client| {
-                                    client.receive_raw(buf, header, radio::PSDU_OFFSET + data_offset, data_len);
+                                    client.receive_secured_frame(buf, header, radio::PSDU_OFFSET + data_offset, data_len);
                                 });
                                 return None;
                             }
@@ -782,7 +782,10 @@ impl<'a, M: Mac<'a>, A: AES128CCM<'a>> MacDevice<'a> for Framer<'a, M, A> {
         self.rx_client.set(client);
     }
 
-    fn set_receive_raw_client(&self, client: &'a dyn super::device::SecuredFrameNoDecryptRxClient) {
+    fn set_receive_secured_frame_no_decrypt_client(
+        &self,
+        client: &'a dyn super::device::SecuredFrameNoDecryptRxClient,
+    ) {
         self.raw_rx_client.set(client);
     }
 
diff --git a/capsules/extra/src/ieee802154/virtual_mac.rs b/capsules/extra/src/ieee802154/virtual_mac.rs
@@ -66,15 +66,15 @@ impl<'a, M: device::MacDevice<'a>> device::RxClient for MuxMac<'a, M> {
 }
 
 impl<'a, M: device::MacDevice<'a>> device::SecuredFrameNoDecryptRxClient for MuxMac<'a, M> {
-    fn receive_raw<'b>(
+    fn receive_secured_frame<'b>(
         &self,
         buf: &'b [u8],
         header: Header<'b>,
         data_offset: usize,
         data_len: usize,
     ) {
         for user in self.users.iter() {
-            user.receive_raw(buf, header, data_offset, data_len);
+            user.receive_secured_frame(buf, header, data_offset, data_len);
         }
     }
 }
@@ -239,7 +239,7 @@ impl<'a, M: device::MacDevice<'a>> MacUser<'a, M> {
             .map(move |client| client.receive(buf, header, data_offset, data_len));
     }
 
-    fn receive_raw<'b>(
+    fn receive_secured_frame<'b>(
         &self,
         buf: &'b [u8],
         header: Header<'b>,
@@ -248,7 +248,7 @@ impl<'a, M: device::MacDevice<'a>> MacUser<'a, M> {
     ) {
         self.secure_frame_no_decrypt_rx_client
             .get()
-            .map(move |client| client.receive_raw(buf, header, data_offset, data_len));
+            .map(move |client| client.receive_secured_frame(buf, header, data_offset, data_len));
     }
 }
 
@@ -267,7 +267,10 @@ impl<'a, M: device::MacDevice<'a>> device::MacDevice<'a> for MacUser<'a, M> {
         self.rx_client.set(client);
     }
 
-    fn set_receive_raw_client(&self, client: &'a dyn device::SecuredFrameNoDecryptRxClient) {
+    fn set_receive_secured_frame_no_decrypt_client(
+        &self,
+        client: &'a dyn device::SecuredFrameNoDecryptRxClient,
+    ) {
         self.secure_frame_no_decrypt_rx_client.set(client);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1085,7 +1085,7 @@ fn encode_address(addr: &Option<MacAddress>) -> usize {`
`1085`	`1085`	`}`
`1086`	`1086`
`1087`	`1087`	`impl<'a, M: device::MacDevice<'a>> device::SecuredFrameNoDecryptRxClient for RadioDriver<'a, M> {`
`1088`		`- fn receive_raw<'b>(`
	`1088`	`+ fn receive_secured_frame<'b>(`
`1089`	`1089`	`&self,`
`1090`	`1090`	`buf: &'b [u8],`
`1091`	`1091`	`header: Header<'b>,`
Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ impl<'a, M: Mac<'a>, A: AES128CCM<'a>> Framer<'a, M, A> {`
`501`	`501`	`None => {`
`502`	`502`	`// Key not found -- pass raw encrypted packet to client`
`503`	`503`	`self.raw_rx_client.map(\|client\| {`
`504`		`- client.receive_raw(buf, header, radio::PSDU_OFFSET + data_offset, data_len);`
	`504`	`+ client.receive_secured_frame(buf, header, radio::PSDU_OFFSET + data_offset, data_len);`
`505`	`505`	`});`
`506`	`506`	`return None;`
`507`	`507`	`}`
`@@ -782,7 +782,10 @@ impl<'a, M: Mac<'a>, A: AES128CCM<'a>> MacDevice<'a> for Framer<'a, M, A> {`
`782`	`782`	`self.rx_client.set(client);`
`783`	`783`	`}`
`784`	`784`
`785`		`- fn set_receive_raw_client(&self, client: &'a dyn super::device::SecuredFrameNoDecryptRxClient) {`
	`785`	`+ fn set_receive_secured_frame_no_decrypt_client(`
	`786`	`+ &self,`
	`787`	`+ client: &'a dyn super::device::SecuredFrameNoDecryptRxClient,`
	`788`	`+ ) {`
`786`	`789`	`self.raw_rx_client.set(client);`
`787`	`790`	`}`
`788`	`791`
Original file line number	Diff line number	Diff line change
`@@ -66,15 +66,15 @@ impl<'a, M: device::MacDevice<'a>> device::RxClient for MuxMac<'a, M> {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`impl<'a, M: device::MacDevice<'a>> device::SecuredFrameNoDecryptRxClient for MuxMac<'a, M> {`
`69`		`- fn receive_raw<'b>(`
	`69`	`+ fn receive_secured_frame<'b>(`
`70`	`70`	`&self,`
`71`	`71`	`buf: &'b [u8],`
`72`	`72`	`header: Header<'b>,`
`73`	`73`	`data_offset: usize,`
`74`	`74`	`data_len: usize,`
`75`	`75`	`) {`
`76`	`76`	`for user in self.users.iter() {`
`77`		`- user.receive_raw(buf, header, data_offset, data_len);`
	`77`	`+ user.receive_secured_frame(buf, header, data_offset, data_len);`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`	`}`
`@@ -239,7 +239,7 @@ impl<'a, M: device::MacDevice<'a>> MacUser<'a, M> {`
`239`	`239`	`.map(move \|client\| client.receive(buf, header, data_offset, data_len));`
`240`	`240`	`}`
`241`	`241`
`242`		`- fn receive_raw<'b>(`
	`242`	`+ fn receive_secured_frame<'b>(`
`243`	`243`	`&self,`
`244`	`244`	`buf: &'b [u8],`
`245`	`245`	`header: Header<'b>,`
`@@ -248,7 +248,7 @@ impl<'a, M: device::MacDevice<'a>> MacUser<'a, M> {`
`248`	`248`	`) {`
`249`	`249`	`self.secure_frame_no_decrypt_rx_client`
`250`	`250`	`.get()`
`251`		`- .map(move \|client\| client.receive_raw(buf, header, data_offset, data_len));`
	`251`	`+ .map(move \|client\| client.receive_secured_frame(buf, header, data_offset, data_len));`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`
`@@ -267,7 +267,10 @@ impl<'a, M: device::MacDevice<'a>> device::MacDevice<'a> for MacUser<'a, M> {`
`267`	`267`	`self.rx_client.set(client);`
`268`	`268`	`}`
`269`	`269`
`270`		`- fn set_receive_raw_client(&self, client: &'a dyn device::SecuredFrameNoDecryptRxClient) {`
	`270`	`+ fn set_receive_secured_frame_no_decrypt_client(`
	`271`	`+ &self,`
	`272`	`+ client: &'a dyn device::SecuredFrameNoDecryptRxClient,`
	`273`	`+ ) {`
`271`	`274`	`self.secure_frame_no_decrypt_rx_client.set(client);`
`272`	`275`	`}`
`273`	`276`