jaewon lee / USBDevice

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Fork of USBDevice by mbed official

Files at this revision

API Documentation at this revision

Revision 13:16731886c049, committed 2013-09-10

Comitter:
bogdanm
Date:
Tue Sep 10 15:14:55 2013 +0300
Parent:
12:6030a12b6c62
Child:
14:d495202c90f4
Commit message:
Sync with git revision 171dda705c947bf910926a0b73d6a4797802554d

Changed in this revision

USBDevice/USBEndpoints.h Show annotated file Show diff for this revision Revisions of this file
USBDevice/USBHAL_KL25Z.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/USBDevice/USBEndpoints.h	Thu Aug 08 15:56:46 2013 +0100
+++ b/USBDevice/USBEndpoints.h	Tue Sep 10 15:14:55 2013 +0300
@@ -39,7 +39,7 @@
 /* Include configuration for specific target */
 #if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088)
 #include "USBEndpoints_LPC17_LPC23.h"
-#elif defined(TARGET_LPC11U24) || defined(TARGET_LPC1347)
+#elif defined(TARGET_LPC11UXX) || defined(TARGET_LPC1347)
 #include "USBEndpoints_LPC11U.h"
 #elif defined(TARGET_KL25Z)
 #include "USBEndpoints_KL25Z.h"

--- a/USBDevice/USBHAL_KL25Z.cpp	Thu Aug 08 15:56:46 2013 +0100
+++ b/USBDevice/USBHAL_KL25Z.cpp	Tue Sep 10 15:14:55 2013 +0300
@@ -75,7 +75,7 @@
 static uint32_t Data1  = 0x55555555;
 
 static uint32_t frameNumber() {
-    return((USB0->FRMNUML | (USB0->FRMNUMH << 8) & 0x07FF));
+    return((USB0->FRMNUML | (USB0->FRMNUMH << 8)) & 0x07FF);
 }
 
 uint32_t USBHAL::endpointReadcore(uint8_t endpoint, uint8_t *buffer) {