~aleteoryx/muditaos

9fdb29846302f88321c23518a163e2c7a389d9e1 — Roman Kubiak 5 years ago 77d3b1a
[EGD-4557] implement usb-deinit (#1101)

Added usb deinit calls for rt1051 and linux
M module-bsp/board/linux/usb_cdc/usb_cdc.cpp => module-bsp/board/linux/usb_cdc/usb_cdc.cpp +8 -2
@@ 10,6 10,7 @@ namespace bsp
{
    int fd;
    xQueueHandle USBReceiveQueue;
    constexpr auto ptsFileName = "/tmp/purephone_pts_name";

    void usbDeviceTask(void *ptr)
    {


@@ 59,12 60,17 @@ namespace bsp

    void writePtsToFile(const char *pts_name)
    {
        constexpr auto fileName = "/tmp/purephone_pts_name";
        std::ofstream ptsNameFile;
        ptsNameFile.open(fileName, std::ios::out | std::ios::trunc);
        ptsNameFile.open(ptsFileName, std::ios::out | std::ios::trunc);
        ptsNameFile << pts_name;
    }

    void usbDeinit()
    {
        LOG_INFO("usbDeinit removing file %s", ptsFileName);
        std::remove(ptsFileName);
    }

    int usbInit(xQueueHandle receiveQueue, USBDeviceListener *)
    {


M module-bsp/board/rt1051/bsp/usb => module-bsp/board/rt1051/bsp/usb +1 -1
@@ 1,1 1,1 @@
Subproject commit 0b8328a31d21585f8f05e1d7faa7e6908c16d043
Subproject commit b2efea05fc6c0b30d85cbb18863b495a76fc8551

M module-bsp/bsp/usb/usb.hpp => module-bsp/bsp/usb/usb.hpp +1 -0
@@ 30,4 30,5 @@ namespace bsp
    int usbInit(xQueueHandle, USBDeviceListener *deviceListener = nullptr);
    int usbCDCReceive(void *ptr);
    int usbCDCSend(std::string *sendMsg);
    void usbDeinit();
} // namespace bsp

M module-services/service-desktop/WorkerDesktop.cpp => module-services/service-desktop/WorkerDesktop.cpp +1 -0
@@ 46,6 46,7 @@ bool WorkerDesktop::deinit(void)

    Worker::deinit();

    bsp::usbDeinit();
    LOG_DEBUG("deinit end");
    return true;
}