[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-620-g48bbf14

[ljsebald <ljs...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  48bbf14b2331e1ffe7ffad0b08ca6b5248cdbac4 (commit)
       via  0ba2043d058733da67c0b285f895b30ee99dada4 (commit)
       via  ee09ed2c51b2d3f0900043cb7f06e0678e3e1e6d (commit)
       via  52ba48b329ee1da1b35db5acf80679c57dfc78d0 (commit)
       via  d63f597b9b0871d433bc457bd455c7184520c617 (commit)
      from  0c9a7bcc27905fc20c6a4889603e80fc8b3c4185 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 48bbf14b2331e1ffe7ffad0b08ca6b5248cdbac4
Merge: 0c9a7bc 0ba2043
Author: Lawrence Sebald <ljs...@us...>
Date:   Mon Jan 16 16:22:44 2023 -0500

    Merge branch 'master' of github.com:KallistiOS/KallistiOS

commit 0ba2043d058733da67c0b285f895b30ee99dada4
Merge: 205e8af ee09ed2
Author: Lawrence Sebald <ljs...@us...>
Date:   Tue Jan 10 17:44:05 2023 -0500

    Merge pull request #86 from darcagn/master
    
    Correct typo in cdrom_change_dataype function to cdrom_change_datatype

commit ee09ed2c51b2d3f0900043cb7f06e0678e3e1e6d
Author: darc <da...@pr...>
Date:   Tue Jan 10 16:26:00 2023 -0600

    Fix typo.... again.

commit 52ba48b329ee1da1b35db5acf80679c57dfc78d0
Author: darc <da...@pr...>
Date:   Tue Jan 10 16:20:01 2023 -0600

    Add helper function with typo for backward compatibility, using deprecated attribute.

commit d63f597b9b0871d433bc457bd455c7184520c617
Author: darc <da...@pr...>
Date:   Mon Jan 9 21:14:56 2023 -0600

    Fix cdrom_change_dataype typo to cdrom_change_datatype

-----------------------------------------------------------------------

Summary of changes:
 kernel/arch/dreamcast/hardware/cdrom.c   |  9 +++++++--
 kernel/arch/dreamcast/include/dc/cdrom.h | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/kernel/arch/dreamcast/hardware/cdrom.c b/kernel/arch/dreamcast/hardware/cdrom.c
index 2af5808..e2a4fea 100644
--- a/kernel/arch/dreamcast/hardware/cdrom.c
+++ b/kernel/arch/dreamcast/hardware/cdrom.c
@@ -185,8 +185,13 @@ int cdrom_get_status(int *status, int *disc_type) {
     return rv;
 }
 
-/* Wrapper for the change datatype syscall */
+/* Helper function to account for long-standing typo */
 int cdrom_change_dataype(int sector_part, int cdxa, int sector_size) {
+    return cdrom_change_datatype(sector_part, cdxa, sector_size);
+}
+
+/* Wrapper for the change datatype syscall */
+int cdrom_change_datatype(int sector_part, int cdxa, int sector_size) {
     int rv = ERR_OK;
     uint32  params[4];
 
@@ -271,7 +276,7 @@ int cdrom_reinit_ex(int sector_part, int cdxa, int sector_size) {
         return r;
     }
 
-    r = cdrom_change_dataype(sector_part, cdxa, sector_size);
+    r = cdrom_change_datatype(sector_part, cdxa, sector_size);
     mutex_unlock(&_g1_ata_mutex);
     
     return r;
diff --git a/kernel/arch/dreamcast/include/dc/cdrom.h b/kernel/arch/dreamcast/include/dc/cdrom.h
index a350580..4169516 100644
--- a/kernel/arch/dreamcast/include/dc/cdrom.h
+++ b/kernel/arch/dreamcast/include/dc/cdrom.h
@@ -232,6 +232,16 @@ int cdrom_exec_cmd(int cmd, void *param);
 */
 int cdrom_get_status(int *status, int *disc_type);
 
+/** \brief    Change the datatype of disc.
+
+    \note                   This function is formally deprecated. It should not
+                            be used in any future code, and may be removed in
+                            the future. You should instead use
+                            cdrom_change_datatype.
+*/
+int cdrom_change_dataype(int sector_part, int cdxa, int sector_size)
+                        __depr("Use cdrom_change_datatype instead.");
+
 /** \brief    Change the datatype of disc.
 
     This function will take in all parameters to pass to the change_datatype 
@@ -246,7 +256,7 @@ int cdrom_get_status(int *status, int *disc_type);
     \return                 \ref cd_cmd_response
     \see    cd_read_sector_part
 */
-int cdrom_change_dataype(int sector_part, int cdxa, int sector_size);
+int cdrom_change_datatype(int sector_part, int cdxa, int sector_size);
 
 /** \brief  Re-initialize the GD-ROM drive.
 
@@ -288,7 +298,7 @@ int cdrom_read_toc(CDROM_TOC *toc_buffer, int session);
 
     This function reads the specified number of sectors from the disc, starting
     where requested. This will respect the size of the sectors set with
-    cdrom_change_dataype(). The buffer must have enough space to store the
+    cdrom_change_datatype(). The buffer must have enough space to store the
     specified number of sectors.
 
     \param  buffer          Space to store the read sectors.


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.