1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00

Fix the build now that usb2 has been renamed.

This commit is contained in:
Joe Marcus Clarke 2009-02-24 05:49:13 +00:00
parent 02f8f4eab9
commit bb1008c45c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=228977
3 changed files with 24 additions and 10 deletions

View File

@ -1,6 +1,10 @@
--- hald/freebsd/probing/probe-hiddev.c.orig 2009-02-23 18:28:54.000000000 -0500
+++ hald/freebsd/probing/probe-hiddev.c 2009-02-23 18:51:35.000000000 -0500
@@ -28,9 +28,17 @@
--- hald/freebsd/probing/probe-hiddev.c.orig 2008-05-07 19:24:08.000000000 -0400
+++ hald/freebsd/probing/probe-hiddev.c 2009-02-24 00:42:06.000000000 -0500
@@ -25,12 +25,21 @@
# include <config.h>
#endif
+#include <sys/param.h>
#include <unistd.h>
#include <stdlib.h>
#include <fcntl.h>
@ -18,7 +22,7 @@
#include <usbhid.h>
#include "../libprobe/hfp.h"
@@ -65,7 +73,12 @@ main (int argc, char **argv)
@@ -65,7 +74,12 @@ main (int argc, char **argv)
/* give a meaningful process title for ps(1) */
setproctitle("%s", device_file);

View File

@ -1,6 +1,6 @@
--- hald/freebsd/probing/probe-usb2-device.c.orig 2009-02-18 00:06:02.000000000 -0500
+++ hald/freebsd/probing/probe-usb2-device.c 2009-02-18 00:07:31.000000000 -0500
@@ -0,0 +1,198 @@
--- hald/freebsd/probing/probe-usb2-device.c.orig 2009-02-24 00:36:27.000000000 -0500
+++ hald/freebsd/probing/probe-usb2-device.c 2009-02-24 00:39:54.000000000 -0500
@@ -0,0 +1,203 @@
+/***************************************************************************
+ * CVSID: $Id$
+ *
@ -28,6 +28,7 @@
+# include <config.h>
+#endif
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
@ -36,8 +37,12 @@
+
+#include <libusb20_desc.h>
+#include <libusb20.h>
+#if __FreeBSD_version >= 800064
+#include <dev/usb/usb_ioctl.h>
+#else
+#include <dev/usb2/include/usb2_standard.h>
+#include <dev/usb2/include/usb2_ioctl.h>
+#endif
+
+#include "../libprobe/hfp.h"
+

View File

@ -1,6 +1,6 @@
--- hald/freebsd/probing/probe-usb2-interface.c.orig 2009-02-18 00:05:44.000000000 -0500
+++ hald/freebsd/probing/probe-usb2-interface.c 2009-02-18 00:08:34.000000000 -0500
@@ -0,0 +1,135 @@
--- hald/freebsd/probing/probe-usb2-interface.c.orig 2009-02-24 00:36:27.000000000 -0500
+++ hald/freebsd/probing/probe-usb2-interface.c 2009-02-24 00:39:42.000000000 -0500
@@ -0,0 +1,140 @@
+/***************************************************************************
+ * CVSID: $Id$
+ *
@ -28,6 +28,7 @@
+# include <config.h>
+#endif
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
@ -36,8 +37,12 @@
+
+#include <libusb20_desc.h>
+#include <libusb20.h>
+#if __FreeBSD_version >= 80064
+#include <dev/usb/usb_ioctl.h>
+#else
+#include <dev/usb2/include/usb2_standard.h>
+#include <dev/usb2/include/usb2_ioctl.h>
+#endif
+
+#include "../libprobe/hfp.h"
+