revert S390 changes

5 files changed, 0 insertions, 92 deletions

diff --git a/isys/devnodes.c b/isys/devnodes.c
index 54638964f..624176bf3 100644
--- a/isys/devnodes.c
+++ b/isys/devnodes.c
@@ -143,18 +143,6 @@ int devMakeInode(char * devName, char * path) {
 	minor = 1;
 	if (devName[3])
 	    minor += devName[3] - '1';
-    } else if (!strncmp(devName, "dasd", 4)) {
-	/* IBM Dasd Drives */
-	type = S_IFBLK;
-	major = 94;
-	minor = ( devName[4] - 'a' ) * 4;
-	if (devName[5])
-		minor += devName[5] - '0';
-    } else if (!strncmp(devName, "mnd", 4)) {
-	/* IBM MiniDisk Drives */
-	type = S_IFBLK;
-	major = 95;
-	minor = devName[3] - 'a';
     } else if (!strncmp(devName, "rd/", 3)) {
 	/* dac 960 "/rd/c0d0{p1}" */
 	type = S_IFBLK;
diff --git a/isys/isys.c b/isys/isys.c
index 3f61b47ea..d61710d17 100644
--- a/isys/isys.c
+++ b/isys/isys.c
@@ -155,7 +155,6 @@ static void probedListDealloc (probedListObject * o);
 static PyObject * probedListNet(probedListObject * s, PyObject * args);
 static PyObject * probedListScsi(probedListObject * s, PyObject * args);
 static PyObject * probedListIde(probedListObject * s, PyObject * args);
-static PyObject * probedListDasd(probedListObject * s, PyObject * args);
 static int probedListLength(PyObject * o);
 static PyObject * probedListSubscript(probedListObject * o, int item);
 
@@ -163,7 +162,6 @@ static PyMethodDef probedListObjectMethods[] = {
     { "updateNet", (PyCFunction) probedListNet, METH_VARARGS, NULL },
     { "updateScsi", (PyCFunction) probedListScsi, METH_VARARGS, NULL },
     { "updateIde", (PyCFunction) probedListIde, METH_VARARGS, NULL },
-    { "updateDasd", (PyCFunction) probedListDasd, METH_VARARGS, NULL },
     { NULL },
 };
 
@@ -858,15 +856,6 @@ static PyObject * probedListScsi(probedListObject * o, PyObject * args) {
     return Py_None;
 }
 
-static PyObject * probedListDasd(probedListObject * o, PyObject * args) {
-    if (!PyArg_ParseTuple(args, "")) return NULL;
-
-    kdFindDasdList(&o->list, 0);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
 int pdc_dev_running_raid(int fd);
 
 #ifdef __i386__
diff --git a/isys/probe.c b/isys/probe.c
index 800a14ff8..a66956ef6 100644
--- a/isys/probe.c
+++ b/isys/probe.c
@@ -404,46 +404,6 @@ bye:
     return val;
 }
 
-int kdFindDasdList(struct knownDevices * devices, int code) {
-  /* patch for s390 by Oliver Paukstadt <oliver.paukstadt@millenux.com> */
-  /* based upon code by Erik Tews <erik.tews@gmx.net> */
-
-  FILE * fd;
-  struct kddevice device;
-  char line[200];
-  char name[10];
-  char status[10];
-  char model[30];
-
-  if (access("/proc/dasd/devices", R_OK)) return 0;
-  /* a system without /proc/dasd/devices is nothing to worry about */
-
-  fd = fopen ("/proc/dasd/devices", "r");
-  if (fd == NULL) return 1;
-
-  /* Every line in this file is a harddisk */
-  while ((fgets(line, 190, fd)) != NULL) {
-
-    sscanf(line, "%*X %*[(A-Z)] at (%*d:%*d) is %[a-z0-9]:%s ", name, status);
-    /* Take every dasd, formated and unformated */
-
-    if (!deviceKnown(devices, name)) {
-      snprintf(model, sizeof(model), "IBM DASD (%s)", status);
-      device.class = CLASS_HD;
-      device.name = strdup(name);
-      device.model = strdup(model);
-      device.code = code;
-      addDevice(devices, device);
-    }
-  }
-  fclose (fd);
-
-  qsort(devices->known, devices->numKnown, sizeof(*devices->known),
-	sortDevices);
-  return 0;
-
-}
-
 struct knownDevices kdInit(void) {
     struct knownDevices kd;
 
diff --git a/isys/probe.h b/isys/probe.h
index dea610b05..90a4ee4c0 100644
--- a/isys/probe.h
+++ b/isys/probe.h
@@ -26,7 +26,6 @@ int kdFindIdeList(struct knownDevices * devices, int code);
 int kdFindFilteredIdeList(struct knownDevices * devices, int code, 
 			  kdFilterType filter);
 int kdFindScsiList(struct knownDevices * devices, int code);
-int kdFindDasdList(struct knownDevices * devices, int code);
 void kdFree(struct knownDevices * devices);
 void kdAddDevice(struct knownDevices * devices, enum deviceClass devClass, 
 		 char * devName, char * devModel);
diff --git a/isys/smp.c b/isys/smp.c
index a7e577d65..c7b467b1e 100644
--- a/isys/smp.c
+++ b/isys/smp.c
@@ -39,30 +39,6 @@ int alphaDetectSMP(void)
 }
 #endif /* __alpha__ */
 
-#if defined (__s390__) || defined (__s390x__)
-int s390DetectSMP(void)
-{
-    int issmp = 0;
-    FILE *f;
-
-    f = fopen("/proc/cpuinfo", "r");
-    if (f) {
-       char buff[1024];
-
-       while (fgets (buff, 1024, f) != NULL) {
-           if (!strncmp (buff, "# processors    : ", 18)) {
-               if (strtoul (buff + 18, NULL, 0) > 1)
-                   issmp = 1;
-               break;
-           }
-       }
-       fclose(f);
-    } else
-       return -1;
-
-    return issmp;
-}
-#endif /* __s390__ */
 
 #ifdef __sparc__
 int sparcDetectSMP(void)
@@ -485,10 +461,6 @@ int detectSMP(void)
     return isSMP = alphaDetectSMP();
 #elif __ia64__
     return isSMP = 1;
-#elif __s390__
-    return isSMP = s390DetectSMP();
-#elif __s390x__
-    return isSMP = s390DetectSMP();
 #else
     #error unknown architecture
 #endif