nuke probe code. move dasd bits that are still needed into their own file

7 files changed, 189 insertions, 1173 deletions

diff --git a/isys/Makefile b/isys/Makefile
index 9538f20a1..e46cd74be 100644
--- a/isys/Makefile
+++ b/isys/Makefile
@@ -3,7 +3,7 @@ include ../Makefile.inc
 CFLAGS = -ffunction-sections -I$(PYTHONINCLUDE) -I.. -Wall -Os -g  -DHAVE_NFS -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -Werror
 
 OBJECTS = nfsmount.o nfsmount_clnt.o nfsmount_xdr.o imount.o getmacaddr.o \
-          smp.o devnodes.o cpio.o probe.o uncpio.o \
+          smp.o devnodes.o cpio.o uncpio.o dasd.o \
 	  lang.o isofs.o dns.o linkdetect.o pdc.o hpt.o silraid.o vio.o \
 	  ethtool.o getipaddr.o
 SOBJECTS = $(patsubst %.o,%.lo,$(OBJECTS))
diff --git a/isys/dasd.c b/isys/dasd.c
new file mode 100644
index 000000000..a9eac03aa
--- /dev/null
+++ b/isys/dasd.c
@@ -0,0 +1,182 @@
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <linux/fs.h>
+
+#include "isys.h"
+
+#if defined(__s390__) || defined(__s390x__)
+/*
+ * struct dasd_information_t
+ * represents any data about the data, which is visible to userspace
+ */
+typedef struct dasd_information_t {
+        unsigned int devno; /* S/390 devno */
+        unsigned int real_devno; /* for aliases */
+        unsigned int schid; /* S/390 subchannel identifier */
+        unsigned int cu_type  : 16; /* from SenseID */
+        unsigned int cu_model :  8; /* from SenseID */
+        unsigned int dev_type : 16; /* from SenseID */
+        unsigned int dev_model : 8; /* from SenseID */
+        unsigned int open_count;
+        unsigned int req_queue_len;
+        unsigned int chanq_len;
+        char type[4]; /* from discipline.name, 'none' for unknown */
+        unsigned int status; /* current device level */
+        unsigned int label_block; /* where to find the VOLSER */
+        unsigned int FBA_layout; /* fixed block size (like AIXVOL) */
+        unsigned int characteristics_size;
+        unsigned int confdata_size;
+        char characteristics[64]; /* from read_device_characteristics */
+        char configuration_data[256]; /* from read_configuration_data */
+} dasd_information_t;
+
+typedef struct cchhb
+{
+        u_int16_t cc;
+        u_int16_t hh;
+        u_int8_t b;
+} __attribute__ ((packed)) cchhb_t;
+
+typedef struct volume_label
+{
+        char volkey[4];         /* volume key = volume label                 */
+        char vollbl[4];         /* volume label                              */
+        char volid[6];          /* volume identifier                         */
+        u_int8_t security;              /* security byte                             */
+        cchhb_t vtoc;           /* VTOC address                              */
+        char res1[5];           /* reserved                                  */
+        char cisize[4];         /* CI-size for FBA,...                       */
+                                /* ...blanks for CKD                         */
+        char blkperci[4];       /* no of blocks per CI (FBA), blanks for CKD */
+        char labperci[4];       /* no of labels per CI (FBA), blanks for CKD */
+        char res2[4];           /* reserved                                  */
+        char lvtoc[14];         /* owner code for LVTOC                      */
+        char res3[29];          /* reserved                                  */
+} __attribute__ ((packed)) volume_label_t;
+#endif
+
+
+#if defined(__s390__) || defined(__s390x__)
+/* s390 stuff to detect DASDs */
+int vtoc_read_volume_label (int fd, unsigned long vlabel_start,
+		volume_label_t *vlabel) {
+	int rc;
+	if (lseek(fd, vlabel_start, SEEK_SET) < 0) {
+		/* fprintf(stderr, "Could not read volume label.\n"); */
+		return 2;
+	}
+	rc = read(fd, vlabel, sizeof(volume_label_t));
+	if (rc != sizeof(volume_label_t)) {
+		/* fprintf(stderr, "Could not read volume label, DASD is probably unformatted\n"); */
+		return 1;
+	}
+	return 0;
+}
+
+int read_vlabel(dasd_information_t *dasd_info, int fd, int blksize, volume_label_t *vlabel) {
+	unsigned long  pos;
+
+	pos = dasd_info->label_block * blksize;
+
+	memset(vlabel, 0, sizeof(volume_label_t));
+	return vtoc_read_volume_label(fd, pos, vlabel);
+}
+#endif
+
+int isUsableDasd(char *device) {
+#if !defined(__s390__) && !defined(__s390x__)
+    return 0;
+#else
+	char devname[16];
+	char label[5], v4_hex[9];
+	char l4ebcdic_hex[] = "d3d5e7f1";  /* LNX1 */
+	char cms1_hex[] = "c3d4e2f1";      /* CMS1 */
+	int f, ret, blksize;
+	dasd_information_t dasd_info;
+	volume_label_t vlabel;
+	memset(&dasd_info, 0, sizeof(dasd_info));
+	strcpy(devname, "/dev/");
+	strcat(devname, device);
+	devMakeInode(device, devname);
+	if((f = open(devname, O_RDONLY)) == -1) {
+		return 0;
+	}
+	if (ioctl(f, BLKSSZGET, &blksize) != 0) {
+		close(f);
+		/* fprintf(stderr, "Could not retrieve blocksize information!\n"); */
+		return 0;
+	}
+	if (ioctl(f, BIODASDINFO, &dasd_info) != 0) {
+		close(f);
+		/* fprintf(stderr, "Could not retrieve disk information!\n"); */
+		return 0;
+	}
+	ret = read_vlabel(&dasd_info, f, blksize, &vlabel);
+        close(f);
+
+	if (ret == 2) {
+		return 0;
+	} else if (ret == 1) { /* probably unformatted DASD */
+		/* fprintf(stderr, "Found a usable device: %s\n", devname); */
+		return 1;
+	}
+	memset(label, 0, 5);
+	memset(v4_hex, 0, 9);
+	strncpy(label, vlabel.volkey, 4);
+	sprintf(v4_hex, "%02x%02x%02x%02x", label[0], label[1], label[2], label[3]);
+        
+	if(!strncmp(v4_hex, cms1_hex, 9)) {
+		return 0;
+	}
+	if(!strncmp(v4_hex, l4ebcdic_hex, 9)) {
+		return 2;
+	}
+        return 1;
+#endif
+}
+
+int isLdlDasd(char * device) {
+   return (isUsableDasd(device) == 2);
+}
+
+char *getDasdPorts() {
+#if !defined(__s390__) && !defined(__s390x__)
+    return 0;
+#else
+        char * line, *ports = NULL;
+	char devname[7];
+        char port[6];
+        FILE *fd;
+	int ret;
+        fd = fopen ("/proc/dasd/devices", "r");
+        if(!fd) {
+                return NULL;
+        }
+        line = (char *)malloc(100*sizeof(char));
+        while (fgets (line, 100, fd) != NULL) {
+                if ((strstr(line, "unknown") != NULL)) {
+                        continue;
+                }
+                ret = sscanf (line, "%[A-Za-z0-9](ECKD) at ( %*d: %*d) is %s : %*s", port, devname);
+		if (ret == 2) {
+			if(!ports) {
+				ports = (char *)malloc(strlen(port) + 1);
+				strcpy(ports, port);
+			} else {
+				ports = (char *)realloc(ports, strlen(ports) + strlen(port) + 2);
+				strcat(ports, ",");
+				strcat(ports, port);
+			}
+                }
+        }
+        if (fd) fclose(fd);
+        return ports;
+#endif
+}
diff --git a/isys/isys.c b/isys/isys.c
index 3c6264ae9..45657e720 100644
--- a/isys/isys.c
+++ b/isys/isys.c
@@ -44,7 +44,6 @@
 #include "imount.h"
 #include "isys.h"
 #include "net.h"
