This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 5a7cd8bcb348cc4cfcc35268052c794b69899ddb Author: Marco Casaroli <[email protected]> AuthorDate: Tue Oct 20 21:17:57 2026 +0200 arch, drivers: Fix nxstyle errors in five files. The files have style errors that are older than the next change. Fix them so that the change can pass the style check. No functional change. Assisted-by: Claude Code:claude-opus-5-5 Signed-off-by: Marco Casaroli <[email protected]> --- arch/arm/src/kinetis/kinetis_usbdev.c | 881 +++++++++++----------- arch/arm/src/rtl8720c/amebaz_driver.c | 85 ++- arch/mips/src/pic32mx/pic32mx_usbdev.c | 831 ++++++++++---------- drivers/power/pm/activity_governor.c | 6 +- drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c | 1 + 5 files changed, 927 insertions(+), 877 deletions(-) diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c index c6d35ba1e0e..f42fb205ee4 100644 --- a/arch/arm/src/kinetis/kinetis_usbdev.c +++ b/arch/arm/src/kinetis/kinetis_usbdev.c @@ -670,7 +670,7 @@ static volatile struct usbotg_bdtentry_s g_bdt[4*KHCI_NENDPOINTS] aligned_data(512); /**************************************************************************** - * Private Private Functions + * Private Functions ****************************************************************************/ /**************************************************************************** @@ -704,6 +704,7 @@ static uint16_t khci_getreg(uint32_t addr) { uinfo("...\n"); } + return val; } } @@ -860,6 +861,7 @@ static void khci_reqreturn(struct khci_ep_s *privep, */ bool stalled = privep->stalled; + if (USB_EPNO(privep->ep.eplog) == EP0) { privep->stalled = (privep->dev->ctrlstate == CTRLSTATE_STALLED); @@ -1184,6 +1186,7 @@ static int khci_wrstart(struct khci_usbdev_s *priv, /* The current BDT is not available, check the other BDT */ volatile struct usbotg_bdtentry_s *otherbdt; + otherbdt = &g_bdt[EP(epno, EP_DIR_IN, EP_PP_EVEN)]; if (otherbdt == bdt) { @@ -2050,466 +2053,471 @@ static void khci_ep0setup(struct khci_usbdev_s *priv) switch (priv->ctrl.req) { - case USB_REQ_GETSTATUS: - { - /* type: device-to-host; recipient = device, interface, - * endpoint - * value: 0 - * index: zero interface endpoint - * len: 2; data = status - */ - - usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_GETSTATUS), - priv->ctrl.type); - if (len.w != 2 || (priv->ctrl.type & USB_REQ_DIR_IN) == 0 || - index.b[MSB] != 0 || value.w != 0) - { - usbtrace(TRACE_DEVERROR( - KHCI_TRACEERR_BADEPGETSTATUS), 0); - priv->ctrlstate = CTRLSTATE_STALL; - } - else - { - switch (priv->ctrl.type & USB_REQ_RECIPIENT_MASK) - { - case USB_REQ_RECIPIENT_ENDPOINT: + case USB_REQ_GETSTATUS: + { + /* type: device-to-host; recipient = device, interface, + * endpoint + * value: 0 + * index: zero interface endpoint + * len: 2; data = status + */ + + usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_GETSTATUS), + priv->ctrl.type); + if (len.w != 2 || + (priv->ctrl.type & USB_REQ_DIR_IN) == 0 || + index.b[MSB] != 0 || value.w != 0) + { + usbtrace(TRACE_DEVERROR( + KHCI_TRACEERR_BADEPGETSTATUS), 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + else + { + switch (priv->ctrl.type & USB_REQ_RECIPIENT_MASK) { - epno = USB_EPNO(index.b[LSB]); - usbtrace(TRACE_INTDECODE( - KHCI_TRACEINTID_EPGETSTATUS), epno); - if (epno >= KHCI_NENDPOINTS) - { - usbtrace(TRACE_DEVERROR( - KHCI_TRACEERR_BADEPGETSTATUS), epno); - priv->ctrlstate = CTRLSTATE_STALL; - } - else + case USB_REQ_RECIPIENT_ENDPOINT: { - privep = &priv->eplist[epno]; - response.w = 0; /* Not stalled */ - nbytes = 2; /* Response size: 2 bytes */ - - if (USB_ISEPIN(index.b[LSB])) + epno = USB_EPNO(index.b[LSB]); + usbtrace(TRACE_INTDECODE( + KHCI_TRACEINTID_EPGETSTATUS), epno); + if (epno >= KHCI_NENDPOINTS) { - /* IN endpoint */ - - bdt = privep->bdtin; + usbtrace(TRACE_DEVERROR( + KHCI_TRACEERR_BADEPGETSTATUS), epno); + priv->ctrlstate = CTRLSTATE_STALL; } else { - /* OUT endpoint */ + privep = &priv->eplist[epno]; + response.w = 0; /* Not stalled */ + nbytes = 2; /* Response size: 2 bytes */ - bdt = privep->bdtout; - } + if (USB_ISEPIN(index.b[LSB])) + { + /* IN endpoint */ + + bdt = privep->bdtin; + } + else + { + /* OUT endpoint */ + + bdt = privep->bdtout; + } + + /* BSTALL set if stalled */ - /* BSTALL set if stalled */ + if ((bdt->status & USB_BDT_BSTALL) != 0) + { + response.b[LSB] = 1; /* Stalled, set bit 0 */ + } + } + } + break; - if ((bdt->status & USB_BDT_BSTALL) != 0) + case USB_REQ_RECIPIENT_DEVICE: + { + if (index.w == 0) { - response.b[LSB] = 1; /* Stalled, set bit 0 */ + usbtrace(TRACE_INTDECODE( + KHCI_TRACEINTID_DEVGETSTATUS), 0); + + /* Features: + * Remote Wakeup=YES; + * selfpowered=? + */ + + response.w = 0; + response.b[LSB] = + (priv->selfpowered << + USB_FEATURE_SELFPOWERED) | + (priv->rwakeup << + USB_FEATURE_REMOTEWAKEUP); + nbytes = 2; /* Response size: 2 bytes */ + } + else + { + usbtrace(TRACE_DEVERROR( + KHCI_TRACEERR_BADDEVGETSTATUS), 0); + priv->ctrlstate = CTRLSTATE_STALL; } } - } - break; + break; - case USB_REQ_RECIPIENT_DEVICE: - { - if (index.w == 0) + case USB_REQ_RECIPIENT_INTERFACE: { usbtrace(TRACE_INTDECODE( - KHCI_TRACEINTID_DEVGETSTATUS), 0); - - /* Features: - * Remote Wakeup=YES; - * selfpowered=? - */ - - response.w = 0; - response.b[LSB] = - (priv->selfpowered << - USB_FEATURE_SELFPOWERED) | - (priv->rwakeup << - USB_FEATURE_REMOTEWAKEUP); - nbytes = 2; /* Response size: 2 bytes */ + KHCI_TRACEINTID_IFGETSTATUS), 0); + response.w = 0; + nbytes = 2; /* Response size: 2 bytes */ } - else + break; + + default: { usbtrace(TRACE_DEVERROR( - KHCI_TRACEERR_BADDEVGETSTATUS), 0); + KHCI_TRACEERR_BADGETSTATUS), 0); priv->ctrlstate = CTRLSTATE_STALL; } + break; } - break; + } + } + break; - case USB_REQ_RECIPIENT_INTERFACE: - { - usbtrace(TRACE_INTDECODE( - KHCI_TRACEINTID_IFGETSTATUS), 0); - response.w = 0; - nbytes = 2; /* Response size: 2 bytes */ - } - break; + case USB_REQ_CLEARFEATURE: + { + /* type: host-to-device; recipient = device, interface or + * endpoint + * value: feature selector + * index: zero interface endpoint; + * len: zero, data = none + */ + + usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_CLEARFEATURE), + priv->ctrl.type); + if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == + USB_REQ_RECIPIENT_DEVICE) + { + /* Disable B device from performing HNP */ - default: + #ifdef CONFIG_KINETIS_USBOTG + if (value.w == USBOTG_FEATURE_B_HNP_ENABLE) { - usbtrace(TRACE_DEVERROR( - KHCI_TRACEERR_BADGETSTATUS), 0); - priv->ctrlstate = CTRLSTATE_STALL; + /* Disable HNP */ + #warning Missing Logic } - break; - } - } - } - break; - case USB_REQ_CLEARFEATURE: - { - /* type: host-to-device; recipient = device, interface or - * endpoint - * value: feature selector - * index: zero interface endpoint; - * len: zero, data = none - */ - - usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_CLEARFEATURE), - priv->ctrl.type); - if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == - USB_REQ_RECIPIENT_DEVICE) - { - /* Disable B device from performing HNP */ + /* Disable A device HNP support */ - #ifdef CONFIG_KINETIS_USBOTG - if (value.w == USBOTG_FEATURE_B_HNP_ENABLE) - { - /* Disable HNP */ + else if (value.w == USBOTG_FEATURE_A_HNP_SUPPORT) + { + /* Disable HNP support */ #warning Missing Logic - } + } - /* Disable A device HNP support */ + /* Disable alternate HNP support */ - else if (value.w == USBOTG_FEATURE_A_HNP_SUPPORT) - { - /* Disable HNP support */ + else if (value.w == USBOTG_FEATURE_A_ALT_HNP_SUPPORT) + { + /* Disable alternate HNP */ #warning Missing Logic - } + } + else + #endif + /* Disable remote wakeup */ - /* Disable alternate HNP support */ + if (value.w == USB_FEATURE_REMOTEWAKEUP) + { + priv->rwakeup = 0; + } + else + { + /* Let the class implementation handle all other + * device features + */ - else if (value.w == USBOTG_FEATURE_A_ALT_HNP_SUPPORT) - { - /* Disable alternate HNP */ - #warning Missing Logic - } - else - #endif - /* Disable remote wakeup */ - - if (value.w == USB_FEATURE_REMOTEWAKEUP) - { - priv->rwakeup = 0; - } - else - { - /* Let the class implementation handle all other - * device features - */ - - khci_dispatchrequest(priv); - dispatched = true; - } - } - else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == - USB_REQ_RECIPIENT_ENDPOINT) - { - epno = USB_EPNO(index.b[LSB]); - if (epno > 0 && epno < - KHCI_NENDPOINTS && index.b[MSB] == 0 && - value.w == USB_FEATURE_ENDPOINTHALT && len.w == 0) - { - privep = &priv->eplist[epno]; - privep->halted = false; - ret = khci_epstall(&privep->ep, true); - UNUSED(ret); - } - else - { - usbtrace(TRACE_DEVERROR( - KHCI_TRACEERR_BADCLEARFEATURE), 0); - priv->ctrlstate = CTRLSTATE_STALL; - } - } - else - { - /* Let the class implementation handle all other - * recipients. - */ - - khci_dispatchrequest(priv); - dispatched = true; - } - } - break; + khci_dispatchrequest(priv); + dispatched = true; + } + } + else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == + USB_REQ_RECIPIENT_ENDPOINT) + { + epno = USB_EPNO(index.b[LSB]); + if (epno > 0 && epno < + KHCI_NENDPOINTS && index.b[MSB] == 0 && + value.w == USB_FEATURE_ENDPOINTHALT && len.w == 0) + { + privep = &priv->eplist[epno]; + privep->halted = false; + ret = khci_epstall(&privep->ep, true); + UNUSED(ret); + } + else + { + usbtrace(TRACE_DEVERROR( + KHCI_TRACEERR_BADCLEARFEATURE), 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + } + else + { + /* Let the class implementation handle all other + * recipients. + */ + + khci_dispatchrequest(priv); + dispatched = true; + } + } + break; - case USB_REQ_SETFEATURE: - { - /* type: host-to-device; recipient = device, interface, - * endpoint - * value: feature selector - * index: zero interface endpoint; - * len: 0; data = none - */ + case USB_REQ_SETFEATURE: + { + /* type: host-to-device; recipient = device, interface, + * endpoint + * value: feature selector + * index: zero interface endpoint; + * len: 0; data = none + */ - usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_SETFEATURE), - priv->ctrl.type); + usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_SETFEATURE), + priv->ctrl.type); - if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == - USB_REQ_RECIPIENT_DEVICE) - { - /* Enable B device to perform HNP */ + if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == + USB_REQ_RECIPIENT_DEVICE) + { + /* Enable B device to perform HNP */ #ifdef CONFIG_KINETIS_USBOTG - if (value.w == USBOTG_FEATURE_B_HNP_ENABLE) - { - /* Enable HNP */ + if (value.w == USBOTG_FEATURE_B_HNP_ENABLE) + { + /* Enable HNP */ #warning "Missing logic" - } + } - /* Enable A device HNP supports */ + /* Enable A device HNP supports */ - else if (value.w == USBOTG_FEATURE_A_HNP_SUPPORT) - { - /* Enable HNP support */ + else if (value.w == USBOTG_FEATURE_A_HNP_SUPPORT) + { + /* Enable HNP support */ #warning "Missing logic" - } + } - /* Another port on the A device supports HNP */ + /* Another port on the A device supports HNP */ - else if (value.w == USBOTG_FEATURE_A_ALT_HNP_SUPPORT) - { - /* Enable alternate HNP */ + else if (value.w == USBOTG_FEATURE_A_ALT_HNP_SUPPORT) + { + /* Enable alternate HNP */ #warning "Missing logic" - } - else + } + else #endif - if (value.w == USB_FEATURE_REMOTEWAKEUP) - { - priv->rwakeup = 0; - } - else if (value.w == USB_FEATURE_TESTMODE) - { - /* Special case recipient=device test mode */ - - uinfo("test mode: %d\n", index.w); - } - else - { - /* Let the class implementation handle all other - * device features - */ - - khci_dispatchrequest(priv); - dispatched = true; - } - } - else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == - USB_REQ_RECIPIENT_ENDPOINT) - { - /* Handler recipient=endpoint */ - - epno = USB_EPNO(index.b[LSB]); - if (epno < KHCI_NENDPOINTS && index.b[MSB] == 0 && - value.w == USB_FEATURE_ENDPOINTHALT && len.w == 0) - { - privep = &priv->eplist[epno]; - privep->halted = true; - ret = khci_epstall(&privep->ep, false); - UNUSED(ret); - } - else - { - usbtrace(TRACE_DEVERROR( - KHCI_TRACEERR_BADSETFEATURE), 0); - priv->ctrlstate = CTRLSTATE_STALL; - } - } - else - { - /* The class driver handles all recipients except - * recipient=endpoint - */ - - khci_dispatchrequest(priv); - dispatched = true; - } - } - break; + if (value.w == USB_FEATURE_REMOTEWAKEUP) + { + priv->rwakeup = 0; + } + else if (value.w == USB_FEATURE_TESTMODE) + { + /* Special case recipient=device test mode */ - case USB_REQ_SETADDRESS: - { + uinfo("test mode: %d\n", index.w); + } + else + { + /* Let the class implementation handle all other + * device features + */ + + khci_dispatchrequest(priv); + dispatched = true; + } + } + else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == + USB_REQ_RECIPIENT_ENDPOINT) + { + /* Handler recipient=endpoint */ + + epno = USB_EPNO(index.b[LSB]); + if (epno < KHCI_NENDPOINTS && index.b[MSB] == 0 && + value.w == USB_FEATURE_ENDPOINTHALT && len.w == 0) + { + privep = &priv->eplist[epno]; + privep->halted = true; + ret = khci_epstall(&privep->ep, false); + UNUSED(ret); + } + else + { + usbtrace(TRACE_DEVERROR( + KHCI_TRACEERR_BADSETFEATURE), 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + } + else + { + /* The class driver handles all recipients except + * recipient=endpoint + */ + + khci_dispatchrequest(priv); + dispatched = true; + } + } + break; + + case USB_REQ_SETADDRESS: + { + /* type: host-to-device; recipient = device + * value: device address + * index: 0 + * len: 0; data = none + */ + + usbtrace(TRACE_INTDECODE( + KHCI_TRACEINTID_EP0SETUPSETADDRESS), value.w); + if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) != + USB_REQ_RECIPIENT_DEVICE || + index.w != 0 || len.w != 0 || value.w > 127) + { + usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_BADSETADDRESS), + 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + else + { + /* Note that setting of the device address will be + * deferred. A zero-length packet will be sent and the + * device address will be set when the zerolength + * packet transfer completes. + */ + + priv->devstate = DEVSTATE_ADDRPENDING; + } + } + break; + + case USB_REQ_GETDESCRIPTOR: + /* type: device-to-host; recipient = device + * value: descriptor type and index + * index: 0 or language ID; + * len: descriptor len; data = descriptor + */ + + case USB_REQ_SETDESCRIPTOR: + /* type: host-to-device; recipient = device + * value: descriptor type and index + * index: 0 or language ID; + * len: descriptor len; data = descriptor + */ + + { + usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_GETSETDESC), + priv->ctrl.type); + if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == + USB_REQ_RECIPIENT_DEVICE) + { + /* The request seems valid... + * let the class implementation handle it + */ + + khci_dispatchrequest(priv); + dispatched = true; + } + else + { + usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_BADGETSETDESC), + 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + } + break; + + case USB_REQ_GETCONFIGURATION: + /* type: device-to-host; recipient = device + * value: 0; + * index: 0; + * len: 1; data = configuration value + */ + + { + usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_GETCONFIG), + priv->ctrl.type); + if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == + USB_REQ_RECIPIENT_DEVICE && value.w == 0 && + index.w == 0 && len.w == 1) + { + /* The request seems valid... let the class + * implementation handle it + */ + + khci_dispatchrequest(priv); + dispatched = true; + } + else + { + usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_BADGETCONFIG), + 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + } + break; + + case USB_REQ_SETCONFIGURATION: /* type: host-to-device; recipient = device - * value: device address - * index: 0 + * value: configuration value + * index: 0; * len: 0; data = none */ - usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_EP0SETUPSETADDRESS), - value.w); - if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) != - USB_REQ_RECIPIENT_DEVICE || - index.w != 0 || len.w != 0 || value.w > 127) - { - usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_BADSETADDRESS), 0); - priv->ctrlstate = CTRLSTATE_STALL; - } - else - { - /* Note that setting of the device address will be - * deferred. A zero-length packet will be sent and the - * device address will be set when the zerolength packet - * transfer completes. - */ - - priv->devstate = DEVSTATE_ADDRPENDING; - } - } - break; + { + usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_SETCONFIG), + priv->ctrl.type); + if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == + USB_REQ_RECIPIENT_DEVICE && index.w == 0 && len.w == 0) + { + /* The request seems valid. Let the class + * implementation handle it + */ + + khci_dispatchrequest(priv); + dispatched = true; + } + else + { + usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_BADSETCONFIG), + 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + } + break; - case USB_REQ_GETDESCRIPTOR: - /* type: device-to-host; recipient = device - * value: descriptor type and index - * index: 0 or language ID; - * len: descriptor len; data = descriptor - */ - - case USB_REQ_SETDESCRIPTOR: - /* type: host-to-device; recipient = device - * value: descriptor type and index - * index: 0 or language ID; - * len: descriptor len; data = descriptor - */ - - { - usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_GETSETDESC), - priv->ctrl.type); - if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == - USB_REQ_RECIPIENT_DEVICE) - { - /* The request seems valid... - * let the class implementation handle it - */ - - khci_dispatchrequest(priv); - dispatched = true; - } - else - { - usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_BADGETSETDESC), 0); - priv->ctrlstate = CTRLSTATE_STALL; - } - } - break; + case USB_REQ_GETINTERFACE: + /* type: device-to-host; recipient = interface + * value: 0 + * index: interface; + * len: 1; data = alt interface + */ - case USB_REQ_GETCONFIGURATION: - /* type: device-to-host; recipient = device - * value: 0; - * index: 0; - * len: 1; data = configuration value - */ - - { - usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_GETCONFIG), - priv->ctrl.type); - if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == - USB_REQ_RECIPIENT_DEVICE && value.w == 0 && - index.w == 0 && len.w == 1) - { - /* The request seems valid... let the class - * implementation handle it - */ - - khci_dispatchrequest(priv); - dispatched = true; - } - else - { - usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_BADGETCONFIG), 0); - priv->ctrlstate = CTRLSTATE_STALL; - } - } - break; + case USB_REQ_SETINTERFACE: + /* type: host-to-device; recipient = interface + * value: alternate setting + * index: interface; + * len: 0; data = none + */ - case USB_REQ_SETCONFIGURATION: - /* type: host-to-device; recipient = device - * value: configuration value - * index: 0; - * len: 0; data = none - */ - - { - usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_SETCONFIG), - priv->ctrl.type); - if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == - USB_REQ_RECIPIENT_DEVICE && index.w == 0 && len.w == 0) - { - /* The request seems valid. Let the class implementation - * handle it - */ - - khci_dispatchrequest(priv); - dispatched = true; - } - else - { - usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_BADSETCONFIG), 0); - priv->ctrlstate = CTRLSTATE_STALL; - } - } - break; + { + /* Let the class implementation handle the request */ - case USB_REQ_GETINTERFACE: - /* type: device-to-host; recipient = interface - * value: 0 - * index: interface; - * len: 1; data = alt interface - */ - - case USB_REQ_SETINTERFACE: - /* type: host-to-device; recipient = interface - * value: alternate setting - * index: interface; - * len: 0; data = none - */ - - { - /* Let the class implementation handle the request */ - - usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_GETSETIF), - priv->ctrl.type); - khci_dispatchrequest(priv); - dispatched = true; - } - break; + usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_GETSETIF), + priv->ctrl.type); + khci_dispatchrequest(priv); + dispatched = true; + } + break; - case USB_REQ_SYNCHFRAME: - /* type: device-to-host; recipient = endpoint - * value: 0 - * index: endpoint; - * len: 2; data = frame number - */ + case USB_REQ_SYNCHFRAME: + /* type: device-to-host; recipient = endpoint + * value: 0 + * index: endpoint; + * len: 2; data = frame number + */ - { - usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_SYNCHFRAME), 0); - } - break; + { + usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_SYNCHFRAME), 0); + } + break; - default: - { - usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDCTRLREQ), - priv->ctrl.req); - priv->ctrlstate = CTRLSTATE_STALL; - } - break; + default: + { + usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDCTRLREQ), + priv->ctrl.req); + priv->ctrlstate = CTRLSTATE_STALL; + } + break; } } } @@ -2660,6 +2668,7 @@ static void khci_ep0incomplete(struct khci_usbdev_s *priv) if (priv->devstate == DEVSTATE_ADDRPENDING) { uint16_t addr = GETUINT16(priv->ctrl.value); + usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_EP0ADDRESSSET), addr); /* This should be the equivalent state */ @@ -2729,7 +2738,7 @@ static void khci_ep0outcomplete(struct khci_usbdev_s *priv) * SETUP transaction. */ - khci_ep0nextsetup(priv); + khci_ep0nextsetup(priv); } break; @@ -2906,14 +2915,14 @@ static int khci_interrupt(int irq, void *context, void *arg) /* Check for the USB OTG SRP timeout */ # warning "Missing logic" - { - /* Handle OTG events of the SRP timeout has expired */ + { + /* Handle OTG events of the SRP timeout has expired */ # warning "Missing logic" - } + } - /* Clear Interrupt 1 msec timer Flag */ + /* Clear Interrupt 1 msec timer Flag */ - khci_putreg(USB_OTGISTAT_ONEMSEC, KINETIS_USB0_OTGISTAT); + khci_putreg(USB_OTGISTAT_ONEMSEC, KINETIS_USB0_OTGISTAT); } } #endif @@ -2968,7 +2977,7 @@ static int khci_interrupt(int irq, void *context, void *arg) priv->devstate = DEVSTATE_DEFAULT; #ifdef CONFIG_KINETIS_USBOTG - /* Disable and deactivate HNP */ + /* Disable and deactivate HNP */ #warning Missing Logic #endif /* Acknowledge the reset interrupt */ @@ -3022,7 +3031,7 @@ static int khci_interrupt(int irq, void *context, void *arg) epno = (regval & USB_STAT_ENDP_MASK) >> USB_STAT_ENDP_SHIFT; if (epno == 0) { - khci_ep0transfer(priv, regval); + khci_ep0transfer(priv, regval); } else { @@ -3031,9 +3040,9 @@ static int khci_interrupt(int irq, void *context, void *arg) } else { - /* USTAT FIFO must be empty. */ + /* USTAT FIFO must be empty. */ - break; + break; } } } @@ -3272,6 +3281,7 @@ khci_epreserve(struct khci_usbdev_s *priv, uint8_t epset) for (epndx = 1; epndx < KHCI_NENDPOINTS; epndx++) { uint8_t bit = KHCI_ENDP_BIT(epndx); + if ((epset & bit) != 0) { /* Mark the endpoint no longer available */ @@ -3298,6 +3308,7 @@ static inline void khci_epunreserve(struct khci_usbdev_s *priv, struct khci_ep_s *privep) { irqstate_t flags = enter_critical_section(); + priv->epavail |= KHCI_ENDP_BIT(USB_EPNO(privep->ep.eplog)); leave_critical_section(flags); } @@ -3397,29 +3408,29 @@ static int khci_epconfigure(struct usbdev_ep_s *ep, /* Set the requested type */ switch (desc->attr & USB_EP_ATTR_XFERTYPE_MASK) - { - case USB_EP_ATTR_XFER_INT: /* Interrupt endpoint */ - regval = epin ? KHCI_EP_INTIN : KHCI_EP_INTOUT; - break; - - case USB_EP_ATTR_XFER_BULK: /* Bulk endpoint */ - regval = epin ? KHCI_EP_BULKIN : KHCI_EP_BULKOUT; - break; - - case USB_EP_ATTR_XFER_ISOC: /* Isochronous endpoint */ - regval = epin ? KHCI_EP_ISOCIN : KHCI_EP_ISOCOUT; - break; - - case USB_EP_ATTR_XFER_CONTROL: /* Control endpoint */ - regval = KHCI_EP_CONTROL; - bidi = true; - break; - - default: - usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_BADEPTYPE), - (uint16_t)desc->type); - return -EINVAL; - } + { + case USB_EP_ATTR_XFER_INT: /* Interrupt endpoint */ + regval = epin ? KHCI_EP_INTIN : KHCI_EP_INTOUT; + break; + + case USB_EP_ATTR_XFER_BULK: /* Bulk endpoint */ + regval = epin ? KHCI_EP_BULKIN : KHCI_EP_BULKOUT; + break; + + case USB_EP_ATTR_XFER_ISOC: /* Isochronous endpoint */ + regval = epin ? KHCI_EP_ISOCIN : KHCI_EP_ISOCOUT; + break; + + case USB_EP_ATTR_XFER_CONTROL: /* Control endpoint */ + regval = KHCI_EP_CONTROL; + bidi = true; + break; + + default: + usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_BADEPTYPE), + (uint16_t)desc->type); + return -EINVAL; + } /* First disable the endpoint */ diff --git a/arch/arm/src/rtl8720c/amebaz_driver.c b/arch/arm/src/rtl8720c/amebaz_driver.c index fd89ce867ee..da6772c7887 100644 --- a/arch/arm/src/rtl8720c/amebaz_driver.c +++ b/arch/arm/src/rtl8720c/amebaz_driver.c @@ -62,6 +62,7 @@ static struct amebaz_dev_s *gp_wlan_dev[AMEBAZ_DEVICE_COUNT + 1]; static void amebaz_state_timeout(wdparm_t arg) { struct amebaz_state_s *state = (struct amebaz_state_s *)arg; + if (state->status < AMEBAZ_STATUS_RUN) { return; @@ -86,6 +87,7 @@ static int amebaz_state_run(struct amebaz_state_s *state, int32_t delay) static int amebaz_state_wait(struct amebaz_state_s *state) { int ret = 0; + while (state->status == AMEBAZ_STATUS_RUN) { ret = nxsem_wait_uninterruptible(&state->sem); @@ -101,6 +103,7 @@ static int amebaz_state_wait(struct amebaz_state_s *state) static void amebaz_state_post(struct amebaz_state_s *state, int status) { int _status = state->status; + state->status = status; if (_status == AMEBAZ_STATUS_RUN) { @@ -124,12 +127,15 @@ void amebaz_wl_scan_handler(int index, union iwreq_data *wrqu, char *extra) { struct amebaz_dev_s *priv = gp_wlan_dev[index]; struct amebaz_state_s *state = &priv->scan; - rtw_scan_result_t *res, *cache, *tmp; + rtw_scan_result_t *res; + rtw_scan_result_t *cache; + rtw_scan_result_t *tmp; rtw_scan_result_t ap_res; rtw_scan_ap_result_t *ap; struct iwreq iwr; int i; int j; + if (state->status != AMEBAZ_STATUS_RUN) { return; @@ -215,6 +221,7 @@ static void amebaz_wl_post_connection_event(struct amebaz_dev_s *priv, int status) { struct amebaz_state_s *state = &priv->conn; + if (status == AMEBAZ_STATUS_DONE) { netdev_carrier_on(&priv->dev); @@ -241,6 +248,7 @@ void amebaz_wl_connection_handler(int index, }; bool mac_avalid; + if (gp_wlan_dev[1]->conn.status == AMEBAZ_STATUS_RUN) { priv = gp_wlan_dev[1]; @@ -284,6 +292,7 @@ void amebaz_wl_connection_handler(int index, void amebaz_wl_netif_info_handler(int index, void *dev, unsigned char *addr) { struct amebaz_dev_s *priv = gp_wlan_dev[index]; + if (!priv || index != priv->devnum) { return; @@ -295,6 +304,7 @@ void amebaz_wl_netif_info_handler(int index, void *dev, unsigned char *addr) void amebaz_wl_notify_rx_handler(int index, unsigned int len) { struct amebaz_dev_s *priv = gp_wlan_dev[index]; + if (!priv || index != priv->devnum || !len) { return; @@ -317,6 +327,7 @@ static int amebaz_wl_set_channels(struct amebaz_dev_s *priv, }; int i; + if (!freqs || num_channels == 0) { return OK; @@ -343,9 +354,9 @@ static int amebaz_wl_set_channels(struct amebaz_dev_s *priv, int amebaz_wl_start_scan(struct amebaz_dev_s *priv, struct iwreq *iwr) { enum - { - RTW_SCAN_COMMAMD = 0x01 - }; + { + RTW_SCAN_COMMAMD = 0x01 + }; struct amebaz_state_s *state = &priv->scan; int scan_type = IW_SCAN_TYPE_ACTIVE; @@ -355,6 +366,7 @@ int amebaz_wl_start_scan(struct amebaz_dev_s *priv, struct iwreq *iwr) uint16_t length; int essid_len; int ret; + iwr->u.data.flags = scan_type | (bss_type << 8); if (iwr->u.data.pointer != NULL && iwr->u.data.length == sizeof(*req)) @@ -424,6 +436,7 @@ static int amebaz_wl_format_scan_results(struct amebaz_dev_s *priv, char *start; char *stop; int i; + start = iwr->u.data.pointer; stop = (char *)iwr->u.data.pointer + iwr->u.data.length; for (i = 0; i < priv->scan_count; i++) @@ -470,6 +483,7 @@ int amebaz_wl_get_scan_results(struct amebaz_dev_s *priv, struct iwreq *iwr) struct amebaz_state_s *state = &priv->scan; int request_size; int ret = OK; + if (state->status == AMEBAZ_STATUS_RUN) { ret = -EAGAIN; @@ -531,6 +545,7 @@ int amebaz_wl_set_encode_ext(struct amebaz_dev_s *priv, struct iwreq *iwr) }; int ret; + iwr->u.encoding.flags = IW_ENCODE_INDEX & 1; iwr->u.encoding.flags |= IW_ENCODE_TEMP; ret = rltk_wlan_control(SIOCSIWENCODEEXT, iwr); @@ -563,6 +578,7 @@ int amebaz_wl_get_encode_ext(struct amebaz_dev_s *priv, struct iwreq *iwr) }; int ret; + ret = rltk_wlan_control(SIOCGIWENCODEEXT, iwr); if (ret < 0) { @@ -593,12 +609,12 @@ static int amebaz_wl_add_custom_ie(struct amebaz_dev_s *priv, }; enum - { - PROBE_REQ = 0x0001, - PROBE_RSP = 0x0002, - BEACON = 0x0004, - ASSOC_REQ = 0x0008, - }; + { + PROBE_REQ = 0x0001, + PROBE_RSP = 0x0002, + BEACON = 0x0004, + ASSOC_REQ = 0x0008, + }; uint8_t ie[8] = { @@ -645,6 +661,7 @@ int amebaz_wl_associate(struct amebaz_dev_s *priv, struct iwreq *iwr) char *data; int ret; + if (priv->mode == RTW_MODE_STA) { if (priv->assoc.mask != @@ -677,15 +694,15 @@ int amebaz_wl_associate(struct amebaz_dev_s *priv, struct iwreq *iwr) memcpy(info.bssid.octet, priv->assoc.mac.octet, IFHWADDRLEN); switch (priv->assoc.alg) { - case IW_ENCODE_ALG_NONE: - info.security_type = RTW_SECURITY_OPEN; - break; - case IW_ENCODE_ALG_WEP: - info.security_type = RTW_SECURITY_WEP_PSK; - break; - case IW_ENCODE_ALG_CCMP: - default: - info.security_type = RTW_SECURITY_WPA2_MIXED_PSK; + case IW_ENCODE_ALG_NONE: + info.security_type = RTW_SECURITY_OPEN; + break; + case IW_ENCODE_ALG_WEP: + info.security_type = RTW_SECURITY_WEP_PSK; + break; + case IW_ENCODE_ALG_CCMP: + default: + info.security_type = RTW_SECURITY_WPA2_MIXED_PSK; } pinfo = &info; @@ -789,6 +806,7 @@ int amebaz_wl_set_bssid(struct amebaz_dev_s *priv, struct iwreq *iwr) }; char *data; + addr->sa_family = ARPHRD_ETHER; data = addr->sa_data; if (!memcmp(data, null_mac, sizeof(null_mac))) @@ -826,17 +844,17 @@ static int amebaz_wl_disable_powersave(int devnum) */ enum - { - AMEBA_PMSET_MODE_IPS, - AMEBA_PMSET_MODE_LPS, - AMEBA_PMSET_MODE_TDMA, - AMEBA_PMSET_MODE_DTIM, - AMEBA_PMSET_MODE_BEACON, - AMEBA_PMSET_MODE_LPS_LEVEL, - AMEBA_PMSET_MODE_LPS_THRESHOLD, - AMEBA_PMSET_MODE_LPS_RF, - AMEBA_PMSET_MODE_RESUME, - }; + { + AMEBA_PMSET_MODE_IPS, + AMEBA_PMSET_MODE_LPS, + AMEBA_PMSET_MODE_TDMA, + AMEBA_PMSET_MODE_DTIM, + AMEBA_PMSET_MODE_BEACON, + AMEBA_PMSET_MODE_LPS_LEVEL, + AMEBA_PMSET_MODE_LPS_THRESHOLD, + AMEBA_PMSET_MODE_LPS_RF, + AMEBA_PMSET_MODE_RESUME, + }; control[7] = AMEBA_PMSET_MODE_IPS; control[8] = 1; @@ -855,6 +873,7 @@ int amebaz_wl_set_mode(struct amebaz_dev_s *priv, struct iwreq *iwr) int ret; int count; int i; + if (priv->devnum == 1) { if (iwr->u.mode == IW_MODE_MASTER) @@ -947,6 +966,7 @@ int amebaz_wl_set_mode(struct amebaz_dev_s *priv, struct iwreq *iwr) } extern void up_irq_attach_workaround(void); + up_irq_attach_workaround(); } @@ -989,6 +1009,7 @@ int amebaz_wl_set_country(struct amebaz_dev_s *priv, struct iwreq *iwr) const char *country = iwr->u.essid.pointer; int32_t cc = RTW_COUNTRY_WORLD1; int ret; + if (!strncmp(country, "CN", 2)) { } @@ -1070,6 +1091,7 @@ int amebaz_wl_set_freq(struct amebaz_dev_s *priv, struct iwreq *iwr) int amebaz_wl_get_freq(struct amebaz_dev_s *priv, struct iwreq *iwr) { int ret; + ret = rltk_wlan_control(SIOCGIWFREQ, iwr); if (ret == 0) { @@ -1107,6 +1129,7 @@ static void amebaz_free_device(struct amebaz_dev_s *priv) static int amebaz_wl_on(int mode) { int ret = -1; + for (int i = 0; i < 2; i++) { ret = rltk_wlan_init(i, mode); @@ -1117,6 +1140,7 @@ static int amebaz_wl_on(int mode) } extern void up_irq_attach_workaround(void); + up_irq_attach_workaround(); for (int i = 0; i < 2; i++) { @@ -1145,6 +1169,7 @@ int amebaz_wl_initialize(unsigned char mode) int ret; int i; + for (i = 0; i < 2; i++) { priv = amebaz_allocate_device(i); diff --git a/arch/mips/src/pic32mx/pic32mx_usbdev.c b/arch/mips/src/pic32mx/pic32mx_usbdev.c index 6b9efc66f57..2664d460892 100644 --- a/arch/mips/src/pic32mx/pic32mx_usbdev.c +++ b/arch/mips/src/pic32mx/pic32mx_usbdev.c @@ -765,6 +765,7 @@ static void pic32mx_reqreturn(struct pic32mx_ep_s *privep, */ bool stalled = privep->stalled; + if (USB_EPNO(privep->ep.eplog) == EP0) { privep->stalled = (privep->dev->ctrlstate == CTRLSTATE_STALLED); @@ -1090,6 +1091,7 @@ static int pic32mx_wrstart(struct pic32mx_usbdev_s *priv, /* The current BDT is not available, check the other BDT */ volatile struct usbotg_bdtentry_s *otherbdt; + otherbdt = &g_bdt[EP(epno, EP_DIR_IN, EP_PP_EVEN)]; if (otherbdt == bdt) { @@ -1925,452 +1927,458 @@ static void pic32mx_ep0setup(struct pic32mx_usbdev_s *priv) switch (priv->ctrl.req) { - case USB_REQ_GETSTATUS: - { - /* type: device-to-host; recipient = device, interface, endpoint - * value: 0 - * index: zero interface endpoint - * len: 2; data = status - */ + case USB_REQ_GETSTATUS: + { + /* type: device-to-host; recipient = device, interface, endpoint + * value: 0 + * index: zero interface endpoint + * len: 2; data = status + */ - usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_GETSTATUS), - priv->ctrl.type); - if (len.w != 2 || (priv->ctrl.type & USB_REQ_DIR_IN) == 0 || - index.b[MSB] != 0 || value.w != 0) - { - usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADEPGETSTATUS), 0); - priv->ctrlstate = CTRLSTATE_STALL; - } - else - { - switch (priv->ctrl.type & USB_REQ_RECIPIENT_MASK) - { - case USB_REQ_RECIPIENT_ENDPOINT: + usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_GETSTATUS), + priv->ctrl.type); + if (len.w != 2 || (priv->ctrl.type & USB_REQ_DIR_IN) == 0 || + index.b[MSB] != 0 || value.w != 0) + { + usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADEPGETSTATUS), 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + else + { + switch (priv->ctrl.type & USB_REQ_RECIPIENT_MASK) { - epno = USB_EPNO(index.b[LSB]); - usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_EPGETSTATUS), - epno); - if (epno >= PIC32MX_NENDPOINTS) + case USB_REQ_RECIPIENT_ENDPOINT: { + epno = USB_EPNO(index.b[LSB]); usbtrace( - TRACE_DEVERROR(PIC32MX_TRACEERR_BADEPGETSTATUS), + TRACE_INTDECODE(PIC32MX_TRACEINTID_EPGETSTATUS), epno); - priv->ctrlstate = CTRLSTATE_STALL; - } - else - { - privep = &priv->eplist[epno]; - response.w = 0; /* Not stalled */ - nbytes = 2; /* Response size: 2 bytes */ - - if (USB_ISEPIN(index.b[LSB])) + if (epno >= PIC32MX_NENDPOINTS) { - /* IN endpoint */ - - bdt = privep->bdtin; + usbtrace( + TRACE_DEVERROR(PIC32MX_TRACEERR_BADEPGETSTATUS), + epno); + priv->ctrlstate = CTRLSTATE_STALL; } else { - /* OUT endpoint */ + privep = &priv->eplist[epno]; + response.w = 0; /* Not stalled */ + nbytes = 2; /* Response size: 2 bytes */ - bdt = privep->bdtout; - } + if (USB_ISEPIN(index.b[LSB])) + { + /* IN endpoint */ - /* BSTALL set if stalled */ + bdt = privep->bdtin; + } + else + { + /* OUT endpoint */ - if ((bdt->status & USB_BDT_BSTALL) != 0) - { - response.b[LSB] = 1; /* Stalled, set bit 0 */ + bdt = privep->bdtout; + } + + /* BSTALL set if stalled */ + + if ((bdt->status & USB_BDT_BSTALL) != 0) + { + response.b[LSB] = 1; /* Stalled, set bit 0 */ + } } } - } - break; + break; - case USB_REQ_RECIPIENT_DEVICE: - { - if (index.w == 0) + case USB_REQ_RECIPIENT_DEVICE: { - usbtrace( - TRACE_INTDECODE(PIC32MX_TRACEINTID_DEVGETSTATUS), 0); + if (index.w == 0) + { + usbtrace( + TRACE_INTDECODE(PIC32MX_TRACEINTID_DEVGETSTATUS), + 0); - /* Features: Remote Wakeup=YES; selfpowered=? */ + /* Features: Remote Wakeup=YES; selfpowered=? */ - response.w = 0; - response.b[LSB] = - (priv->selfpowered << USB_FEATURE_SELFPOWERED) | - (priv->rwakeup << USB_FEATURE_REMOTEWAKEUP); - nbytes = 2; /* Response size: 2 bytes */ + response.w = 0; + response.b[LSB] = + (priv->selfpowered << USB_FEATURE_SELFPOWERED) | + (priv->rwakeup << USB_FEATURE_REMOTEWAKEUP); + nbytes = 2; /* Response size: 2 bytes */ + } + else + { + usbtrace( + TRACE_DEVERROR(PIC32MX_TRACEERR_BADDEVGETSTATUS), + 0); + priv->ctrlstate = CTRLSTATE_STALL; + } } - else + break; + + case USB_REQ_RECIPIENT_INTERFACE: { usbtrace( - TRACE_DEVERROR(PIC32MX_TRACEERR_BADDEVGETSTATUS), 0); - priv->ctrlstate = CTRLSTATE_STALL; + TRACE_INTDECODE(PIC32MX_TRACEINTID_IFGETSTATUS), 0); + response.w = 0; + nbytes = 2; /* Response size: 2 bytes */ } - } - break; - - case USB_REQ_RECIPIENT_INTERFACE: - { - usbtrace( - TRACE_INTDECODE(PIC32MX_TRACEINTID_IFGETSTATUS), 0); - response.w = 0; - nbytes = 2; /* Response size: 2 bytes */ - } - break; + break; - default: - { - usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADGETSTATUS), 0); - priv->ctrlstate = CTRLSTATE_STALL; + default: + { + usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADGETSTATUS), + 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + break; } - break; - } - } - } - break; + } + } + break; - case USB_REQ_CLEARFEATURE: - { - /* type: host-to-device; recipient = device, interface or endpoint - * value: feature selector - * index: zero interface endpoint; - * len: zero, data = none - */ + case USB_REQ_CLEARFEATURE: + { + /* type: host-to-device; recipient = device, interface or endpoint + * value: feature selector + * index: zero interface endpoint; + * len: zero, data = none + */ - usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_CLEARFEATURE), - priv->ctrl.type); - if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == - USB_REQ_RECIPIENT_DEVICE) - { - /* Disable B device from performing HNP */ + usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_CLEARFEATURE), + priv->ctrl.type); + if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == + USB_REQ_RECIPIENT_DEVICE) + { + /* Disable B device from performing HNP */ #ifdef CONFIG_USBOTG - if (value.w == USBOTG_FEATURE_B_HNP_ENABLE) - { - /* Disable HNP */ + if (value.w == USBOTG_FEATURE_B_HNP_ENABLE) + { + /* Disable HNP */ #warning Missing Logic - } + } - /* Disable A device HNP support */ + /* Disable A device HNP support */ - else if (value.w == USBOTG_FEATURE_A_HNP_SUPPORT) - { - /* Disable HNP support */ + else if (value.w == USBOTG_FEATURE_A_HNP_SUPPORT) + { + /* Disable HNP support */ #warning Missing Logic - } + } - /* Disable alternate HNP support */ + /* Disable alternate HNP support */ - else if (value.w == USBOTG_FEATURE_A_ALT_HNP_SUPPORT) - { - /* Disable alternate HNP */ + else if (value.w == USBOTG_FEATURE_A_ALT_HNP_SUPPORT) + { + /* Disable alternate HNP */ #warning Missing Logic - } - else + } + else #endif - /* Disable remote wakeup */ - - if (value.w == USB_FEATURE_REMOTEWAKEUP) - { - priv->rwakeup = 0; - } - else - { - /* Let the class implementation handle - * all other device features - */ - - pic32mx_dispatchrequest(priv); - dispatched = true; - } - } - else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == - USB_REQ_RECIPIENT_ENDPOINT) - { - epno = USB_EPNO(index.b[LSB]); - if (epno > 0 && epno < PIC32MX_NENDPOINTS && index.b[MSB] == 0 && - value.w == USB_FEATURE_ENDPOINTHALT && len.w == 0) - { - privep = &priv->eplist[epno]; - privep->halted = false; - ret = pic32mx_epstall(&privep->ep, true); - UNUSED(ret); - } - else - { - usbtrace( - TRACE_DEVERROR(PIC32MX_TRACEERR_BADCLEARFEATURE), 0); - priv->ctrlstate = CTRLSTATE_STALL; - } - } - else - { - /* Let the class implementation handle all other recipients. */ + /* Disable remote wakeup */ - pic32mx_dispatchrequest(priv); - dispatched = true; - } - } - break; + if (value.w == USB_FEATURE_REMOTEWAKEUP) + { + priv->rwakeup = 0; + } + else + { + /* Let the class implementation handle + * all other device features + */ - case USB_REQ_SETFEATURE: - { - /* type: host-to-device; recipient = device, interface, endpoint - * value: feature selector - * index: zero interface endpoint; - * len: 0; data = none - */ + pic32mx_dispatchrequest(priv); + dispatched = true; + } + } + else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == + USB_REQ_RECIPIENT_ENDPOINT) + { + epno = USB_EPNO(index.b[LSB]); + if (epno > 0 && epno < PIC32MX_NENDPOINTS && + index.b[MSB] == 0 && + value.w == USB_FEATURE_ENDPOINTHALT && len.w == 0) + { + privep = &priv->eplist[epno]; + privep->halted = false; + ret = pic32mx_epstall(&privep->ep, true); + UNUSED(ret); + } + else + { + usbtrace( + TRACE_DEVERROR(PIC32MX_TRACEERR_BADCLEARFEATURE), 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + } + else + { + /* Let the class implementation handle all other recipients. */ + + pic32mx_dispatchrequest(priv); + dispatched = true; + } + } + break; - usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_SETFEATURE), - priv->ctrl.type); + case USB_REQ_SETFEATURE: + { + /* type: host-to-device; recipient = device, interface, endpoint + * value: feature selector + * index: zero interface endpoint; + * len: 0; data = none + */ - if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == - USB_REQ_RECIPIENT_DEVICE) - { - /* Enable B device to perform HNP */ + usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_SETFEATURE), + priv->ctrl.type); + + if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == + USB_REQ_RECIPIENT_DEVICE) + { + /* Enable B device to perform HNP */ #ifdef CONFIG_USBOTG - if (value.w == USBOTG_FEATURE_B_HNP_ENABLE) - { - /* Enable HNP */ + if (value.w == USBOTG_FEATURE_B_HNP_ENABLE) + { + /* Enable HNP */ #warning "Missing logic" - } + } - /* Enable A device HNP supports */ + /* Enable A device HNP supports */ - else if (value.w == USBOTG_FEATURE_A_HNP_SUPPORT) - { - /* Enable HNP support */ + else if (value.w == USBOTG_FEATURE_A_HNP_SUPPORT) + { + /* Enable HNP support */ #warning "Missing logic" - } + } - /* Another port on the A device supports HNP */ + /* Another port on the A device supports HNP */ - else if (value.w == USBOTG_FEATURE_A_ALT_HNP_SUPPORT) - { - /* Enable alternate HNP */ + else if (value.w == USBOTG_FEATURE_A_ALT_HNP_SUPPORT) + { + /* Enable alternate HNP */ #warning "Missing logic" - } - else + } + else #endif - if (value.w == USB_FEATURE_REMOTEWAKEUP) - { - priv->rwakeup = 0; - } - else if (value.w == USB_FEATURE_TESTMODE) - { - /* Special case recipient=device test mode */ - - uinfo("test mode: %d\n", index.w); - } - else - { - /* Let the class implementation handle - * all other device features - */ - - pic32mx_dispatchrequest(priv); - dispatched = true; - } - } - else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == - USB_REQ_RECIPIENT_ENDPOINT) - { - /* Handler recipient=endpoint */ - - epno = USB_EPNO(index.b[LSB]); - if (epno < PIC32MX_NENDPOINTS && index.b[MSB] == 0 && - value.w == USB_FEATURE_ENDPOINTHALT && len.w == 0) - { - privep = &priv->eplist[epno]; - privep->halted = true; - ret = pic32mx_epstall(&privep->ep, false); - UNUSED(ret); - } - else - { - usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADSETFEATURE), 0); - priv->ctrlstate = CTRLSTATE_STALL; - } - } - else - { - /* The class driver handles all recipients - * except recipient=endpoint - */ + if (value.w == USB_FEATURE_REMOTEWAKEUP) + { + priv->rwakeup = 0; + } + else if (value.w == USB_FEATURE_TESTMODE) + { + /* Special case recipient=device test mode */ - pic32mx_dispatchrequest(priv); - dispatched = true; - } - } - break; + uinfo("test mode: %d\n", index.w); + } + else + { + /* Let the class implementation handle + * all other device features + */ - case USB_REQ_SETADDRESS: - { - /* type: host-to-device; recipient = device - * value: device address - * index: 0 - * len: 0; data = none - */ + pic32mx_dispatchrequest(priv); + dispatched = true; + } + } + else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == + USB_REQ_RECIPIENT_ENDPOINT) + { + /* Handler recipient=endpoint */ - usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_EP0SETUPSETADDRESS), - value.w); - if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) != - USB_REQ_RECIPIENT_DEVICE || index.w != 0 || - len.w != 0 || value.w > 127) - { - usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADSETADDRESS), 0); - priv->ctrlstate = CTRLSTATE_STALL; - } - else - { - /* Note that setting of the device address will be deferred. - * A zero-length packet will be sent and the device address - * will be set when the zero- length packet transfer completes. - */ + epno = USB_EPNO(index.b[LSB]); + if (epno < PIC32MX_NENDPOINTS && index.b[MSB] == 0 && + value.w == USB_FEATURE_ENDPOINTHALT && len.w == 0) + { + privep = &priv->eplist[epno]; + privep->halted = true; + ret = pic32mx_epstall(&privep->ep, false); + UNUSED(ret); + } + else + { + usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADSETFEATURE), + 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + } + else + { + /* The class driver handles all recipients + * except recipient=endpoint + */ - priv->devstate = DEVSTATE_ADDRPENDING; - } - } - break; + pic32mx_dispatchrequest(priv); + dispatched = true; + } + } + break; - case USB_REQ_GETDESCRIPTOR: - /* type: device-to-host; recipient = device - * value: descriptor type and index - * index: 0 or language ID; - * len: descriptor len; data = descriptor - */ + case USB_REQ_SETADDRESS: + { + /* type: host-to-device; recipient = device + * value: device address + * index: 0 + * len: 0; data = none + */ - case USB_REQ_SETDESCRIPTOR: - /* type: host-to-device; recipient = device - * value: descriptor type and index - * index: 0 or language ID; - * len: descriptor len; data = descriptor - */ + usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_EP0SETUPSETADDRESS), + value.w); + if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) != + USB_REQ_RECIPIENT_DEVICE || index.w != 0 || + len.w != 0 || value.w > 127) + { + usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADSETADDRESS), 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + else + { + /* Note that setting of the device address will be deferred. + * A zero-length packet will be sent and the device address + * will be set when the zero- length packet transfer completes. + */ - { - usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_GETSETDESC), - priv->ctrl.type); - if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == - USB_REQ_RECIPIENT_DEVICE) - { - /* The request seems valid... - * let the class implementation handle it - */ + priv->devstate = DEVSTATE_ADDRPENDING; + } + } + break; - pic32mx_dispatchrequest(priv); - dispatched = true; - } - else - { - usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADGETSETDESC), 0); - priv->ctrlstate = CTRLSTATE_STALL; - } - } - break; + case USB_REQ_GETDESCRIPTOR: + /* type: device-to-host; recipient = device + * value: descriptor type and index + * index: 0 or language ID; + * len: descriptor len; data = descriptor + */ - case USB_REQ_GETCONFIGURATION: - /* type: device-to-host; recipient = device - * value: 0; - * index: 0; - * len: 1; data = configuration value - */ + case USB_REQ_SETDESCRIPTOR: + /* type: host-to-device; recipient = device + * value: descriptor type and index + * index: 0 or language ID; + * len: descriptor len; data = descriptor + */ - { - usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_GETCONFIG), - priv->ctrl.type); - if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == - USB_REQ_RECIPIENT_DEVICE && value.w == 0 && - index.w == 0 && len.w == 1) - { - /* The request seems valid... - * let the class implementation handle it - */ + { + usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_GETSETDESC), + priv->ctrl.type); + if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == + USB_REQ_RECIPIENT_DEVICE) + { + /* The request seems valid... + * let the class implementation handle it + */ - pic32mx_dispatchrequest(priv); - dispatched = true; - } - else - { - usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADGETCONFIG), 0); - priv->ctrlstate = CTRLSTATE_STALL; - } - } - break; + pic32mx_dispatchrequest(priv); + dispatched = true; + } + else + { + usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADGETSETDESC), 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + } + break; - case USB_REQ_SETCONFIGURATION: - /* type: host-to-device; recipient = device - * value: configuration value - * index: 0; - * len: 0; data = none - */ + case USB_REQ_GETCONFIGURATION: + /* type: device-to-host; recipient = device + * value: 0; + * index: 0; + * len: 1; data = configuration value + */ - { - usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_SETCONFIG), - priv->ctrl.type); - if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == - USB_REQ_RECIPIENT_DEVICE && index.w == 0 && len.w == 0) - { - /* The request seems valid... - * let the class implementation handle it - */ + { + usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_GETCONFIG), + priv->ctrl.type); + if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == + USB_REQ_RECIPIENT_DEVICE && value.w == 0 && + index.w == 0 && len.w == 1) + { + /* The request seems valid... + * let the class implementation handle it + */ - pic32mx_dispatchrequest(priv); - dispatched = true; - } - else - { - usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADSETCONFIG), 0); - priv->ctrlstate = CTRLSTATE_STALL; - } - } - break; + pic32mx_dispatchrequest(priv); + dispatched = true; + } + else + { + usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADGETCONFIG), 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + } + break; - case USB_REQ_GETINTERFACE: - /* type: device-to-host; recipient = interface - * value: 0 - * index: interface; - * len: 1; data = alt interface - */ + case USB_REQ_SETCONFIGURATION: + /* type: host-to-device; recipient = device + * value: configuration value + * index: 0; + * len: 0; data = none + */ - case USB_REQ_SETINTERFACE: - /* type: host-to-device; recipient = interface - * value: alternate setting - * index: interface; - * len: 0; data = none - */ + { + usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_SETCONFIG), + priv->ctrl.type); + if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) == + USB_REQ_RECIPIENT_DEVICE && index.w == 0 && len.w == 0) + { + /* The request seems valid... + * let the class implementation handle it + */ - { - /* Let the class implementation handle the request */ + pic32mx_dispatchrequest(priv); + dispatched = true; + } + else + { + usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADSETCONFIG), 0); + priv->ctrlstate = CTRLSTATE_STALL; + } + } + break; - usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_GETSETIF), - priv->ctrl.type); - pic32mx_dispatchrequest(priv); - dispatched = true; - } - break; + case USB_REQ_GETINTERFACE: + /* type: device-to-host; recipient = interface + * value: 0 + * index: interface; + * len: 1; data = alt interface + */ - case USB_REQ_SYNCHFRAME: - /* type: device-to-host; recipient = endpoint - * value: 0 - * index: endpoint; - * len: 2; data = frame number - */ + case USB_REQ_SETINTERFACE: + /* type: host-to-device; recipient = interface + * value: alternate setting + * index: interface; + * len: 0; data = none + */ - { - usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_SYNCHFRAME), 0); - } - break; + { + /* Let the class implementation handle the request */ - default: - { - usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDCTRLREQ), - priv->ctrl.req); - priv->ctrlstate = CTRLSTATE_STALL; - } - break; + usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_GETSETIF), + priv->ctrl.type); + pic32mx_dispatchrequest(priv); + dispatched = true; + } + break; + + case USB_REQ_SYNCHFRAME: + /* type: device-to-host; recipient = endpoint + * value: 0 + * index: endpoint; + * len: 2; data = frame number + */ + + { + usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_SYNCHFRAME), 0); + } + break; + + default: + { + usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDCTRLREQ), + priv->ctrl.req); + priv->ctrlstate = CTRLSTATE_STALL; + } + break; } /* PKTDIS bit is set when a Setup Transaction is received. Clear to resume @@ -2510,6 +2518,7 @@ static void pic32mx_ep0incomplete(struct pic32mx_usbdev_s *priv) if (priv->devstate == DEVSTATE_ADDRPENDING) { uint16_t addr = GETUINT16(priv->ctrl.value); + usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_EP0ADDRESSSET), addr); /* This should be the equivalent state */ @@ -2579,7 +2588,7 @@ static void pic32mx_ep0outcomplete(struct pic32mx_usbdev_s *priv) * SETUP transaction. */ - pic32mx_ep0nextsetup(priv); + pic32mx_ep0nextsetup(priv); } break; @@ -2715,25 +2724,25 @@ static int pic32mx_interrupt(int irq, void *context, void *arg) /* if USB OTG SRP is ready */ # warning "Missing logic" - { - /* Check if the 1 millisecond timer has expired */ + { + /* Check if the 1 millisecond timer has expired */ - if ((otgir & OTG_INT_T1MSEC) != 0) - { - usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_T1MSEC), otgir); + if ((otgir & OTG_INT_T1MSEC) != 0) + { + usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_T1MSEC), otgir); - /* Check for the USB OTG SRP timeout */ + /* Check for the USB OTG SRP timeout */ # warning "Missing logic" - { - /* Handle OTG events of the SRP timeout has expired */ + { + /* Handle OTG events of the SRP timeout has expired */ # warning "Missing logic" - } + } - /* Clear Interrupt 1 msec timer Flag */ + /* Clear Interrupt 1 msec timer Flag */ - pic32mx_putreg(USBOTG_INT_T1MSEC, PIC32MX_USBOTG_IR); - } - } + pic32mx_putreg(USBOTG_INT_T1MSEC, PIC32MX_USBOTG_IR); + } + } #endif /* Handle events while we are in the attached state */ @@ -2921,7 +2930,7 @@ static int pic32mx_interrupt(int irq, void *context, void *arg) epno = (regval & USB_STAT_ENDPT_MASK) >> USB_STAT_ENDPT_SHIFT; if (epno == 0) { - pic32mx_ep0transfer(priv, regval); + pic32mx_ep0transfer(priv, regval); } else { @@ -3080,6 +3089,7 @@ pic32mx_epreserve(struct pic32mx_usbdev_s *priv, uint8_t epset) for (epndx = 1; epndx < PIC32MX_NENDPOINTS; epndx++) { uint8_t bit = PIC32MX_ENDP_BIT(epndx); + if ((epset & bit) != 0) { /* Mark the endpoint no longer available */ @@ -3107,6 +3117,7 @@ pic32mx_epunreserve(struct pic32mx_usbdev_s *priv, struct pic32mx_ep_s *privep) { irqstate_t flags = enter_critical_section(); + priv->epavail |= PIC32MX_ENDP_BIT(USB_EPNO(privep->ep.eplog)); leave_critical_section(flags); } @@ -3202,27 +3213,27 @@ static int pic32mx_epconfigure(struct usbdev_ep_s *ep, /* Set the requested type */ switch (desc->attr & USB_EP_ATTR_XFERTYPE_MASK) - { - case USB_EP_ATTR_XFER_INT: /* Interrupt endpoint */ - regval = epin ? PIC32MX_EP_INTIN : PIC32MX_EP_INTOUT; - break; - - case USB_EP_ATTR_XFER_BULK: /* Bulk endpoint */ - regval = epin ? PIC32MX_EP_BULKIN : PIC32MX_EP_BULKOUT; - break; - - case USB_EP_ATTR_XFER_ISOC: /* Isochronous endpoint */ - regval = epin ? PIC32MX_EP_ISOCIN : PIC32MX_EP_ISOCOUT; - break; - - case USB_EP_ATTR_XFER_CONTROL: /* Control endpoint */ - regval = PIC32MX_EP_CONTROL; - bidi = true; - break; - - default: - usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADEPTYPE), desc->type); - return -EINVAL; + { + case USB_EP_ATTR_XFER_INT: /* Interrupt endpoint */ + regval = epin ? PIC32MX_EP_INTIN : PIC32MX_EP_INTOUT; + break; + + case USB_EP_ATTR_XFER_BULK: /* Bulk endpoint */ + regval = epin ? PIC32MX_EP_BULKIN : PIC32MX_EP_BULKOUT; + break; + + case USB_EP_ATTR_XFER_ISOC: /* Isochronous endpoint */ + regval = epin ? PIC32MX_EP_ISOCIN : PIC32MX_EP_ISOCOUT; + break; + + case USB_EP_ATTR_XFER_CONTROL: /* Control endpoint */ + regval = PIC32MX_EP_CONTROL; + bidi = true; + break; + + default: + usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_BADEPTYPE), desc->type); + return -EINVAL; } /* Enable the endpoint */ diff --git a/drivers/power/pm/activity_governor.c b/drivers/power/pm/activity_governor.c index c757fb1af9f..c9060c65c00 100644 --- a/drivers/power/pm/activity_governor.c +++ b/drivers/power/pm/activity_governor.c @@ -223,7 +223,8 @@ static void governor_initialize(void) static void governor_activity(int domain, int count) { FAR struct pm_domain_state_s *pdomstate; - clock_t now, elapsed; + clock_t now; + clock_t elapsed; uint32_t accum; irqstate_t flags; @@ -467,7 +468,8 @@ static enum pm_state_e governor_checkstate(int domain) { FAR struct pm_domain_state_s *pdomstate; FAR struct pm_domain_s *pdom; - clock_t now, elapsed; + clock_t now; + clock_t elapsed; irqstate_t flags; int index; diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c index 278a6cf425f..32819509e87 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c @@ -835,6 +835,7 @@ void bcmf_wl_scan_event_handler(FAR struct bcmf_dev_s *priv, { uint32_t suite = ntohl (*(FAR uint32_t *)&akm->suite[j]); + if (suite == WLAN_AKM_SUITE_PSK) { goto vaild_bss;
