add mtp custom mount support (image sd, image nand, install, speed test).

sphaira/include/evman.hpp

@@ -7,7 +7,6 @@
 #include <string>
 #include <switch.h>
 #include <nxlink.h>
-#include <haze.h>
 #include "download.hpp"
 
 namespace sphaira::evman {
@@ -24,7 +23,6 @@ struct ExitEventData {
 using EventData = std::variant<
     LaunchNroEventData,
     ExitEventData,
-    HazeCallbackData,
     NxlinkCallbackData,
     curl::DownloadEventData
 >;

sphaira/include/fs.hpp

@@ -195,6 +195,7 @@ struct Dir {
     ~Dir();
 
     Result GetEntryCount(s64* out);
+    Result Read(s64 *total_entries, size_t max_entries, FsDirectoryEntry *buf);
     Result ReadAll(std::vector<FsDirectoryEntry>& buf);
     void Close();
 
@@ -398,36 +399,6 @@ struct FsNative : Fs {
         return fsFsGetTotalSpace(&m_fs, path, out);
     }
 
-    // Result OpenDirectory(const FsPath& path, u32 mode, FsDir *out) {
-    //     return fsFsOpenDirectory(&m_fs, path, mode, out);
-    // }
-
-    // void DirClose(FsDir *d) {
-    //     fsDirClose(d);
-    // }
-
-    // Result DirGetEntryCount(FsDir *d, s64* out) {
-    //     return fsDirGetEntryCount(d, out);
-    // }
-
-    // Result DirGetEntryCount(const FsPath& path, u32 mode, s64* out) {
-    //     FsDir d;
-    //     R_TRY(OpenDirectory(path, mode, &d));
-    //     ON_SCOPE_EXIT(DirClose(&d));
-    //     return DirGetEntryCount(&d, out);
-    // }
-
-    // Result DirRead(FsDir *d, s64 *total_entries, size_t max_entries, FsDirectoryEntry *buf) {
-    //     return fsDirRead(d, total_entries, max_entries, buf);
-    // }
-
-    // Result DirRead(const FsPath& path, u32 mode, s64 *total_entries, size_t max_entries, FsDirectoryEntry *buf) {
-    //     FsDir d;
-    //     R_TRY(OpenDirectory(path, mode, &d));
-    //     ON_SCOPE_EXIT(DirClose(&d));
-    //     return DirRead(&d, total_entries, max_entries, buf);
-    // }
-
     virtual bool IsFsActive() {
         return serviceIsActive(&m_fs.s);
     }

sphaira/include/haze_helper.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <functional>
+
+namespace sphaira::haze {
+
+bool Init();
+void Exit();
+
+using OnInstallStart = std::function<bool(void* user, const char* path)>;
+using OnInstallWrite = std::function<bool(void* user, const void* buf, size_t size)>;
+using OnInstallClose = std::function<void(void* user)>;
+
+void InitInstallMode(void* user, OnInstallStart on_start, OnInstallWrite on_write, OnInstallClose on_close);
+void DisableInstallMode();
+
+} // namespace sphaira::haze

sphaira/include/ui/menus/mtp_menu.hpp

@@ -0,0 +1,57 @@
+#pragma once
+
+#include "ui/menus/menu_base.hpp"
+#include "yati/source/stream.hpp"
+
+namespace sphaira::ui::menu::mtp {
+
+enum class State {
+    // not connected.
+    None,
+    // just connected, starts the transfer.
+    Connected,
+    // set whilst transfer is in progress.
+    Progress,
+    // set when the transfer is finished.
+    Done,
+    // failed to connect.
+    Failed,
+};
+
+struct StreamFtp final : yati::source::Stream {
+    StreamFtp(const fs::FsPath& path, std::stop_token token);
+
+    Result ReadChunk(void* buf, s64 size, u64* bytes_read) override;
+    bool Push(const void* buf, s64 size);
+    void Disable();
+
+// private:
+    fs::FsPath m_path{};
+    std::stop_token m_token{};
+    std::vector<u8> m_buffer{};
+    Mutex m_mutex{};
+    bool m_active{};
+    // bool m_push_exit{};
+};
+
+struct Menu final : MenuBase {
+    Menu(u32 flags);
+    ~Menu();
+
+    auto GetShortTitle() const -> const char* override { return "MTP"; };
+    void Update(Controller* controller, TouchInfo* touch) override;
+    void Draw(NVGcontext* vg, Theme* theme) override;
+    void OnFocusGained() override;
+
+// this should be private
+// private:
+    std::shared_ptr<StreamFtp> m_source{};
+    Thread m_thread{};
+    Mutex m_mutex{};
+    // the below are shared across threads, lock with the above mutex!
+    State m_state{State::None};
+
+    bool m_was_mtp_enabled{};
+};
+
+} // namespace sphaira::ui::menu::mtp

sphaira/include/usb/usbds.hpp

@@ -2,6 +2,11 @@
 
 #include "base.hpp"
 
+// TODO: remove these when libnx pr is merged.
+enum { UsbDeviceSpeed_None = 0x0 };
+enum { UsbDeviceSpeed_Low = 0x1 };
+Result usbDsGetSpeed(UsbDeviceSpeed *out);
+
 namespace sphaira::usb {
 
 // Device Host