The-Homebrew-Cloud/fceugx
2
0
Fork 0
mirror of https://github.com/dborth/fceugx.git synced 2025-01-07 14:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

improved DVD function (thanks Erant)

Browse Source
This commit is contained in:
dborth 2008-10-15 17:05:59 +00:00
parent 204b1a477b
commit 43c55a17d3
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/ngc/dvd.c
View File

@ -14,6 +14,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <malloc.h>
#ifdef WII_DVD #ifdef WII_DVD
#include <di/di.h> #include <di/di.h>
@ -33,16 +34,17 @@ bool isWii = false;
volatile unsigned long *dvd = (volatile unsigned long *) 0xCC006000; volatile unsigned long *dvd = (volatile unsigned long *) 0xCC006000;
#endif #endif
/** Due to lack of memory, we'll use this little 2k keyhole for all DVD operations **/
unsigned char DVDreadbuffer[2048] ATTRIBUTE_ALIGN (32);
unsigned char dvdbuffer[2048]; unsigned char dvdbuffer[2048];
/**************************************************************************** /****************************************************************************
* dvd_read * dvd_read
* *
* The only DVD function we need - you gotta luv gc-linux self-boots! * Main DVD function, everything else uses this!
* returns: 1 - ok ; 0 - error * returns: 1 - ok ; 0 - error
***************************************************************************/ ***************************************************************************/
#define ALIGN_FORWARD(x,align) ((typeof(x))((((uint32_t)(x)) + (align) - 1) & (~(align-1))))
#define ALIGN_BACKWARD(x,align) ((typeof(x))(((uint32_t)(x)) & (~(align-1))))
int int
dvd_read (void *dst, unsigned int len, u64 offset) dvd_read (void *dst, unsigned int len, u64 offset)
{ {
@ -52,7 +54,9 @@ dvd_read (void *dst, unsigned int len, u64 offset)
// don't read past the end of the DVD (1.5 GB for GC DVD, 4.7 GB for DVD) // don't read past the end of the DVD (1.5 GB for GC DVD, 4.7 GB for DVD)
if((offset < 0x57057C00) || (isWii && (offset < 0x118244F00LL))) if((offset < 0x57057C00) || (isWii && (offset < 0x118244F00LL)))
{ {
unsigned char *buffer = (unsigned char *) (unsigned int) DVDreadbuffer; u8 * buffer = (u8 *)memalign(32, 0x8000);
u32 off_size = 0;
DCInvalidateRange ((void *) buffer, len); DCInvalidateRange ((void *) buffer, len);
#ifdef HW_DOL #ifdef HW_DOL
@ -72,11 +76,16 @@ dvd_read (void *dst, unsigned int len, u64 offset)
if (dvd[0] & 0x4) if (dvd[0] & 0x4)
return 0; return 0;
#else #else
if (DI_ReadDVD(buffer, len >> 11, (u32)(offset >> 11))) off_size = (offset << 2) - ALIGN_BACKWARD((offset << 2),0x800);
if (DI_ReadDVD(
buffer,
(ALIGN_FORWARD((offset << 2) + len,0x800) - ALIGN_BACKWARD((offset << 2),0x800)) >> 11,
(u32)(ALIGN_BACKWARD(offset << 2, 0x800) >> 11)
))
return 0; return 0;
#endif #endif
memcpy (dst, buffer, len); memcpy (dst, buffer+off_size, len);
return 1; return 1;
} }