Merge branch 'main' into frontend-rework

lib/Cargo.toml

@@ -18,7 +18,7 @@ tplink = []
 bytes = "1.5.0"
 chrono = "0.4.31"
 crc = "3.0.1"
-deku = { version = "0.16.0", features = ["logging"] }
+deku = { version = "0.18.0", features = ["logging"] }
 env_logger = "0.10.1"
 libc = "0.2.150"
 log = "0.4.20"

lib/src/diag.rs

@@ -25,14 +25,14 @@ pub struct RequestContainer {
 }
 
 #[derive(Debug, Clone, PartialEq, DekuWrite)]
-#[deku(type = "u32")]
+#[deku(id_type = "u32")]
 pub enum Request {
     #[deku(id = "115")]
     LogConfig(LogConfigRequest),
 }
 
 #[derive(Debug, Clone, PartialEq, DekuWrite)]
-#[deku(type = "u32", endian = "little")]
+#[deku(id_type = "u32", endian = "little")]
 pub enum LogConfigRequest {
     #[deku(id = "1")]
     RetrieveIdRanges,
@@ -46,7 +46,7 @@ pub enum LogConfigRequest {
 }
 
 #[derive(Debug, Clone, PartialEq, DekuRead, DekuWrite)]
-#[deku(type = "u32", endian = "little")]
+#[deku(id_type = "u32", endian = "little")]
 pub enum DataType {
     #[deku(id = "32")]
     UserSpace,
@@ -121,7 +121,7 @@ pub struct HdlcEncapsulatedMessage {
 }
 
 #[derive(Debug, Clone, PartialEq, DekuRead, DekuWrite)]
-#[deku(type = "u8")]
+#[deku(id_type = "u8")]
 pub enum Message {
     #[deku(id = "16")]
     Log {

lib/src/diag_device.rs

@@ -59,18 +59,22 @@ pub const LOG_CODES_FOR_RAW_PACKET_LOGGING: [u32; 11] = [
 const BUFFER_LEN: usize = 1024 * 1024 * 10;
 const MEMORY_DEVICE_MODE: u32 = 2;
 
-#[cfg(target_arch = "arm")]
+#[cfg(target_env = "musl")]
+const DIAG_IOCTL_REMOTE_DEV: i32 = 32;
+#[cfg(all(not(target_env = "musl"), target_arch = "arm"))]
 const DIAG_IOCTL_REMOTE_DEV: u32 = 32;
-#[cfg(target_arch = "x86_64")]
+#[cfg(all(not(target_env = "musl"), target_arch = "x86_64"))]
 const DIAG_IOCTL_REMOTE_DEV: u64 = 32;
-#[cfg(target_arch = "aarch64")]
+#[cfg(all(not(target_env = "musl"), target_arch = "aarch64"))]
 const DIAG_IOCTL_REMOTE_DEV: u64 = 32;
 
-#[cfg(target_arch = "arm")]
+#[cfg(target_env = "musl")]
+const DIAG_IOCTL_SWITCH_LOGGING: i32 = 7;
+#[cfg(all(not(target_env = "musl"), target_arch = "arm"))]
 const DIAG_IOCTL_SWITCH_LOGGING: u32 = 7;
-#[cfg(target_arch = "x86_64")]
+#[cfg(all(not(target_env = "musl"), target_arch = "x86_64"))]
 const DIAG_IOCTL_SWITCH_LOGGING: u64 = 7;
-#[cfg(target_arch = "aarch64")]
+#[cfg(all(not(target_env = "musl"), target_arch = "aarch64"))]
 const DIAG_IOCTL_SWITCH_LOGGING: u64 = 7;
 
 pub struct DiagDevice {
@@ -126,8 +130,8 @@ impl DiagDevice {
         );
 
         match MessagesContainer::from_bytes((&self.read_buf[0..bytes_read], 0)) {
-            Ok((_, container)) => return Ok(container),
-            Err(err) => return Err(DiagDeviceError::ParseMessagesContainerError(err)),
+            Ok((_, container)) => Ok(container),
+            Err(err) => Err(DiagDeviceError::ParseMessagesContainerError(err)),
         }
     }