Rename to pypcilib.

Add pypcimap, to easily access a modules.pcimap.

diff --git a/pypciscan.spec b/pypcilib.spec
similarity index 62%
rename from pypciscan.spec
rename to pypcilib.spec
index 0a701c0..35c427d 100644 (file)
--- a/pypciscan.spec
+++ b/pypcilib.spec
@@ -1,23 +1,24 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Summary: Scan PCI devices from Python
-Name: pypciscan
+Summary: Python library for doing PCI stuff
+Name: pypcilib
 Version: 0.1
 Release: 1
 License: BSD
-URL: http://svn.planet-lab.org/wiki/pypciscan
+URL: http://svn.planet-lab.org/wiki/pypcilib
 Group: System Environment/Libraries
 
 BuildRequires: pciutils-devel
 
-Source0: pypciscan-%{version}.tar.bz2
+Source0: pypcilib-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -un)
 
 
 %description
-pypciscan is a Python library to scan PCI devices using
-pciutils' libpci.
+pypcilib is a Python library to scan PCI devices using
+pciutils' libpci, and to parse the modules.pcimap file.
 
 
 %prep
@@ -40,6 +41,7 @@ rm -fr "%{buildroot}"
 %files
 %defattr(-,root,root,-)
 %{python_sitearch}/pypciscan.so
+%{python_sitelib}/pypcimap.py
 
 
 %changelog

diff --git a/pypcimap.py b/pypcimap.py
new file mode 100644 (file)
index 0000000..9160cc0
--- /dev/null
+++ b/pypcimap.py
@@ -0,0 +1,78 @@
+#!/usr/bin/python -tt
+# Copyright 2007 The Trustees of Princeton University
+# Author: Daniel Hokka Zakrisson
+# $Id$
+# vim:ts=4:expandtab
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met: 
+# 
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#       
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#       
+# * Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#       
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL PRINCETON
+# UNIVERSITY OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+# WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE. 
+
+import os
+import re
+
+class PCIMap:
+    """Encapsulates modules.pcimap"""
+    def __init__(self, filename):
+        self.list = []
+        self.read(filename)
+    def get(self, tuple):
+        """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
+                (i[5] == (tuple[4] & i[6]))):
+                ret.append(i[0])
+        return ret
+    def add(self, list):
+        # FIXME: check values
+        self.list.append(list)
+    def read(self, filename):
+        f = file(filename)
+        pattern = re.compile("(\\S+)\\s+0x([0-9A-Fa-f]+)\\s0x([0-9A-Fa-f]+)\\s0x([0-9A-Fa-f]+)\\s0x([0-9A-Fa-f]+)\\s0x([0-9A-Fa-f]+)\\s0x([0-9A-Fa-f]+)\\s0x([0-9A-Fa-f]+)\\n")
+        while True:
+            line = f.readline()
+            if line == "":
+                break
+            if line[0] == '#' or line[0] == '\n':
+                continue
+            match = pattern.match(line)
+            if not match:
+                continue
+            self.add([match.group(1),
+                int(match.group(2), 16),
+                int(match.group(3), 16),
+                int(match.group(4), 16),
+                int(match.group(5), 16),
+                int(match.group(6), 16),
+                int(match.group(7), 16),
+                int(match.group(8), 16)])
+        f.close()

diff --git a/pypciscan.c b/pypciscan.c
index 02087d6..f56eb7c 100644 (file)
--- a/pypciscan.c
+++ b/pypciscan.c
@@ -69,7 +69,7 @@ static PyObject *get_devices(PyObject *self, PyObject *args)
 
                snprintf(buf, sizeof(buf), "%04x:%02x:%02x.%02x", dev->domain, dev->bus, dev->dev, dev->func);
                value = Py_BuildValue("iiiii", dev->vendor_id, dev->device_id,
-                                     subdevice, subvendor, dev->device_class);
+                                     subvendor, subdevice, dev->device_class);
                if (!value)
                        return NULL;
                if (PyDict_SetItemString(ret, buf, value) == -1)

diff --git a/setup.py b/setup.py
index f30ff9e..aa025ac 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -7,6 +7,7 @@ setup(name='pypciscan',
       description='PCI scanning from Python',
       author='Daniel Hokka Zakrisson',
       author_email='daniel@hozac.com',
+      packages=['pypcimap'],
       ext_modules=[Extension('pypciscan', ['pypciscan.c'],
                             libraries=['pci', 'z'])],
      )