whb04b: Remove teardown and checks

Author: hdiethelm

src/hal/user_comps/xhc-whb04b-6/usb.cc

@@ -662,7 +662,7 @@ Usb::InitStatus Usb::init()
         if (devicesCount < 0)
         {
             std::cerr << endl << "failed to get device list" << endl;
-            teardown();
+            closeLibusb();
             mDoReconnect=true;
             return InitStatus::RETRY;
         }
@@ -679,7 +679,7 @@ Usb::InitStatus Usb::init()
                 if ((mWaitSecs--) <= 0)
                 {
                     std::cerr << endl << "Configured timeout exceeded, exiting" << endl;
-                    teardown();
+                    closeLibusb();
                     return InitStatus::EXIT;
                 }
             }
@@ -700,7 +700,7 @@ Usb::InitStatus Usb::init()
             {
                 std::cerr << "libusb_detach_kernel_driver failed with " << r << endl;
                 closeHandle();
-                teardown();
+                closeLibusb();
                 mDoReconnect=true;
                 return InitStatus::RETRY;
             }
@@ -714,7 +714,7 @@ Usb::InitStatus Usb::init()
         {
             std::cerr << "libusb_kernel_driver_active failed with " << r << endl;
             closeHandle();
-            teardown();
+            closeLibusb();
             mDoReconnect=true;
             return InitStatus::RETRY;
         }
@@ -724,7 +724,7 @@ Usb::InitStatus Usb::init()
         {
             std::cerr << endl << "failed to claim interface" << endl;
             closeHandle();
-            teardown();
+            closeLibusb();
             mDoReconnect=true;
             return InitStatus::RETRY;
         }
@@ -735,6 +735,12 @@ Usb::InitStatus Usb::init()
 // ----------------------------------------------------------------------
 void Usb::process()
 {
+    if(context == nullptr)
+    {
+        std::cerr << endl << "Bug: process context is closed!" << endl;
+        return;
+    }
+
     struct timeval timeout;
     timeout.tv_sec  = 0;
     timeout.tv_usec = 200 * 1000;
@@ -755,12 +761,38 @@ void Usb::process()
 // ----------------------------------------------------------------------
 void Usb::closeHandle()
 {
+    if(deviceHandle == nullptr)
+    {
+        std::cerr << endl << "Bug: closeHandle allready closed!" << endl;
+        return;
+    }
     libusb_close(deviceHandle);
     deviceHandle = nullptr;
 }
 // ----------------------------------------------------------------------
+void Usb::closeLibusb()
+{
+    if(context == nullptr)
+    {
+        std::cerr << endl << "Bug: closeLibusb allready closed!" << endl;
+        return;
+    }
+    libusb_exit(context);
+    context = nullptr;
+}
+// ----------------------------------------------------------------------
 void Usb::close()
 {
+    if(context == nullptr)
+    {
+        std::cerr << endl << "Bug: close context allready closed!" << endl;
+        return;
+    }
+    if(deviceHandle == nullptr)
+    {
+        std::cerr << endl << "Bug: close deviceHandle allready closed!" << endl;
+        return;
+    }
     struct timeval tv;
     tv.tv_sec  = 1;
     tv.tv_usec = 0;
@@ -775,12 +807,7 @@ void Usb::close()
         std::cerr << endl << "Error: close() libusb_release_interface returned " << r << endl;
     }
     closeHandle();
-}
-// ----------------------------------------------------------------------
-void Usb::teardown()
-{
-    libusb_exit(context);
-    context = nullptr;
+    closeLibusb();
 }
 // ----------------------------------------------------------------------
 void Usb::setWaitWithTimeout(uint8_t waitSecs)

src/hal/user_comps/xhc-whb04b-6/usb.h

@@ -301,13 +301,13 @@ class Usb : public UsbRawInputListener
     InitStatus init();
     void process();
     void close();
-    void teardown();
     void setWaitWithTimeout(uint8_t waitSecs);
 
     UsbOutPackageData& getOutputPackageData();
 
 private:
     void closeHandle();
+    void closeLibusb();
     const uint16_t usbVendorId{0x10ce};
     uint16_t usbProductId{0xeb93};
     libusb_context      * context{nullptr};

src/hal/user_comps/xhc-whb04b-6/xhc-whb04b6.cc

@@ -454,12 +454,10 @@ int XhcWhb04b6Component::run()
                 {
                     *mInitCout << " ok" << endl;
                     process(); //process loops until disconnect/stopped
-                    mUsb.teardown();
                 }
                 else
                 {
                     mUsb.close();
-                    mUsb.teardown();
                 }
             }
         }