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

Removed unused PFIFO_CACHE distinction 

(it seems not really a separate device component)
This commit is contained in:
PatrickvL 2017-01-10 17:44:14 +01:00
parent 1fbc512115
commit 2aa08b2c2e
2 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/CxbxKrnl/EmuNV2A.cpp
View File

@ -267,9 +267,6 @@ DEBUG_START(PFIFO)
DEBUG_CASE(NV_PFIFO_RUNOUT_STATUS);
DEBUG_CASE(NV_PFIFO_MODE);
DEBUG_CASE(NV_PFIFO_DMA);
DEBUG_END(PFIFO)
DEBUG_START(PFIFO_CACHE)
DEBUG_CASE(NV_PFIFO_CACHE1_PUSH0);
DEBUG_CASE(NV_PFIFO_CACHE1_PUSH1);
DEBUG_CASE(NV_PFIFO_CACHE1_STATUS);
@ -286,7 +283,7 @@ DEBUG_START(PFIFO_CACHE)
DEBUG_CASE(NV_PFIFO_CACHE1_DMA_GET_JMP_SHADOW);
DEBUG_CASE(NV_PFIFO_CACHE1_DMA_RSVD_SHADOW);
DEBUG_CASE(NV_PFIFO_CACHE1_DMA_DATA_SHADOW);
DEBUG_END(PFIFO_CACHE)
DEBUG_END(PFIFO)
DEBUG_START(PRMA)
DEBUG_END(PRMA)
@ -620,25 +617,6 @@ DEVICE_WRITE32(PFIFO)
}
DEVICE_READ32(PFIFO_CACHE)
{
DEVICE_READ32_SWITCH(addr) {
default:
DEBUG_READ32_UNHANDLED(PFIFO_CACHE);
}
DEVICE_READ32_END(PFIFO_CACHE);
}
DEVICE_WRITE32(PFIFO_CACHE)
{
DEVICE_WRITE32_SWITCH(PFIFO_CACHE, addr) {
default:
DEBUG_WRITE32_UNHANDLED(PFIFO_CACHE);
}
}
DEVICE_READ32(PRMA)
{
DEVICE_READ32_SWITCH(addr) {

22
src/CxbxKrnl/nv2a_int.h
View File

@ -18,28 +18,6 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#define NV_NUM_BLOCKS 21
#define NV_PMC 0x00000 /* card master control */
#define NV_PBUS 0x00001 /* bus control */
#define NV_PFIFO 0x00002 /* MMIO and DMA FIFO submission to PGRAPH and VPE */
#define NV_PFIFO_CACHE 1000003
#define NV_PRMA 1000004 /* access to BAR0/BAR1 from real mode */
#define NV_PVIDEO 0x00008 /* video overlay */
#define NV_PTIMER 0x00009 /* time measurement and time-based alarms */
#define NV_PCOUNTER 0x0000A /* performance monitoring counters */
#define NV_PVPE 0x0000B /* MPEG2 decoding engine */
#define NV_PTV 0x0000D /* TV encoder */
#define NV_PRMFB 1000010 /* aliases VGA memory window */
#define NV_PRMVIO 1000011 /* aliases VGA sequencer and graphics controller registers */
#define NV_PFB 0x00100 /* memory interface */
#define NV_PSTRAPS 0x00101 /* straps readout / override */
#define NV_PGRAPH 1000014 /* accelerated 2d/3d drawing engine */
#define NV_PCRTC 1000015 /* more CRTC controls */
#define NV_PRMCIO 1000016 /* aliases VGA CRTC and attribute controller registers */
#define NV_PRAMDAC 1000017 /* RAMDAC, cursor, and PLL control */
#define NV_PRMDIO 1000018 /* aliases VGA palette registers */
#define NV_PRAMIN 0x00700 /* RAMIN access */
#define NV_USER 1000020 /* PFIFO MMIO and DMA submission area */
#define NV_PMC_BOOT_0 0x00000000
#define NV_PMC_INTR_0 0x00000100