diff options
author | Matt Wilson <msw@redhat.com> | 2000-12-04 20:21:02 +0000 |
---|---|---|
committer | Matt Wilson <msw@redhat.com> | 2000-12-04 20:21:02 +0000 |
commit | 6acbcc8dd4598fe4ac965ebcc810a424bb5d0752 (patch) | |
tree | 4448da6e13dfdb5bcb2cb1e33967c4efcbb415b9 /isys | |
parent | d9b3f40e338bae302914faf9eabfc23649daeead (diff) | |
download | anaconda-6acbcc8dd4598fe4ac965ebcc810a424bb5d0752.tar.gz anaconda-6acbcc8dd4598fe4ac965ebcc810a424bb5d0752.tar.xz anaconda-6acbcc8dd4598fe4ac965ebcc810a424bb5d0752.zip |
this pciprobe mess in isys isn't used...
Diffstat (limited to 'isys')
-rw-r--r-- | isys/isys.c | 26 | ||||
-rw-r--r-- | isys/isys.py | 16 |
2 files changed, 0 insertions, 42 deletions
diff --git a/isys/isys.c b/isys/isys.c index 1b12a738b..dc2491834 100644 --- a/isys/isys.c +++ b/isys/isys.c @@ -56,7 +56,6 @@ static PyObject * doReadModInfo(PyObject * s, PyObject * args); static PyObject * doUMount(PyObject * s, PyObject * args); static PyObject * getModuleList(PyObject * s, PyObject * args); static PyObject * makeDevInode(PyObject * s, PyObject * args); -static PyObject * doPciProbe(PyObject * s, PyObject * args); static PyObject * smpAvailable(PyObject * s, PyObject * args); static PyObject * createProbedList(PyObject * s, PyObject * args); static PyObject * doChroot(PyObject * s, PyObject * args); @@ -110,7 +109,6 @@ static PyMethodDef isysModuleMethods[] = { { "poptParseArgv", (PyCFunction) doPoptParse, METH_VARARGS, NULL }, { "mkdevinode", (PyCFunction) makeDevInode, METH_VARARGS, NULL }, { "modulelist", (PyCFunction) getModuleList, METH_VARARGS, NULL }, - { "pciprobe", (PyCFunction) doPciProbe, METH_VARARGS, NULL }, { "ProbedList", (PyCFunction) createProbedList, METH_VARARGS, NULL }, { "readmoduleinfo", (PyCFunction) doReadModInfo, METH_VARARGS, NULL }, /* @@ -598,30 +596,6 @@ static PyObject * doReadModInfo(PyObject * s, PyObject * args) { return Py_None; } -static PyObject * doPciProbe(PyObject * s, PyObject * args) { - struct device ** matches, ** item; - PyObject * list; - - if (!PyArg_ParseTuple(args, "")) return NULL; - - matches = probeDevices(CLASS_UNSPEC,BUS_PCI|BUS_SBUS,PROBE_ALL); - - if (!matches) { - Py_INCREF(Py_None); - return Py_None; - } - - list = PyList_New(0); - for (item = matches; *item; item++) { - PyList_Append(list, Py_BuildValue("s", (*item)->driver)); - freeDevice (*item); - } - - free(matches); - - return list; -} - static PyObject * doUMount(PyObject * s, PyObject * args) { char * fs; diff --git a/isys/isys.py b/isys/isys.py index 521ec0b70..f076555d1 100644 --- a/isys/isys.py +++ b/isys/isys.py @@ -150,22 +150,6 @@ def loadFont(font): def loadKeymap(keymap): return _isys.loadKeymap (keymap) -def probePciDevices(): - # probes all probeable buses and returns a list of - # ( driver, major, minor, description, args ) tuples, where args is a - # list of (argName, argDescrip) tuples - devices = _isys.pciprobe() - if (not devices): return None - - result = [] - for dev in devices: - info = _isys.findmoduleinfo(dev) - if not info: - raise KeyError, "module " + dev + " is not in the module list" - result.append(info) - - return result - def driveDict(klassArg): p = _isys.ProbedList() p.updateIde() |