ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ups, exi slots are on whole different channels...

This commit is contained in:
Shawn Hoffman 2011-10-16 02:08:51 -07:00
parent 3556069f9f
commit 676822891d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Src/HW/EXI_Channel.cpp
View File

@ -42,7 +42,7 @@ CEXIChannel::CEXIChannel(u32 ChannelId) :
m_Status.CHIP_SELECT = 1; m_Status.CHIP_SELECT = 1;
for (int i = 0; i < NUM_DEVICES; i++) for (int i = 0; i < NUM_DEVICES; i++)
m_pDevices[i] = EXIDevice_Create(EXIDEVICE_NONE, i); m_pDevices[i] = EXIDevice_Create(EXIDEVICE_NONE, m_ChannelId);
} }
CEXIChannel::~CEXIChannel() CEXIChannel::~CEXIChannel()
@ -71,7 +71,7 @@ void CEXIChannel::AddDevice(const TEXIDevices device_type, const int device_num)
} }
// create the new one // create the new one
m_pDevices[device_num] = EXIDevice_Create(device_type, device_num); m_pDevices[device_num] = EXIDevice_Create(device_type, m_ChannelId);
// This means "device presence changed", software has to check // This means "device presence changed", software has to check
// m_Status.EXT to see if it is now present or not // m_Status.EXT to see if it is now present or not

6
Source/Core/Core/Src/HW/EXI_Device.cpp
View File

@ -102,7 +102,7 @@ public:
// F A C T O R Y // F A C T O R Y
IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int device_num) IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int channel_num)
{ {
switch (device_type) switch (device_type)
{ {
@ -111,7 +111,7 @@ IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int device_num)
break; break;
case EXIDEVICE_MEMORYCARD: case EXIDEVICE_MEMORYCARD:
return new CEXIMemoryCard(device_num); return new CEXIMemoryCard(channel_num);
break; break;
case EXIDEVICE_MASKROM: case EXIDEVICE_MASKROM:
@ -123,7 +123,7 @@ IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int device_num)
break; break;
case EXIDEVICE_MIC: case EXIDEVICE_MIC:
return new CEXIMic(device_num); return new CEXIMic(channel_num);
break; break;
case EXIDEVICE_ETH: case EXIDEVICE_ETH:

2
Source/Core/Core/Src/HW/EXI_Device.h
View File

@ -63,6 +63,6 @@ enum TEXIDevices
EXIDEVICE_NONE = (u8)-1 EXIDEVICE_NONE = (u8)-1
}; };
extern IEXIDevice* EXIDevice_Create(const TEXIDevices device_type, const int device_num); extern IEXIDevice* EXIDevice_Create(const TEXIDevices device_type, const int channel_num);
#endif #endif