pc, pc64: remove PCICONS debug buffer from pci.c
This commit is contained in:
parent
ca4e12839a
commit
5fd97c7d60
|
@ -10,29 +10,7 @@
|
||||||
#include "io.h"
|
#include "io.h"
|
||||||
#include "../port/error.h"
|
#include "../port/error.h"
|
||||||
|
|
||||||
#define DBG if(0) pcilog
|
#define DBG if(0) print
|
||||||
|
|
||||||
struct
|
|
||||||
{
|
|
||||||
char output[16384];
|
|
||||||
int ptr;
|
|
||||||
}PCICONS;
|
|
||||||
|
|
||||||
int
|
|
||||||
pcilog(char *fmt, ...)
|
|
||||||
{
|
|
||||||
int n;
|
|
||||||
va_list arg;
|
|
||||||
char buf[PRINTSIZE];
|
|
||||||
|
|
||||||
va_start(arg, fmt);
|
|
||||||
n = vseprint(buf, buf+sizeof(buf), fmt, arg) - buf;
|
|
||||||
va_end(arg);
|
|
||||||
|
|
||||||
memmove(PCICONS.output+PCICONS.ptr, buf, n);
|
|
||||||
PCICONS.ptr += n;
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{ /* configuration mechanism #1 */
|
{ /* configuration mechanism #1 */
|
||||||
|
@ -211,7 +189,7 @@ pcibusmap(Pcidev *root, ulong *pmema, ulong *pioa, int wrreg)
|
||||||
for(p = root; p != nil; p = p->link) {
|
for(p = root; p != nil; p = p->link) {
|
||||||
if(p->ccrb == 0x06) {
|
if(p->ccrb == 0x06) {
|
||||||
if(p->ccru != 0x04 || p->bridge == nil) {
|
if(p->ccru != 0x04 || p->bridge == nil) {
|
||||||
// DBG("pci: ignored bridge %T\n", p->tbdf);
|
DBG("pci: ignored bridge %T\n", p->tbdf);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1068,7 +1046,7 @@ pcicfginit(void)
|
||||||
ioa = 0x1000;
|
ioa = 0x1000;
|
||||||
mema = 0x90000000;
|
mema = 0x90000000;
|
||||||
|
|
||||||
pcilog("Mask sizes: mem=%lux io=%lux\n", mema, ioa);
|
DBG("Mask sizes: mem=%lux io=%lux\n", mema, ioa);
|
||||||
|
|
||||||
pcibusmap(pciroot, &mema, &ioa, 1);
|
pcibusmap(pciroot, &mema, &ioa, 1);
|
||||||
DBG("Sizes2: mem=%lux io=%lux\n", mema, ioa);
|
DBG("Sizes2: mem=%lux io=%lux\n", mema, ioa);
|
||||||
|
@ -1335,7 +1313,6 @@ pcilhinv(Pcidev* p)
|
||||||
Pcidev *t;
|
Pcidev *t;
|
||||||
|
|
||||||
if(p == nil) {
|
if(p == nil) {
|
||||||
putstrn(PCICONS.output, PCICONS.ptr);
|
|
||||||
p = pciroot;
|
p = pciroot;
|
||||||
print("bus dev type vid did intl memory\n");
|
print("bus dev type vid did intl memory\n");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue