merge taroon branch up until now. tagged as before-taroon-merge before and

will be tagged after-taroon-merge after.  taroon at this point is tagged
taroon-merge-point for where to base merges from in the future

1 files changed, 17 insertions, 2 deletions

diff --git a/isys/isys.c b/isys/isys.c
index 02ffe0d45..21bc300d7 100644
--- a/isys/isys.c
+++ b/isys/isys.c
@@ -100,6 +100,8 @@ static PyObject * py_bind_textdomain_codeset(PyObject * o, PyObject * args);
 static PyObject * getLinkStatus(PyObject * s, PyObject * args);
 static PyObject * hasIdeRaidMagic(PyObject * s, PyObject * args);
 static PyObject * start_bterm(PyObject * s, PyObject * args);
+static PyObject * py_getDasdPorts(PyObject * s, PyObject * args);
+static PyObject * py_isUsableDasd(PyObject * s, PyObject * args);
 
 static PyMethodDef isysModuleMethods[] = {
     { "ejectcdrom", (PyCFunction) doEjectCdrom, METH_VARARGS, NULL },
@@ -149,6 +151,8 @@ static PyMethodDef isysModuleMethods[] = {
     { "getLinkStatus", (PyCFunction) getLinkStatus, METH_VARARGS, NULL },
     { "hasIdeRaidMagic", (PyCFunction) hasIdeRaidMagic, METH_VARARGS, NULL },
     { "startBterm", (PyCFunction) start_bterm, METH_VARARGS, NULL },
+    { "getDasdPorts", (PyCFunction) py_getDasdPorts, METH_VARARGS, NULL},
+    { "isUsableDasd", (PyCFunction) py_isUsableDasd, METH_VARARGS, NULL},
     { NULL }
 } ;
 
@@ -701,9 +705,7 @@ static PyObject * probedListScsi(probedListObject * o, PyObject * args) {
 static PyObject * probedListDasd(probedListObject * o, PyObject * args) {
     if (!PyArg_ParseTuple(args, "")) return NULL;
 
-#if defined (__s390__) || defined (__s390x__)
     kdFindDasdList(&o->list, 0);
-#endif
 
     Py_INCREF(Py_None);
     return Py_None;
@@ -1371,6 +1373,19 @@ static PyObject * getLinkStatus(PyObject * s, PyObject * args) {
     return Py_BuildValue("i", ret);
 }
 
+static PyObject * py_getDasdPorts(PyObject * o, PyObject * args) {
+    if (!PyArg_ParseTuple(args, "")) return NULL;
+
+    return Py_BuildValue("s", getDasdPorts());
+}
+
+static PyObject * py_isUsableDasd(PyObject * o, PyObject * args) {
+    char *devname;
+    if (!PyArg_ParseTuple(args, "s", &devname))
+	return NULL;
+    return Py_BuildValue("i", isUsableDasd(devname));
+}
+
 static PyObject * printObject (PyObject * o, PyObject * args) {
     PyObject * obj;
     char buf[256];