whb04b: Cleanup

XhcWhb04b6Component should not even include libusb

Author: hdiethelm

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

@@ -140,31 +140,6 @@ bool Usb::isDeviceOpen() const
     return deviceHandle != nullptr;
 }
 // ----------------------------------------------------------------------
-libusb_context** Usb::getContextReference()
-{
-    return &context;
-}
-// ----------------------------------------------------------------------
-libusb_context* Usb::getContext()
-{
-    return context;
-}
-// ----------------------------------------------------------------------
-void Usb::setContext(libusb_context* context)
-{
-    this->context = context;
-}
-// ----------------------------------------------------------------------
-libusb_device_handle* Usb::getDeviceHandle()
-{
-    return deviceHandle;
-}
-// ----------------------------------------------------------------------
-void Usb::setDeviceHandle(libusb_device_handle* deviceHandle)
-{
-    this->deviceHandle = deviceHandle;
-}
-// ----------------------------------------------------------------------
 bool Usb::isWaitForPendantBeforeHalEnabled() const
 {
     return isWaitWithTimeout;
@@ -729,6 +704,33 @@ Usb::InitStatus Usb::init()
     }
     return InitStatus::OK;
 }
+void Usb::handleTimeouts()
+{
+    struct timeval timeout;
+    timeout.tv_sec  = 0;
+    timeout.tv_usec = 200 * 1000;
+
+    int r = libusb_handle_events_timeout_completed(context, &timeout, nullptr);
+    assert((r == LIBUSB_SUCCESS) || (r == LIBUSB_ERROR_NO_DEVICE) || (r == LIBUSB_ERROR_BUSY) ||
+            (r == LIBUSB_ERROR_TIMEOUT) || (r == LIBUSB_ERROR_INTERRUPTED));
+}
+void Usb::close()
+{
+    struct timeval tv;
+    tv.tv_sec  = 1;
+    tv.tv_usec = 0;
+    int r = libusb_handle_events_timeout_completed(context, &tv, nullptr);
+    assert(0 == r);
+    r = libusb_release_interface(deviceHandle, 0);
+    assert((0 == r) || (r == LIBUSB_ERROR_NO_DEVICE));
+    libusb_close(deviceHandle);
+    deviceHandle = nullptr;
+}
+void Usb::teardown()
+{
+    libusb_exit(context);
+    context = nullptr;
+}
 // ----------------------------------------------------------------------
 void Usb::setWaitWithTimeout(uint8_t waitSecs)
 {

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

@@ -288,11 +288,6 @@ class Usb : public UsbRawInputListener
     uint16_t getUsbProductId() const;
     void setUsbProductId(uint16_t usbProductId);
     bool isDeviceOpen() const;
-    libusb_context** getContextReference();
-    libusb_context* getContext();
-    void setContext(libusb_context* context);
-    libusb_device_handle* getDeviceHandle();
-    void setDeviceHandle(libusb_device_handle* deviceHandle);
     bool isWaitForPendantBeforeHalEnabled() const;
     bool getDoReconnect() const;
     void setDoReconnect(bool doReconnect);
@@ -308,6 +303,9 @@ class Usb : public UsbRawInputListener
     void enableVerboseRx(bool enable);
     void enableVerboseInit(bool enable);
     InitStatus init();
+    void handleTimeouts();
+    void close();
+    void teardown();
     void setWaitWithTimeout(uint8_t waitSecs);
 
     UsbOutPackageData& getOutputPackageData();

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

@@ -23,7 +23,6 @@
 #include <assert.h>
 #include <iostream>
 #include <iomanip>
-#include <libusb.h>
 #include <bitset>
 
 
@@ -459,7 +458,7 @@ int XhcWhb04b6Component::run()
                 *mInitCout << " ok" << endl;
             }
             process();
-            teardownUsb();
+            mUsb.teardown();
         }
     }
     teardownHal();
@@ -483,34 +482,13 @@ void XhcWhb04b6Component::setSimulationMode(bool enableSimulationMode)
     mUsb.setSimulationMode(mIsSimulationMode);
 }
 // ----------------------------------------------------------------------
-void XhcWhb04b6Component::setUsbContext(libusb_context* context)
-{
-    mUsb.setContext(context);
-}
-// ----------------------------------------------------------------------
-libusb_device_handle* XhcWhb04b6Component::getUsbDeviceHandle()
-{
-    return mUsb.getDeviceHandle();
-}
-// ----------------------------------------------------------------------
-libusb_context* XhcWhb04b6Component::getUsbContext()
-{
-    return mUsb.getContext();
-}
-// ----------------------------------------------------------------------
 void XhcWhb04b6Component::process()
 {
     if (mUsb.isDeviceOpen())
     {
         while (isRunning() && !mUsb.getDoReconnect())
         {
-            struct timeval timeout;
-            timeout.tv_sec  = 0;
-            timeout.tv_usec = 200 * 1000;
-
-            int r = libusb_handle_events_timeout_completed(getUsbContext(), &timeout, nullptr);
-            assert((r == LIBUSB_SUCCESS) || (r == LIBUSB_ERROR_NO_DEVICE) || (r == LIBUSB_ERROR_BUSY) ||
-                   (r == LIBUSB_ERROR_TIMEOUT) || (r == LIBUSB_ERROR_INTERRUPTED));
+            mUsb.handleTimeouts();
             if (mHal.isSimulationModeEnabled())
             {
                 linuxcncSimulate();
@@ -521,24 +499,10 @@ void XhcWhb04b6Component::process()
 
         mHal.setIsPendantConnected(false);
         *mInitCout << "connection lost, cleaning up" << endl;
-        struct timeval tv;
-        tv.tv_sec  = 1;
-        tv.tv_usec = 0;
-        int r = libusb_handle_events_timeout_completed(getUsbContext(), &tv, nullptr);
-        assert(0 == r);
-        r = libusb_release_interface(getUsbDeviceHandle(), 0);
-        assert((0 == r) || (r == LIBUSB_ERROR_NO_DEVICE));
-        libusb_close(getUsbDeviceHandle());
-        mUsb.setDeviceHandle(nullptr);
+        mUsb.close();
     }
 }
 // ----------------------------------------------------------------------
-void XhcWhb04b6Component::teardownUsb()
-{
-    libusb_exit(getUsbContext());
-    mUsb.setContext(nullptr);
-}
-// ----------------------------------------------------------------------
 void XhcWhb04b6Component::enableVerbosePendant(bool enable)
 {
     mPendant.enableVerbose(enable);

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

@@ -42,9 +42,6 @@ class XhcWhb04b6Component :
     virtual ~XhcWhb04b6Component();
     void process();
     void teardownUsb();
-    void setUsbContext(libusb_context* context);
-    libusb_device_handle* getUsbDeviceHandle();
-    libusb_context* getUsbContext();
     //! \return the name as specified to \ref XhcWhb04b6Component
     const char* getName() const;
     //! \return the name as specified to \ref Hal