fix(kts1622/tla2528): Ensure protection using base_mutex (#443)

Author: finger563

components/kts1622/include/kts1622.hpp

@@ -161,6 +161,7 @@ class Kts1622 : public BasePeripheral<> {
    *       output pins on the ports.
    */
   void output(uint8_t p0, uint8_t p1, std::error_code &ec) {
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     output(Port::PORT0, p0, ec);
     if (ec)
       return;
@@ -175,6 +176,7 @@ class Kts1622 : public BasePeripheral<> {
    *       output pins on the ports.
    */
   void output(uint16_t value, std::error_code &ec) {
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     output(Port::PORT0, value & 0xFF, ec);
     if (ec)
       return;
@@ -189,6 +191,7 @@ class Kts1622 : public BasePeripheral<> {
    * @param ec Error code to set if an error occurs.
    */
   void clear_pins(Port port, uint8_t mask, std::error_code &ec) {
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     auto addr = port == Port::PORT0 ? Registers::OUTPORT0 : Registers::OUTPORT1;
     auto data = read_u8_from_register((uint8_t)addr, ec);
     if (ec)
@@ -205,6 +208,7 @@ class Kts1622 : public BasePeripheral<> {
    * @param ec Error code to set if an error occurs.
    */
   void clear_pins(uint8_t p0, uint8_t p1, std::error_code &ec) {
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     clear_pins(Port::PORT0, p0, ec);
     if (ec)
       return;
@@ -218,6 +222,7 @@ class Kts1622 : public BasePeripheral<> {
    * @param ec Error code to set if an error occurs.
    */
   void clear_pins(uint16_t mask, std::error_code &ec) {
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     clear_pins(Port::PORT0, mask & 0xFF, ec);
     if (ec)
       return;
@@ -233,6 +238,7 @@ class Kts1622 : public BasePeripheral<> {
    */
   void set_pins(Port port, uint8_t mask, std::error_code &ec) {
     auto addr = port == Port::PORT0 ? Registers::OUTPORT0 : Registers::OUTPORT1;
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     auto data = read_u8_from_register((uint8_t)addr, ec);
     if (ec)
       return;
@@ -248,6 +254,7 @@ class Kts1622 : public BasePeripheral<> {
    * @param ec Error code to set if an error occurs.
    */
   void set_pins(uint8_t p0, uint8_t p1, std::error_code &ec) {
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     set_pins(Port::PORT0, p0, ec);
     if (ec)
       return;
@@ -261,6 +268,7 @@ class Kts1622 : public BasePeripheral<> {
    * @param ec Error code to set if an error occurs.
    */
   void set_pins(uint16_t mask, std::error_code &ec) {
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     set_pins(Port::PORT0, mask & 0xFF, ec);
     if (ec)
       return;
@@ -284,6 +292,7 @@ class Kts1622 : public BasePeripheral<> {
    * @return The pin values as a 16 bit mask (P0_0 lsb, P1_7 msb).
    */
   uint16_t get_output(std::error_code &ec) {
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     uint16_t p0 = read_u8_from_register((uint8_t)Registers::OUTPORT0, ec);
     if (ec)
       return 0;
@@ -300,6 +309,7 @@ class Kts1622 : public BasePeripheral<> {
    * @param ec Error code to set if an error occurs.
    */
   void set_port_output_drive_mode(Port port, OutputDriveMode mode, std::error_code &ec) {
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     // get the current value from the register
     uint8_t data = read_u8_from_register((uint8_t)Registers::OUT_CFG, ec);
     if (ec)
@@ -397,6 +407,7 @@ class Kts1622 : public BasePeripheral<> {
    */
   void configure_interrupt(uint8_t p0, uint8_t p1, InterruptType type, std::error_code &ec) {
     logger_.info("Configuring interrupt p0:{:#08b}, p1:{:#08b} to {}", p0, p1, type);
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     configure_interrupt(Port::PORT0, p0, type, ec);
     if (ec)
       return;
@@ -442,6 +453,7 @@ class Kts1622 : public BasePeripheral<> {
    * @param ec Error code to set if an error occurs.
    */
   void clear_interrupts(std::error_code &ec) {
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     write_u8_to_register((uint8_t)Registers::INT_CLEAR0, 0xFF, ec);
     if (ec)
       return;
@@ -489,6 +501,7 @@ class Kts1622 : public BasePeripheral<> {
    * @param ec Error code to set if an error occurs.
    */
   void set_direction(uint16_t mask, bool direction, std::error_code &ec) {
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     auto addr = Registers::CONFIG0;
     uint8_t data[] = {0, 0};
     read_many_from_register((uint8_t)addr, data, 2, ec);
@@ -615,6 +628,7 @@ class Kts1622 : public BasePeripheral<> {
     // if pull == PullResistor::NO_PULL, then clear the bits in the appropriate
     // PULL_UP_DOWN_EN register
     auto addr = port == Port::PORT0 ? Registers::PULL_UP_DOWN_EN0 : Registers::PULL_UP_DOWN_EN1;
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     auto data = read_u8_from_register((uint8_t)addr, ec);
     if (ec)
       return;
@@ -705,6 +719,7 @@ class Kts1622 : public BasePeripheral<> {
   };
 
   void init(const Config &config, std::error_code &ec) {
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     set_direction(Port::PORT0, config.port_0_direction_mask, ec);
     if (ec)
       return;

components/tla2528/include/tla2528.hpp

@@ -553,6 +553,7 @@ class Tla2528 : public BasePeripheral<> {
   };
 
   void init(const Config &config, std::error_code &ec) {
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     // Set the data format
     set_data_format(data_format_, append_, ec);
     if (ec)
@@ -601,6 +602,7 @@ class Tla2528 : public BasePeripheral<> {
   }
 
   void set_data_format(DataFormat format, Append append, std::error_code &ec) {
+    std::lock_guard<std::recursive_mutex> lock(base_mutex_);
     data_format_ = format;
     logger_.info("Data format set to {}", data_format_);
     append_ = append;
@@ -712,20 +714,25 @@ class Tla2528 : public BasePeripheral<> {
     std::vector<uint16_t> values(num_inputs);
     size_t num_bytes = num_inputs * num_bytes_per_sample_;
     uint8_t raw_values[num_bytes];
-    // start the auto conversion sequence
-    start_auto_conversion(ec);
-    if (ec) {
-      return {};
-    }
-    read_many(raw_values, num_bytes, ec);
-    if (ec) {
-      return {};
-    }
-    // stop the auto conversion sequence
-    stop_auto_conversion(ec);
-    if (ec) {
-      return {};
+
+    {
+      std::lock_guard<std::recursive_mutex> lock(base_mutex_);
+      // start the auto conversion sequence
+      start_auto_conversion(ec);
+      if (ec) {
+        return {};
+      }
+      read_many(raw_values, num_bytes, ec);
+      if (ec) {
+        return {};
+      }
+      // stop the auto conversion sequence
+      stop_auto_conversion(ec);
+      if (ec) {
+        return {};
+      }
     }
+
     int analog_index = 0;
     // only pull out the ones that were configured as analog inputs
     for (int i = 0; i < num_bytes; i += num_bytes_per_sample_) {