5 files changed, 18 insertions(+), 8 deletions(-)

M module-bsp/bsp/usb/usb.hpp
M module-services/service-desktop/ServiceDesktop.cpp
M module-services/service-desktop/WorkerDesktop.cpp
M module-services/service-desktop/WorkerDesktop.hpp
M third-party/usb_stack

@@ 38,6 38,7 @@ namespace bsp
         std::string serialNumber;
         std::uint16_t deviceVersion;
         std::string rootPath;
+        bool mtpLockedAtInit;
     };
 
     int usbInit(const usbInitParams &initParams);

@@ 172,9 172,9 @@ auto ServiceDesktop::usbWorkerInit() -> sys::ReturnCodes
     if (initialized) {
         return sys::ReturnCodes::Success;
     }
+
     auto serialNumber = getSerialNumber();
     auto caseColour   = getCaseColour();
-
     LOG_DEBUG("usbWorkerInit Serial Number: %s, Case Colour: %s", serialNumber.c_str(), caseColour.c_str());
 
     desktopWorker = std::make_unique<WorkerDesktop>(this,

@@ 48,8 48,12 @@ bool WorkerDesktop::init(std::list<sys::WorkerQueueInfo> queues)
     auto sentinelRegistrationMsg = std::make_shared<sys::SentinelRegistrationMessage>(cpuSentinel);
     ownerService->bus.sendUnicast(sentinelRegistrationMsg, service::name::system_manager);
 
-    const bsp::usbInitParams initParams = {
-        receiveQueue, irqQueue, serialNumber, device_colour::getColourVersion(caseColour), rootPath};
+    const bsp::usbInitParams initParams = {receiveQueue,
+                                           irqQueue,
+                                           serialNumber,
+                                           device_colour::getColourVersion(caseColour),
+                                           rootPath,
+                                           securityModel.isSecurityEnabled()};
 
     initialized = bsp::usbInit(initParams) == 0;
 


@@ 96,9 100,15 @@ void WorkerDesktop::reset()
     usbStatus   = bsp::USBDeviceStatus::Disconnected;
     bsp::usbDeinit();
 
-    bsp::usbInitParams initParams = {
-        receiveQueue, irqQueue, serialNumber, device_colour::getColourVersion(caseColour), rootPath};
-    initialized = bsp::usbInit(initParams) >= 0;
+    const bsp::usbInitParams initParams = {receiveQueue,
+                                           irqQueue,
+                                           serialNumber,
+                                           device_colour::getColourVersion(caseColour),
+                                           rootPath,
+                                           securityModel.isSecurityEnabled()};
+
+    initialized = bsp::usbInit(initParams) == 0;
+
     if (initialized) {
         usbStatus = bsp::USBDeviceStatus::Connected;
         ownerService->bus.sendMulticast(std::make_shared<sdesktop::usb::USBConnected>(),

@@ 44,7 44,6 @@ class WorkerDesktop : public sys::Worker
 
   private:
     void reset();
-    void suspendUsb();
 
     bool handleReceiveQueueMessage(std::shared_ptr<sys::WorkerQueue> &queue);
     bool handleSendQueueMessage(std::shared_ptr<sys::WorkerQueue> &queue);

@@ 1,1 1,1 @@
-Subproject commit 262386626b4135a8809bedfdce46202c2bbcd712
+Subproject commit 66264940da90314542d3e4087e88d1f57992628f