Minor formatting fixes

Author: mvirkkunen

src/descriptor.rs

@@ -11,8 +11,8 @@ pub mod descriptor_type {
     pub const STRING: u8 = 3;
     pub const INTERFACE: u8 = 4;
     pub const ENDPOINT: u8 = 5;
-    pub const BOS: u8 = 0x0f;
-    pub const CAPABILITY: u8 = 0x10;
+    pub const BOS: u8 = 15;
+    pub const CAPABILITY: u8 = 16;
 }
 
 /// String descriptor language IDs.
@@ -41,68 +41,6 @@ pub struct DescriptorWriter<'a> {
     num_endpoints_mark: Option<usize>,
 }
 
-/// A writer for Binary Object Store descriptor.
-pub struct BosWriter<'w, 'a: 'w> {
-    writer: &'w mut DescriptorWriter<'a>,
-    num_caps_mark: Option<usize>,
-}
-
-impl<'w, 'a: 'w> BosWriter<'w, 'a> {
-    pub(crate) fn new(writer: &'w mut DescriptorWriter<'a>) -> Self {
-        Self {
-            writer: writer,
-            num_caps_mark: None,
-        }
-    }
-
-    pub(crate) fn bos(&mut self) -> Result<()> {
-        self.num_caps_mark= Some(self.writer.position + 4);
-        self.writer.write(
-            descriptor_type::BOS,
-            &[
-                0x00, 0x00, // wTotalLength
-                0x00, // bNumDeviceCaps
-            ])
-    }
-    
-    /// Writes capability descriptor to a BOS
-    ///
-    /// # Arguments
-    ///
-    /// * `capability_type` - Type of a capability
-    /// * `data` - Binary data of the descriptor
-    pub fn capability(&mut self, capability_type: u8, data: &[u8]) -> Result<()> {
-        match self.num_caps_mark{
-            Some(mark) => self.writer.buf[mark] += 1,
-            None => return Err(UsbError::InvalidState),
-        }
-
-        let mut start = self.writer.position;
-        let blen = data.len();
-
-        if start + blen + 3 > self.writer.buf.len()
-            || (blen + 3) > 255 {
-            return Err(UsbError::BufferOverflow);
-        }
-
-        self.writer.buf[start] = (blen + 3) as u8;
-        self.writer.buf[start+1] = descriptor_type::CAPABILITY;
-        self.writer.buf[start+2] = capability_type;
-
-        start += 3;
-        self.writer.buf[start..start+blen].copy_from_slice(data);
-        self.writer.position = start + blen;
-
-        Ok(())
-    }
-
-    pub(crate) fn end_bos(&mut self) {
-        self.num_caps_mark= None;
-        let position = self.writer.position as u16;
-        self.writer.buf[2..4].copy_from_slice(&position.to_le_bytes());
-    }
-}
-
 impl DescriptorWriter<'_> {
     pub(crate) fn new(buf: &mut [u8]) -> DescriptorWriter<'_> {
         DescriptorWriter {
@@ -138,7 +76,6 @@ impl DescriptorWriter<'_> {
         Ok(())
     }
 
-
     pub(crate) fn device(&mut self, config: &device::Config) -> Result<()> {
         self.write(
             descriptor_type::DEVICE,
@@ -276,3 +213,64 @@ impl DescriptorWriter<'_> {
         Ok(())
     }
 }
+
+/// A writer for Binary Object Store descriptor.
+pub struct BosWriter<'w, 'a: 'w> {
+    writer: &'w mut DescriptorWriter<'a>,
+    num_caps_mark: Option<usize>,
+}
+
+impl<'w, 'a: 'w> BosWriter<'w, 'a> {
+    pub(crate) fn new(writer: &'w mut DescriptorWriter<'a>) -> Self {
+        Self {
+            writer: writer,
+            num_caps_mark: None,
+        }
+    }
+
+    pub(crate) fn bos(&mut self) -> Result<()> {
+        self.num_caps_mark= Some(self.writer.position + 4);
+        self.writer.write(
+            descriptor_type::BOS,
+            &[
+                0x00, 0x00, // wTotalLength
+                0x00, // bNumDeviceCaps
+            ])
+    }
+
+    /// Writes capability descriptor to a BOS
+    ///
+    /// # Arguments
+    ///
+    /// * `capability_type` - Type of a capability
+    /// * `data` - Binary data of the descriptor
+    pub fn capability(&mut self, capability_type: u8, data: &[u8]) -> Result<()> {
+        match self.num_caps_mark{
+            Some(mark) => self.writer.buf[mark] += 1,
+            None => return Err(UsbError::InvalidState),
+        }
+
+        let mut start = self.writer.position;
+        let blen = data.len();
+
+        if (start + blen + 3) > self.writer.buf.len() || (blen + 3) > 255 {
+            return Err(UsbError::BufferOverflow);
+        }
+
+        self.writer.buf[start] = (blen + 3) as u8;
+        self.writer.buf[start+1] = descriptor_type::CAPABILITY;
+        self.writer.buf[start+2] = capability_type;
+
+        start += 3;
+        self.writer.buf[start..start+blen].copy_from_slice(data);
+        self.writer.position = start + blen;
+
+        Ok(())
+    }
+
+    pub(crate) fn end_bos(&mut self) {
+        self.num_caps_mark= None;
+        let position = self.writer.position as u16;
+        self.writer.buf[2..4].copy_from_slice(&position.to_le_bytes());
+    }
+}