-#include "probe.h"
 #include "smp.h"
 #include "lang.h"
 #include "getmacaddr.h"
@@ -850,7 +849,7 @@ static PyObject * doDevSpaceFree(PyObject * s, PyObject * args) {
 	return NULL;
     }
 
-    return Py_BuildValue("i", sb.f_bfree * (sb.f_bsize / 1024) / (1024));
+    return Py_BuildValue("l", (long) sb.f_bfree * (sb.f_bsize / 1024) / (1024));
 }
 
 static PyObject * doRaidStop(PyObject * s, PyObject * args) {
diff --git a/isys/isys.h b/isys/isys.h
index 8051b5a5b..ef0d0942f 100644
--- a/isys/isys.h
+++ b/isys/isys.h
@@ -19,4 +19,9 @@ int fileIsIso(const char * file);
 /* returns 1 if on an iSeries vio console, 0 otherwise */
 int isVioConsole(void);
 
+/* dasd functions */
+char *getDasdPorts();
+int isLdlDasd(char * dev);
+int isUsableDasd(char *device);
+
 #endif
diff --git a/isys/probe.c b/isys/probe.c
deleted file mode 100644
index e89bb44ae..000000000
--- a/isys/probe.c
+++ /dev/null
@@ -1,917 +0,0 @@
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <asm/types.h>
-#include <linux/cdrom.h>
-#include <linux/hdreg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <linux/fs.h>
-
-#include "isys.h"
-#include "probe.h"
-
-static int dac960GetDevices(struct knownDevices * devices);
-static int CompaqSmartArrayGetDevices(struct knownDevices * devices);
-static int CompaqSmartArray5300GetDevices(struct knownDevices * devices);
-#ifdef WITH_ATARAID
-static int ataraidGetDevices(struct knownDevices * devices);
-#endif
-static int viodGetDevices(struct knownDevices * devices);
-/* Added support for I2O Block devices: Boji Kannanthanam
-       <boji.t.Kannanthanam@intel.com> */
-static int ProcPartitionsGetDevices(struct knownDevices * devices);
-
-int readFD (int fd, char **buf)
-{
-    char *p;
-    size_t size = 4096;
-    int s, filesize;
-
-    *buf = malloc (size);
-    if (*buf == 0)
-      return -1;
-
-    filesize = 0;
-    do {
-	p = &(*buf) [filesize];
-	s = read (fd, p, 4096);
-	if (s < 0)
-	    break;
-	filesize += s;
-	if (s != 4096)
-	    break;
-	size += 4096;
-	*buf = realloc (*buf, size);
-    } while (1);
-
-    if (filesize == 0 && s < 0) {
-	free (*buf);     
-	*buf = NULL;
-	return -1;
-    }
-
-    return filesize;
-}
-
-static int sortDevices(const void * a, const void * b) {
-    const struct kddevice * one = a;
-    const struct kddevice * two = b;
-
-    return strcmp(one->name, two->name);
-}
-
-int deviceKnown(struct knownDevices * devices, char * dev) {
-    int i;
-
-    for (i = 0; i < devices->numKnown; i++)
-    	if (!strcmp(devices->known[i].name, dev)) return 1;
-
-    return 0;
-}
-
-void addDevice(struct knownDevices * devices, struct kddevice dev) {
-    if (devices->numKnown == devices->numKnownAlloced) {
-    	devices->numKnownAlloced += 5;
-    	devices->known = realloc(devices->known, 
-		sizeof(*devices->known) * devices->numKnownAlloced);
-    }
-
-    devices->known[devices->numKnown++] = dev;
-}
-
-void kdAddDevice(struct knownDevices * devices, enum deviceClass devClass, 
-		 char * devName, char * devModel) {
-    struct kddevice new;
-
-    new.class = devClass;
-    new.name = devName;
-    new.model = devModel;
-
-    addDevice(devices, new);
-}
-
-void kdFree(struct knownDevices * devices) {
-    if (devices->known) free(devices->known);
-    devices->known = NULL;
-    devices->numKnown = devices->numKnownAlloced = 0;
-}
-
-int kdFindNetList(struct knownDevices * devices, int code) {
-    int fd, i;
-    char *buf;
-    char * start, * end;
-    struct device **kdevs;
-    struct kddevice newDevice;
-    int s;
-    
-    kdevs = probeDevices(CLASS_NETWORK, BUS_UNSPEC, PROBE_ALL);
-
-    if ((fd = open("/proc/net/dev", O_RDONLY)) < 0) {
-	fprintf(stderr, "failed to open /proc/net/dev!\n");
-	return 1;
-    }
-
-    s = readFD(fd, &buf);
-    close(fd);
-    if (s < 0) {
-        /*	fprintf(stderr, "error reading /proc/net/dev!\n");*/
-	return 1;
-    }
-
-    buf[s] = '\0';
-
-    /* skip the first two lines */
-    start = strchr(buf, '\n');
-    if (!start) goto bye;
-    start = strchr(start + 1, '\n');
-    if (!start) goto bye;
-
-    start++;
-    while (start && *start) {
-	while (isspace(*start)) start++;
-	end = strchr(start, ':');
-	if (!end) goto bye;
-	*end = '\0';
-	
-    	if (strcmp(start, "lo")) {
-	    if (!deviceKnown(devices, start)) {
-                newDevice.name = strdup(start);
-                newDevice.model = NULL;
-                if (kdevs) {
-                    for (i = 0; kdevs[i]; i++)
-                        if (kdevs[i]->device && !strcmp(kdevs[i]->device, newDevice.name))
-                             newDevice.model = strdup(kdevs[i]->desc);
-                
-                }
-                newDevice.class = CLASS_NETWORK;
-                newDevice.code = code;
-                addDevice(devices, newDevice);
-            }
-	}
-
-	start = strchr(end + 1, '\n');
-	if (start) start++;
-    }
-
-    qsort(devices->known, devices->numKnown, sizeof(*devices->known),
-	  sortDevices);
-
-bye:
-    free (buf);
-    return 0;
-}
-
-#if defined(__s390__) || defined(__s390x__)
-/* s390 stuff to detect DASDs */
-int vtoc_read_volume_label (int fd, unsigned long vlabel_start,
-		volume_label_t *vlabel) {
-	int rc;
-	if (lseek(fd, vlabel_start, SEEK_SET) < 0) {
-		/* fprintf(stderr, "Could not read volume label.\n"); */
-		return 2;
-	}
-	rc = read(fd, vlabel, sizeof(volume_label_t));
-	if (rc != sizeof(volume_label_t)) {
-		/* fprintf(stderr, "Could not read volume label, DASD is probably unformatted\n"); */
-		return 1;
-	}
-	return 0;
-}
-
-int read_vlabel(dasd_information_t *dasd_info, int fd, int blksize, volume_label_t *vlabel) {
-	unsigned long  pos;
-
-	pos = dasd_info->label_block * blksize;
-
-	memset(vlabel, 0, sizeof(volume_label_t));
-	return vtoc_read_volume_label(fd, pos, vlabel);
-}
-#endif
-
-int isUsableDasd(char *device) {
-#if !defined(__s390__) && !defined(__s390x__)
-    return 0;
-#else
-	char devname[16];
-	char label[5], v4_hex[9];
-	char l4ebcdic_hex[] = "d3d5e7f1";  /* LNX1 */
-	char cms1_hex[] = "c3d4e2f1";      /* CMS1 */
-	int f, ret, blksize;
-	dasd_information_t dasd_info;
-	volume_label_t vlabel;
-	memset(&dasd_info, 0, sizeof(dasd_info));
-	strcpy(devname, "/dev/");
-	strcat(devname, device);
-	devMakeInode(device, devname);
-	if((f = open(devname, O_RDONLY)) == -1) {
-		return 0;
-	}
-	if (ioctl(f, BLKSSZGET, &blksize) != 0) {
-		close(f);
-		/* fprintf(stderr, "Could not retrieve blocksize information!\n"); */
-		return 0;
-	}
-	if (ioctl(f, BIODASDINFO, &dasd_info) != 0) {
-		close(f);
-		/* fprintf(stderr, "Could not retrieve disk information!\n"); */
-		return 0;
-	}
-	ret = read_vlabel(&dasd_info, f, blksize, &vlabel);
-        close(f);
-
-	if (ret == 2) {
-		return 0;
-	} else if (ret == 1) { /* probably unformatted DASD */
-		/* fprintf(stderr, "Found a usable device: %s\n", devname); */
-		return 1;
-	}
-	memset(label, 0, 5);
-	memset(v4_hex, 0, 9);
-	strncpy(label, vlabel.volkey, 4);
-	sprintf(v4_hex, "%02x%02x%02x%02x", label[0], label[1], label[2], label[3]);
-        
-	if(!strncmp(v4_hex, cms1_hex, 9)) {
-		return 0;
-	}
-	if(!strncmp(v4_hex, l4ebcdic_hex, 9)) {
-		return 2;
-	}
-        return 1;
-#endif
-}
-
-int isLdlDasd(char * device) {
-   return (isUsableDasd(device) == 2);
-}
-
-char *getDasdPorts() {
-#if !defined(__s390__) && !defined(__s390x__)
-    return 0;
-#else
-        char * line, *ports = NULL;
-	char devname[7];
-        char port[6];
-        FILE *fd;
-	int ret;
-        fd = fopen ("/proc/dasd/devices", "r");
-        if(!fd) {
-                return NULL;
-        }
-        line = (char *)malloc(100*sizeof(char));
-        while (fgets (line, 100, fd) != NULL) {
-                if ((strstr(line, "unknown") != NULL)) {
-                        continue;
-                }
-                ret = sscanf (line, "%[A-Za-z0-9](ECKD) at ( %*d: %*d) is %s : %*s", port, devname);
-		if (ret == 2) {
-			if(!ports) {
-				ports = (char *)malloc(strlen(port) + 1);
-				strcpy(ports, port);
-			} else {
-				ports = (char *)realloc(ports, strlen(ports) + strlen(port) + 2);
-				strcat(ports, ",");
-				strcat(ports, port);
-			}
-                }
-        }
-        if (fd) fclose(fd);
-        return ports;
-#endif
-}
-
-int kdFindDasdList(struct knownDevices * devices, int code) {
-        char devname[7];
-        char *line;
-        int ret;
-        FILE *fd;
-
-        struct kddevice device;
-
-        fd = fopen ("/proc/dasd/devices", "r");
-        if(!fd) {
-                return 0;
-        }
-
-        line = (char *)malloc(100*sizeof(char));
-        while (fgets (line, 100, fd) != NULL) {
-                ret = sscanf (line, "%*[A-Za-z0-9](ECKD) at ( %*d: %*d) is %s : %*s",
-                                devname);
-                if (ret == 1 && !deviceKnown(devices, devname) 
-		   && isUsableDasd(devname)) {
-                                device.code = code;
-                                device.class = CLASS_HD;
-                                device.name = strdup(devname);
-                                device.model = strdup("IBM DASD");
-                                addDevice(devices, device);
-                }
-        }
-        if (fd) fclose(fd);
-        qsort(devices->known, devices->numKnown, sizeof(*devices->known),
-                        sortDevices);
-        return 0;
-}
-
-int kdFindIdeList(struct knownDevices * devices, int code) {
-    return kdFindFilteredIdeList(devices, code, NULL);
-}
-
-int kdFindFilteredIdeList(struct knownDevices * devices, int code, 
-			  kdFilterType filter) {
-    DIR * dir;
-    char path[80];
-    int fd, i;
-    struct dirent * ent;
-    struct kddevice device;
-
-    if (access("/proc/ide", R_OK)) return 0;
-
-    if (!(dir = opendir("/proc/ide"))) {
-	return 1;
-    }
-
-    /* set errno to 0, so we can tell when readdir() fails */
-    errno = 0;
-    while ((ent = readdir(dir))) {
-    	if (!deviceKnown(devices, ent->d_name)) {
-	    sprintf(path, "/proc/ide/%s/media", ent->d_name);
-	    if ((fd = open(path, O_RDONLY)) >= 0) {
-		i = read(fd, path, 50);
-		close(fd);
-		path[i - 1] = '\0';		/* chop off trailing \n */
-
-		device.code = code;
-
-		device.class = CLASS_UNSPEC;
-		if (!strcmp(path, "cdrom")) 
-		    device.class = CLASS_CDROM;
-		else if (!strcmp(path, "disk"))
-		    device.class = CLASS_HD;
-		else if (!strcmp(path, "floppy"))
-		    device.class = CLASS_FLOPPY;
-
-		if (device.class != CLASS_UNSPEC) {
-		    device.name = strdup(ent->d_name);
-
-		    sprintf(path, "/proc/ide/%s/model", ent->d_name);
-		    if ((fd = open(path, O_RDONLY)) >= 0) {
-			i = read(fd, path, 50);
-			close(fd);
-			path[i - 1] = '\0';	/* chop off trailing \n */
-			device.model = strdup(path);
-		    }
-
-		    if (filter && !filter(&device)) {
-			free(device.model);
-			free(device.name);
-		    } else {
-			addDevice(devices, device);
-		    }
-		}
-	    }
-	}
-
-        errno = 0;          
-    }
-
-    closedir(dir);
-
-    qsort(devices->known, devices->numKnown, sizeof(*devices->known),
-	  sortDevices);
-
-    return 0;
-}
-
-#define SCSISCSI_TOP	0
-#define SCSISCSI_HOST 	1
-#define SCSISCSI_VENDOR 2
-#define SCSISCSI_TYPE 	3
-
-int kdFindScsiList(struct knownDevices * devices, int code) {
-    int fd;
-    char *buf;
-    char linebuf[80];
-    char typebuf[10];
-    int i, state = SCSISCSI_TOP;
-    char * start, * chptr, * next, *end;
-    int driveNum = 0;
-    char cdromNum = '0';
-    char tapeNum = '0';
-    struct kddevice device;
-    int val = 0;
-
-    ProcPartitionsGetDevices(devices);
-    
-    if (access("/proc/scsi/scsi", R_OK)) {
-	dac960GetDevices(devices);
-	CompaqSmartArrayGetDevices(devices);
-	CompaqSmartArray5300GetDevices(devices);
-	viodGetDevices(devices);
-	return 0;
-    }
-
-    fd = open("/proc/scsi/scsi", O_RDONLY);
-    if (fd < 0) return 1;
-    
-    i = readFD(fd, &buf);
-    if (i < 1) {
-        close(fd);
-	return 1;
-    }
-    close(fd);
-    buf[i] = '\0';
-
-    if (!strncmp(buf, "Attached devices: none", 22)) {
-	dac960GetDevices(devices);
-	CompaqSmartArrayGetDevices(devices);
-	CompaqSmartArray5300GetDevices(devices);
-	viodGetDevices(devices);
-	goto bye;
-    }
-
-    start = buf;
-    while (*start) {
-	chptr = start;
- 	while (*chptr != '\n') chptr++;
-	*chptr = '\0';
-	next = chptr + 1;
-
-	switch (state) {
-	  case SCSISCSI_TOP:
-	    if (strncmp("Attached devices:", start, 17)) {
-		val = -1;
-		goto bye;
-	    }
-	    state = SCSISCSI_HOST;
-	    break;
-
-	  case SCSISCSI_HOST:
-	    if (strncmp("Host: ", start, 6)) {
-		val = -1;
-		goto bye;
-	    }
-
-	    start = strstr(start, "Id: ");
-	    if (!start) {
-		val = -1;
-		goto bye;
-	    }
-	    start += 4;
-
-	    /*id = strtol(start, NULL, 10);*/
-
-	    state = SCSISCSI_VENDOR;
-	    break;
-
-	  case SCSISCSI_VENDOR:
-	    if (strncmp("  Vendor: ", start, 10)) {
-		val = -1;
-		goto bye;
-	    }
-
-	    start += 10;
-	    end = chptr = strstr(start, "Model:");
-	    if (!chptr) {
-		val = -1;
-		goto bye;
-	    }
-
-	    chptr--;
-	    while (*chptr == ' ' && *chptr != ':' ) chptr--;
-	    if (*chptr == ':') {
-		    chptr++;
-		    *(chptr + 1) = '\0';
-		    strcpy(linebuf,"Unknown");
-	    } else {
-		    *(chptr + 1) = '\0';
-		    strcpy(linebuf, start);
-	    }
-	    *linebuf = toupper(*linebuf);
-	    chptr = linebuf + 1;
-	    while (*chptr) {
-		*chptr = tolower(*chptr);
-		chptr++;
-	    }
-
-	    start = end;  /* beginning of "Model:" */
-	    start += 7;
-		
-	    chptr = strstr(start, "Rev:");
-	    if (!chptr) {
-		val = -1;
-		goto bye;
-	    }
-	   
-	    chptr--;
-	    while (*chptr == ' ') chptr--;
-	    *(chptr + 1) = '\0';
-
-	    strcat(linebuf, " ");
-	    strcat(linebuf, start);
-
-	    state = SCSISCSI_TYPE;
-
-	    break;
-
-	  case SCSISCSI_TYPE:
-	    if (strncmp("  Type:", start, 7)) {
-		val = -1;
-		goto bye;
-	    }
-	    *typebuf = '\0';
-	    if (strstr(start, "Direct-Access")) {
-		if (driveNum < 26)
-		    sprintf(typebuf, "sd%c", driveNum + 'a');
-		else
-		    sprintf(typebuf, "sd%c%c", (driveNum / 26 - 1) + 'a',
-			    (driveNum % 26) + 'a');
-		driveNum++;
-		device.class = CLASS_HD;
-	    } else if (strstr(start, "Sequential-Access")) {
-		sprintf(typebuf, "st%c", tapeNum++);
-		device.class = CLASS_TAPE;
-	    } else if (strstr(start, "CD-ROM")) {
-		sprintf(typebuf, "scd%c", cdromNum++);
-		device.class = CLASS_CDROM;
-	    }
-
-	    if (*typebuf && !deviceKnown(devices, typebuf)) {
-		device.name = strdup(typebuf);
-		device.model = strdup(linebuf);
-		device.code = code;
-
-		/* Do we need this for anything?
-		sdi[numMatches].bus = 0;
-		sdi[numMatches].id = id;
-		*/
-
-		addDevice(devices, device);
-	    }
-
-	    state = SCSISCSI_HOST;
-	}
-
-	start = next;
-    }
-
-    dac960GetDevices(devices);
-    CompaqSmartArrayGetDevices(devices);
-    CompaqSmartArray5300GetDevices(devices);
-    viodGetDevices(devices);
-    /* we can't really sanely do ataraid devs yet (#82848) */
-#if WITH_ATARAID
-    ataraidGetDevices(devices);
-#endif
-
-    qsort(devices->known, devices->numKnown, sizeof(*devices->known),
-	  sortDevices);
-
-bye:
-    free (buf);
-    return val;
-}
-
-struct knownDevices kdInit(void) {
-    struct knownDevices kd;
-
-    memset(&kd, 0, sizeof(kd));
-
-    return kd;
-}
-
-static int dac960GetDevices(struct knownDevices * devices) {
-    struct kddevice newDevice;
-    char ctl[50];
-    int ctlNum = 0;
-    char *buf = NULL;
-    int fd;
-    int i;
-    char * start, * chptr;
-
-    sprintf(ctl, "/proc/rd/c%d/current_status", ctlNum++);
-
-    while ((fd = open(ctl, O_RDONLY)) >= 0) {
-    	free (buf);
-	i = readFD(fd, &buf);
-	buf[i] = '\0';
-	start = buf;
-	while (start && (start = strstr(start, "/dev/rd/"))) {
-	    start += 5;
-	    chptr = strchr(start, ':');
-	    if (!chptr)
-		continue;
-
-	    *chptr = '\0';
-	    if (!deviceKnown(devices, start)) {
-		newDevice.name = strdup(start);
-
-		start = chptr + 2;
-		chptr = strchr(start, '\n');
-		*chptr = '\0';
-
-		newDevice.model = strdup(start);
-		newDevice.class = CLASS_HD;
-		addDevice(devices, newDevice);
-
-		*chptr = '\n';
-	    } else {
-		*chptr = '\0';
-	    }
-
-	    start = strchr(chptr, '\n');
-	    if (start) start++;
-	}
-
-	sprintf(ctl, "/proc/rd/c%d/current_status", ctlNum++);
-    }
-
-    free (buf);
-    return 0;
-}
-
-static int CompaqSmartArrayGetDevices(struct knownDevices * devices) {
-    struct kddevice newDevice;
-    FILE *f;
-    char buf[256];
-    char *ptr;
-    int ctlNum = 0;
-    char ctl[64];
-    char *path;
-	
-    path = "/proc/driver/cpqarray";
-
-    sprintf(ctl, "%s/ida%d", path, ctlNum++);
-    f = fopen(ctl, "r");
-
-    if (!f) {
-	    path = "/proc/driver/array";
-	    sprintf(ctl, "%s/ida%d", path, ctlNum++);
-	    f = fopen(ctl, "r");
-    }
-
-    if (!f) {
-	    path = "/proc/ida";
-	    sprintf(ctl, "%s/ida%d", path, ctlNum++);
-	    f = fopen(ctl, "r");
-    }
-
-    while (f) {
-	while (fgets(buf, sizeof(buf) - 1, f)) {
-	    if (!strncmp(buf, "ida/", 4)) {
-		ptr = strchr(buf, ':');
-		*ptr = '\0';
-
-		if (!deviceKnown(devices, buf)) {
-		    newDevice.name = strdup(buf);
-		    newDevice.model = strdup("Compaq RAID logical disk");
-		    newDevice.class = CLASS_HD;
-		    addDevice(devices, newDevice);
-		}
-	    }
-	}
-	sprintf(ctl, "%s/ida%d", path, ctlNum++);
-        fclose(f);
-	f = fopen(ctl, "r");
-    }
-
-    
-    return 0;
-}
-
-static int ProcPartitionsGetDevices(struct knownDevices * devices) {
-    struct kddevice newDevice;
-    int fd, i;
-    char *buf;
-    char * start, *chptr, *next, *end, *model;
-    char ctl[40];
-
-    /* Read from /proc/partitions */
-    fd = open("/proc/partitions", O_RDONLY);
-    if (fd < 0) 
-	{
-	    fprintf(stderr, "failed to open /proc/partitions!\n");
-	    return 1;
-	}
-
-    i = readFD(fd, &buf);
-    if (i < 1) {
-        close(fd);
-        free (buf);
-        /*	fprintf(stderr, "error reading /proc/partitions!\n");*/
-        return 1;
-    }
-    close(fd);
-    buf[i] = '\0';
-
-    /* skip the first two lines */
-    start = strchr(buf, '\n');
-    if (!start) goto bye;
-
-    start = strchr(start + 1, '\n');
-    if (!start) goto bye;
-
-    start++;
-    end = start + strlen(start);
-    while (*start && start < end) {
-	/* parse till end of line and store the start of next line. */
-	chptr = start;
-	while (*chptr != '\n') chptr++;
-	*chptr = '\0';
-	next = chptr + 1;
-
-	/* get rid of anything which is not alpha */
-	while (!(isalpha(*start))) start++;
-
-	model = NULL;
-	    
-	if (!strncmp("i2o/", start, 4))
-	   model = "I2O Block Device";
-
-	if (model) {
-	    i = 0;
-	    while(!(isspace(*start))) {
-		ctl[i] = *start;
-		i++;
-		start++;
-	    }
-	    ctl[i] = '\0';
-	    if (i < 1) { 
-		free (buf);
-		return 1; 
-	    }
-	    /* We don't want partitions just the disks ! */
-	    if (!isdigit(ctl[i-1])){
-		if (!deviceKnown(devices, ctl)) {
-		    newDevice.name = strdup(ctl);
-		    newDevice.model = strdup(model);
-		    newDevice.class = CLASS_HD;
-		    addDevice(devices, newDevice);
-		}
-	    }
-	} /* end of if it is an /proc/partition device */
-	start = next;
-	end = start + strlen(start);
-    } /* end of while */
- bye:
-    free (buf);
-    return 0;
-}
-
-#ifdef WITH_ATARAID
-static int ataraidGetDevices(struct knownDevices * devices) {
-    struct kddevice newDevice;
-    int fd, i;
-    char *buf;
-    char * start, *chptr, *next, *end, *model;
-    char ctl[40];
-
-    return 0;
-
-    /* since the ataraid stuff doesn't have its own proc file, we have
-     * to use /proc/partitions and be "smart" for now */
-    /* the following is bsaed on the /proc/partitions reading code above,
-     * but can hopefully be replaced by a nice ataraid probe at some point */
-    fd = open("/proc/partitions", O_RDONLY);
-    if (fd < 0) 
-        {
-            fprintf(stderr, "failed to open /proc/partitions!\n");
-            return 1;
-        }
-
-    i = readFD(fd, &buf);
-    if (i < 1) {
-        close(fd);
-        free (buf);
-        /*fprintf(stderr, "error reading /proc/partitions!\n");*/
-        return 1;
-    }
-    close(fd);
-    buf[i] = '\0';
-
-    /* skip the first two lines */
-    start = strchr(buf, '\n');
-    if (!start) goto bye;
-
-    start = strchr(start + 1, '\n');
-    if (!start) goto bye;
-
-    start++;
-    end = start + strlen(start);
-    while (*start && start < end) {
-        /* parse till end of line and store the start of next line. */
-        chptr = start;
-        while (*chptr != '\n') chptr++;
-        *chptr = '\0';
-        next = chptr + 1;
-
-        /* get rid of anything which is not alpha */
-        while (!(isalpha(*start))) start++;
-
-        model = NULL;
-            
-        if (!strncmp("ataraid/", start, 8)) 
-            model = "ATARAID Block Device";
-
-        if (model) {
-            i = 0;
-            while(!(isspace(*start))) {
-                ctl[i] = *start;
-                i++;
-                start++;
-            }
-            ctl[i] = '\0';
-            if (i < 1) { 
-                free (buf);
-                return 1; 
-            }
-        
-            /* we just want the disks.  form is ataraid/d0p12 */
-            for (i = strlen(ctl); i > 0; i--) {
-              if (isdigit(ctl[i - 1]))
-                continue;
-              if (ctl[i - 1] == 'p')
-                break;
-              if (ctl[i - 1] == 'd') {
-                if (!deviceKnown(devices, ctl)) {
-                    newDevice.name = strdup(ctl);
-                    newDevice.model = strdup(model);
-                    newDevice.class = CLASS_HD;
-                    addDevice(devices, newDevice);
-                }
-              }
-            }
-        } /* end of if it is an /proc/partition device */
-        start = next;
-        end = start + strlen(start);
-    } /* end of while */
- bye:
-    free (buf);
-    return 0;
-}
-#endif
-
-
-static int CompaqSmartArray5300GetDevices(struct knownDevices * devices) {
-    struct kddevice newDevice;
-    FILE *f;
-    char buf[256];
-    char *ptr;
-    int ctlNum = 0;
-    char ctl[64];
-    char *path;
-	
-    path = "/proc/driver/cciss";
-
-    sprintf(ctl, "%s/cciss%d", path, ctlNum++);
-		
-    f = fopen(ctl, "r");
-    if (!f) {
-	    path = "/proc/cciss";
-	    sprintf(ctl, "%s/cciss%d", path, ctlNum++);
-	    f = fopen(ctl, "r");
-    }
-
-    while (f) {
-	while (fgets(buf, sizeof(buf) - 1, f)) {
-	    if (!strncmp(buf, "cciss/", 6)) {
-		ptr = strchr(buf, ':');
-		*ptr = '\0';
-
-		if (!deviceKnown(devices, buf)) {
-		    newDevice.name = strdup(buf);
-		    newDevice.model = strdup("Compaq RAID logical disk");
-		    newDevice.class = CLASS_HD;
-		    addDevice(devices, newDevice);
-		}
-	    }
-	}
-	sprintf(ctl, "%s/cciss%d", path, ctlNum++);
-	fclose(f);
-	f = fopen (ctl, "r");
-    }
-
-    
-    return 0;
-}
-
-static int viodGetDevices(struct knownDevices * devices) {
-    if (access("/proc/iSeries", X_OK))
-	return 0;
-
-    vioGetCdDevs(devices);
-    vioGetDasdDevs(devices);
-
-    return 0;
-}
-
-
-
-
-
diff --git a/isys/probe.h b/isys/probe.h
deleted file mode 100644
index a4f42eb94..000000000
--- a/isys/probe.h
+++ /dev/null
@@ -1,99 +0,0 @@
-#ifndef H_PROBE
-#define H_PROBE
-
-#include <sys/types.h>
-#include "kudzu/kudzu.h"
-
-#define DASD_IOCTL_LETTER 'D'
-#define BIODASDINFO    _IOR(DASD_IOCTL_LETTER,1,dasd_information_t)
-
-struct kddevice {
-    char * name;		/* malloced */
-    char * model;
-    enum deviceClass class;
-    int code;
-};
-
-struct knownDevices {
-    struct kddevice * known;
-    int numKnown;
-    int numKnownAlloced;
-};
-
-#if defined(__s390__) || defined(__s390x__)
-/*
- * struct dasd_information_t
- * represents any data about the data, which is visible to userspace
- */
-typedef struct dasd_information_t {
-        unsigned int devno; /* S/390 devno */
-        unsigned int real_devno; /* for aliases */
-        unsigned int schid; /* S/390 subchannel identifier */
-        unsigned int cu_type  : 16; /* from SenseID */
-        unsigned int cu_model :  8; /* from SenseID */
-        unsigned int dev_type : 16; /* from SenseID */
-        unsigned int dev_model : 8; /* from SenseID */
-        unsigned int open_count;
-        unsigned int req_queue_len;
-        unsigned int chanq_len;
-        char type[4]; /* from discipline.name, 'none' for unknown */
-        unsigned int status; /* current device level */
-        unsigned int label_block; /* where to find the VOLSER */
-        unsigned int FBA_layout; /* fixed block size (like AIXVOL) */
-        unsigned int characteristics_size;
-        unsigned int confdata_size;
-        char characteristics[64]; /* from read_device_characteristics */
-        char configuration_data[256]; /* from read_configuration_data */
-} dasd_information_t;
-
-typedef struct cchhb
-{
-        u_int16_t cc;
-        u_int16_t hh;
-        u_int8_t b;
-} __attribute__ ((packed)) cchhb_t;
-
-typedef struct volume_label
-{
-        char volkey[4];         /* volume key = volume label                 */
-        char vollbl[4];         /* volume label                              */
-        char volid[6];          /* volume identifier                         */
-        u_int8_t security;              /* security byte                             */
-        cchhb_t vtoc;           /* VTOC address                              */
-        char res1[5];           /* reserved                                  */
-        char cisize[4];         /* CI-size for FBA,...                       */
-                                /* ...blanks for CKD                         */
-        char blkperci[4];       /* no of blocks per CI (FBA), blanks for CKD */
-        char labperci[4];       /* no of labels per CI (FBA), blanks for CKD */
-        char res2[4];           /* reserved                                  */
-        char lvtoc[14];         /* owner code for LVTOC                      */
-        char res3[29];          /* reserved                                  */
-} __attribute__ ((packed)) volume_label_t;
-#endif
-
-
-/* 0 if the device should be filtered from the list, 1 if it should be 
-   included */
-typedef int (*kdFilterType)(const struct kddevice * dev);
-
-struct knownDevices kdInit(void);
-int kdFindNetList(struct knownDevices * devices, int code);
-int kdFindDasdList(struct knownDevices * devices, int code);
-int kdFindIdeList(struct knownDevices * devices, int code);
-int kdFindFilteredIdeList(struct knownDevices * devices, int code, 
-			  kdFilterType filter);
-int kdFindScsiList(struct knownDevices * devices, int code);
-void kdFree(struct knownDevices * devices);
-void kdAddDevice(struct knownDevices * devices, enum deviceClass devClass, 
-		 char * devName, char * devModel);
-char *getDasdPorts();
-int isLdlDasd(char * dev);
-
-int vioGetDasdDevs(struct knownDevices * devices);
-int vioGetCdDevs(struct knownDevices * devices);
-
-int readFD (int fd, char **buf);
-void addDevice(struct knownDevices * devices, struct kddevice dev);
-int deviceKnown(struct knownDevices * devices, char * dev);
-int isUsableDasd(char *device);
-#endif
diff --git a/isys/vio.c b/isys/vio.c
index 8917c455f..c03896acd 100644
--- a/isys/vio.c
+++ b/isys/vio.c
@@ -16,160 +16,6 @@
 #include <unistd.h>
 
 #include <kudzu/kudzu.h>
-#include "probe.h"
-
-int vioGetCdDevs(struct knownDevices * devices) {
-#if !defined(__powerpc__)
-    return 0;
-#else
-    int fd, i;
-    char * buf, * start, * end, * chptr, * next, * model, * ptr;
-    int ctlNum = 0;
-    char ctl[64];
-    struct kddevice newDevice;
-
-    if (access("/proc/iSeries/viocd", R_OK))
-	return 0;
-
-    /* Read from /proc/iSeries/viocd */
-    fd = open("/proc/iSeries/viocd", O_RDONLY);
-    if (fd < 0) {
-	fprintf(stderr, "failed to open /proc/iSeries/viocd!\n");
-	return 1;
-    }
-
-    i = readFD(fd, &buf);
-    if (i < 1) {
-        close(fd);
-	fprintf(stderr, "error reading /proc/iSeries/viocd!\n");
-        return 1;
-    }
-    close(fd);
-    buf[i] = '\0';
-
-    start = buf;
-    end = start + strlen(start);
-    while (*start && start < end) {
-	/* parse till end of line and store the start of next line. */
-	chptr = start;
-	while (*chptr != '\n') chptr++;
-	*chptr = '\0';
-	next = chptr + 1;
-
-	/* get rid of anything which is not alpha */
-	while (!(isalpha(*start))) start++;
-
-	model = NULL;
-	if (!strncmp("viocd", start, 5))
-	    model = "IBM Virtual CDROM";
-
-	if (model) {
-	    start += 13;
-	    ptr = strchr(start, ' ');
-	    *ptr++ = '\0';
-	    
-	    ctlNum = atoi(start);
-
-	    chptr = strstr(ptr, "type ") + 5;
-	    ptr = strchr(chptr, ',');
-	    *ptr = '\0';
-
-	    model = alloca((20 + strlen(chptr)) * sizeof(char *));
-	    sprintf(model, "IBM Virtual CD-ROM Model %s", chptr);
-	    snprintf(ctl, 63, "iseries/vcd%c", ctlNum + 'a');
-
-	    if (!deviceKnown(devices, ctl)) {
-	      newDevice.name = strdup(ctl);
-	      newDevice.model = strdup(model);
-	      newDevice.class = CLASS_CDROM;
-	      addDevice(devices, newDevice);
-	    }
-	    //	    printf("model is %s, ctl is %s\n", model, ctl);
-	}
-
-	start = next;
-	end = start + strlen(start);
-    } /* end of while */
-
-    free (buf);
-    return 0;
-#endif
-}
-
-int vioGetDasdDevs(struct knownDevices * devices) {
-#if !defined(__powerpc__)
-    return 0;
-#else
-    int fd, i;
-    char * buf, * start, * end, * chptr, * next, * model, * ptr;
-    int ctlNum = 0;
-    char ctl[64];
-    struct kddevice newDevice;
-
-    if (access("/proc/iSeries/viodasd", R_OK))
-	return 0;
-
-    /* Read from /proc/iSeries/viodasd */
-    fd = open("/proc/iSeries/viodasd", O_RDONLY);
-    if (fd < 0) {
-	fprintf(stderr, "failed to open /proc/iSeries/viodasd!\n");
-	return 1;
-    }
-
-    i = readFD(fd, &buf);
-    if (i < 1) {
-        close(fd);
-	fprintf(stderr, "error reading /proc/iSeries/viodasd!\n");
-        return 1;
-    }
-    close(fd);
-    buf[i] = '\0';
-
-    start = buf;
-    end = start + strlen(start);
-    while (*start && start < end) {
-	/* parse till end of line and store the start of next line. */
-	chptr = start;
-	while (*chptr != '\n') chptr++;
-	*chptr = '\0';
-	next = chptr + 1;
-
-	/* get rid of anything which is not alpha */
-	while (!(isalpha(*start))) start++;
-
-	model = NULL;
-	if (!strncmp("DISK ", start, 5))
-	    model = "IBM Virtual DASD";
-
-	if (model) {
-	    chptr = start += 5;
-	    ptr = strchr(chptr, ' ');
-	    *ptr = '\0';
-	    ctlNum = atoi(chptr);
-
-	    if (ctlNum <= 26) {
-		snprintf(ctl, 63, "iseries/vd%c", 'a' + ctlNum);
-	    } else {
-		snprintf(ctl, 63, "iseries/vda%c", 'a' + ctlNum - 26);
-	    }
-	   
-	    if (!deviceKnown(devices, ctl)) {
-	      newDevice.name = strdup(ctl);
-	      newDevice.model = strdup(model);
-	      newDevice.class = CLASS_HD;
-	      addDevice(devices, newDevice);
-	    }
-	    //	    printf("model is %s, ctl is %s\n", model, ctl);
-	}
-
-	start = next;
-	end = start + strlen(start);
-    } /* end of while */
-
-    free (buf);
-    return 0;
-#endif
-}
 
 int isVioConsole(void) {
 #if !defined(__powerpc__)