Attachment 153421 Details for Bug 218783 – patch to fix usb floppy being detected as hard disk

[patch] patch to fix usb floppy being detected as hard disk

kudzu_fix_usb_floppy_as_HD.patch (text/plain), 1.50 KB, created by Sandeep K. Shandilya on 2007-04-25 14:25:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sandeep K. Shandilya

Created: 2007-04-25 14:25:18 UTC

Size: 1.50 KB

patch

obsolete

>--- kudzu-1.1.95.22-orig/scsi.c	2006-11-22 05:18:56.000000000 +0530
>+++ kudzu-1.1.95.22/scsi.c	2007-04-10 19:04:04.000000000 +0530
>@@ -348,6 +348,8 @@
>     struct device * devend = NULL, *devhead = NULL;
>     int missingHosts[256];
>     int numMissingHosts = 0;
>+    DIR *dir;
>+    struct dirent *dp;
>     
>     if (
> 	(probeClass & CLASS_OTHER) ||
>@@ -532,31 +534,24 @@
> 		newdev->desc = strdup(linebuf);
> 		
> 		i = 0;
>-		while (1) {
>-			snprintf(path,63, "/proc/scsi/usb-storage-%d", i);
>-			if (stat(path, &sb)) break;
>-			snprintf(path,63, "/proc/scsi/usb-storage-%d/%d", i, newdev->host);
>-			i++;
>-			fd = open(path, O_RDONLY);
>-			if (fd < 0) continue;
>-			memset(buf, '\0', sizeof(buf));
>-			rc = read(fd, buf, 16384);
>-			if (rc <= 0) continue;
>-			buf[rc-1] = '\0';
>-			close(fd);
>-			if (strstr(buf, "Protocol: Uniform Floppy Interface (UFI)")) {
>-			  newdev->type = CLASS_FLOPPY;
>-			}
>-			break;
>-		}
>-
>+		snprintf(path,63,"/proc/scsi/usb-storage/%d",newdev->host);
>+		fd = open(path, O_RDONLY);
>+		if ( fd > 0) { 
>+		   memset(buf, '\0', sizeof(buf));
>+		   rc = read(fd, buf, 16384);
>+		   if (rc <= 0) continue;
>+		   buf[rc-1] = '\0';
>+		   close(fd);
>+		   if (strstr(buf, "Protocol: Uniform Floppy Interface (UFI)")) {
>+		      newdev->type = CLASS_FLOPPY;
>+	           }
>+                }
> 		for (i = 0; i < numMissingHosts; i++) {
> 		    if (missingHosts[i] == newdev->host) {
> 			newdev->detached = 1;
> 			break;
> 		    }
> 		}
>-
> 		newdev->next = NULL;
> 		if (devend)
> 		      devend->next = (struct device *)newdev;

Actions: View | Diff

Attachments on bug 218783: 144900 | 153421 | 153454 | 156922