diff options
author | Lars Engels <lme@FreeBSD.org> | 2009-05-28 18:53:53 +0000 |
---|---|---|
committer | Lars Engels <lme@FreeBSD.org> | 2009-05-28 18:53:53 +0000 |
commit | 3d642d5919a37532457845efe9cb9d5cb0b86fa9 (patch) | |
tree | 70f4f5d21f2e58fb18c03834811064cd4039354f /multimedia/pwcbsd/files/patch-pwc-ctrl.c | |
parent | Make fetchable again by upgrading to 7.5.11. (diff) |
- Fix build on 7.x
- Mark BROKEN for older 8-CURRENT
- Bump PORTREVISION
Diffstat (limited to 'multimedia/pwcbsd/files/patch-pwc-ctrl.c')
-rw-r--r-- | multimedia/pwcbsd/files/patch-pwc-ctrl.c | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/multimedia/pwcbsd/files/patch-pwc-ctrl.c b/multimedia/pwcbsd/files/patch-pwc-ctrl.c deleted file mode 100644 index 73bd0e74c71e..000000000000 --- a/multimedia/pwcbsd/files/patch-pwc-ctrl.c +++ /dev/null @@ -1,50 +0,0 @@ ---- 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) |