removed the #if false in the Maple variant usb_cdcam.c which I wrongly thought needed to be removed from build as it was clashing with other code, but this was a mistake, and this file is needed for the Maple build
This commit is contained in:
parent
c2d5ac0a1f
commit
e5c795f0f7
|
@ -32,21 +32,12 @@
|
||||||
* place else. Nonportable bits really need to be factored out, and
|
* place else. Nonportable bits really need to be factored out, and
|
||||||
* the result made cleaner.
|
* the result made cleaner.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/******************************************************************************************************
|
|
||||||
* IMPORTANT
|
|
||||||
* Roger Clark. This file is not used
|
|
||||||
* contents are #if'ed out !
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if false
|
|
||||||
|
|
||||||
#include <libmaple/usb_cdcacm.h>
|
#include <libmaple/usb_cdcacm.h>
|
||||||
|
|
||||||
#include <libmaple/usb.h>
|
#include <libmaple/usb.h>
|
||||||
#include <libmaple/nvic.h>
|
#include <libmaple/nvic.h>
|
||||||
#include <libmaple/delay.h>
|
#include <libmaple/delay.h>
|
||||||
#include <libmaple/usb_cdcacm.h>
|
|
||||||
|
|
||||||
/* Private headers */
|
/* Private headers */
|
||||||
#include "usb_lib_globals.h"
|
#include "usb_lib_globals.h"
|
||||||
|
@ -730,4 +721,4 @@ static void usbSetConfiguration(void) {
|
||||||
static void usbSetDeviceAddress(void) {
|
static void usbSetDeviceAddress(void) {
|
||||||
USBLIB->state = USB_ADDRESSED;
|
USBLIB->state = USB_ADDRESSED;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
Loading…
Reference in New Issue