Mahir Ozturk / USBDevice

USBDevice library fork to add multi-function (e.g. Keyboard(HID) + Virtual COM Port(CDC)) usb support.

Fork of USBDevice by Maxim Integrated

Files at this revision

API Documentation at this revision

Revision 68:17ac7abb27a7, committed 2017-06-13

Comitter:
jessexm
Date:
Tue Jun 13 22:42:27 2017 +0000
Parent:
67:8ca8b458434a
Child:
69:dad310740b28
Commit message:
Remove API incompatibility workaround and fix include dependency

Changed in this revision

USBDevice/USBDevice_Types.h Show annotated file Show diff for this revision Revisions of this file
USBDevice/USBHAL_Maxim.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/USBDevice/USBDevice_Types.h	Mon Jun 12 23:05:18 2017 +0000
+++ b/USBDevice/USBDevice_Types.h	Tue Jun 13 22:42:27 2017 +0000
@@ -19,6 +19,8 @@
 #ifndef USBDEVICE_TYPES_H
 #define USBDEVICE_TYPES_H
 
+#include <stdint.h>
+
 /* Standard requests */
 #define GET_STATUS        (0)
 #define CLEAR_FEATURE     (1)

--- a/USBDevice/USBHAL_Maxim.cpp	Mon Jun 12 23:05:18 2017 +0000
+++ b/USBDevice/USBHAL_Maxim.cpp	Tue Jun 13 22:42:27 2017 +0000
@@ -141,11 +141,7 @@
 
     // attach IRQ handler and enable interrupts
     instance = this;
-#if defined(TARGET_MAX32620C) || defined(TARGET_MAX32625) || defined(TARGET_MAX32630)
-    NVIC_SetVector(USB_IRQn, _usbisr);
-#else
     NVIC_SetVector(USB_IRQn, (uint32_t)&_usbisr);
-#endif
     NVIC_EnableIRQ(USB_IRQn);
 }