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

sort out the logging but there are still regressions (driver fail to boot)

Browse Source
This commit is contained in:
starfrost013
2024-12-29 17:24:17 +00:00
parent 378af452d6
commit 88cc5f07f7
11 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/nv/nv3/nv3_core.c
View File

@@ -842,8 +842,10 @@ void* nv3_init(const device_t *info)
// These only get turned on when the requisite registers are twiddled
timer_add(&nv3->nvbase.pixel_clock_timer, nv3_pramdac_pixel_clock_poll, nv3, false);
nv_log("NV3: Pixel clock OK. Will be started when the VBIOS tells us to start\n");
timer_add(&nv3->nvbase.memory_clock_timer, nv3_pramdac_memory_clock_poll, nv3, false);
nv_log("NV3: Memory clock OK. Will be started when the VBIOS tells us to start\n");
return nv3;
}

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 = %04x)\n", reg->friendly_name, ret);
nv_log(": %s (value = 0x%04x)\n", reg->friendly_name, ret);
else
nv_log("\n");
}
else
{
nv_log(": Unknown register read (address=%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
}
return ret;

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

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

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

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

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

@@ -98,7 +98,7 @@ uint32_t nv3_pfifo_read(uint32_t address)
}
else
{
nv_log(": Unknown register read (address=%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
}
return ret;

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

@@ -125,7 +125,7 @@ uint32_t nv3_pgraph_read(uint32_t address)
}
if (reg->friendly_name)
nv_log(": %s (value = %04x)\n", reg->friendly_name, ret);
nv_log(": %s (value = 0x%04x)\n", reg->friendly_name, ret);
else
nv_log("\n");
}
@@ -142,7 +142,7 @@ uint32_t nv3_pgraph_read(uint32_t address)
}
else /* Completely unknown */
{
nv_log(": Unknown register read (address=%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
}
}

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

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

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

@@ -54,11 +54,6 @@ uint32_t nv3_pme_read(uint32_t address)
// if the register actually exists
if (reg)
{
if (reg->friendly_name)
nv_log(": %s\n", reg->friendly_name);
else
nv_log("\n");
// on-read function
if (reg->on_read)
ret = reg->on_read();
@@ -80,13 +75,13 @@ uint32_t nv3_pme_read(uint32_t address)
}
if (reg->friendly_name)
nv_log(": %s (value = %04x)\n", reg->friendly_name, ret);
nv_log(": %s (value = 0x%04x)\n", reg->friendly_name, ret);
else
nv_log("\n");
}
else
{
nv_log(": Unknown register read (address=%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
}
return ret;

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

@@ -211,7 +211,7 @@ uint32_t nv3_pramdac_read(uint32_t address)
nv_register_t* reg = nv_get_register(address, pramdac_registers, sizeof(pramdac_registers)/sizeof(pramdac_registers[0]));
uint32_t ret = 0x00;
// todo: friendly logging
nv_log("NV3: PRAMDAC Read from 0x%08x", address);
@@ -219,11 +219,6 @@ uint32_t nv3_pramdac_read(uint32_t address)
// if the register actually exists
if (reg)
{
if (reg->friendly_name)
nv_log(": %s\n", reg->friendly_name);
else
nv_log("\n");
// on-read function
if (reg->on_read)
ret = reg->on_read();
@@ -268,13 +263,13 @@ uint32_t nv3_pramdac_read(uint32_t address)
}
if (reg->friendly_name)
nv_log(": %s (value = %04x)\n", reg->friendly_name, ret);
nv_log(": %s (value = 0x%04x)\n", reg->friendly_name, ret);
else
nv_log("\n");
}
else
{
nv_log(": Unknown register read (address=%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
}
return ret;

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

@@ -88,15 +88,10 @@ uint32_t nv3_ptimer_read(uint32_t address)
nv_log("NV3: PTIMER Read from 0x%08x", address);
uint32_t ret = 0x00;
// if the register actually exists
if (reg)
{
if (reg->friendly_name)
nv_log(": %s\n", reg->friendly_name);
else
nv_log("\n");
// on-read function
if (reg->on_read)
ret = reg->on_read();
@@ -128,13 +123,13 @@ uint32_t nv3_ptimer_read(uint32_t address)
}
if (reg->friendly_name)
nv_log(": %s (value = %04x)\n", reg->friendly_name, ret);
nv_log(": %s (value = 0x%04x)\n", reg->friendly_name, ret);
else
nv_log("\n");
}
else
{
nv_log(": Unknown register read (address=%04x), returning 0x00\n", address);
nv_log(": Unknown register read (address=0x%04x), returning 0x00\n", address);
}
return ret;

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

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