perso
/
cos2000v2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: correction detection pci

This commit is contained in:
Nicolas Hordé 2018-11-09 16:44:56 +01:00
parent 42f87229ad
commit 852509789d
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/pci.h
View File

@ -12,3 +12,6 @@ typedef struct pcidev {
}; };
} pcidev __attribute__ ((packed)); } pcidev __attribute__ ((packed));
u16 pciConfigReadWord(const u8 bus, const u8 dev, const u8 function, const u8 offset);
void scanPCI(void);
pcidev getPCImininfo(const u8 bus, const u8 dev, const u8 function);

39
lib/pci.c
View File

@ -6,48 +6,51 @@
#include "types.h" #include "types.h"
#include "pci.h" #include "pci.h"
#define MAX_BUS_SCAN 256 #define MAX_BUS_SCAN 256
#define MAX_DEVICE_SCAN 32 #define MAX_DEVICE_SCAN 32
#define MAX_FUNCTION_SCAN 8 #define MAX_FUNCTION_SCAN 8
/*******************************************************************************/ /*******************************************************************************/
/* Detecte s */ /* Récupère les identifiants vendeur / periphérique du periphérique PCI donnée */
pcidev getPCIinfo(const u8 bus, const u8 dev, const u8 function) pcidev getPCImininfo(const u8 bus, const u8 dev, const u8 function)
{ {
pcidev result; pcidev result;
const u32 registry = 0; if ((result.vendor = pciConfigReadWord(bus,dev,function,0x0)) != 0xFFFF) {
u32 addr = (0x80000000|(bus << 16)|(dev << 11)|(function << 8)|(registry & 0xFC)); result.device = pciConfigReadWord(bus,dev,function,0x2);
outd(0xCF8, addr); }
result.dword = ind(0xCFC);
if (result.dword == 0xFFFFFFFF)
result.dword = 0x0;
return result; return result;
} }
/*******************************************************************************/
/* Récupère les informations sur le periphérique PCI donnée */
u16 pciConfigReadWord(const u8 bus, const u8 dev, const u8 function, const u8 offset)
{
u16 tmp = 0;
u32 addr = (0x80000000|(bus << 16)|(dev << 11)|(function << 8)|(offset & 0xFC));
outd(0xCF8, addr);
tmp = (u16)((ind(0xCFC) >> ((offset & 2) * 8)) & 0xffff);
return tmp;
}
/*******************************************************************************/ /*******************************************************************************/
/* Scan le bus PCI et affiche les périphériques */ /* Scan le bus PCI et affiche les périphériques */
void scanPCI(void) void scanPCI(void)
{ {
u32 i, bus, device, function; u16 bus,device,function;
pcidev result; pcidev result;
i = 0;
for (bus=0; bus<MAX_BUS_SCAN; ++bus) for (bus=0; bus<MAX_BUS_SCAN; ++bus)
for (device=0; device<MAX_DEVICE_SCAN; ++device) for (device=0; device<MAX_DEVICE_SCAN; ++device)
for (function=0; function<MAX_FUNCTION_SCAN; ++function) for (function=0; function<MAX_FUNCTION_SCAN; ++function)
{ {
result = getPCIinfo(bus, device, function); result = getPCImininfo(bus,device,function);
if (result.dword) if (result.vendor != 0xFFFF)
printf("%d) Bus: 0x%x, Device: 0x%x. Function: 0x%x (0x%hx:0x%hx)\r\n", printf("Bus:%hx Dev:%hx Func:%hx %hx:%hx\r\n",bus, device, function, result.vendor, result.device);
++i, bus, device, function, result.vendor, result.device);
} }
return; return;
} }
/*******************************************************************************/ /*******************************************************************************/