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

NVNet : Corrected bar order and a typo

This commit is contained in:
PatrickvL 2017-12-15 18:37:09 +01:00 committed by patrickvl
parent 1b579e2c4b
commit ec01f039a5
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/CxbxKrnl/EmuNVNet.cpp
View File

@ -516,15 +516,15 @@ void NVNetDevice::Init()
{
PCIBarRegister r;
// Register IO bar :
r.Raw.type = PCI_BAR_TYPE_IO;
r.IO.address = 0xE000;
RegisterBAR(0, 8, r.value);
// Register Memory bar :
r.Raw.type = PCI_BAR_TYPE_MEMORY;
r.Memory.address = NVNET_ADDR >> 4;
RegisterBAR(1, NVNET_SIZE, r.value);
RegisterBAR(0, NVNET_SIZE, r.value);
// Register IO bar :
r.Raw.type = PCI_BAR_TYPE_IO;
r.IO.address = 0xE000;
RegisterBAR(1, 8, r.value);
m_DeviceId = 0x01C3;
m_VendorId = PCI_VENDOR_ID_NVIDIA;
@ -536,16 +536,24 @@ void NVNetDevice::Reset()
uint32_t NVNetDevice::IORead(int barIndex, uint32_t port, unsigned size)
{
if (barIndex != 1) {
return 0;
}
return 0;
}
void NVNetDevice::IOWrite(int BarIndex, uint32_t port, uint32_t value, unsigned size)
void NVNetDevice::IOWrite(int barIndex, uint32_t port, uint32_t value, unsigned size)
{
if (barIndex != 1) {
return;
}
}
uint32_t NVNetDevice::MMIORead(int barIndex, uint32_t addr, unsigned size)
{
if (barIndex != 1) {
if (barIndex != 0) {
return 0;
}
@ -554,7 +562,7 @@ uint32_t NVNetDevice::MMIORead(int barIndex, uint32_t addr, unsigned size)
void NVNetDevice::MMIOWrite(int barIndex, uint32_t addr, uint32_t value, unsigned size)
{
if (barIndex != 1) {
if (barIndex != 0) {
return;
}

2
src/CxbxKrnl/EmuNVNet.h
View File

@ -44,7 +44,7 @@ public:
void Init();
void Reset();
uint32_t IORead(int barIndex, uint32_t port, unsigned size);
void IOWrite(int BarIndex, uint32_t port, uint32_t value, unsigned size);
void IOWrite(int barIndex, uint32_t port, uint32_t value, unsigned size);
uint32_t MMIORead(int barIndex, uint32_t addr, unsigned size);
void MMIOWrite(int barIndex, uint32_t addr, uint32_t value, unsigned size);
};

2
src/CxbxKrnl/PCIDevice.h
View File

@ -68,7 +68,7 @@ public:
virtual void Init() = 0;
virtual void Reset() = 0;
virtual uint32_t IORead(int barIndex, uint32_t port, unsigned size) = 0;
virtual void IOWrite(int BarIndex, uint32_t port, uint32_t value, unsigned size) = 0;
virtual void IOWrite(int barIndex, uint32_t port, uint32_t value, unsigned size) = 0;
virtual uint32_t MMIORead(int barIndex, uint32_t addr, unsigned size) = 0;
virtual void MMIOWrite(int barIndex, uint32_t addr, uint32_t value, unsigned size) = 0;