|
Lines 1-6
Link Here
|
| 1 |
--- hald/freebsd/probing/probe-video4linux.c.orig 2010-02-21 14:51:01.000000000 -0500 |
1 |
--- hald/freebsd/probing/probe-video4linux.c.orig 2014-10-03 22:48:53.887627582 -0300 |
| 2 |
+++ hald/freebsd/probing/probe-video4linux.c 2010-02-21 14:54:51.000000000 -0500 |
2 |
+++ hald/freebsd/probing/probe-video4linux.c 2014-10-12 23:37:47.263963719 -0300 |
| 3 |
@@ -0,0 +1,225 @@ |
3 |
@@ -0,0 +1,218 @@ |
| 4 |
+/*************************************************************************** |
4 |
+/*************************************************************************** |
| 5 |
+ * CVSID: $Id$ |
5 |
+ * CVSID: $Id$ |
| 6 |
+ * |
6 |
+ * |
|
Lines 87-103
Link Here
|
| 87 |
+ return -1; |
87 |
+ return -1; |
| 88 |
+ } |
88 |
+ } |
| 89 |
+ g_free (contents); |
89 |
+ g_free (contents); |
| 90 |
+ |
|
|
| 91 |
+ len = 4; |
| 92 |
+ sysctlnametomib ("kern.proc.pid", mib, &len); |
| 93 |
+ |
| 94 |
+ len = sizeof(struct kinfo_proc); |
| 95 |
+ mib[3] = pid; |
| 96 |
+ |
| 97 |
+ /* This is just a rough test. */ |
| 98 |
+ if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1) |
| 99 |
+ return -1; |
| 100 |
+ |
| 101 |
+ return i; |
90 |
+ return i; |
| 102 |
+} |
91 |
+} |
| 103 |
+ |
92 |
+ |
|
Lines 110-115
Link Here
|
| 110 |
+ int bus = -1; |
99 |
+ int bus = -1; |
| 111 |
+ int addr = -1; |
100 |
+ int addr = -1; |
| 112 |
+ int intf = -1; |
101 |
+ int intf = -1; |
|
|
102 |
+ //int i; |
| 113 |
+ char *device_file = NULL; |
103 |
+ char *device_file = NULL; |
| 114 |
+ char *busstr; |
104 |
+ char *busstr; |
| 115 |
+ char *addrstr; |
105 |
+ char *addrstr; |
|
Lines 118-123
Link Here
|
| 118 |
+ struct v4l2_capability v2cap; |
108 |
+ struct v4l2_capability v2cap; |
| 119 |
+ LibHalChangeSet *cset; |
109 |
+ LibHalChangeSet *cset; |
| 120 |
+ |
110 |
+ |
|
|
111 |
+ |
| 121 |
+ if (! hfp_init (argc, argv)) |
112 |
+ if (! hfp_init (argc, argv)) |
| 122 |
+ goto out; |
113 |
+ goto out; |
| 123 |
+ |
114 |
+ |
|
Lines 134-139
Link Here
|
| 134 |
+ bus = atoi (busstr); |
125 |
+ bus = atoi (busstr); |
| 135 |
+ addr = atoi (addrstr); |
126 |
+ addr = atoi (addrstr); |
| 136 |
+ intf = atoi (intfstr); |
127 |
+ intf = atoi (intfstr); |
|
|
128 |
+ |
| 129 |
+ //g_message("bus:%d, addr=%d, intf=%d",bus,addr,intf); |
| 137 |
+ if (intf != 0) |
130 |
+ if (intf != 0) |
| 138 |
+ goto out; |
131 |
+ goto out; |
| 139 |
+ |
132 |
+ |