diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-02-24 05:49:13 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-02-24 05:49:13 +0000 |
| commit | bb1008c45caa327a1d062fde84284def927fc0be (patch) | |
| tree | ad76e8a2e733357f65de792aa5e497c3ef019f9c /sysutils/hal | |
| parent | Upgrade to 1.2.35 (diff) | |
Fix the build now that usb2 has been renamed.
Diffstat (limited to 'sysutils/hal')
3 files changed, 24 insertions, 10 deletions
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-hiddev.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-hiddev.c index 04dd6fa1a516..ee627c451795 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-hiddev.c +++ b/sysutils/hal/files/patch-hald_freebsd_probing_probe-hiddev.c @@ -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); diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-device.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-device.c index a521eab0f853..90d61c6d35bb 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-device.c +++ b/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-device.c @@ -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" + diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c index 2216c5bdfa08..477d3bab6070 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c +++ b/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c @@ -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" + |