80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2801 from Cacodemon345/voodoo

Browse Source 
Improve Banshee error reporting
This commit is contained in:
Miran Grča
2022-11-04 02:07:24 +01:00
committed by GitHub
parent ebdd1886de c5f7cf5fa2
commit 9657dba060
1 changed files with 64 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/video/vid_voodoo_banshee.c
View File

@@ -98,6 +98,12 @@ typedef struct banshee_t {
uint32_t vidScreenSize; uint32_t vidScreenSize;
uint32_t vidSerialParallelPort; uint32_t vidSerialParallelPort;
uint32_t agpReqSize;
uint32_t agpHostAddressHigh;
uint32_t agpHostAddressLow;
uint32_t agpGraphicsAddress;
uint32_t agpGraphicsStride;
int overlay_pix_fmt; int overlay_pix_fmt;
uint32_t hwCurPatAddr, hwCurLoc, hwCurC0, hwCurC1; uint32_t hwCurPatAddr, hwCurLoc, hwCurC0, hwCurC1;
@@ -161,7 +167,7 @@ enum {
Video_vidOverlayDvdy = 0xac, Video_vidOverlayDvdy = 0xac,
Video_vidOverlayDvdyOffset = 0xe0, Video_vidOverlayDvdyOffset = 0xe0,
Video_vidDesktopStartAddr = 0xe4, Video_vidDesktopStartAddr = 0xe4,
Video_vidDesktopOverlayStride = 0xe8 Video_vidDesktopOverlayStride = 0xe8,
}; };
enum { enum {
@@ -173,7 +179,13 @@ enum {
cmdAMin0 = 0x34, cmdAMin0 = 0x34,
cmdAMax0 = 0x3c, cmdAMax0 = 0x3c,
cmdFifoDepth0 = 0x44, cmdFifoDepth0 = 0x44,
cmdHoleCnt0 = 0x48 cmdHoleCnt0 = 0x48,
Agp_agpReqSize = 0x00,
Agp_agpHostAddressLow = 0x04,
Agp_agpHostAddressHigh = 0x08,
Agp_agpGraphicsAddress = 0x0C,
Agp_agpGraphicsStride = 0x10,
}; };
#define VGAINIT0_EXTENDED_SHIFT_OUT (1 << 12) #define VGAINIT0_EXTENDED_SHIFT_OUT (1 << 12)
@@ -1123,6 +1135,26 @@ banshee_cmd_read(banshee_t *banshee, uint32_t addr)
uint32_t ret = 0xffffffff; uint32_t ret = 0xffffffff;
switch (addr & 0x1fc) { switch (addr & 0x1fc) {
case Agp_agpHostAddressLow:
ret = banshee->agpHostAddressLow;
break;
case Agp_agpHostAddressHigh:
ret = banshee->agpHostAddressHigh;
break;
case Agp_agpGraphicsAddress:
ret = banshee->agpGraphicsAddress;
break;
case Agp_agpGraphicsStride:
ret = banshee->agpGraphicsStride;
break;
case Agp_agpReqSize:
ret = banshee->agpReqSize;
break;
case cmdBaseAddr0: case cmdBaseAddr0:
ret = voodoo->cmdfifo_base >> 12; ret = voodoo->cmdfifo_base >> 12;
// banshee_log("Read cmdfifo_base %08x\n", ret); // banshee_log("Read cmdfifo_base %08x\n", ret);
@@ -1142,7 +1174,7 @@ banshee_cmd_read(banshee_t *banshee, uint32_t addr)
break; break;
default: default:
fatal("Unknown banshee_cmd_read %08x\n", addr); fatal("Unknown banshee_cmd_read 0x%08x (reg 0x%03x)\n", addr, addr & 0x1fc);
} }
return ret; return ret;
@@ -1348,6 +1380,26 @@ banshee_cmd_write(banshee_t *banshee, uint32_t addr, uint32_t val)
voodoo_t *voodoo = banshee->voodoo; voodoo_t *voodoo = banshee->voodoo;
// banshee_log("banshee_cmd_write: addr=%03x val=%08x\n", addr & 0x1fc, val); // banshee_log("banshee_cmd_write: addr=%03x val=%08x\n", addr & 0x1fc, val);
switch (addr & 0x1fc) { switch (addr & 0x1fc) {
case Agp_agpHostAddressLow:
banshee->agpHostAddressLow = val;
break;
case Agp_agpHostAddressHigh:
banshee->agpHostAddressHigh = val;
break;
case Agp_agpGraphicsAddress:
banshee->agpGraphicsAddress = val;
break;
case Agp_agpGraphicsStride:
banshee->agpGraphicsStride = val;
break;
case Agp_agpReqSize:
banshee->agpReqSize = val;
break;
case cmdBaseAddr0: case cmdBaseAddr0:
voodoo->cmdfifo_base = (val & 0xfff) << 12; voodoo->cmdfifo_base = (val & 0xfff) << 12;
voodoo->cmdfifo_end = voodoo->cmdfifo_base + (((voodoo->cmdfifo_size & 0xff) + 1) << 12); voodoo->cmdfifo_end = voodoo->cmdfifo_base + (((voodoo->cmdfifo_size & 0xff) + 1) << 12);
@@ -1382,7 +1434,7 @@ banshee_cmd_write(banshee_t *banshee, uint32_t addr, uint32_t val)
break; break;
default: default:
banshee_log("Unknown banshee_cmd_write: addr=%08x val=%08x\n", addr, val); banshee_log("Unknown banshee_cmd_write: addr=%08x val=%08x reg=0x%03x\n", addr, val, addr & 0x1fc);
break; break;
} }