diff options
| author | Lars Engels <lme@FreeBSD.org> | 2009-09-09 18:12:16 +0000 |
|---|---|---|
| committer | Lars Engels <lme@FreeBSD.org> | 2009-09-09 18:12:16 +0000 |
| commit | 0f060f5e863c5ad335c22ca081e798e6b5304a37 (patch) | |
| tree | 6d9dc74a44f5cacc63dead9500dfb5abefad2ed6 /multimedia/pwcbsd/files/extra-patch-pwc.h | |
| parent | Update to 3.2.8 (diff) | |
- Fix build on 8.x
- Bump PORTREVISION
Patch by: gj@
Diffstat (limited to 'multimedia/pwcbsd/files/extra-patch-pwc.h')
| -rw-r--r-- | multimedia/pwcbsd/files/extra-patch-pwc.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/multimedia/pwcbsd/files/extra-patch-pwc.h b/multimedia/pwcbsd/files/extra-patch-pwc.h index 5c514ba7f8fc..2797847d8e1a 100644 --- a/multimedia/pwcbsd/files/extra-patch-pwc.h +++ b/multimedia/pwcbsd/files/extra-patch-pwc.h @@ -1,17 +1,22 @@ --- pwc.h.orig 2006-09-27 07:21:01.000000000 +0200 -+++ pwc.h 2009-05-27 20:22:49.147289211 +0200 -@@ -44,8 +44,16 @@ ++++ pwc.h 2009-09-09 10:16:04.000000000 +0200 +@@ -44,8 +44,21 @@ #include <vm/pmap.h> #include <dev/usb/usb.h> -#include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> ++/* GJ +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> ++*/ + ++#include <dev/usb/usbdi.h> /* GJ */ +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> ++/* GJ +#include <dev/usb/usb_lookup.h> ++*/ +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_request.h> @@ -19,7 +24,7 @@ #include "pwc-uncompress.h" #include "pwc-ioctl.h" #include "videodev.h" -@@ -69,7 +77,7 @@ +@@ -69,7 +82,7 @@ #define TRACE_READ_VERBOSE 0x0800 #define TRACE_SEQUENCE 0x1000 @@ -28,7 +33,7 @@ #define Trace(R, A...) if (pwcdebug & R) printf(PWC_NAME " " A) #define Debug(A...) if(pwcdebug) printf(PWC_NAME " " A) extern int pwcdebug; -@@ -93,14 +101,9 @@ +@@ -93,14 +106,9 @@ #define FRAME_LOWMARK 5 /* Size and number of buffers for the ISO pipe. */ @@ -45,7 +50,7 @@ /* Frame buffers: contains compressed or uncompressed video data. */ #define MAX_FRAMES 5 -@@ -133,17 +136,17 @@ +@@ -133,17 +141,17 @@ struct pwc_softc { device_t sc_dev; @@ -53,8 +58,8 @@ - usbd_interface_handle sc_iface; - usbd_pipe_handle sc_videopipe; + -+ struct usb2_xfer *sc_xfer[MAX_ISO_BUFS]; -+ struct usb2_device *udev; ++ struct usb_xfer *sc_xfer[MAX_ISO_BUFS]; ++ struct usb_device *udev; struct cdev *sc_dev_t; struct selinfo rsel; @@ -68,7 +73,7 @@ int error_status; /* set when something goes wrong with the cam (unplugged, USB errors) */ int usb_init; /* set when the cam has been initialized over USB */ -@@ -165,7 +168,6 @@ +@@ -165,7 +173,6 @@ int vframe_count; /* received frames */ int vframes_dumped; /* counter for dumped frames */ int vframes_error; /* frames received in error */ @@ -76,7 +81,7 @@ u_int16_t vlast_packet_size; /* for frame synchronisation */ int visoc_errors; /* number of contiguous ISOC errors */ int vcompression; /* desired compression factor */ -@@ -187,15 +189,7 @@ +@@ -187,15 +194,7 @@ Note that MAX_ISO_BUFS != MAX_FRAMES != MAX_IMAGES.... We have in effect a back-to-back-double-buffer system. */ |