From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Thu, 6 Dec 2007 17:11:34 +0000 (+0000)
Subject: Don't return ata_generic or eepro100 if other drivers are available.
X-Git-Tag: pypcilib-0.1-1~2
X-Git-Url: http://git.onelab.eu/?p=pypcilib.git;a=commitdiff_plain;h=8738cfc42d5a41ff341c0672b5cb3deeea2887ed;ds=sidebyside

Don't return ata_generic or eepro100 if other drivers are available.
---

diff --git a/pypcimap.py b/pypcimap.py
index 9160cc0..ba7f9f6 100644
--- a/pypcimap.py
+++ b/pypcimap.py
@@ -36,6 +36,9 @@
 import os
 import re
 
+# These are modules which are only returned if no other driver is available
+greylist = ["ata_generic", "eepro100"]
+
 class PCIMap:
     """Encapsulates modules.pcimap"""
     def __init__(self, filename):
@@ -51,6 +54,9 @@ class PCIMap:
                 (i[4] == tuple[3] or i[4] == 0xffffffff) and
                 (i[5] == (tuple[4] & i[6]))):
                 ret.append(i[0])
+        for i in greylist:
+            if i in ret and len(ret) > 1:
+                ret.remove(i)
         return ret
     def add(self, list):
         # FIXME: check values