X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=carlfw%2Fusb%2Fusb.c;h=aedf30d1404830bb989e9ba8caeb4a459aee5fc1;hp=0d339801e4767572968bab4ee1586bbe2295165d;hb=f99b6fd51bf8429eaad357ac9c7149a92f719628;hpb=12d3f1ba6ba522cd1ef11483d813fe2c2e64f04b diff --git a/carlfw/usb/usb.c b/carlfw/usb/usb.c index 0d33980..aedf30d 100644 --- a/carlfw/usb/usb.c +++ b/carlfw/usb/usb.c @@ -19,8 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with this program; If not, see . */ #include "carl9170.h" #include "usb.h" @@ -159,15 +158,14 @@ static struct ar9170_usb_config usb_config_fullspeed = { .bLength = USB_DT_ENDPOINT_SIZE, .bDescriptorType = USB_DT_ENDPOINT, .bEndpointAddress = USB_DIR_OUT | AR9170_USB_EP_CMD, - .bmAttributes = USB_ENDPOINT_XFER_INT, + .bmAttributes = USB_ENDPOINT_XFER_BULK, .wMaxPacketSize = cpu_to_le16(64), .bInterval = 1, }, }, }; -#ifdef CONFIG_CARL9170FW_USB_MODESWITCH -static void usb_reset_eps(void) +void usb_reset_eps(void) { unsigned int i; @@ -175,6 +173,7 @@ static void usb_reset_eps(void) for (i = 1; i < __AR9170_USB_NUM_MAX_EP; i++) { usb_set_input_ep_toggle(i); usb_clear_input_ep_toggle(i); + usb_clear_input_ep_stall(i); } /* @@ -184,12 +183,10 @@ static void usb_reset_eps(void) for (i = 1; i < __AR9170_USB_NUM_MAX_EP; i++) { usb_set_output_ep_toggle(i); usb_clear_output_ep_toggle(i); + usb_clear_output_ep_stall(i); } } -#endif /* CONFIG_CARL9170FW_USB_MODESWITCH */ - -#ifdef CONFIG_CARL9170FW_USB_INIT_FIRMWARE static void usb_pta_init(void) { unsigned int usb_dma_ctrl = 0; @@ -251,13 +248,10 @@ static void usb_pta_init(void) set(AR9170_USB_REG_DMA_CTL, usb_dma_ctrl); } -#endif /* CONFIG_CARL9170FW_USB_INIT_FIRMWARE */ void usb_init(void) { -#ifdef CONFIG_CARL9170FW_USB_INIT_FIRMWARE usb_pta_init(); -#endif /* CONFIG_CARL9170FW_USB_INIT_FIRMWARE */ fw.usb.config = 1; /* @@ -341,7 +335,30 @@ static int usb_get_status(const struct usb_ctrlrequest *ctrl) status = cpu_to_le16(0); break; - case USB_RECIP_ENDPOINT: + case USB_RECIP_ENDPOINT: { + unsigned int ep = le16_to_cpu(ctrl->wIndex) & 0xf; + unsigned int dir = le16_to_cpu(ctrl->wIndex) & USB_DIR_MASK; + + if (ep == 0) { + status = !!(getb(AR9170_USB_REG_CX_CONFIG_STATUS) & BIT(2)); + } else { + unsigned int addr; + + if (dir == USB_DIR_IN) + addr = AR9170_USB_REG_EP_IN_MAX_SIZE_HIGH; + else + addr = AR9170_USB_REG_EP_OUT_MAX_SIZE_HIGH; + + addr += (ep << 1); + + /* + * AR9170_USB_EP_OUT_STALL == AR9170_USB_EP_IN_STALL + * so it doesn't matter which one we use + */ + status = !!(getb(addr) & AR9170_USB_EP_OUT_STALL); + } + break; + } case USB_RECIP_OTHER: default: break; @@ -482,7 +499,7 @@ static int usb_get_configuration(const struct usb_ctrlrequest *ctrl) if (USB_CHECK_REQTYPE(ctrl, USB_RECIP_DEVICE, USB_DIR_IN)) return -1; - return usb_ep0tx_data(&fw.usb.config, 1); + return usb_ep0tx_data(&fw.usb.config, fw.usb.config); } static int usb_set_configuration(const struct usb_ctrlrequest *ctrl) @@ -498,10 +515,11 @@ static int usb_set_configuration(const struct usb_ctrlrequest *ctrl) /* Disable Device */ andb(AR9170_USB_REG_DEVICE_ADDRESS, (uint8_t) ~(AR9170_USB_DEVICE_ADDRESS_CONFIGURE)); -#ifdef CONFIG_CARL9170FW_USB_MODESWITCH + /* fall through */ case 1: fw.usb.config = config; +#ifdef CONFIG_CARL9170FW_USB_MODESWITCH if (usb_detect_highspeed()) { /* High Speed Configuration */ usb_init_highspeed_fifo_cfg(); @@ -509,25 +527,20 @@ static int usb_set_configuration(const struct usb_ctrlrequest *ctrl) /* Full Speed Configuration */ usb_init_fullspeed_fifo_cfg(); } - break; + /* usb_pta_init() ? */ +#endif /* CONFIG_CARL9170FW_USB_MODESWITCH */ - default: - return -1; - } - /* usb_pta_init() ? */ + usb_reset_eps(); + orb(AR9170_USB_REG_DEVICE_ADDRESS, + (AR9170_USB_DEVICE_ADDRESS_CONFIGURE)); - usb_reset_eps(); - orb(AR9170_USB_REG_DEVICE_ADDRESS, - (AR9170_USB_DEVICE_ADDRESS_CONFIGURE)); + usb_enable_global_int(); + usb_trigger_out(); + return 1; - usb_enable_global_int(); - usb_trigger_out(); - return 1; -#else default: return -1; } -#endif /* CONFIG_CARL9170FW_USB_MODESWITCH */ } static int usb_set_address(const struct usb_ctrlrequest *ctrl) @@ -575,7 +588,8 @@ static int usb_get_interface(const struct usb_ctrlrequest *ctrl) static int usb_manipulate_feature(const struct usb_ctrlrequest *ctrl, bool __unused clear) { unsigned int feature; - if (USB_CHECK_REQTYPE(ctrl, USB_RECIP_DEVICE, USB_DIR_OUT)) + + if ((ctrl->bRequestType & USB_DIR_MASK) != USB_DIR_OUT) return -1; if (usb_configured() == false) @@ -583,19 +597,61 @@ static int usb_manipulate_feature(const struct usb_ctrlrequest *ctrl, bool __unu feature = le16_to_cpu(ctrl->wValue); + switch (ctrl->bRequestType & USB_RECIP_MASK) { + case USB_RECIP_DEVICE: { #ifdef CONFIG_CARL9170FW_WOL - if (feature & USB_DEVICE_REMOTE_WAKEUP) { + if (feature & USB_DEVICE_REMOTE_WAKEUP) { + if (clear) + usb_disable_remote_wakeup(); + else + usb_enable_remote_wakeup(); + } +#endif /* CONFIG_CARL9170FW_WOL */ + if (clear) - usb_disable_remote_wakeup(); + fw.usb.device_feature &= ~feature; else - usb_enable_remote_wakeup(); - } -#endif /* CONFIG_CARL9170FW_WOL */ + fw.usb.device_feature |= feature; + + + break; + } + + case USB_RECIP_ENDPOINT: { + unsigned int ep, dir; + + ep = le16_to_cpu(ctrl->wIndex) & 0xf; + dir = le16_to_cpu(ctrl->wIndex) & USB_DIR_MASK; + if (ep == 0) { + /* According to the spec, EP cannot be stopped this way. */ + return -1; + } else { + unsigned int addr; + + if (dir == USB_DIR_IN) + addr = AR9170_USB_REG_EP_IN_MAX_SIZE_HIGH; + else + addr = AR9170_USB_REG_EP_OUT_MAX_SIZE_HIGH; + + addr += (ep << 1); - if (clear) - fw.usb.device_feature &= ~feature; - else - fw.usb.device_feature |= feature; + if (clear) + andb(addr, ~AR9170_USB_EP_OUT_STALL); + else + orb(addr, AR9170_USB_EP_OUT_STALL); + } + break; + } + + case USB_RECIP_INTERFACE: + /* + * the current USB Specification Revision 2 + * specifies no interface features. + */ + + default: + return -1; + } return 1; } @@ -649,7 +705,7 @@ static int usb_standard_command(const struct usb_ctrlrequest *ctrl __unused) case USB_REQ_CLEAR_FEATURE: case USB_REQ_SET_FEATURE: - usb_manipulate_feature(ctrl, ctrl->bRequest == USB_REQ_CLEAR_FEATURE); + status = usb_manipulate_feature(ctrl, ctrl->bRequest == USB_REQ_CLEAR_FEATURE); break; case USB_REQ_SET_ADDRESS: