mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-24 10:28:19 -07:00
Code Issues Packages Projects Releases Activity

Local idiot forgets break; wonders why code does not work?

Browse Source
This commit is contained in:
starfrost013
2024-12-29 17:58:02 +00:00
parent 88cc5f07f7
commit 3914a00f9b
10 changed files with 62 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/nv/nv3/subsystems/nv3_pbus.c
View File

@@ -75,13 +75,13 @@ uint32_t nv3_pbus_read(uint32_t address)
}
if (reg->friendly_name)
nv_log(": %s (value = 0x%04x)\n", reg->friendly_name, ret);
nv_log(": %s (value = 0x%08x)\n", reg->friendly_name, ret);
else
nv_log("\n");
}
else
{
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%08x), returning 0x00\n", address);
}
return ret;

5
src/video/nv/nv3/subsystems/nv3_pextdev.c
View File

@@ -108,17 +108,18 @@ uint32_t nv3_pextdev_read(uint32_t address)
{
case NV3_PSTRAPS:
ret = nv3->pextdev.straps;
break;
}
}
if (reg->friendly_name)
nv_log(": %s (value = 0x%04x)\n", reg->friendly_name, ret);
nv_log(": %s (value = 0x%08x)\n", reg->friendly_name, ret);
else
nv_log("\n");
}
else
{
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%08x), returning 0x00\n", address);
}
return ret;

6
src/video/nv/nv3/subsystems/nv3_pfb.c
View File

@@ -81,20 +81,22 @@ uint32_t nv3_pfb_read(uint32_t address)
{
case NV3_PFB_BOOT:
ret = nv3->pfb.boot;
break;
// Config 0 has a read/write function
case NV3_PFB_CONFIG_1:
ret = nv3->pfb.config_1;
break;
}
}
if (reg->friendly_name)
nv_log(": %s (value = 0x%04x)\n", reg->friendly_name, ret);
nv_log(": %s (value = 0x%08x)\n", reg->friendly_name, ret);
else
nv_log("\n");
}
else
{
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%08x), returning 0x00\n", address);
}
return ret;

4
src/video/nv/nv3/subsystems/nv3_pfifo.c
View File

@@ -86,8 +86,10 @@ uint32_t nv3_pfifo_read(uint32_t address)
{
case NV3_PFIFO_INTR:
ret = nv3->pfifo.interrupt_status;
break;
case NV3_PFIFO_INTR_EN:
ret = nv3->pfifo.interrupt_enable;
break;
}
}
@@ -98,7 +100,7 @@ uint32_t nv3_pfifo_read(uint32_t address)
}
else
{
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%08x), returning 0x00\n", address);
}
return ret;

8
src/video/nv/nv3/subsystems/nv3_pgraph.c
View File

@@ -115,17 +115,21 @@ uint32_t nv3_pgraph_read(uint32_t address)
//interrupt status and enable regs
case NV3_PGRAPH_INTR_0:
ret = nv3->pgraph.interrupt_status_0;
break;
case NV3_PGRAPH_INTR_1:
ret = nv3->pgraph.interrupt_status_1;
break;
case NV3_PGRAPH_INTR_EN_0:
ret = nv3->pgraph.interrupt_enable_0;
break;
case NV3_PGRAPH_INTR_EN_1:
ret = nv3->pgraph.interrupt_enable_1;
break;
}
}
if (reg->friendly_name)
nv_log(": %s (value = 0x%04x)\n", reg->friendly_name, ret);
nv_log(": %s (value = 0x%08x)\n", reg->friendly_name, ret);
else
nv_log("\n");
}
@@ -142,7 +146,7 @@ uint32_t nv3_pgraph_read(uint32_t address)
}
else /* Completely unknown */
{
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%08x), returning 0x00\n", address);
}
}

12
src/video/nv/nv3/subsystems/nv3_pmc.c
View File

@@ -189,28 +189,32 @@ uint32_t nv3_pmc_read(uint32_t address)
{
case NV3_PMC_BOOT:
ret = nv3->pmc.boot;
break;
case NV3_PMC_INTERRUPT_STATUS:
nv_log("\n"); // clear_interrupts logs
nv3_pmc_clear_interrupts();
ret = nv3_pmc_handle_interrupts(false);
break;
case NV3_PMC_INTERRUPT_ENABLE:
//TODO: ACTUALLY CHANGE THE INTERRUPT STATE
ret = nv3->pmc.interrupt_enable;
ret = nv3->pmc.interrupt_enable;
break;
case NV3_PMC_ENABLE:
ret = nv3->pmc.enable;
ret = nv3->pmc.enable;
break;
}
}
if (reg->friendly_name)
nv_log(": %s (value = 0x%04x)\n", reg->friendly_name, ret);
nv_log(": %s (value = 0x%08x)\n", reg->friendly_name, ret);
else
nv_log("\n");
}
else
{
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%08x), returning 0x00\n", address);
}
return ret;

6
src/video/nv/nv3/subsystems/nv3_pme.c
View File

