diff options
Diffstat (limited to 'at76_usb.c')
| -rw-r--r-- | at76_usb.c | 44 |
1 files changed, 24 insertions, 20 deletions
@@ -539,9 +539,10 @@ static inline void at76_free_bss_list(struct at76_priv *priv) static int at76_remap(struct usb_device *udev) { int ret; - ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), - 0x0a, INTERFACE_VENDOR_REQUEST_OUT, - 0, 0, NULL, 0, USB_CTRL_GET_TIMEOUT); + ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x0a, + USB_TYPE_VENDOR | USB_DIR_OUT | + USB_RECIP_INTERFACE, 0, 0, NULL, 0, + USB_CTRL_GET_TIMEOUT); if (ret < 0) return ret; return 0; @@ -552,9 +553,10 @@ static int at76_get_op_mode(struct usb_device *udev) int ret; u8 op_mode; - ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), - 0x33, INTERFACE_VENDOR_REQUEST_IN, - 0x01, 0, &op_mode, 1, USB_CTRL_GET_TIMEOUT); + ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33, + USB_TYPE_VENDOR | USB_DIR_IN | + USB_RECIP_INTERFACE, 0x01, 0, &op_mode, 1, + USB_CTRL_GET_TIMEOUT); if (ret < 0) return ret; return op_mode; @@ -564,8 +566,8 @@ static int at76_get_op_mode(struct usb_device *udev) static inline int at76_load_ext_fw_block(struct usb_device *udev, int blockno, void *block, int size) { - return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), - 0x0e, DEVICE_VENDOR_REQUEST_OUT, + return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x0e, + USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE, 0x0802, blockno, block, size, USB_CTRL_GET_TIMEOUT); } @@ -573,9 +575,9 @@ static inline int at76_load_ext_fw_block(struct usb_device *udev, int blockno, static inline int at76_get_hw_cfg_rfmd(struct usb_device *udev, union at76_hwcfg *buf, int buf_size) { - return usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), - 0x33, INTERFACE_VENDOR_REQUEST_IN, - ((0x0a << 8) | 0x02), 0, + return usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33, + USB_TYPE_VENDOR | USB_DIR_IN | + USB_RECIP_INTERFACE, ((0x0a << 8) | 0x02), 0, buf, buf_size, USB_CTRL_GET_TIMEOUT); } @@ -583,9 +585,9 @@ static inline int at76_get_hw_cfg_rfmd(struct usb_device *udev, static inline int at76_get_hw_cfg_intersil(struct usb_device *udev, union at76_hwcfg *buf, int buf_size) { - return usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), - 0x33, INTERFACE_VENDOR_REQUEST_IN, - ((0x09 << 8) | 0x02), 0, + return usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33, + USB_TYPE_VENDOR | USB_DIR_IN | + USB_RECIP_INTERFACE, ((0x09 << 8) | 0x02), 0, buf, buf_size, USB_CTRL_GET_TIMEOUT); } @@ -676,10 +678,10 @@ static struct reg_domain const *at76_get_reg_domain(u16 code) static inline int at76_get_mib(struct usb_device *udev, u16 mib, void *buf, int buf_size) { - return usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), - 0x33, INTERFACE_VENDOR_REQUEST_IN, - mib << 8, 0, - buf, buf_size, USB_CTRL_GET_TIMEOUT); + return usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33, + USB_TYPE_VENDOR | USB_DIR_IN | + USB_RECIP_INTERFACE, mib << 8, 0, buf, buf_size, + USB_CTRL_GET_TIMEOUT); } /* Return positive number for status, negative for an error */ @@ -689,7 +691,8 @@ static inline int at76_get_cmd_status(struct usb_device *udev, u8 cmd) int ret; ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x22, - INTERFACE_VENDOR_REQUEST_IN, cmd, 0, stat_buf, + USB_TYPE_VENDOR | USB_DIR_IN | + USB_RECIP_INTERFACE, cmd, 0, stat_buf, sizeof(stat_buf), USB_CTRL_GET_TIMEOUT); if (ret < 0) return ret; @@ -760,7 +763,8 @@ static int at76_set_card_command(struct usb_device *udev, int cmd, void *buf, memcpy(cmd_buf->data, buf, buf_size); ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x0e, - DEVICE_VENDOR_REQUEST_OUT, 0, 0, cmd_buf, + USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE, + 0, 0, cmd_buf, sizeof(struct at76_command) + buf_size, USB_CTRL_GET_TIMEOUT); kfree(cmd_buf); |