yet another attempt

[pypcilib.git] / pypcimap.py

diff --git a/pypcimap.py b/pypcimap.py
index 504ac92..fd3dd2d 100644 (file)
--- a/pypcimap.py
+++ b/pypcimap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python2 -tt
 # Copyright 2007 The Trustees of Princeton University
 # Author: Daniel Hokka Zakrisson
 # $Id$
@@ -37,7 +37,7 @@ import os
 import re
 
 # These are modules which are only returned if no other driver is available
-greylist = ["ata_generic", "eepro100", "8139too"]
+greylist = ["ata_generic", "eepro100", "8139cp", "e1000e"]
 
 class PCIMap:
     """Encapsulates modules.pcimap"""
@@ -48,10 +48,10 @@ class PCIMap:
         """Returns a list of candidate modules for the PCI device specified in tuple"""
         ret = []
         for i in self.list:
-            if ((i[1] == tuple[0] or i[1] == 0xffffffff) and
-                (i[2] == tuple[1] or i[2] == 0xffffffff) and
-                (i[3] == tuple[2] or i[3] == 0xffffffff) and
-                (i[4] == tuple[3] or i[4] == 0xffffffff) and
+            if ((i[1] == tuple[0] or i[1] == 0xffffffffL) and
+                (i[2] == tuple[1] or i[2] == 0xffffffffL) and
+                (i[3] == tuple[2] or i[3] == 0xffffffffL) and
+                (i[4] == tuple[3] or i[4] == 0xffffffffL) and
                 (i[5] == (tuple[4] & i[6]))):
                 ret.append(i[0])
         for i in greylist: