able/vmware-svga
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Sync to latest Metalkit source. Includes Kurt's fix for PCI_GetBARAddr().

Browse source
This commit is contained in:
Micah Dowty 2010-08-05 19:55:08 +00:00
parent a8eafa801d
commit 3a3ad0e7dc
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/metalkit/pci.c
View file

@ -207,13 +207,18 @@ PCI_SetBAR(const PCIAddress *addr, int index, uint32 value)
* PCI_GetBARAddr -- * PCI_GetBARAddr --
* *
* Get the current address set in one of the device's Base Address Registers. * Get the current address set in one of the device's Base Address Registers.
* (We mask off the lower 2 bits, which hold memory type flags.) * We mask off the lower bits that are not part of the address. IO bars are
* 4 byte aligned so we mask lower 2 bits, and memory bars are 16-byte aligned
* so we mask the lower 4 bits.
*/ */
fastcall uint32 fastcall uint32
PCI_GetBARAddr(const PCIAddress *addr, int index) PCI_GetBARAddr(const PCIAddress *addr, int index)
{ {
return PCI_ConfigRead32(addr, offsetof(PCIConfigSpace, BAR[index])) & ~3; uint32 bar = PCI_ConfigRead32(addr, offsetof(PCIConfigSpace, BAR[index]));
uint32 mask = (bar & PCI_CONF_BAR_IO) ? 0x3 : 0xf;
return bar & ~mask;
} }

5
lib/metalkit/pci.h
View file

@ -76,6 +76,11 @@ typedef struct PCIScanState {
PCIAddress addr; PCIAddress addr;
} PCIScanState; } PCIScanState;
// BAR bits
#define PCI_CONF_BAR_IO 0x01
#define PCI_CONF_BAR_64BIT 0x04
#define PCI_CONF_BAR_PREFETCH 0x08
fastcall uint32 PCI_ConfigRead32(const PCIAddress *addr, uint16 offset); fastcall uint32 PCI_ConfigRead32(const PCIAddress *addr, uint16 offset);
fastcall uint16 PCI_ConfigRead16(const PCIAddress *addr, uint16 offset); fastcall uint16 PCI_ConfigRead16(const PCIAddress *addr, uint16 offset);
fastcall uint8 PCI_ConfigRead8(const PCIAddress *addr, uint16 offset); fastcall uint8 PCI_ConfigRead8(const PCIAddress *addr, uint16 offset);

3
lib/metalkit/vbe.c
View file

@ -56,8 +56,6 @@ VBE_Init()
/* Let the BIOS know we support VBE2 */ /* Let the BIOS know we support VBE2 */
cInfo->signature = SIGNATURE_VBE2; cInfo->signature = SIGNATURE_VBE2;
Console_WriteString("Foo\n");
/* "Get SuperVGA Information" command */ /* "Get SuperVGA Information" command */
reg.ax = 0x4f00; reg.ax = 0x4f00;
reg.di = PTR_32_TO_NEAR(cInfo, 0); reg.di = PTR_32_TO_NEAR(cInfo, 0);
@ -65,7 +63,6 @@ VBE_Init()
if (reg.ax != 0x004F) { if (reg.ax != 0x004F) {
return FALSE; return FALSE;
} }
Console_WriteString("Bar\n");
/* /*
* Make a copy of the VBEControllerInfo struct itself, and of the * Make a copy of the VBEControllerInfo struct itself, and of the