@@ -69,19 +69,21 @@ uint32_t nv3_pme_read(uint32_t address)
{
case NV3_PME_INTR:
ret = nv3->pme.interrupt_status;
break;
case NV3_PME_INTR_EN:
ret = nv3->pme.interrupt_enable;
break;
}
}
if (reg->friendly_name)
nv_log(": %s (value = 0x%04x)\n", reg->friendly_name, ret);
nv_log(": %s (value = 0x%08x)\n", reg->friendly_name, ret);
else
nv_log("\n");
}
else
{
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%08x), returning 0x00\n", address);
}
return ret;

20
src/video/nv/nv3/subsystems/nv3_pramdac.c
View File

@@ -229,47 +229,63 @@ uint32_t nv3_pramdac_read(uint32_t address)
{
case NV3_PRAMDAC_COEFF_SELECT:
ret = nv3->pramdac.coeff_select;
break;
case NV3_PRAMDAC_GENERAL_CONTROL:
ret = nv3->pramdac.general_control;
break;
case NV3_PRAMDAC_VSERR_WIDTH:
ret = nv3->pramdac.vserr_width;
break;
case NV3_PRAMDAC_VBBLANK_END:
ret = nv3->pramdac.vbblank_end;
break;
case NV3_PRAMDAC_VBLANK_END:
ret = nv3->pramdac.vblank_end;
break;
case NV3_PRAMDAC_VBLANK_START:
ret = nv3->pramdac.vblank_start;
break;
case NV3_PRAMDAC_VEQU_START:
ret = nv3->pramdac.vequ_start;
break;
case NV3_PRAMDAC_VTOTAL:
ret = nv3->pramdac.vtotal;
break;
case NV3_PRAMDAC_HSYNC_WIDTH:
ret = nv3->pramdac.hsync_width;
break;
case NV3_PRAMDAC_HBURST_START:
ret = nv3->pramdac.hburst_start;
break;
case NV3_PRAMDAC_HBURST_END:
ret = nv3->pramdac.hburst_end;
break;
case NV3_PRAMDAC_HBLANK_START:
ret = nv3->pramdac.hblank_start;
break;
case NV3_PRAMDAC_HBLANK_END:
ret = nv3->pramdac.hblank_end;
break;
case NV3_PRAMDAC_HTOTAL:
ret = nv3->pramdac.htotal;
break;
case NV3_PRAMDAC_HEQU_WIDTH:
ret = nv3->pramdac.hequ_width;
break;
case NV3_PRAMDAC_HSERR_WIDTH:
ret = nv3->pramdac.hserr_width;
break;
}
}
if (reg->friendly_name)
nv_log(": %s (value = 0x%04x)\n", reg->friendly_name, ret);
nv_log(": %s (value = 0x%08x)\n", reg->friendly_name, ret);
else
nv_log("\n");
}
else
{
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%08x), returning 0x00\n", address);
}
return ret;

12
src/video/nv/nv3/subsystems/nv3_ptimer.c
View File

@@ -104,32 +104,40 @@ uint32_t nv3_ptimer_read(uint32_t address)
{
case NV3_PTIMER_INTR:
ret = nv3->ptimer.interrupt_status;
break;
case NV3_PTIMER_INTR_EN:
ret = nv3->ptimer.interrupt_enable;
break;
case NV3_PTIMER_NUMERATOR:
ret = nv3->ptimer.clock_numerator; // 15:0
break;
case NV3_PTIMER_DENOMINATOR:
ret = nv3->ptimer.clock_denominator ; //15:0
break;
// 64-bit value
// High part
case NV3_PTIMER_TIME_0_NSEC:
ret = nv3->ptimer.time & 0xFFFFFFFF; //28:0
break;
// Low part
case NV3_PTIMER_TIME_1_NSEC:
ret = nv3->ptimer.time >> 32; // 31:5
break;
case NV3_PTIMER_ALARM_NSEC:
ret = nv3->ptimer.alarm; // 31:5
break;
}
}
if (reg->friendly_name)
nv_log(": %s (value = 0x%04x)\n", reg->friendly_name, ret);
nv_log(": %s (value = 0x%08x)\n", reg->friendly_name, ret);
else
nv_log("\n");
}
else
{
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%08x), returning 0x00\n", address);
}
return ret;

6
src/video/nv/nv3/subsystems/nv3_pvideo.c
View File

@@ -74,19 +74,21 @@ uint32_t nv3_pvideo_read(uint32_t address)
{
case NV3_PVIDEO_INTR:
ret = nv3->pvideo.interrupt_status;
break;
case NV3_PVIDEO_INTR_EN:
ret = nv3->pvideo.interrupt_enable;
break;
}
}
if (reg->friendly_name)
nv_log(": %s (value = 0x%04x)\n", reg->friendly_name, ret);
nv_log(": %s (value = 0x%08x)\n", reg->friendly_name, ret);
else
nv_log("\n");
}
else
{
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%08x), returning 0x00\n", address);
}
return ret;