klaute/USB2SerialMux
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Function declaration fixed. Makefile is correct configured now.

Browse source
This commit is contained in:
klaute 2016-08-17 08:33:57 +02:00
parent e4e6fc0df1
commit 27f015ea00
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Descriptors.c
View file

@ -315,7 +315,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
* USB host. * USB host.
*/ */
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex, const uint16_t wIndex,
const void** const DescriptorAddress) const void** const DescriptorAddress)
{ {
const uint8_t DescriptorType = (wValue >> 8); const uint8_t DescriptorType = (wValue >> 8);

2
src/Descriptors.h
View file

@ -127,7 +127,7 @@
/* Function Prototypes: */ /* Function Prototypes: */
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex, const uint16_t wIndex,
const void** const DescriptorAddress) const void** const DescriptorAddress)
ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

1
src/USB2SerialMux.c
View file

@ -240,7 +240,6 @@ void CDC1_Task(void)
// { // {
// call(cmd) // call(cmd)
// } // }
}
} }
//=========================================================================== //===========================================================================

14
src/makefile
View file

@ -13,19 +13,25 @@
MCU = atmega32u4 MCU = atmega32u4
ARCH = AVR8 ARCH = AVR8
BOARD = USBKEY #BOARD = USBKEY
F_CPU = 16000000UL F_CPU = 16000000
F_USB = $(F_CPU) F_USB = $(F_CPU)
OPTIMIZATION = s OPTIMIZATION = s
TARGET = USB2SerialMux TARGET = USB2SerialMux
SRC = $(TARGET).c Descriptors.c $(LUFA_SRC_USB) uart/uart.c SRC = $(TARGET).c Descriptors.c uart/uart.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
LUFA_PATH = ../LUFA LUFA_PATH = ../LUFA/LUFA
CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -Iuart/ CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -Iuart/
LD_FLAGS = LD_FLAGS =
PROGRAMMER = dfu-programmer
# Default target # Default target
all: all:
program:
$(PROGRAMMER) $(MCU) erase
$(PROGRAMMER) $(MCU) flash $(TARGET).hex
$(PROGRAMMER) $(MCU) reset
# Include LUFA build script makefiles # Include LUFA build script makefiles
include $(LUFA_PATH)/Build/lufa_core.mk include $(LUFA_PATH)/Build/lufa_core.mk
include $(LUFA_PATH)/Build/lufa_sources.mk include $(LUFA_PATH)/Build/lufa_sources.mk