fix style

nx/include/switch/services/capsa.h

@@ -41,10 +41,10 @@ Result capsaGetAlbumFileList(CapsAlbumStorage storage, u64 *count, CapsAlbumEntr
  * @brief Loads a file into the specified buffer.
  * @param[in] file_id \ref CapsAlbumFileId
  * @param[out] out_size Size of the AlbumFile.
- * @param[out] workbuf File output buffer.
+ * @param[out] filebuf File output buffer.
- * @param[in] workbuf_size Size of the workbuf.
+ * @param[in] filebuf_size Size of the filebuf.
  */
-Result capsaLoadAlbumFile(const CapsAlbumFileId *file_id, u64 *out_size, void *workbuf, u64 workbuf_size);
+Result capsaLoadAlbumFile(const CapsAlbumFileId *file_id, u64 *out_size, void* filebuf, u64 filebuf_size);
 
 /**
  * @brief Deletes an AlbumFile corresponding to the specified \ref CapsAlbumFileId.
@@ -62,14 +62,14 @@ Result capsaStorageCopyAlbumFile(const CapsAlbumFileId *file_id, CapsAlbumStorag
 /**
  * @brief Gets the mount status of the specified \ref CapsAlbumStorage.
  * @param[in] storage \ref CapsAlbumStorage
- * @param[out] is_mounted
+ * @param[out] is_mounted Boolean over wether the storage is mounted or not.
  */
 Result capsaIsAlbumMounted(CapsAlbumStorage storage, bool *is_mounted);
 
 /**
  * @brief Returns the AlbumUsage for a specified \ref CapsAlbumStorage.
  * @param[in] storage \ref CapsAlbumStorage
- * @param[out] out \ref CapsAlbumUsage
+ * @param[out] out \ref CapsAlbumUsage2
  */
 Result capsaGetAlbumUsage(CapsAlbumStorage storage, CapsAlbumUsage2 *out);
 
@@ -88,7 +88,7 @@ Result capsaGetAlbumFileSize(const CapsAlbumFileId *file_id, u64 *size);
  * @param[out] image JPEG image output buffer.
  * @param[in] image_size Image buffer size.
  */
-Result capsaLoadAlbumFileThumbnail(const CapsAlbumFileId *file_id, u64 *out_size, void *image, u64 image_size);
+Result capsaLoadAlbumFileThumbnail(const CapsAlbumFileId *file_id, u64 *out_size, void* image, u64 image_size);
 
 /**
  * @brief Load the ScreenShotImage for the specified AlbumFile.
@@ -101,7 +101,7 @@ Result capsaLoadAlbumFileThumbnail(const CapsAlbumFileId *file_id, u64 *out_size
  * @param[out] workbuf Work buffer, cleared to 0 by the cmd before it returns.
  * @param[in] workbuf_size Work buffer size, must be at least the size of the JPEG within the AlbumFile.
  */
-Result capsaLoadAlbumScreenShotImage(u64 *width, u64 *height, const CapsAlbumFileId *file_id, void *image, u64 image_size, void *workbuf, u64 workbuf_size);
+Result capsaLoadAlbumScreenShotImage(u64 *width, u64 *height, const CapsAlbumFileId *file_id, void* image, u64 image_size, void* workbuf, u64 workbuf_size);
 
 /**
  * @brief Load the ScreenShotThumbnailImage for the specified AlbumFile.
@@ -114,7 +114,7 @@ Result capsaLoadAlbumScreenShotImage(u64 *width, u64 *height, const CapsAlbumFil
  * @param[out] workbuf Work buffer, cleared to 0 by the cmd before it returns.
  * @param[in] workbuf_size Work buffer size, must be at least the size of the JPEG within the AlbumFile.
  */
-Result capsaLoadAlbumScreenShotThumbnailImage(u64 *width, u64 *height, const CapsAlbumFileId *file_id, void *image, u64 image_size, void *workbuf, u64 workbuf_size);
+Result capsaLoadAlbumScreenShotThumbnailImage(u64 *width, u64 *height, const CapsAlbumFileId *file_id, void* image, u64 image_size, void* workbuf, u64 workbuf_size);
 
 /**
  * @brief Load the ScreenShotImage for the specified AlbumFile.
@@ -128,7 +128,7 @@ Result capsaLoadAlbumScreenShotThumbnailImage(u64 *width, u64 *height, const Cap
  * @param[out] workbuf Work buffer, cleared to 0 by the cmd before it returns.
  * @param[in] workbuf_size Work buffer size, must be at least the size of the JPEG within the AlbumFile.
  */
-Result capsaLoadAlbumScreenShotImageEx(u64 *width, u64 *height, const CapsAlbumFileId *file_id, const CapsScreenShotDecodeOption *opts, void *image, u64 image_size, void *workbuf, u64 workbuf_size);
+Result capsaLoadAlbumScreenShotImageEx(u64 *width, u64 *height, const CapsAlbumFileId *file_id, const CapsScreenShotDecodeOption *opts, void* image, u64 image_size, void* workbuf, u64 workbuf_size);
 
 /**
  * @brief Load the ScreenShotThumbnailImage for the specified AlbumFile.
@@ -142,13 +142,13 @@ Result capsaLoadAlbumScreenShotImageEx(u64 *width, u64 *height, const CapsAlbumF
  * @param[out] workbuf Work buffer, cleared to 0 by the cmd before it returns.
  * @param[in] workbuf_size Work buffer size, must be at least the size of the JPEG within the AlbumFile.
  */
-Result capsaLoadAlbumScreenShotThumbnailImageEx(u64 *width, u64 *height, const CapsAlbumFileId *file_id, const CapsScreenShotDecodeOption *opts, void *image, u64 image_size, void *workbuf, u64 workbuf_size);
+Result capsaLoadAlbumScreenShotThumbnailImageEx(u64 *width, u64 *height, const CapsAlbumFileId *file_id, const CapsScreenShotDecodeOption *opts, void* image, u64 image_size, void* workbuf, u64 workbuf_size);
 
 /**
  * @brief Returns the AlbumUsage for a specified \ref CapsAlbumStorage.
  * @note Only available on [4.0.0+].
  * @param[in] storage \ref CapsAlbumStorage
- * @param[out] out \ref CapsAlbumUsage
+ * @param[out] out \ref CapsAlbumUsage3
  */
 Result capsaGetAlbumUsage3(CapsAlbumStorage storage, CapsAlbumUsage3 *out);
 
@@ -162,7 +162,7 @@ Result capsaGetAlbumMountResult(CapsAlbumStorage storage);
  * @brief Returns the AlbumUsage for a specified \ref CapsAlbumStorage.
  * @note Only available on [4.0.0+].
  * @param[in] storage \ref CapsAlbumStorage
- * @param[out] out \ref CapsAlbumUsage
+ * @param[out] out \ref CapsAlbumUsage16
  */
 Result capsaGetAlbumUsage16(CapsAlbumStorage storage, CapsAlbumUsage16 *out);
 
@@ -193,7 +193,7 @@ Result capsaGetRequiredStorageSpaceSizeToCopyAll(CapsAlbumStorage dst_storage, C
  * @param[out] out Data buffer.
  * @param[in] out_size Size of the Data buffer.
  */
-Result capsaLoadAlbumScreenShotThumbnailImageEx1(const CapsAlbumFileId *file_id, const CapsScreenShotDecodeOption *opts, void *image, u64 image_size, void *workbuf, u64 workbuf_size, void *out, u64 out_size);
+Result capsaLoadAlbumScreenShotThumbnailImageEx1(const CapsAlbumFileId *file_id, const CapsScreenShotDecodeOption *opts, void* image, u64 image_size, void* workbuf, u64 workbuf_size, void* out, u64 out_size);
 
 /**
  * @brief Unmounts the specified AlbumStorage.
@@ -218,7 +218,7 @@ Result capsaRefreshAlbumCache(CapsAlbumStorage storage);
  * @brief Opens an AlbumMovieStream.
  * @note This opens IAlbumAccessorSession if not previously opened, it's closed during \ref capsaExit.
  * @note Up to 4 streams can be open at the same time. Multiple streams can be open at the same time for the same \ref CapsAlbumFileId.
- * @note Only available on [4.0.0+]
+ * @note Only available on [4.0.0+].
  * @param[out] stream Stream handle.
  * @param[in] entry \ref CapsAlbumFileId
  */
@@ -226,14 +226,14 @@ Result capsaOpenAlbumMovieStream(u64 *stream, const CapsAlbumFileId *file_id);
 
 /**
  * @brief Closes an AlbumMovieStream.
- * @note Only available on [4.0.0+]
+ * @note Only available on [4.0.0+].
  * @param[in] stream Stream handle.
  */
 Result capsaCloseAlbumMovieStream(u64 stream);
 
 /**
  * @brief Gets the data size of an AlbumMovieStream.
- * @note Only available on [4.0.0+]
+ * @note Only available on [4.0.0+].
  * @param[in] stream Stream handle.
  * @param[out] size Size of the actual MP4, without the JPEG at the end.
  */
@@ -243,26 +243,26 @@ Result capsaGetAlbumMovieStreamSize(u64 stream, u64 *size);
  * @brief Reads data from an AlbumMovieStream.
  * @note offset(+size) must not be negative. offset and size must be aligned to 0x40000-bytes.
  * @note When offset(+size) goes beyond the size from \ref capsaGetAlbumMovieStreamSize, the regions of the buffer which goes beyond that are cleared to 0, and actual_size is still set to the input size.
- * @note Only available on [4.0.0+]
+ * @note Only available on [4.0.0+].
  * @param[in] stream Stream handle.
  * @param[in] offset Offset.
  * @param[out] Output data buffer.
  * @param[in] size Data buffer size.
  * @param[out] actual_size Actual read size.
  */
-Result capsaReadMovieDataFromAlbumMovieReadStream(u64 stream, s64 offset, void *buffer, size_t size, u64 *actual_size);
+Result capsaReadMovieDataFromAlbumMovieReadStream(u64 stream, s64 offset, void* buffer, size_t size, u64 *actual_size);
 
 /**
  * @brief Gets the BrokenReason for an AlbumMovieStream.
  * @note Official sw doesn't use this.
- * @note Only available on [4.0.0+]
+ * @note Only available on [4.0.0+].
  * @param[in] stream Stream handle.
  */
 Result capsaGetAlbumMovieReadStreamBrokenReason(u64 stream);
 
 /**
  * @brief Gets the data size of an Image taken from an AlbumMovieStream.
- * @note Only available on [4.0.0+]
+ * @note Only available on [4.0.0+].
  * @param[in] stream Stream handle.
  * @param[out] size Expected size of an Image.
  */
@@ -270,17 +270,18 @@ Result capsaGetAlbumMovieReadStreamImageDataSize(u64 stream, u64 *size);
 
 /**
  * @brief Reads data of an Image taken from an AlbumMovieStream.
- * @note Only available on [4.0.0+]
+ * @note Only available on [4.0.0+].
  * @param[in] stream Stream handle.
  * @param[in] offset Offset.
  * @param[out] Output data buffer.
  * @param[in] size Data buffer size.
  * @param[out] actual_size Actual read size.
  */
-Result capsaReadImageDataFromAlbumMovieReadStream(u64 stream, s64 offset, void *buffer, size_t size, u64 *actual_size);
+Result capsaReadImageDataFromAlbumMovieReadStream(u64 stream, s64 offset, void* buffer, size_t size, u64 *actual_size);
 
 /**
  * @brief Gets the file attribute of an AlbumMovieStream.
+ * @note Only available on [4.0.0+].
  * @param[in] stream Stream handle.
  * @param[out] attr \ref CapsScreenShotAttributeForApplication.
  */

nx/source/services/capsa.c

@@ -41,14 +41,14 @@ Result capsaGetAlbumFileList(CapsAlbumStorage storage, u64 *count, CapsAlbumEntr
     u8 inval = storage;
     return serviceDispatchInOut(&g_capsaSrv, 1, inval, *count,
         .buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_Out },
-        .buffers = { { buffer, buffer_size } },
+        .buffers = { { entries, size } },
     );
 }
 
-Result capsaLoadAlbumFile(const CapsAlbumFileId *file_id, u64 *out_size, void *workbuf, u64 workbuf_size) {
+Result capsaLoadAlbumFile(const CapsAlbumFileId *file_id, u64 *out_size, void* filebuf, u64 filebuf_size) {
     return serviceDispatchInOut(&g_capsaSrv, 2, *file_id, *out_size,
         .buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_Out },
-        .buffers = { { workbuf, workbuf_size } },
+        .buffers = { { filebuf, filebuf_size } },
     );
 }
 
@@ -79,14 +79,14 @@ Result capsaGetAlbumFileSize(const CapsAlbumFileId *file_id, u64 *size) {
     return serviceDispatchInOut(&g_capsaSrv, 7, *file_id, *size);
 }
 
-Result capsaLoadAlbumFileThumbnail(const CapsAlbumFileId *file_id, u64 *out_size, void *image, u64 image_size) {
+Result capsaLoadAlbumFileThumbnail(const CapsAlbumFileId *file_id, u64 *out_size, void* image, u64 image_size) {
     return serviceDispatchInOut(&g_capsaSrv, 8, *file_id, *out_size,
         .buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_Out },
         .buffers = { { image, image_size } },
     );
 }
 
-static Result _capsaLoadAlbumScreenshot(u64 *width, u64 *height, const CapsAlbumFileId *file_id, void *image, u64 image_size, void *workbuf, u64 workbuf_size, u32 cmd_id) {
+static Result _capsaLoadAlbumScreenshot(u64 *width, u64 *height, const CapsAlbumFileId *file_id, void* image, u64 image_size, void* workbuf, u64 workbuf_size, u32 cmd_id) {
     if (hosversionBefore(2,0,0))
         return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
     struct {
@@ -102,15 +102,15 @@ static Result _capsaLoadAlbumScreenshot(u64 *width, u64 *height, const CapsAlbum
     return rc;
 }
 
-Result capsaLoadAlbumScreenShotImage(u64 *width, u64 *height, const CapsAlbumFileId *file_id, void *image, u64 image_size, void *workbuf, u64 workbuf_size) {
+Result capsaLoadAlbumScreenShotImage(u64 *width, u64 *height, const CapsAlbumFileId *file_id, void* image, u64 image_size, void* workbuf, u64 workbuf_size) {
     return _capsaLoadAlbumScreenshot(width, height, file_id, image, image_size, workbuf, workbuf_size, 9);
 }
 
-Result capsaLoadAlbumScreenShotThumbnailImage(u64 *width, u64 *height, const CapsAlbumFileId *file_id, void *image, u64 image_size, void *workbuf, u64 workbuf_size) {
+Result capsaLoadAlbumScreenShotThumbnailImage(u64 *width, u64 *height, const CapsAlbumFileId *file_id, void* image, u64 image_size, void* workbuf, u64 workbuf_size) {
     return _capsaLoadAlbumScreenshot(width, height, file_id, image, image_size, workbuf, workbuf_size, 10);
 }
 
-static Result _capsaLoadAlbumScreenshotEx(u64 *width, u64 *height, const CapsAlbumFileId *file_id, const CapsScreenShotDecodeOption *opts, void *image, u64 image_size, void *workbuf, u64 workbuf_size, u32 cmd_id) {
+static Result _capsaLoadAlbumScreenshotEx(u64 *width, u64 *height, const CapsAlbumFileId *file_id, const CapsScreenShotDecodeOption *opts, void* image, u64 image_size, void* workbuf, u64 workbuf_size, u32 cmd_id) {
     if (hosversionBefore(3,0,0))
         return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
     struct {
@@ -130,11 +130,11 @@ static Result _capsaLoadAlbumScreenshotEx(u64 *width, u64 *height, const CapsAlb
     return rc;
 }
 
-Result capsaLoadAlbumScreenShotImageEx(u64 *width, u64 *height, const CapsAlbumFileId *file_id, const CapsScreenShotDecodeOption *opts, void *image, u64 image_size, void *workbuf, u64 workbuf_size) {
+Result capsaLoadAlbumScreenShotImageEx(u64 *width, u64 *height, const CapsAlbumFileId *file_id, const CapsScreenShotDecodeOption *opts, void* image, u64 image_size, void* workbuf, u64 workbuf_size) {
     return _capsaLoadAlbumScreenshotEx(width, height, file_id, opts, image, image_size, workbuf, workbuf_size, 12);
 }
 
-Result capsaLoadAlbumScreenShotThumbnailImageEx(u64 *width, u64 *height, const CapsAlbumFileId *file_id, const CapsScreenShotDecodeOption *opts, void *image, u64 image_size, void *workbuf, u64 workbuf_size) {
+Result capsaLoadAlbumScreenShotThumbnailImageEx(u64 *width, u64 *height, const CapsAlbumFileId *file_id, const CapsScreenShotDecodeOption *opts, void* image, u64 image_size, void* workbuf, u64 workbuf_size) {
     return _capsaLoadAlbumScreenshotEx(width, height, file_id, opts, image, image_size, workbuf, workbuf_size, 13);
 }
 
@@ -173,7 +173,7 @@ Result capsaGetRequiredStorageSpaceSizeToCopyAll(CapsAlbumStorage dst_storage, C
     return serviceDispatchInOut(&g_capsaSrv, 501, in, *out);
 }
 
-Result capsaLoadAlbumScreenShotThumbnailImageEx1(const CapsAlbumFileId *file_id, const CapsScreenShotDecodeOption *opts, void *image, u64 image_size, void *workbuf, u64 workbuf_size, void *out, u64 out_size) {
+Result capsaLoadAlbumScreenShotThumbnailImageEx1(const CapsAlbumFileId *file_id, const CapsScreenShotDecodeOption *opts, void* image, u64 image_size, void* workbuf, u64 workbuf_size, void* out, u64 out_size) {
     if (hosversionBefore(4,0,0))
         return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
     struct {
@@ -213,7 +213,7 @@ static Result _capsaOpenAlbumMovieReadStream(u64 *stream, const CapsAlbumFileId
     return serviceDispatchInOut(&g_capsaAccessor, 2001, *file_id, *stream);
 }
 
-static Result _capsaReadMovieDataFromAlbumMovieReadStream(u64 stream, s64 offset, void *buffer, size_t size, u64 *actual_size) {
+static Result _capsaReadMovieDataFromAlbumMovieReadStream(u64 stream, s64 offset, void* buffer, size_t size, u64 *actual_size) {
     const struct {
         u64 stream;
         s64 offset;
@@ -225,7 +225,7 @@ static Result _capsaReadMovieDataFromAlbumMovieReadStream(u64 stream, s64 offset
     );
 }
 
-static Result _capsaReadImageDataFromAlbumMovieReadStream(u64 stream, s64 offset, void *buffer, size_t size, u64 *actual_size) {
+static Result _capsaReadImageDataFromAlbumMovieReadStream(u64 stream, s64 offset, void* buffer, size_t size, u64 *actual_size) {
     const struct {
         u64 stream;
         s64 offset;
@@ -270,7 +270,7 @@ Result capsaGetAlbumMovieStreamSize(u64 stream, u64 *size) {
     return serviceDispatchInOut(&g_capsaAccessor, 2003, stream, *size);
 }
 
-Result capsaReadMovieDataFromAlbumMovieReadStream(u64 stream, s64 offset, void *buffer, size_t size, u64 *actual_size) {
+Result capsaReadMovieDataFromAlbumMovieReadStream(u64 stream, s64 offset, void* buffer, size_t size, u64 *actual_size) {
     if (hosversionBefore(4,0,0))
         return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
 
@@ -300,7 +300,7 @@ Result capsaGetAlbumMovieReadStreamImageDataSize(u64 stream, u64 *size) {
     return serviceDispatchInOut(&g_capsaAccessor, 2006, stream, *size);
 }
 
-Result capsaReadImageDataFromAlbumMovieReadStream(u64 stream, s64 offset, void *buffer, size_t size, u64 *actual_size) {
+Result capsaReadImageDataFromAlbumMovieReadStream(u64 stream, s64 offset, void* buffer, size_t size, u64 *actual_size) {
     if (hosversionBefore(4,0,0))
         return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);