diff options
| author | Kamil Zbróg | 2014-01-27 21:43:05 +0100 |
|---|---|---|
| committer | Kamil Zbróg | 2014-01-27 21:43:05 +0100 |
| commit | 8eac80cfc59c34299899ebe18a3b0582ef76e0d2 (patch) | |
| tree | 5d02a8fba0559c16f2a2045b14e3e292509c6924 /backends/fs/wii/wii-fs-factory.cpp | |
| parent | 444934a0accec982f55db92c17ef65270fe18e66 (diff) | |
| parent | 0f5eeaed7b3c9d2f74eee7dff2114c5f4dc63f00 (diff) | |
| download | scummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.tar.gz scummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.tar.bz2 scummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'backends/fs/wii/wii-fs-factory.cpp')
| -rw-r--r-- | backends/fs/wii/wii-fs-factory.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/backends/fs/wii/wii-fs-factory.cpp b/backends/fs/wii/wii-fs-factory.cpp index 760e5316e7..f234c1e300 100644 --- a/backends/fs/wii/wii-fs-factory.cpp +++ b/backends/fs/wii/wii-fs-factory.cpp @@ -33,6 +33,9 @@ #ifdef USE_WII_DI #include <di/di.h> #include <iso9660.h> +#ifdef GAMECUBE +#include <ogc/dvd.h> +#endif #endif #ifdef USE_WII_SMB @@ -125,6 +128,14 @@ bool WiiFilesystemFactory::failedToMount(FileSystemType type) { return false; } +#ifdef USE_WII_DI +#ifndef GAMECUBE + const DISC_INTERFACE* dvd = &__io_wiidvd; +#else + const DISC_INTERFACE* dvd = &__io_gcdvd; +#endif +#endif + void WiiFilesystemFactory::mount(FileSystemType type) { switch (type) { case kDVD: @@ -133,7 +144,7 @@ void WiiFilesystemFactory::mount(FileSystemType type) { break; printf("mount dvd\n"); - if (ISO9660_Mount()) { + if (ISO9660_Mount("dvd", dvd)) { _dvdMounted = true; _dvdError = false; printf("ISO9660 mounted\n"); @@ -179,7 +190,7 @@ void WiiFilesystemFactory::umount(FileSystemType type) { printf("umount dvd\n"); - ISO9660_Unmount(); + ISO9660_Unmount("dvd:"); _dvdMounted = false; _dvdError = false; |