From 1bad1ac5d6604976de0dae32bee8b5a7897fdd4d Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Thu, 25 Jan 2007 17:15:13 +0000 Subject: [PATCH] use libnds functions for bus ownership --- source/disc_io/disc.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/source/disc_io/disc.c b/source/disc_io/disc.c index 9c81031..f1a1776 100644 --- a/source/disc_io/disc.c +++ b/source/disc_io/disc.c @@ -113,10 +113,7 @@ const IO_INTERFACE* _FAT_disc_gbaSlotFindInterface (void) // the GBA cart. First implemented by SaTa. #ifdef NDS #ifdef ARM9 - WAIT_CR &= ~ARM9_OWNS_ROM; - #endif - #ifdef ARM7 - WAIT_CR |= ARM9_OWNS_ROM; + sysSetCartOwner(BUS_OWNER_ARM9); #endif #endif @@ -140,10 +137,7 @@ const IO_INTERFACE* _FAT_disc_gbaSlotFindInterface (void) const IO_INTERFACE* _FAT_disc_dsSlotFindInterface (void) { #ifdef ARM9 - WAIT_CR &= ~ARM9_OWNS_CARD; -#endif -#ifdef ARM7 - WAIT_CR |= ARM9_OWNS_CARD; + sysSetCardOwner(BUS_OWNER_ARM9); #endif int i; @@ -169,10 +163,7 @@ const IO_INTERFACE* _FAT_disc_dsSlotFindInterface (void) const IO_INTERFACE* _FAT_disc_findInterface (void) { #ifdef ARM9 - WAIT_CR &= ~(ARM9_OWNS_CARD | ARM9_OWNS_ROM); -#endif -#ifdef ARM7 - WAIT_CR |= (ARM9_OWNS_CARD | ARM9_OWNS_ROM); + sysSetBusOwners(BUS_OWNER_ARM9, BUS_OWNER_ARM9); #endif int i;