i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added more device IDs

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22862 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2007-11-09 15:49:55 +00:00
parent 5fac00b279
commit 8c8d63ee00
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/ide/silicon_image_3112/silicon_image_3112.c
+15 -3
View File
@@ -141,8 +141,13 @@ controller_supports(device_node_handle parent, bool *_noConnection)
#define ID(v, d) (((v) << 16) | (d)) #define ID(v, d) (((v) << 16) | (d))
switch (ID(vendorID, deviceID)) { switch (ID(vendorID, deviceID)) {
case ID(0x1095, 0x0240):
case ID(0x1095, 0x3112): case ID(0x1095, 0x3112):
case ID(0x1095, 0x3114): case ID(0x1095, 0x3114):
case ID(0x1095, 0x3512):
case ID(0x1002, 0x436e): // ATI
case ID(0x1002, 0x4379): // ATI
case ID(0x1002, 0x437a): // ATI
break; break;
default: default:
return 0.0f; return 0.0f;
@@ -162,6 +167,7 @@ controller_probe(device_node_handle parent)
device_node_handle controller_node; device_node_handle controller_node;
uint32 mmioBase; uint32 mmioBase;
uint16 deviceID; uint16 deviceID;
uint16 vendorID;
uint8 interruptNumber; uint8 interruptNumber;
int asicIndex; int asicIndex;
int channelIndex; int channelIndex;
@@ -174,15 +180,21 @@ controller_probe(device_node_handle parent)
return B_ERROR; return B_ERROR;
deviceID = pci->read_pci_config(device, PCI_device_id, 2); deviceID = pci->read_pci_config(device, PCI_device_id, 2);
vendorID = pci->read_pci_config(device, PCI_vendor_id, 2);
interruptNumber = pci->read_pci_config(device, PCI_interrupt_line, 1); interruptNumber = pci->read_pci_config(device, PCI_interrupt_line, 1);
mmioBase = pci->read_pci_config(device, PCI_base_registers + 20, 4) mmioBase = pci->read_pci_config(device, PCI_base_registers + 20, 4)
& PCI_address_io_mask; & PCI_address_io_mask;
switch (deviceID) { switch (ID(vendorID, deviceID)) {
case 0x3112: case ID(0x1095, 0x0240):
case ID(0x1095, 0x3112):
case ID(0x1095, 0x3512):
case ID(0x1002, 0x436e): // ATI
case ID(0x1002, 0x4379): // ATI
case ID(0x1002, 0x437a): // ATI
asicIndex = ASIC_SI3112; asicIndex = ASIC_SI3112;
break; break;
case 0x3114: case ID(0x1095, 0x3114):
asicIndex = ASIC_SI3114; asicIndex = ASIC_SI3114;
break; break;
default: default: