- re-enable dvd_motor_off on GC

This commit is contained in:
michniewski 2008-09-28 03:12:15 +00:00
parent 8d07410616
commit dba88e0437
3 changed files with 22 additions and 6 deletions

View File

@ -507,7 +507,7 @@ void uselessinquiry ()
* dvd_motor_off( ) * dvd_motor_off( )
* Turns off DVD drive motor so it doesn't make noise (Gamecube only) * Turns off DVD drive motor so it doesn't make noise (Gamecube only)
***************************************************************************/ ***************************************************************************/
void dvd_motor_off( ) void dvd_motor_off ()
{ {
dvd[0] = 0x2e; dvd[0] = 0x2e;
dvd[1] = 0; dvd[1] = 0;

View File

@ -10,8 +10,8 @@
* DVD I/O functions * DVD I/O functions
***************************************************************************/ ***************************************************************************/
#ifndef _NGCDVD_ #ifndef _NGCDVD_H_
#define _NGCDVD_ #define _NGCDVD_H_
int getpvd (); int getpvd ();
int ParseDVDdirectory (); int ParseDVDdirectory ();
@ -20,5 +20,8 @@ bool TestDVD();
int dvd_read (void *dst, unsigned int len, u64 offset); int dvd_read (void *dst, unsigned int len, u64 offset);
bool SwitchDVDFolder(char dir[]); bool SwitchDVDFolder(char dir[]);
void SetDVDDriveType(); void SetDVDDriveType();
#ifdef HW_DOL
void dvd_motor_off ();
#endif
#endif #endif

View File

@ -1023,7 +1023,7 @@ ConfigureControllers ()
/**************************************************************************** /****************************************************************************
* Main Menu * Main Menu
***************************************************************************/ ***************************************************************************/
int menucount = 8; int menucount = 9;
char menuitems[][50] = { char menuitems[][50] = {
"Choose Game", "Choose Game",
"Controller Configuration", "Controller Configuration",
@ -1031,6 +1031,7 @@ char menuitems[][50] = {
"Game Menu", "Game Menu",
"Video Options", "Video Options",
"Credits", "Credits",
"DVD Motor Off",
"Reset System", "Reset System",
"Return to Loader" "Return to Loader"
}; };
@ -1047,6 +1048,11 @@ mainmenu (int selectedMenu)
else else
sprintf (menuitems[3], "Game Menu"); sprintf (menuitems[3], "Game Menu");
#ifndef HW_DOL
// don't show dvd motor off on the wii
menuitems[6][0] = '\0';
#endif
VIDEO_WaitVSync (); VIDEO_WaitVSync ();
while (quit == 0) while (quit == 0)
@ -1095,11 +1101,18 @@ mainmenu (int selectedMenu)
break; break;
case 6: case 6:
// turn the dvd motor off (GC only)
#ifdef HW_DOL
dvd_motor_off ();
#endif
break;
case 7:
// Reset the Gamecube/Wii // Reset the Gamecube/Wii
Reboot(); Reboot();
break; break;
case 7: case 8:
// Exit to Loader // Exit to Loader
#ifdef HW_RVL #ifdef HW_RVL
#ifdef WII_DVD #ifdef WII_DVD