cadcdev-svn-commits Mailing List for Cryptic Allusion DCDev (Page 36)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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  44a62b490650c4da1fd386da594204aded37e9e1 (commit)
      from  15e2b89b3ddf9ceedd1960c5c3d8b2ddb411efe2 (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 44a62b490650c4da1fd386da594204aded37e9e1
Author: Donald Haase <qu...@co...>
Date:   Sun Sep 7 13:14:58 2014 -0400

    Updated functionality for the CDROM. Includes subcode reading, DMA sector reading, and more accessible parameters for initializing the drive.

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

Summary of changes:
 kernel/arch/dreamcast/hardware/cdrom.c   |  211 +++++++++++++++++++-----------
 kernel/arch/dreamcast/include/dc/cdrom.h |  121 ++++++++++++++++--
 2 files changed, 245 insertions(+), 87 deletions(-)

diff --git a/kernel/arch/dreamcast/hardware/cdrom.c b/kernel/arch/dreamcast/hardware/cdrom.c
index 09e613e..ce6464e 100644
--- a/kernel/arch/dreamcast/hardware/cdrom.c
+++ b/kernel/arch/dreamcast/hardware/cdrom.c
@@ -4,6 +4,7 @@
 
    Copyright (C) 2000 Dan Potter
    Copyright (C) 2014 Lawrence Sebald
+   Copyright (C) 2014 Donald Haase
 
  */
 
@@ -32,13 +33,14 @@ they require their parameters to be in certain registers, which is
 normally the case with the default options. If in doubt, decompile the
 output and look to make sure.
 
+XXX: This could all be done in a non-blocking way by taking advantage of
+command queuing. Every call to gdc_req_cmd returns a 'request id' which
+just needs to eventually be checked by cmd_stat. A non-blocking version
+of all functions would simply require manual calls to check the status.
+Doing this would probably allow data reading while cdda is playing without
+hiccups (by severely reducing the number of gd commands being sent).
 */
 
-/* Parts of the a CD-ROM sector to read. These are possible values for the
-   third parameter word sent with the change data type syscall. */
-#define CDROM_READ_WHOLE_SECTOR 0x1000
-#define CDROM_READ_DATA_AREA    0x2000
-
 
 /* GD-Rom BIOS calls... named mostly after Marcus' code. None have more
    than two parameters; R7 (fourth parameter) needs to describe
@@ -79,10 +81,9 @@ static int gdc_change_data_type(void *param) {
     MAKE_SYSCALL(return, param, 0, 10);
 }
 
-/* These two functions are never actually used in here. They're only really here
-   for reference at this point. */
-#if 0
 /* Reset the GD-ROM */
+/* Stop gcc from complaining that we don't use it */
+static void gdc_reset() __attribute__((unused));
 static void gdc_reset() {
     MAKE_SYSCALL(/**/, 0, 0, 9);
 }
@@ -91,20 +92,21 @@ static void gdc_reset() {
 static void gdc_abort_cmd(int cmd) {
     MAKE_SYSCALL(/**/, cmd, 0, 8);
 }
-#endif
 
-/* The CD access mutex */
-mutex_t _g1_ata_mutex;
-static int initted = 0;
-static int sector_size = 2048;   /*default 2048, 2352 for raw data reading*/
+/* The G1 ATA access mutex */
+mutex_t _g1_ata_mutex = RECURSIVE_MUTEX_INITIALIZER;
 
-void cdrom_set_sector_size(int size) {
-    sector_size = size;
-    cdrom_reinit();
+/* Shortcut to cdrom_reinit_ex. Typically this is the only thing changed. */
+int cdrom_set_sector_size(int size) {
+    return cdrom_reinit_ex(-1, -1, size);
 }
 
 /* Command execution sequence */
-int cdrom_exec_cmd(int cmd, void *param) {
+/* XXX: It might make sense to have a version of this that takes a timeout.
+   The only time this could cause an issue is if for some inane reason a user
+   were to cdrom_init/reinit in one thread and expect to be able to get a 
+   reliable read in another. */
+static int cdrom_exec_cmd(int cmd, void *param) {
     int status[4] = {0};
     int f, n;
 
@@ -151,6 +153,7 @@ int cdrom_get_status(int *status, int *disc_type) {
        already in progress. */
     if(irq_inside_int()) {
         if(mutex_trylock(&_g1_ata_mutex))
+            /* DH: Figure out a better return to signal error */
             return -1;
     }
     else {
@@ -161,6 +164,7 @@ int cdrom_get_status(int *status, int *disc_type) {
     g1_ata_select_device(G1_ATA_MASTER);
 
     rv = gdc_get_drv_stat(params);
+    mutex_unlock(&_g1_ata_mutex);
 
     if(rv >= 0) {
         if(status != NULL)
@@ -177,16 +181,58 @@ int cdrom_get_status(int *status, int *disc_type) {
             *disc_type = -1;
     }
 
-    mutex_unlock(&_g1_ata_mutex);
+    return rv;
+}
+
+/* Wrapper for the change datatype syscall */
+int cdrom_change_dataype(int sector_part, int cdxa, int sector_size) {
+    int rv = ERR_OK;
+    uint32  params[4];
+
+    mutex_lock(&_g1_ata_mutex);
+    g1_ata_select_device(G1_ATA_MASTER);
+
+    /* Check if we are using default params */
+    if(sector_size == 2352) {
+        if(cdxa == -1)
+            cdxa = 0;
+
+        if(sector_part == -1)
+            sector_part = CDROM_READ_WHOLE_SECTOR;
+    }
+    else {
+        if(cdxa == -1) {
+            /* If not overriding cdxa, check what the drive thinks we should 
+               use */
+            gdc_get_drv_stat(params);
+            cdxa = (params[1] == 32 ? 2048 : 1024);
+        }
 
+        if(sector_part == -1)
+            sector_part = CDROM_READ_DATA_AREA;
+
+        if(sector_size == -1)
+            sector_size = 2048;
+    }
+
+    params[0] = 0;              /* 0 = set, 1 = get */
+    params[1] = sector_part;    /* Get Data or Full Sector */
+    params[2] = cdxa;           /* CD-XA mode 1/2 */
+    params[3] = sector_size;    /* sector size */
+    rv = gdc_change_data_type(params);
+    mutex_unlock(&_g1_ata_mutex);
     return rv;
 }
 
 /* Re-init the drive, e.g., after a disc change, etc */
 int cdrom_reinit() {
-    int rv = ERR_OK;
-    int r = -1, cdxa;
-    uint32  params[4];
+    /* By setting -1 to each parameter, they fall to the old defaults */
+    return cdrom_reinit_ex(-1, -1, -1);
+}
+
+/* Enhanced cdrom_reinit, takes the place of the old 'sector_size' function */
+int cdrom_reinit_ex(int sector_part, int cdxa, int sector_size) {
+    int r = -1;
     int timeout;
 
     mutex_lock(&_g1_ata_mutex);
@@ -204,12 +250,12 @@ int cdrom_reinit() {
         if(r == 0) break;
 
         if(r == ERR_NO_DISC) {
-            rv = r;
-            goto exit;
+            mutex_unlock(&_g1_ata_mutex);
+            return r;
         }
         else if(r == ERR_SYS) {
-            rv = r;
-            goto exit;
+            mutex_unlock(&_g1_ata_mutex);
+            return r;
         }
 
         /* Still trying.. sleep a bit and check again */
@@ -218,34 +264,16 @@ int cdrom_reinit() {
     }
 
     if(timeout <= 0) {
-        rv = r;
-        goto exit;
+        /* Send an abort since we're giving up waiting for the init */
+        gdc_abort_cmd(CMD_INIT);
+        mutex_unlock(&_g1_ata_mutex);
+        return r;
     }
 
-    /* Check disc type and set parameters */
-    gdc_get_drv_stat(params);
-    if(sector_size != 2352) {
-        cdxa = params[1] == 32;
-        params[0] = 0;                       /* 0 = set, 1 = get */
-        params[1] = CDROM_READ_DATA_AREA;    /* Part of the sector to read */
-        params[2] = cdxa ? 2048 : 1024;      /* Sector type */
-        params[3] = sector_size;             /* Sector size */
-    }
-    else {
-        params[0] = 0;
-        params[1] = CDROM_READ_WHOLE_SECTOR;
-        params[2] = 0;
-        params[3] = 2352;
-    }
-
-    if(gdc_change_data_type(params) < 0) {
-        rv = ERR_SYS;
-        goto exit;
-    }
-
-exit:
+    r = cdrom_change_dataype(sector_part, cdxa, sector_size);
     mutex_unlock(&_g1_ata_mutex);
-    return rv;
+    
+    return r;
 }
 
 /* Read the table of contents */
@@ -256,37 +284,75 @@ int cdrom_read_toc(CDROM_TOC *toc_buffer, int session) {
     } params;
     int rv;
 
-    mutex_lock(&_g1_ata_mutex);
-
     params.session = session;
     params.buffer = toc_buffer;
-    rv = cdrom_exec_cmd(CMD_GETTOC2, &params);
 
+    mutex_lock(&_g1_ata_mutex);
+
+    rv = cdrom_exec_cmd(CMD_GETTOC2, &params);
     mutex_unlock(&_g1_ata_mutex);
+
     return rv;
 }
 
-/* Read one or more sectors */
-int cdrom_read_sectors(void *buffer, int sector, int cnt) {
+/* Enhanced Sector reading: Choose mode to read in. */
+int cdrom_read_sectors_ex(void *buffer, int sector, int cnt, int mode) {
     struct {
         int sec, num;
         void    *buffer;
         int dunno;
     } params;
-    int rv;
-
-    mutex_lock(&_g1_ata_mutex);
+    int rv = ERR_OK;
 
     params.sec = sector;    /* Starting sector */
-    params.num = cnt;   /* Number of sectors */
+    params.num = cnt;       /* Number of sectors */
     params.buffer = buffer; /* Output buffer */
-    params.dunno = 0;   /* ? */
-    rv = cdrom_exec_cmd(CMD_PIOREAD, &params);
+    params.dunno = 0;       /* ? */
+
+    mutex_lock(&_g1_ata_mutex);
+
+    /* The DMA mode blocks the thread it is called in by the way we execute
+       gd syscalls. It does however allow for other threads to run. */
+    /* XXX: DMA Mode may conflict with using a second G1ATA device. More 
+       testing is needed from someone with such a device.
+    */
+    if(mode == CDROM_READ_DMA)
+        rv = cdrom_exec_cmd(CMD_DMAREAD, &params);
+    else if (mode == CDROM_READ_PIO)
+        rv = cdrom_exec_cmd(CMD_PIOREAD, &params);
 
     mutex_unlock(&_g1_ata_mutex);
     return rv;
 }
 
+/* Basic old sector read */
+int cdrom_read_sectors(void *buffer, int sector, int cnt) {
+    return cdrom_read_sectors_ex(buffer, sector, cnt, CDROM_READ_PIO);
+}
+
+
+/* Read a piece of or all of the Q byte of the subcode of the last sector read.
+   If you need the subcode from every sector, you cannot read more than one at 
+   a time. */
+/* XXX: Use some CD-Gs and other stuff to test if you get more than just the 
+   Q byte */
+int cdrom_get_subcode(void *buffer, int buflen, int which) {
+    struct {
+        int which;
+        int buflen;
+        void    *buffer;
+    } params;
+    int rv;
+
+    params.which = which;
+    params.buflen = buflen;
+    params.buffer = buffer;
+    mutex_lock(&_g1_ata_mutex);
+    rv = cdrom_exec_cmd(CMD_GETSCD, &params);
+    mutex_unlock(&_g1_ata_mutex);
+    return rv;
+}
+
 /* Locate the LBA sector of the data track; use after reading TOC */
 uint32 cdrom_locate_data_track(CDROM_TOC *toc) {
     int i, first, last;
@@ -318,7 +384,7 @@ int cdrom_cdda_play(uint32 start, uint32 end, uint32 repeat, int mode) {
         int end;
         int repeat;
     } params;
-    int rv;
+    int rv = ERR_OK;
 
     /* Limit to 0-15 */
     if(repeat > 15)
@@ -332,7 +398,7 @@ int cdrom_cdda_play(uint32 start, uint32 end, uint32 repeat, int mode) {
 
     if(mode == CDDA_TRACKS)
         rv = cdrom_exec_cmd(CMD_PLAY, &params);
-    else
+    else if(mode == CDDA_SECTORS)
         rv = cdrom_exec_cmd(CMD_PLAY2, &params);
 
     mutex_unlock(&_g1_ata_mutex);
@@ -376,28 +442,24 @@ int cdrom_spin_down() {
 /* Initialize: assume no threading issues */
 int cdrom_init() {
     uint32 p;
-    volatile uint32 *react = (uint32*)0xa05f74e4,
-                     *bios = (uint32*)0xa0000000;
-
-    if(initted)
-        return -1;
+    volatile uint32 *react = (uint32 *)0xa05f74e4,
+                     *bios = (uint32 *)0xa0000000;
 
     /* Reactivate drive: send the BIOS size and then read each
        word across the bus so the controller can verify it. */
     *react = 0x1fffff;
 
-    for(p = 0; p < 0x200000 / 4; p++) {
+    for(p = 0; p < 0x200000 / sizeof(bios[0]); p++) {
         (void)bios[p];
     }
 
+    mutex_lock(&_g1_ata_mutex);
     /* Make sure to select the GD-ROM drive. */
     g1_ata_select_device(G1_ATA_MASTER);
 
     /* Reset system functions */
     gdc_init_system();
-
-    /* Initialize mutex */
-    mutex_init(&_g1_ata_mutex, MUTEX_TYPE_NORMAL);
+    mutex_unlock(&_g1_ata_mutex);
 
     /* Do an initial initialization */
     cdrom_reinit();
@@ -406,9 +468,6 @@ int cdrom_init() {
 }
 
 void cdrom_shutdown() {
-    if(!initted)
-        return;
 
-    mutex_destroy(&_g1_ata_mutex);
-    initted = 0;
+    /* What would you want done here? */
 }
diff --git a/kernel/arch/dreamcast/include/dc/cdrom.h b/kernel/arch/dreamcast/include/dc/cdrom.h
index daa7188..038d477 100644
--- a/kernel/arch/dreamcast/include/dc/cdrom.h
+++ b/kernel/arch/dreamcast/include/dc/cdrom.h
@@ -1,8 +1,8 @@
 /* KallistiOS ##version##
 
    dc/cdrom.h
-   (c)2000-2001 Dan Potter
-
+   Copyright (C) 2000-2001 Dan Potter
+   Copyright (C) 2014 Donald Haase
 */
 
 #ifndef __DC_CDROM_H
@@ -25,8 +25,8 @@ __BEGIN_DECLS
     CD, it will automatically detect and react to disc changes for you.
 
     This file only facilitates reading raw sectors and doing other fairly low-
-    level things with CDs. If you're looking for higher-level stuff, like normal
-    file reading, consult with the stuff for the fs and for fs_iso9660.
+    level things with CDs. If you're looking for higher-level stuff, like 
+    normal file reading, consult with the stuff for the fs and for fs_iso9660.
 
     \author Dan Potter
     \see    kos/fs.h
@@ -91,6 +91,40 @@ __BEGIN_DECLS
 #define CDDA_SECTORS    2   /**< \brief Play by sector number */
 /** @} */
 
+/** \defgroup cd_read_sector_part    CD-ROM Read Sector Part
+
+    Parts of the a CD-ROM sector to read. These are possible values for the
+    third parameter word sent with the change data type syscall. 
+    @{
+*/
+#define CDROM_READ_WHOLE_SECTOR 0x1000    /**< \brief Read the whole sector */
+#define CDROM_READ_DATA_AREA    0x2000    /**< \brief Read the data area */
+/** @} */
+
+/** \defgroup cd_read_subcode_type    CD-ROM Read Subcode Type
+
+    Types of data available to read from the sector subcode. These are 
+    possible values for the first parameter sent to the GETSCD syscall.
+    @{
+*/
+#define CD_SUB_Q_CHANNEL        0    /**< \brief Read Q Channel Subcode Data */
+#define CD_SUB_CURRENT_POSITION 1    /**< \brief Read all Subcode Data for 
+                                                 most recent sector */
+#define CD_SUB_MEDIA_CATALOG    2    /**< \brief Read the Media Catalog 
+                                                 Subcode Data */
+#define CD_SUB_TRACK_ISRC       3    /**< \brief Read the ISRC Subcode Data */
+/** @} */
+
+/** \defgroup cd_read_sector_mode    CD-ROM Read Sector Mode
+
+    How to read the sectors of a CD, via PIO or DMA. 4th parameter of 
+    cdrom_read_sectors_ex.
+    @{
+*/
+#define CDROM_READ_PIO 0    /**< \brief Read sector(s) in PIO mode */
+#define CDROM_READ_DMA 1    /**< \brief Read sector(s) in DMA mode */
+/** @} */
+
 /** \defgroup cd_status_values      CD-ROM status values
 
     These are the values that can be returned as the status parameter from the
@@ -170,20 +204,23 @@ typedef struct {
     sectors) or 2352 (for reading raw sectors).
 
     \param  size            The size of the sector data.
+
+    \return                 \ref cd_cmd_response
 */
-void cdrom_set_sector_size(int size);
+int cdrom_set_sector_size(int size);
 
 /** \brief  Execute a CD-ROM command.
 
     This function executes the specified command using the BIOS syscall for
-    executing GD-ROM commands.
+    executing GD-ROM commands. This is *NOT* thread-safe. You must track the 
+	G1_ATA mutex yourself.
 
     \param  cmd             The command number to execute.
     \param  param           Data to pass to the syscall.
 
     \return                 \ref cd_cmd_response
 */
-int cdrom_exec_cmd(int cmd, void *param);
+static int cdrom_exec_cmd(int cmd, void *param);
 
 /** \brief  Get the status of the GD-ROM drive.
 
@@ -196,15 +233,48 @@ int cdrom_exec_cmd(int cmd, void *param);
 */
 int cdrom_get_status(int *status, int *disc_type);
 
+/** \brief    Change the datatype of disc.
+
+    This function will take in all parameters to pass to the change_datatype 
+    syscall. This allows these parameters to be modified without a reinit. 
+    Each parameter allows -1 as a default, which is tied to the former static 
+    values provided by cdrom_reinit and cdrom_set_sector_size.
+
+    \param sector_part      How much of each sector to return.
+    \param cdxa             What CDXA mode to read as (if applicable).
+    \param sector_size      What sector size to read (eg. - 2048, 2532).
+
+    \return                 \ref cd_cmd_response
+    \see    cd_read_sector_part
+*/
+int cdrom_change_dataype(int sector_part, int cdxa, int sector_size);
+
 /** \brief  Re-initialize the GD-ROM drive.
 
-    This function is for reinitializing the GD-ROM drive after a disc change,
-    or something of the like.
+    This function is for reinitializing the GD-ROM drive after a disc change to
+    its default settings. Calls cdrom_reinit(-1,-1,-1)
 
     \return                 \ref cd_cmd_response
+    \see    cdrom_reinit_ex
 */
 int cdrom_reinit();
 
+/** \brief    Re-initialize the GD-ROM drive with custom parameters.
+
+    At the end of each cdrom_reinit(), cdrom_change_datatype is called. 
+    This passes in the requested values to that function after 
+    reinitialization, as opposed to defaults.
+
+    \param sector_part      How much of each sector to return.
+    \param cdxa             What CDXA mode to read as (if applicable).
+    \param sector_size      What sector size to read (eg. - 2048, 2532).
+
+    \return                 \ref cd_cmd_response
+    \see    cd_read_sector_part
+    \see    cdrom_change_datatype
+*/
+int cdrom_reinit_ex(int sector_part, int cdxa, int sector_size);
+
 /** \brief  Read the table of contents from the disc.
 
...<truncated>...


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




2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (35)	Dec (2)
2004	Jan (37)	Feb (10)	Mar	Apr (2)	May (17)	Jun (1)	Jul (14)	Aug (14)	Sep (4)	Oct	Nov (14)	Dec (4)
2005	Jan (6)	Feb	Mar	Apr (6)	May	Jun	Jul	Aug	Sep (1)	Oct	Nov (92)	Dec (12)
2006	Jan (3)	Feb (4)	Mar	Apr (5)	May (3)	Jun (15)	Jul (3)	Aug (1)	Sep (29)	Oct (1)	Nov (6)	Dec (5)
2007	Jan (2)	Feb (2)	Mar	Apr (3)	May (14)	Jun (2)	Jul (16)	Aug (73)	Sep (12)	Oct (9)	Nov (27)	Dec (3)
2008	Jan (4)	Feb (4)	Mar (3)	Apr (8)	May (23)	Jun (4)	Jul (1)	Aug (3)	Sep (7)	Oct (5)	Nov (1)	Dec (1)
2009	Jan	Feb (10)	Mar	Apr (4)	May (4)	Jun (10)	Jul	Aug (1)	Sep	Oct (7)	Nov	Dec (1)
2010	Jan	Feb (1)	Mar	Apr (6)	May	Jun (3)	Jul (11)	Aug (1)	Sep	Oct (15)	Nov (1)	Dec (5)
2011	Jan (4)	Feb (1)	Mar (6)	Apr	May (22)	Jun	Jul (8)	Aug (2)	Sep	Oct	Nov	Dec (2)
2012	Jan	Feb (10)	Mar (1)	Apr (6)	May (27)	Jun (48)	Jul (30)	Aug (4)	Sep	Oct (3)	Nov (1)	Dec (11)
2013	Jan (4)	Feb (7)	Mar (6)	Apr (18)	May (28)	Jun (20)	Jul	Aug (4)	Sep (1)	Oct (1)	Nov (2)	Dec (7)
2014	Jan (3)	Feb (2)	Mar (4)	Apr (9)	May (11)	Jun (10)	Jul	Aug (18)	Sep (12)	Oct (17)	Nov (10)	Dec (16)
2015	Jan (5)	Feb (1)	Mar (5)	Apr (4)	May (28)	Jun (2)	Jul	Aug	Sep (6)	Oct	Nov (2)	Dec (1)
2016	Jan (14)	Feb	Mar (3)	Apr	May	Jun (3)	Jul (4)	Aug (4)	Sep (1)	Oct (1)	Nov	Dec (1)
2017	Jan (11)	Feb	Mar (21)	Apr	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2018	Jan	Feb	Mar (1)	Apr	May (1)	Jun	Jul	Aug (2)	Sep (4)	Oct (4)	Nov	Dec (1)
2019	Jan (1)	Feb	Mar	Apr (1)	May	Jun	Jul	Aug (13)	Sep (4)	Oct	Nov	Dec
2020	Jan (10)	Feb (9)	Mar (5)	Apr (4)	May (3)	Jun (18)	Jul (4)	Aug (2)	Sep (20)	Oct (2)	Nov	Dec
2021	Jan	Feb	Mar	Apr (2)	May (1)	Jun (2)	Jul (1)	Aug (2)	Sep	Oct	Nov	Dec (2)
2022	Jan (1)	Feb (2)	Mar (2)	Apr (1)	May	Jun	Jul	Aug (5)	Sep	Oct (1)	Nov	Dec (1)
2023	Jan (10)	Feb (7)	Mar (29)	Apr (31)	May (29)	Jun (34)	Jul (3)	Aug (24)	Sep (22)	Oct (10)	Nov (38)	Dec (27)
2024	Jan (15)	Feb (8)	Mar (4)	Apr (20)	May (33)	Jun (18)	Jul (15)	Aug (23)	Sep (26)	Oct (32)	Nov (6)	Dec (4)
2025	Jan (7)	Feb (1)	Mar (1)	Apr (4)	May (46)	Jun (19)	Jul (26)	Aug (1)	Sep	Oct	Nov	Dec

cadcdev-svn-commits Mailing List for Cryptic Allusion DCDev (Page 36)

cadcdev-svn-commits — Source Code Repository Updates