Attachment 150593 Details for Bug 231708 – kudzu patch

[patch] kudzu patch

kudzu-juju.patch (text/plain), 1.82 KB, created by Kristian Høgsberg on 2007-03-21 15:26:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kristian Høgsberg

Created: 2007-03-21 15:26:27 UTC

Size: 1.82 KB

patch

obsolete

>--- kudzu-1.2.64/firewire.c.juju	2005-09-16 16:36:47.000000000 -0400
>+++ kudzu-1.2.64/firewire.c	2007-03-21 11:15:57.000000000 -0400
>@@ -22,6 +22,15 @@
> 
> #include "kudzuint.h"
> 
>+#define JUJU_4EVAH
>+#ifdef JUJU_4EVAH
>+#define BUS_DIR		"/sys/bus/firewire"
>+#define MODEL_NAME	"model_name"
>+#else
>+#define BUS_DIR		"/sys/bus/ieee1394"
>+#define MODEL_NAME	"model_name_kv"
>+#endif
>+
> static void firewireFreeDevice(struct firewireDevice *dev)
> {
> 	freeDevice((struct device *) dev);
>@@ -64,7 +73,7 @@
> 		struct dirent *entry;
> 		int fd;
> 		
>-		dir = opendir("/sys/bus/ieee1394/devices");
>+		dir = opendir(BUS_DIR "/devices");
> 		if (!dir)
> 			goto out;
> 		
>@@ -73,14 +82,14 @@
> 			char *specifier_id, *version;
> 			if (entry->d_name[0] == '.')
> 				continue;
>-			snprintf(path,255,"/sys/bus/ieee1394/devices/%s/specifier_id",entry->d_name);
>+			snprintf(path,255, BUS_DIR "/devices/%s/specifier_id",entry->d_name);
> 			fd = open(path, O_RDONLY);
> 			if (fd < 0)
> 				continue;
> 			specifier_id = __bufFromFd(fd);
> 			if (!specifier_id) continue;
> 			specifier_id[strlen(specifier_id) - 1] = '\0';
>-			snprintf(path,255,"/sys/bus/ieee1394/devices/%s/version",entry->d_name);
>+			snprintf(path,255, BUS_DIR "/devices/%s/version",entry->d_name);
> 			fd = open(path, O_RDONLY);
> 			if (fd < 0) {
> 				free(specifier_id);
>@@ -96,11 +105,11 @@
> 			if (!strcmp(version,"0x010483") &&
> 			    !strcmp(specifier_id,"0x00609e")) {
> 				fwdev = firewireNewDevice(NULL);
>-				fwdev->driver = strdup("sbp2");
>+				fwdev->driver = strdup("fw-sbp2");
> 				fwdev->type = CLASS_SCSI;
> 				if (devlist)
> 					fwdev->next = devlist;
>-				snprintf(path,255,"/sys/bus/ieee1394/devices/%s/model_name_kv",entry->d_name);
>+				snprintf(path,255, BUS_DIR "/devices/%s/" MODEL_NAME ,entry->d_name);
> 				fd = open(path, O_RDONLY);
> 				if (fd >= 0) {
> 					fwdev->desc = __bufFromFd(fd);

Actions: View | Diff

Attachments on bug 231708: 149774 | 149832 | 149834 | 150593 | 151215 | 151216 | 153390 | 153391 | 184241 | 195331