[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1096-ga113876

[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  a113876777c99e0ed3edded98f226a6c902af97e (commit)
      from  ad6a4726a081cdfda00294369cb90832eb419cb8 (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 a113876777c99e0ed3edded98f226a6c902af97e
Author: Andress Barajas <and...@gm...>
Date:   Sat Nov 4 10:42:15 2023 -0700

    Use uint32_t and size_t in store queues (#337)
    
    Change uint32 -> uint32_t, sizes to actually be size_t.

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

Summary of changes:
 kernel/arch/dreamcast/hardware/sq.c   | 14 +++++++-------
 kernel/arch/dreamcast/include/dc/sq.h | 22 +++++++++++-----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/kernel/arch/dreamcast/hardware/sq.c b/kernel/arch/dreamcast/hardware/sq.c
index 8fa9947..561ae94 100644
--- a/kernel/arch/dreamcast/hardware/sq.c
+++ b/kernel/arch/dreamcast/hardware/sq.c
@@ -16,7 +16,7 @@
 */
 
 /* Copies n bytes from src to dest, dest must be 32-byte aligned */
-void * sq_cpy(void *dest, const void *src, int n) {
+void * sq_cpy(void *dest, const void *src, size_t n) {
     uint32_t *d = SQ_MASK_DEST(dest);
     const uint32_t *s = src;
 
@@ -89,7 +89,7 @@ void * sq_cpy(void *dest, const void *src, int n) {
 }
 
 /* Fills n bytes at dest with byte c, dest must be 32-byte aligned */
-void * sq_set(void *dest, uint32_t c, int n) {
+void * sq_set(void *dest, uint32_t c, size_t n) {
     /* Duplicate low 8-bits of c into high 24-bits */
     c = c & 0xff;
     c = (c << 24) | (c << 16) | (c << 8) | c;
@@ -98,7 +98,7 @@ void * sq_set(void *dest, uint32_t c, int n) {
 }
 
 /* Fills n bytes at dest with short c, dest must be 32-byte aligned */
-void * sq_set16(void *dest, uint32_t c, int n) {
+void * sq_set16(void *dest, uint32_t c, size_t n) {
     /* Duplicate low 16-bits of c into high 16-bits */
     c = c & 0xffff;
     c = (c << 16) | c;
@@ -107,7 +107,7 @@ void * sq_set16(void *dest, uint32_t c, int n) {
 }
 
 /* Fills n bytes at dest with int c, dest must be 32-byte aligned */
-void * sq_set32(void *dest, uint32_t c, int n) {
+void * sq_set32(void *dest, uint32_t c, size_t n) {
     uint32_t *d = SQ_MASK_DEST(dest);
 
     /* Set store queue memory area as desired */
@@ -133,7 +133,7 @@ void * sq_set32(void *dest, uint32_t c, int n) {
 }
 
 /* Clears n bytes at dest, dest must be 32-byte aligned */
-void sq_clr(void *dest, int n) {
+void sq_clr(void *dest, size_t n) {
     sq_set32(dest, 0, n);
 }
 
@@ -141,7 +141,7 @@ void sq_clr(void *dest, int n) {
 #define PVR_DMA_DEST  (*(volatile uint32_t *)(void *)0xa05f6808)
 
 /* Copies n bytes from src to dest (in VRAM), dest must be 32-byte aligned */
-void * sq_cpy_pvr(void *dest, const void *src, int n) {
+void * sq_cpy_pvr(void *dest, const void *src, size_t n) {
     if(PVR_DMA_DEST != 0) {
         dbglog(DBG_ERROR, "sq_cpy_pvr: Previous DMA has not finished\n");
         return NULL;
@@ -159,7 +159,7 @@ void * sq_cpy_pvr(void *dest, const void *src, int n) {
 }
 
 /* Fills n bytes at PVR dest with short c, dest must be 32-byte aligned */
-void * sq_set_pvr(void *dest, uint32_t c, int n) {
+void * sq_set_pvr(void *dest, uint32_t c, size_t n) {
     if(PVR_DMA_DEST != 0) {
         dbglog(DBG_ERROR, "sq_set_pvr: Previous DMA has not finished\n");
         return NULL;
diff --git a/kernel/arch/dreamcast/include/dc/sq.h b/kernel/arch/dreamcast/include/dc/sq.h
index c570a0e..5dbad30 100644
--- a/kernel/arch/dreamcast/include/dc/sq.h
+++ b/kernel/arch/dreamcast/include/dc/sq.h
@@ -63,10 +63,10 @@ __BEGIN_DECLS
 /** \brief   Mask dest to Store Queue area
     \ingroup store_queues
 */
-#define SQ_MASK_DEST(dest)        \
-            ((uint32_t *)(void *) \
-            (MEM_AREA_SQ_BASE |      \
-            (((uint32_t)(dest)) & 0x03ffffe0)))
+#define SQ_MASK_DEST(dest) \
+        ((uint32_t *)(void *) \
+        (MEM_AREA_SQ_BASE |   \
+        (((uint32_t)(dest)) & 0x03ffffe0)))
 
 /** \brief   Copy a block of memory.
     \ingroup store_queues
@@ -86,7 +86,7 @@ __BEGIN_DECLS
 
     \sa sq_cpy_pvr()
 */
-void * sq_cpy(void *dest, const void *src, int n);
+void * sq_cpy(void *dest, const void *src, size_t n);
 
 /** \brief   Set a block of memory to an 8-bit value.
     \ingroup store_queues
@@ -105,7 +105,7 @@ void * sq_cpy(void *dest, const void *src, int n);
 
     \sa sq_set16(), sq_set32(), sq_set_pvr()
 */
-void * sq_set(void *dest, uint32 c, int n);
+void * sq_set(void *dest, uint32_t c, size_t n);
 
 /** \brief   Set a block of memory to a 16-bit value.
     \ingroup store_queues
@@ -124,7 +124,7 @@ void * sq_set(void *dest, uint32 c, int n);
 
     \sa sq_set(), sq_set32(), sq_set_pvr()
 */
-void * sq_set16(void *dest, uint32 c, int n);
+void * sq_set16(void *dest, uint32_t c, size_t n);
 
 /** \brief   Set a block of memory to a 32-bit value.
     \ingroup store_queues
@@ -142,7 +142,7 @@ void * sq_set16(void *dest, uint32 c, int n);
 
     \sa sq_set(), sq_set16(), sq_set_pvr()
 */
-void * sq_set32(void *dest, uint32 c, int n);
+void * sq_set32(void *dest, uint32_t c, size_t n);
 
 /** \brief   Clear a block of memory.
     \ingroup store_queues
@@ -156,7 +156,7 @@ void * sq_set32(void *dest, uint32 c, int n);
     \param  dest            The address to begin clearing at (32-byte aligned).
     \param  n               The number of bytes to clear (multiple of 32).
 */
-void sq_clr(void *dest, int n);
+void sq_clr(void *dest, size_t n);
 
 /** \brief   Copy a block of memory to VRAM
     \ingroup store_queues
@@ -183,7 +183,7 @@ void sq_clr(void *dest, int n);
 
     \sa sq_cpy()
 */
-void * sq_cpy_pvr(void *dest, const void *src, int n);
+void * sq_cpy_pvr(void *dest, const void *src, size_t n);
 
 /** \brief   Set a block of PVR memory to a 16-bit value.
     \ingroup store_queues
@@ -205,7 +205,7 @@ void * sq_cpy_pvr(void *dest, const void *src, int n);
 
     \sa sq_set(), sq_set16(), sq_set32()
 */
-void * sq_set_pvr(void *dest, uint32 c, int n);
+void * sq_set_pvr(void *dest, uint32_t c, size_t n);
 
 __END_DECLS
 


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