code cleanup

IntergatedCircuits · Jun 29, 2024 · 3bf2246 · 3bf2246
1 parent 67dc05e
commit 3bf2246
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/c2usb/i2c/hid/device.hpp b/c2usb/i2c/hid/device.hpp
@@ -58,7 +58,7 @@ class device : public slave::module, public ::hid::transport
         POWER_STATE_CHANGE = 0,
     };
     using power_event_delegate = etl::delegate<void(device&, event)>;
-    void set_power_event_delegate(const power_event_delegate&& delegate)
+    void set_power_event_delegate(const power_event_delegate& delegate)
     {
         power_event_delegate_ = delegate;
     }

diff --git a/c2usb/port/zephyr/bluetooth/hid.cpp b/c2usb/port/zephyr/bluetooth/hid.cpp
@@ -458,7 +458,7 @@ ssize_t service::ccc_cfg_write(::bt_conn* conn, const gatt::attribute* attr, gat
     }
 
     // prevent changing protocol mode
-    if ((protocol == protocol::BOOT) && (this_->get_protocol() != protocol))
+    if ((protocol == protocol::BOOT) and (this_->get_protocol() != protocol))
     {
         return BT_GATT_ERR(BT_ATT_ERR_WRITE_REQ_REJECTED);
     }

diff --git a/c2usb/usb/df/class/cdc.cpp b/c2usb/usb/df/class/cdc.cpp
@@ -45,7 +45,7 @@ function::get_base_functional_descriptors(class_info cinfo, uint8_t if_index, df
 
 void function::start(const config::interface& iface, uint8_t alt_sel)
 {
-    if (iface.primary() && (iface.endpoints().size() > 0))
+    if (iface.primary() and (iface.endpoints().size() > 0))
     {
         notify_eph_ = open_ep(iface.endpoints()[0]);
     }

diff --git a/c2usb/usb/df/device.hpp b/c2usb/usb/df/device.hpp
@@ -86,7 +86,7 @@ class device : protected mac::device_interface
         CONFIGURATION_CHANGE,
     };
     using power_event_delegate = etl::delegate<void(device&, event)>;
-    void set_power_event_delegate(const power_event_delegate&& delegate)
+    void set_power_event_delegate(const power_event_delegate& delegate)
     {
         power_event_delegate_ = delegate;
     }
@@ -155,11 +155,6 @@ class device : protected mac::device_interface
     void handle_control_message(message& msg) override;
     void handle_new_power_state(usb::power::state new_state) override;
 
-    device(const device&) = delete;
-    device& operator=(const device&) = delete;
-    device(const device&&) = delete;
-    device& operator=(const device&&) = delete;
-
   protected:
     usb::df::mac& mac_;
     const product_info& product_info_;

diff --git a/c2usb/usb/product_info.hpp b/c2usb/usb/product_info.hpp
@@ -27,10 +27,10 @@ struct product_info
 
     constexpr product_info(uint16_t vendor_id, const char_t* vendor_name, uint16_t product_id,
                            const char_t* product_name, version product_version,
-                           const std::span<const uint8_t>&& serial_no = {})
+                           const std::span<const uint8_t>& serial_no = {})
         : vendor_name(vendor_name),
           product_name(product_name),
-          serial_number(std::move(serial_no)),
+          serial_number(serial_no),
           vendor_id(vendor_id),
           product_id(product_id),
           product_version(product_version)