🐛 Enforce LE for all u16s put on the bus

Author: PhazonicRidley

v5/conanfile.py

@@ -62,7 +62,7 @@ def build_requirements(self):
         self.test_requires("boost-ext-ut/2.1.0")
 
     def requirements(self):
-        self.requires("libhal/[^4.18.1]", transitive_headers=True)
+        self.requires("libhal/[^4.19.3]", transitive_headers=True)
 
     def layout(self):
         cmake_layout(self)

v5/include/libhal-util/mock/usb.hpp

@@ -43,9 +43,9 @@ constexpr std::vector<hal::byte> pkt_to_scatter(setup_packet const& req)
   std::vector<byte> vec;
   vec.push_back(req.bm_request_type());
   vec.push_back(req.request());
-  vec.append_range(setup_packet::to_le_u16(req.value()));
-  vec.append_range(setup_packet::to_le_u16(req.index()));
-  vec.append_range(setup_packet::to_le_u16(req.length()));
+  vec.append_range(req.value_bytes());
+  vec.append_range(req.index_bytes());
+  vec.append_range(req.length_bytes());
 
   return vec;
 }
@@ -369,7 +369,7 @@ class iad_mock : public interface
       safe_throw(hal::operation_not_supported(this));
     }
 
-    auto iface_idx = p_pkt.index() & 0xFF;
+    auto iface_idx = p_pkt.index_bytes()[0];
 
     if (iface_idx == m_iface_one.num) {
       return m_iface_one.num;
@@ -387,7 +387,7 @@ class iad_mock : public interface
       safe_throw(hal::operation_not_supported(this));
     }
 
-    auto iface_idx = p_pkt.index() & 0xFF;
+    auto iface_idx = p_pkt.index_bytes()[0];
 
     if (iface_idx == m_iface_one.num) {
       m_iface_one.feature = p_set;
@@ -400,7 +400,7 @@ class iad_mock : public interface
 
   u8 driver_get_interface(setup_packet p_pkt)
   {
-    auto iface_idx = p_pkt.index() & 0xFF;
+    auto iface_idx = p_pkt.index_bytes()[0];
 
     if (iface_idx == m_iface_one.num) {
       return m_iface_one.alt_settings;
@@ -413,7 +413,7 @@ class iad_mock : public interface
 
   void driver_set_interface(setup_packet p_pkt)
   {
-    auto iface_idx = p_pkt.index() & 0xFF;
+    auto iface_idx = p_pkt.index_bytes()[0];
     auto alt_setting = p_pkt.value();
     if (iface_idx == m_iface_one.num) {
       m_iface_one.alt_settings = alt_setting;

v5/include/libhal-util/usb/enumerator.hpp

@@ -309,12 +309,11 @@ class enumerator
     if (req.get_type() == setup_packet::request_type::invalid) {
       return;
     }
-
     if (determine_standard_request(req) ==
           standard_request_types::get_descriptor &&
-        static_cast<descriptor_type>(req.value() >> 8 & 0xFF) ==
+        static_cast<descriptor_type>(req.value_bytes()[1]) ==
           descriptor_type::string) {
-      handle_str_descriptors(req.value() & 0xFF, req.length());
+      handle_str_descriptors(req.value_bytes()[0], req.length());
 
     } else if (req.get_recipient() == setup_packet::request_recipient::device) {
       try {
@@ -360,12 +359,21 @@ class enumerator
   }
 
 private:
+  u16 assemble_le_u16(std::span<byte const> bytes)
+  {
+    if (bytes.size() != 2) {
+      throw hal::argument_out_of_domain(this);
+    }
+
+    return static_cast<u16>(bytes[0]) | (static_cast<u16>(bytes[1]) << 8);
+  }
+
   void handle_standard_device_request(setup_packet& req)
   {
     switch (determine_standard_request(req)) {
       case standard_request_types::set_address: {
         m_ctrl_ep->write({});
-        m_ctrl_ep->set_address(req.value());
+        m_ctrl_ep->set_address(req.value_bytes()[0]);
 
         break;
       }
@@ -398,18 +406,17 @@ class enumerator
 
   void process_get_descriptor(setup_packet& req)
   {
-    hal::byte desc_type = req.value() >> 8 & 0xFF;
-    [[maybe_unused]] hal::byte desc_idx = req.value() & 0xFF;
-
+    hal::byte desc_type = req.value_bytes()[1];
+    [[maybe_unused]] hal::byte desc_idx = req.value_bytes()[0];
     switch (static_cast<descriptor_type>(desc_type)) {
       case descriptor_type::device: {
         auto header =
           std::to_array({ constants::device_descriptor_size,
                           static_cast<byte>(descriptor_type::device) });
         m_device->set_max_packet_size(
           static_cast<byte>(m_ctrl_ep->info().size));
-        auto scatter_arr_pair =
-          make_sub_scatter_bytes(req.length(), header, *m_device);
+        auto scatter_arr_pair = make_sub_scatter_bytes(
+          assemble_le_u16(req.length_bytes()), header, *m_device);
         hal::v5::write_and_flush(
           *m_ctrl_ep,
           scatter_span<byte const>(scatter_arr_pair.spans)
@@ -423,8 +430,10 @@ class enumerator
         auto conf_hdr =
           std::to_array({ constants::configuration_descriptor_size,
                           static_cast<byte>(descriptor_type::configuration) });
-        auto scatter_conf_pair = make_sub_scatter_bytes(
-          req.length(), conf_hdr, static_cast<std::span<u8 const>>(conf));
+        auto scatter_conf_pair =
+          make_sub_scatter_bytes(assemble_le_u16(req.length_bytes()),
+                                 conf_hdr,
+                                 static_cast<std::span<u8 const>>(conf));
 
         m_ctrl_ep->write(scatter_span<byte const>(scatter_conf_pair.spans)
                            .first(scatter_conf_pair.count));