From f8230d65653383178aec4ea7fb2ddbefd6cce0b7 Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Mon, 10 Aug 2015 22:01:14 +0200 Subject: [PATCH] ARM: get usb_serial.c in. Once more just made sure it doesn't accidentially slip in without giving the user a warning. --- Makefile-ARM | 3 +-- usb_serial.h | 9 ++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile-ARM b/Makefile-ARM index b4bda7c..a38aa16 100644 --- a/Makefile-ARM +++ b/Makefile-ARM @@ -101,9 +101,8 @@ SOURCES = mendel.c cpu.c serial.c sermsg.c sersendf.c delay.c SOURCES += gcode_parse.c gcode_process.c pinio.c timer.c clock.c SOURCES += dda_queue.c dda_maths.c dda_kinematics.c dda.c dda_lookahead.c SOURCES += analog.c temp.c heater.c home.c debug.c crc.c pff.c pff_diskio.c -SOURCES += spi.c intercom.c graycode.c +SOURCES += spi.c intercom.c graycode.c usb_serial.c # Sources left: -# usb_serial.c # watchdog.c ifeq ($(MCU), lpc1114) diff --git a/usb_serial.h b/usb_serial.h index 14c5b1a..2b978f9 100644 --- a/usb_serial.h +++ b/usb_serial.h @@ -3,6 +3,13 @@ #include +/** + Test configuration. +*/ +#ifdef __ARMEL__ + #error Direct USB connection (USB_SERIAL) not yet supported on ARM. +#endif + // setup void usb_init(void); // initialize everything uint8_t usb_configured(void); // is the USB port configured @@ -79,7 +86,7 @@ int8_t usb_serial_set_control(uint8_t signals); // set DSR, DCD, RI, etc #define MSB(n) ((n >> 8) & 255) #if defined(__AVR_AT90USB162__) -#define HW_CONFIG() +#define HW_CONFIG() #define PLL_CONFIG() (PLLCSR = ((1<