[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1501-g4346a857

[darcagn <da...@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  4346a85740d341587fd151cf47475b74fff9eeb4 (commit)
       via  9d759bc67d15f8faaecaa89d4fe91c147fbb7155 (commit)
       via  08c583f3fa1b44aac6a032be12a8ff9c334d7acf (commit)
      from  cdff9466a32a5f59d9139513786adc6184c3adce (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 4346a85740d341587fd151cf47475b74fff9eeb4
Merge: 08c583f3 9d759bc6
Author: darcagn <da...@pr...>
Date:   Wed Aug 21 12:11:26 2024 -0500

    Merge pull request #723 from pcercuei/fix-lba48
    
    g1ata: Restore LBA48 support

commit 9d759bc67d15f8faaecaa89d4fe91c147fbb7155
Author: Paul Cercueil <pa...@cr...>
Date:   Wed Aug 21 19:02:57 2024 +0200

    g1ata: Restore LBA48 support
    
    The introduction of chained LBA28 DMA transfers accidentally broke LBA48
    support.
    
    Restore LBA48 support by checking that we're actually using a non-LBA48
    drive before trying to chain DMA descriptors.
    
    Signed-off-by: Paul Cercueil <pa...@cr...>

commit 08c583f3fa1b44aac6a032be12a8ff9c334d7acf
Author: darcagn <da...@pr...>
Date:   Wed Aug 21 10:51:42 2024 -0500

    Adjust pvrtex .gitignore and Makefile (#721)
    
    -Create info folder as needed rather than forcing it to always exist.

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

Summary of changes:
 kernel/arch/dreamcast/hardware/g1ata.c | 3 ++-
 utils/pvrtex/.gitignore                | 1 +
 utils/pvrtex/Makefile                  | 3 ++-
 utils/pvrtex/info/.gitkeep             | 0
 4 files changed, 5 insertions(+), 2 deletions(-)
 delete mode 100644 utils/pvrtex/info/.gitkeep

diff --git a/kernel/arch/dreamcast/hardware/g1ata.c b/kernel/arch/dreamcast/hardware/g1ata.c
index 7faa8c0a..777c8b52 100644
--- a/kernel/arch/dreamcast/hardware/g1ata.c
+++ b/kernel/arch/dreamcast/hardware/g1ata.c
@@ -232,13 +232,14 @@ static void g1_ata_set_sector_and_count(uint64_t sector, uint32_t count, int lba
 }
 
 static void g1_dma_irq_hnd(uint32 code, void *data) {
+    int can_lba48 = CAN_USE_LBA48();
     unsigned int nb_sectors;
 
     /* XXXX: Probably should look at the code to make sure it isn't an error. */
     (void)code;
     (void)data;
 
-    if(dma_in_progress && dma_nb_sectors > 256) {
+    if(dma_in_progress && !can_lba48 && dma_nb_sectors > 256) {
         dma_sector += 256;
         dma_nb_sectors -= 256;
         nb_sectors = dma_nb_sectors <= 256 ? dma_nb_sectors : 256;
diff --git a/utils/pvrtex/.gitignore b/utils/pvrtex/.gitignore
index 1d3690fa..e1fdd06b 100644
--- a/utils/pvrtex/.gitignore
+++ b/utils/pvrtex/.gitignore
@@ -1,2 +1,3 @@
+info/
 pvrtex
 README
diff --git a/utils/pvrtex/Makefile b/utils/pvrtex/Makefile
index d736110b..1acf1204 100644
--- a/utils/pvrtex/Makefile
+++ b/utils/pvrtex/Makefile
@@ -19,6 +19,7 @@ MYCFLAGS=$(MYFLAGS) -Wno-pointer-sign
 
 
 define textSegment2Header
+	mkdir -p info
 	awk '/$1/,/--------------------------------------------------------------------------/' README > $2/$3.txt
 	$(KOS_BASE)/utils/bin2c/bin2c $2/$3.txt $2/$3.h $(3)_txt
 	rm $2/$3.txt
@@ -47,7 +48,7 @@ README: readme_unformatted.txt
 
 all: $(TARGET) README
 
-install: all 
+install: all
 	install -m 755 $(TARGET) $(DC_TOOLS_BASE)/
 
 info/options.h: README Makefile
diff --git a/utils/pvrtex/info/.gitkeep b/utils/pvrtex/info/.gitkeep
deleted file mode 100644
index e69de29b..00000000


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