Attachment 148285 Details for Bug 194345 – this patches the file files/patch-hald_freebsd_probing_probe-video4linux.c

[patch] this patches the file files/patch-hald_freebsd_probing_probe-video4linux.c

p1 (text/plain), 1.53 KB, created by lenzi.sergio on 2014-10-14 03:04:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lenzi.sergio

Created: 2014-10-14 03:04:49 UTC

Size: 1.53 KB

patch

obsolete

>diff -up ./patch-hald_freebsd_probing_probe-video4linux.c.orig ./patch-hald_freebsd_probing_probe-video4linux.c
>--- ./patch-hald_freebsd_probing_probe-video4linux.c.orig	2014-10-13 17:43:05.562784510 -0300
>+++ ./patch-hald_freebsd_probing_probe-video4linux.c	2014-10-13 17:46:28.527621221 -0300
>@@ -1,6 +1,6 @@
>---- hald/freebsd/probing/probe-video4linux.c.orig	2010-02-21 14:51:01.000000000 -0500
>-+++ hald/freebsd/probing/probe-video4linux.c	2010-02-21 14:54:51.000000000 -0500
>-@@ -0,0 +1,225 @@
>+--- hald/freebsd/probing/probe-video4linux.c.orig	2014-10-03 22:48:53.887627582 -0300
>++++ hald/freebsd/probing/probe-video4linux.c	2014-10-12 23:37:47.263963719 -0300
>+@@ -0,0 +1,218 @@
> +/***************************************************************************
> + * CVSID: $Id$
> + *
>@@ -87,17 +87,6 @@
> +		return -1;
> +	}
> +	g_free (contents);
>-+
>-+	len = 4;
>-+	sysctlnametomib ("kern.proc.pid", mib, &len);
>-+
>-+	len = sizeof(struct kinfo_proc);
>-+	mib[3] = pid;
>-+
>-+	/* This is just a rough test. */
>-+	if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1)
>-+		return -1;
>-+
> +	return i;
> +}
> +
>@@ -110,6 +99,7 @@
> +	int bus = -1;
> +	int addr = -1;
> +	int intf = -1;
>++	//int i;
> +	char *device_file = NULL;
> +	char *busstr;
> +	char *addrstr;
>@@ -118,6 +108,7 @@
> +	struct v4l2_capability v2cap;
> +	LibHalChangeSet *cset;
> +
>++
> +	if (! hfp_init (argc, argv))
> +		goto out;
> +
>@@ -134,6 +125,8 @@
> +	bus = atoi (busstr);
> +	addr = atoi (addrstr);
> +	intf = atoi (intfstr);
>++
>++	//g_message("bus:%d, addr=%d, intf=%d",bus,addr,intf);
> +	if (intf != 0)
> +		goto out;
> +

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 194345: 148285