pf2: drv::IsInserted

libraries/libvapours/include/vapours/prfile2/pdm/prfile2_pdm_upper_layer_api.hpp

@@ -23,6 +23,14 @@ namespace ams::prfile2::pdm {
     namespace part {
 
         pdm::Error CheckDataEraseRequest(HandleType part_handle, bool *out);
+        pdm::Error CheckMediaInsert(HandleType part_handle, bool *out);
+
+    }
+
+    namespace disk {
+
+        pdm::Error CheckDataEraseRequest(HandleType disk_handle, bool *out);
+        pdm::Error CheckMediaInsert(HandleType disk_handle, bool *out);
 
     }
 

libraries/libvapours/include/vapours/prfile2/prfile2_drv.hpp

@@ -26,4 +26,6 @@ namespace ams::prfile2::drv {
 
     pf::Error Initialize(Volume *volume);
 
+    bool IsInserted(Volume *volume);
+
 }

libraries/libvapours/source/prfile2/pdm/prfile2_pdm_upper_layer_disk_api.cpp

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#if defined(ATMOSPHERE_IS_STRATOSPHERE)
+#include <stratosphere.hpp>
+#elif defined(ATMOSPHERE_IS_MESOSPHERE)
+#include <mesosphere.hpp>
+#elif defined(ATMOSPHERE_IS_EXOSPHERE)
+#include <exosphere.hpp>
+#else
+#include <vapours.hpp>
+#endif
+#include "prfile2_pdm_disk_set.hpp"
+
+namespace ams::prfile2::pdm::disk {
+
+    pdm::Error CheckDataEraseRequest(HandleType disk_handle, bool *out) {
+        /* Check parameters. */
+        Disk *disk = GetDisk(disk_handle);
+        if (out == nullptr || disk == nullptr) {
+            return pdm::Error_InvalidParameter;
+        }
+
+        /* Check for data erase function. */
+        *out = disk->erase_callback != nullptr;
+        return pdm::Error_Ok;
+    }
+
+    pdm::Error CheckMediaInsert(HandleType disk_handle, bool *out) {
+        /* Check parameters. */
+        Disk *disk = GetDisk(disk_handle);
+        if (out == nullptr || disk == nullptr) {
+            return pdm::Error_InvalidParameter;
+        }
+
+        /* Get whether the disk is inserted. */
+        *out = disk->is_inserted;
+        return pdm::Error_Ok;
+    }
+
+}

libraries/libvapours/source/prfile2/pdm/prfile2_pdm_upper_layer_part_api.cpp

@@ -33,15 +33,19 @@ namespace ams::prfile2::pdm::part {
             return pdm::Error_InvalidParameter;
         }
 
-        /* Get the disk. */
+        /* Check the disk. */
-        Disk *disk = GetDisk(part->disk_handle);
+        return pdm::disk::CheckDataEraseRequest(part->disk_handle, out);
-        if (disk == nullptr) {
+    }
+
+    pdm::Error CheckMediaInsert(HandleType part_handle, bool *out) {
+        /* Check parameters. */
+        Partition *part = GetPartition(part_handle);
+        if (out == nullptr || part == nullptr) {
             return pdm::Error_InvalidParameter;
         }
 
-        /* Check for data erase function. */
+        /* Check if the disk is inserted. */
-        *out = disk->erase_callback != nullptr;
+        return pdm::disk::CheckMediaInsert(part->disk_handle, out);
-        return pdm::Error_Ok;
     }
 
 }

libraries/libvapours/source/prfile2/prfile2_drv.cpp

@@ -42,4 +42,12 @@ namespace ams::prfile2::drv {
         return pf::Error_Ok;
     }
 
+    bool IsInserted(Volume *volume) {
+        /* Check inserted. */
+        /* NOTE: Error is not checked here. */
+        bool inserted = false;
+        pdm::part::CheckMediaInsert(volume->partition_handle, std::addressof(inserted));
+        return inserted;
+    }
+
 }

libraries/libvapours/source/prfile2/prfile2_volume.cpp

@@ -272,6 +272,8 @@ namespace ams::prfile2::vol {
             vol->tail_entry.tracker_size = util::size(vol->tail_entry.tracker_buf);
             vol->tail_entry.tracker_bits = vol->tail_entry.tracker_buf;
 
+            /* NOTE: Cluster link is cleared here, but we already memset vol to zero, so it's unnecessary. */
+
             /* Initialize driver for volume. */
             if (auto err = drv::Initialize(vol); err != pf::Error_Ok) {
                 return SetLastErrorAndReturn(err);
@@ -310,7 +312,7 @@ namespace ams::prfile2::vol {
 
         /* Perform mount as appropriate. */
         const auto check_mount_err = /* TODO vol::CheckMediaInsertForAttachMount(vol) */ pf::Error_Ok;
-        const bool inserted        = /* TODO: drv::IsInserted(vol) */ false;
+        const bool inserted        = drv::IsInserted(vol);
         if (check_mount_err != pf::Error_Ok) {
             if (inserted) {
                 drive_table->SetDiskInserted(true);