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

Made io.c only count qfound when logging is enabled.

Browse Source
This commit is contained in:
OBattler
2023-08-09 18:24:16 +02:00
parent 1a0bebaf4e
commit 8b1746f961
1 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/io.c
View File

@@ -286,16 +286,22 @@ inb(uint16_t port)
io_t *p; io_t *p;
io_t *q; io_t *q;
int found = 0; int found = 0;
#ifdef ENABLE_IO_LOG
int qfound = 0; int qfound = 0;
#endif
if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) { if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
ret = pci_read(port, NULL); ret = pci_read(port, NULL);
found = 1; found = 1;
#ifdef ENABLE_IO_LOG
qfound = 1; qfound = 1;
#endif
} else if ((pci_flags & FLAG_CONFIG_DEV0_IO_ON) && (port >= 0xc000) && (port < 0xc100)) { } else if ((pci_flags & FLAG_CONFIG_DEV0_IO_ON) && (port >= 0xc000) && (port < 0xc100)) {
ret = pci_read(port, NULL); ret = pci_read(port, NULL);
found = 1; found = 1;
#ifdef ENABLE_IO_LOG
qfound = 1; qfound = 1;
#endif
} else { } else {
p = io[port]; p = io[port];
while (p) { while (p) {
@@ -303,7 +309,9 @@ inb(uint16_t port)
if (p->inb) { if (p->inb) {
ret &= p->inb(port, p->priv); ret &= p->inb(port, p->priv);
found |= 1; found |= 1;
#ifdef ENABLE_IO_LOG
qfound++; qfound++;
#endif
} }
p = q; p = q;
} }
@@ -338,16 +346,22 @@ outb(uint16_t port, uint8_t val)
io_t *p; io_t *p;
io_t *q; io_t *q;
int found = 0; int found = 0;
#ifdef ENABLE_IO_LOG
int qfound = 0; int qfound = 0;
#endif
if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) { if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
pci_write(port, val, NULL); pci_write(port, val, NULL);
found = 1; found = 1;
#ifdef ENABLE_IO_LOG
qfound = 1; qfound = 1;
#endif
} else if ((pci_flags & FLAG_CONFIG_DEV0_IO_ON) && (port >= 0xc000) && (port < 0xc100)) { } else if ((pci_flags & FLAG_CONFIG_DEV0_IO_ON) && (port >= 0xc000) && (port < 0xc100)) {
pci_write(port, val, NULL); pci_write(port, val, NULL);
found = 1; found = 1;
#ifdef ENABLE_IO_LOG
qfound = 1; qfound = 1;
#endif
} else { } else {
p = io[port]; p = io[port];
while (p) { while (p) {
@@ -355,7 +369,9 @@ outb(uint16_t port, uint8_t val)
if (p->outb) { if (p->outb) {
p->outb(port, val, p->priv); p->outb(port, val, p->priv);
found |= 1; found |= 1;
#ifdef ENABLE_IO_LOG
qfound++; qfound++;
#endif
} }
p = q; p = q;
} }
@@ -381,17 +397,23 @@ inw(uint16_t port)
io_t *q; io_t *q;
uint16_t ret = 0xffff; uint16_t ret = 0xffff;
int found = 0; int found = 0;
#ifdef ENABLE_IO_LOG
int qfound = 0; int qfound = 0;
#endif
uint8_t ret8[2]; uint8_t ret8[2];
if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) { if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
ret = pci_readw(port, NULL); ret = pci_readw(port, NULL);
found = 2; found = 2;
#ifdef ENABLE_IO_LOG
qfound = 1; qfound = 1;
#endif
} else if ((pci_flags & FLAG_CONFIG_DEV0_IO_ON) && (port >= 0xc000) && (port < 0xc100)) { } else if ((pci_flags & FLAG_CONFIG_DEV0_IO_ON) && (port >= 0xc000) && (port < 0xc100)) {
ret = pci_readw(port, NULL); ret = pci_readw(port, NULL);
found = 2; found = 2;
#ifdef ENABLE_IO_LOG
qfound = 1; qfound = 1;
#endif
} else { } else {
p = io[port]; p = io[port];
while (p) { while (p) {
@@ -399,7 +421,9 @@ inw(uint16_t port)
if (p->inw) { if (p->inw) {
ret &= p->inw(port, p->priv); ret &= p->inw(port, p->priv);
found |= 2; found |= 2;
#ifdef ENABLE_IO_LOG
qfound++; qfound++;
#endif
} }
p = q; p = q;
} }
@@ -413,7 +437,9 @@ inw(uint16_t port)
if (p->inb && !p->inw) { if (p->inb && !p->inw) {
ret8[i] &= p->inb(port + i, p->priv); ret8[i] &= p->inb(port + i, p->priv);
found |= 1; found |= 1;
#ifdef ENABLE_IO_LOG
qfound++; qfound++;
#endif
} }
p = q; p = q;
} }
@@ -444,16 +470,22 @@ outw(uint16_t port, uint16_t val)
io_t *p; io_t *p;
io_t *q; io_t *q;
int found = 0; int found = 0;
#ifdef ENABLE_IO_LOG
int qfound = 0; int qfound = 0;
#endif
if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) { if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
pci_writew(port, val, NULL); pci_writew(port, val, NULL);
found = 2; found = 2;
#ifdef ENABLE_IO_LOG
qfound = 1; qfound = 1;
#endif
} else if ((pci_flags & FLAG_CONFIG_DEV0_IO_ON) && (port >= 0xc000) && (port < 0xc100)) { } else if ((pci_flags & FLAG_CONFIG_DEV0_IO_ON) && (port >= 0xc000) && (port < 0xc100)) {
pci_writew(port, val, NULL); pci_writew(port, val, NULL);
found = 2; found = 2;
#ifdef ENABLE_IO_LOG
qfound = 1; qfound = 1;
#endif
} else { } else {
p = io[port]; p = io[port];
while (p) { while (p) {
@@ -461,7 +493,9 @@ outw(uint16_t port, uint16_t val)
if (p->outw) { if (p->outw) {
p->outw(port, val, p->priv); p->outw(port, val, p->priv);
found |= 2; found |= 2;
#ifdef ENABLE_IO_LOG
qfound++; qfound++;
#endif
} }
p = q; p = q;
} }
@@ -473,7 +507,9 @@ outw(uint16_t port, uint16_t val)
if (p->outb && !p->outw) { if (p->outb && !p->outw) {
p->outb(port + i, val >> (i << 3), p->priv); p->outb(port + i, val >> (i << 3), p->priv);
found |= 1; found |= 1;
#ifdef ENABLE_IO_LOG
qfound++; qfound++;
#endif
} }
p = q; p = q;
} }
@@ -502,16 +538,22 @@ inl(uint16_t port)
uint16_t ret16[2]; uint16_t ret16[2];
uint8_t ret8[4]; uint8_t ret8[4];
int found = 0; int found = 0;
#ifdef ENABLE_IO_LOG
int qfound = 0; int qfound = 0;
#endif
if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) { if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
ret = pci_readl(port, NULL); ret = pci_readl(port, NULL);
found = 4; found = 4;
#ifdef ENABLE_IO_LOG
qfound = 1; qfound = 1;
#endif
} else if ((pci_flags & FLAG_CONFIG_DEV0_IO_ON) && (port >= 0xc000) && (port < 0xc100)) { } else if ((pci_flags & FLAG_CONFIG_DEV0_IO_ON) && (port >= 0xc000) && (port < 0xc100)) {
ret = pci_readl(port, NULL); ret = pci_readl(port, NULL);
found = 4; found = 4;
#ifdef ENABLE_IO_LOG
qfound = 1; qfound = 1;
#endif
} else { } else {
p = io[port]; p = io[port];
while (p) { while (p) {
@@ -519,7 +561,9 @@ inl(uint16_t port)
if (p->inl) { if (p->inl) {
ret &= p->inl(port, p->priv); ret &= p->inl(port, p->priv);
found |= 4; found |= 4;
#ifdef ENABLE_IO_LOG
qfound++; qfound++;
#endif
} }
p = q; p = q;
} }
@@ -532,7 +576,9 @@ inl(uint16_t port)
if (p->inw && !p->inl) { if (p->inw && !p->inl) {
ret16[0] &= p->inw(port, p->priv); ret16[0] &= p->inw(port, p->priv);
found |= 2; found |= 2;
#ifdef ENABLE_IO_LOG
qfound++; qfound++;
#endif
} }
p = q; p = q;
} }
@@ -543,7 +589,9 @@ inl(uint16_t port)
if (p->inw && !p->inl) { if (p->inw && !p->inl) {
ret16[1] &= p->inw(port + 2, p->priv); ret16[1] &= p->inw(port + 2, p->priv);
found |= 2; found |= 2;
#ifdef ENABLE_IO_LOG
qfound++; qfound++;
#endif
} }
p = q; p = q;
} }
@@ -560,7 +608,9 @@ inl(uint16_t port)
if (p->inb && !p->inw && !p->inl) { if (p->inb && !p->inw && !p->inl) {
ret8[i] &= p->inb(port + i, p->priv); ret8[i] &= p->inb(port + i, p->priv);
found |= 1; found |= 1;
#ifdef ENABLE_IO_LOG
qfound++; qfound++;
#endif
} }
p = q; p = q;
} }
@@ -591,17 +641,23 @@ outl(uint16_t port, uint32_t val)
io_t *p; io_t *p;
io_t *q; io_t *q;
int found = 0; int found = 0;
#ifdef ENABLE_IO_LOG
int qfound = 0; int qfound = 0;
#endif
int i = 0; int i = 0;
if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) { if ((pci_flags & FLAG_CONFIG_IO_ON) && (port >= pci_base) && (port < (pci_base + pci_size))) {
pci_writel(port, val, NULL); pci_writel(port, val, NULL);
found = 4; found = 4;
#ifdef ENABLE_IO_LOG
qfound = 1; qfound = 1;
#endif
} else if ((pci_flags & FLAG_CONFIG_DEV0_IO_ON) && (port >= 0xc000) && (port < 0xc100)) { } else if ((pci_flags & FLAG_CONFIG_DEV0_IO_ON) && (port >= 0xc000) && (port < 0xc100)) {
pci_writel(port, val, NULL); pci_writel(port, val, NULL);
found = 4; found = 4;
#ifdef ENABLE_IO_LOG
qfound = 1; qfound = 1;
#endif
} else { } else {
p = io[port]; p = io[port];
if (p) { if (p) {
@@ -610,7 +666,9 @@ outl(uint16_t port, uint32_t val)
if (p->outl) { if (p->outl) {
p->outl(port, val, p->priv); p->outl(port, val, p->priv);
found |= 4; found |= 4;
#ifdef ENABLE_IO_LOG
qfound++; qfound++;
#endif
} }
p = q; p = q;
} }
@@ -623,7 +681,9 @@ outl(uint16_t port, uint32_t val)
if (p->outw && !p->outl) { if (p->outw && !p->outl) {
p->outw(port + i, val >> (i << 3), p->priv); p->outw(port + i, val >> (i << 3), p->priv);
found |= 2; found |= 2;
#ifdef ENABLE_IO_LOG
qfound++; qfound++;
#endif
} }
p = q; p = q;
} }
@@ -636,7 +696,9 @@ outl(uint16_t port, uint32_t val)
if (p->outb && !p->outw && !p->outl) { if (p->outb && !p->outw && !p->outl) {
p->outb(port + i, val >> (i << 3), p->priv); p->outb(port + i, val >> (i << 3), p->priv);
found |= 1; found |= 1;
#ifdef ENABLE_IO_LOG
qfound++; qfound++;
#endif
} }
p = q; p = q;
} }