diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-08-19 10:00:07 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-08-19 10:00:07 +0200 |
| commit | 7d86e924186107720d80cbf14780ff9e2b8180df (patch) | |
| tree | 50e4837d414827ee3cbaede33dfb45e786373d81 /kernel/pci.c | |
| parent | 9b04920f5b8310971b407b6f0626d2623c367646 (diff) | |
minor cosmetic changes & new screenshot
Diffstat (limited to 'kernel/pci.c')
| -rw-r--r-- | kernel/pci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/pci.c b/kernel/pci.c index 5e1c869..292bf1b 100644 --- a/kernel/pci.c +++ b/kernel/pci.c @@ -89,7 +89,7 @@ void test_bar(uint8_t bus, uint8_t slot, uint8_t offset) // restore original values pciConfigSet(bus,slot,0,offset,(bar_high<<16)+bar_low); - scr_put_string("BAR: "); + scr_put_string("e1000: BAR: "); if(bar_low& 1)scr_put_string("i/o "); else scr_put_string("mem "); @@ -119,6 +119,7 @@ uint16_t pciCheck(uint8_t bus, uint8_t slot) if ((vendor = pciConfigReadWord(bus,slot,0,0)) != 0xFFFF) { device = pciConfigReadWord(bus,slot,0,2); + scr_put_string("pci: "); scr_put_hex(vendor); scr_put_hex(device); scr_put_string_nl(";"); @@ -129,6 +130,7 @@ uint16_t pciCheck(uint8_t bus, uint8_t slot) { // uint16_t irq=pciConfigReadWord(bus,slot,0,0x3C); // uint16_t irq2=pciConfigReadWord(bus,slot,0,0x3E); + init_e1000(); test_bar(bus,slot,0x10); test_bar(bus,slot,0x14); @@ -139,7 +141,6 @@ uint16_t pciCheck(uint8_t bus, uint8_t slot) // scr_put_string_nl(";"); - init_e1000(); } @@ -153,7 +154,7 @@ uint16_t pciCheck(uint8_t bus, uint8_t slot) void pci_init() { - scr_put_string_nl("scanning pci bus"); + scr_put_string_nl("pci: scanning pci bus"); // todo: recurse on pci to pci bridges! // todo: support multiple pci host controllers! // (check more funcitons of device 0:0) |