diff options
| author | Lars Engels <lme@FreeBSD.org> | 2009-05-27 18:31:56 +0000 |
|---|---|---|
| committer | Lars Engels <lme@FreeBSD.org> | 2009-05-27 18:31:56 +0000 |
| commit | 7349eb0b67f03ff7feb06786ff95e25efaf578e8 (patch) | |
| tree | 1ce0a7e6e1656a5ccea62e49deb9c96092008690 /multimedia/pwcbsd/files/patch-pwc-ctrl.c | |
| parent | fix compilation if the old sane version is still installed (diff) | |
- Add patches to fix build with USB2
- Bump PORTREVISION
Patches Submitted by: hps
Notes
Notes:
svn path=/head/; revision=234670
Diffstat (limited to 'multimedia/pwcbsd/files/patch-pwc-ctrl.c')
| -rw-r--r-- | multimedia/pwcbsd/files/patch-pwc-ctrl.c | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/multimedia/pwcbsd/files/patch-pwc-ctrl.c b/multimedia/pwcbsd/files/patch-pwc-ctrl.c new file mode 100644 index 000000000000..73bd0e74c71e --- /dev/null +++ b/multimedia/pwcbsd/files/patch-pwc-ctrl.c @@ -0,0 +1,50 @@ +--- pwc-ctrl.c.orig 2007-07-02 08:54:19.000000000 +0200 ++++ pwc-ctrl.c 2009-05-27 20:22:49.137318240 +0200 +@@ -130,7 +130,7 @@ + static void pwc_set_image_buffer_size(struct pwc_softc *pdev); + + /****************************************************************************/ +-static int usb_control_msg(usbd_device_handle udev,u_int pipe,u_int8_t request,u_int8_t requesttype, ++static int usb_control_msg(struct usb2_device *udev,u_int pipe,u_int8_t request,u_int8_t requesttype, + u_int16_t value, u_int16_t index, void *data, u_int16_t size,int timeout) + { + usb_device_request_t req; +@@ -139,9 +139,9 @@ + USETW(req.wValue, value); + USETW(req.wIndex, index); + USETW(req.wLength,size); +- return -usbd_do_request(udev, &req, data); ++ return -usb2_do_request(udev, NULL, &req, data); + } +- ++ + + #define SendControlMsg(request, value, buflen) \ + usb_control_msg(pdev->udev, 0, \ +@@ -159,7 +159,7 @@ + pdev->vcinterface, \ + &buf, buflen, 500) + +-static int send_video_command(usbd_device_handle udev, int index, void *buf, int buflen) ++static int send_video_command(struct usb2_device *udev, int index, void *buf, int buflen) + { + return usb_control_msg(udev, + 0, +@@ -1150,7 +1150,7 @@ + pdev->pan_angle += pan; + pdev->tilt_angle += tilt; + } +- if (ret == -USBD_STALLED) /* stall -> out of range */ ++ if (ret == -USB_ERR_STALLED) /* stall -> out of range */ + ret = -ERANGE; + return ret; + } +@@ -1284,7 +1284,7 @@ + { + ARG_DEF(struct pwc_probe, probe) + +- strncpy(ARGR(probe).name, pdev->name,sizeof(ARGR(probe).name) - 1); ++ strncpy(ARGR(probe).name,device_get_desc(pdev->sc_dev),sizeof(ARGR(probe).name) - 1); + ARGR(probe).name[sizeof(ARGR(probe).name) - 1] = '\0'; + ARGR(probe).type = pdev->type; + ARG_OUT(probe) |