Revision 38:dfe51ad5cacf, committed 2014-11-28

Comitter:

mbed_official

Date:

Fri Nov 28 07:15:18 2014 +0000

Parent:

37:9506bdafbf94

Child:

39:1dbc943a21cf

Commit message:

Synchronized with git revision dc815b081604d78f9922061eb64f15df9f1be528

Full URL: https://github.com/mbedmicro/mbed/commit/dc815b081604d78f9922061eb64f15df9f1be528/

Changed in this revision

--- a/USBDevice/USBDevice.cpp	Wed Nov 19 09:00:30 2014 +0000
+++ b/USBDevice/USBDevice.cpp	Fri Nov 28 07:15:18 2014 +0000
@@ -187,7 +187,7 @@
     /* Check we should be transferring data OUT */
     if (transfer.direction != HOST_TO_DEVICE)
     {
-#if defined(TARGET_KL25Z) | defined(TARGET_KL46Z) | defined(TARGET_K20D5M) | defined(TARGET_K64F)
+#if defined(TARGET_KL25Z) | defined(TARGET_KL46Z) | defined(TARGET_K20D5M) | defined(TARGET_K64F) | defined(TARGET_K22F)
         /*
          * We seem to have a pending device-to-host transfer.  The host must have
          * sent a new control request without waiting for us to finish processing

--- a/USBDevice/USBEndpoints.h	Wed Nov 19 09:00:30 2014 +0000
+++ b/USBDevice/USBEndpoints.h	Fri Nov 28 07:15:18 2014 +0000
@@ -41,7 +41,7 @@
 #include "USBEndpoints_LPC17_LPC23.h"
 #elif defined(TARGET_LPC11UXX) || defined(TARGET_LPC1347) || defined (TARGET_LPC11U6X) || defined (TARGET_LPC1549)
 #include "USBEndpoints_LPC11U.h"
-#elif defined(TARGET_KL25Z) | defined(TARGET_KL43Z) | defined(TARGET_KL46Z) | defined(TARGET_K20D50M) | defined(TARGET_K64F)
+#elif defined(TARGET_KL25Z) | defined(TARGET_KL43Z) | defined(TARGET_KL46Z) | defined(TARGET_K20D50M) | defined(TARGET_K64F) | defined(TARGET_K22F)
 #include "USBEndpoints_KL25Z.h"
 #elif defined (TARGET_STM32F4)
 #include "USBEndpoints_STM32F4.h"

--- a/USBDevice/USBHAL_KL25Z.cpp	Wed Nov 19 09:00:30 2014 +0000
+++ b/USBDevice/USBHAL_KL25Z.cpp	Fri Nov 28 07:15:18 2014 +0000
@@ -16,7 +16,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#if defined(TARGET_KL25Z) | defined(TARGET_KL43Z) | defined(TARGET_KL46Z) | defined(TARGET_K20D50M) | defined(TARGET_K64F)
+#if defined(TARGET_KL25Z) | defined(TARGET_KL43Z) | defined(TARGET_KL46Z) | defined(TARGET_K20D50M) | defined(TARGET_K64F) | defined(TARGET_K22F)
 
 #include "USBHAL.h"
 
@@ -135,7 +135,8 @@
     SIM->SOPT2 |= SIM_SOPT2_USBSRC_MASK;
 #else
     // choose usb src as PLL
-    SIM->SOPT2 |= (SIM_SOPT2_USBSRC_MASK | SIM_SOPT2_PLLFLLSEL_MASK);
+    SIM->SOPT2 &= ~SIM_SOPT2_PLLFLLSEL_MASK;
+    SIM->SOPT2 |= (SIM_SOPT2_USBSRC_MASK | (1 << SIM_SOPT2_PLLFLLSEL_SHIFT));
 
     // enable OTG clock
     SIM->SCGC4 |= SIM_SCGC4_USBOTG_MASK;