From: Dean Camera Date: Fri, 27 Sep 2013 16:48:42 +0000 (-0700) Subject: Merge pull request #7 from mondalaci/hidclassdevice_whitespaces X-Git-Tag: LUFA-140302~59 X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/8e2476a125d6a4bd0385eb0f9569ac597bdbf9ed?hp=ef1a4b750bca3ef538e47a07fa093bad3a883f12 Merge pull request #7 from mondalaci/hidclassdevice_whitespaces Use spaces instead of tabs where necessary to fix indentation. --- diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index 74e406629..5f1047eee 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -236,9 +236,9 @@ void EVENT_USB_Device_ControlRequest(void) #if !defined(NO_BLOCK_SUPPORT) /** Reads or writes a block of EEPROM or FLASH memory to or from the appropriate CDC data endpoint, depending - * on the AVR910 protocol command issued. + * on the AVR109 protocol command issued. * - * \param[in] Command Single character AVR910 protocol command indicating what memory operation to perform + * \param[in] Command Single character AVR109 protocol command indicating what memory operation to perform */ static void ReadWriteMemoryBlock(const uint8_t Command) { @@ -402,7 +402,7 @@ static void WriteNextResponseByte(const uint8_t Response) Endpoint_Write_8(Response); } -/** Task to read in AVR910 commands from the CDC data OUT endpoint, process them, perform the required actions +/** Task to read in AVR109 commands from the CDC data OUT endpoint, process them, perform the required actions * and send the appropriate response back to the host. */ static void CDC_Task(void) diff --git a/LUFA/Build/lufa_build.mk b/LUFA/Build/lufa_build.mk index 828401096..a1a130e1e 100644 --- a/LUFA/Build/lufa_build.mk +++ b/LUFA/Build/lufa_build.mk @@ -31,9 +31,9 @@ LUFA_BUILD_PROVIDED_MACROS += # bin - Build application BIN binary object file # hex - Build application HEX object file # lss - Build application LSS assembly listing file -# clean - Remove all project intermediatary and binary +# clean - Remove all project intermediary and binary # output files -# mostlyclean - Remove intermediatary output files, but +# mostlyclean - Remove intermediary output files, but # preserve binaries # .s - Compile C/C++ source file into an assembly file # for manual code inspection diff --git a/LUFA/Build/lufa_cppcheck.mk b/LUFA/Build/lufa_cppcheck.mk index 017b852db..faf66974e 100644 --- a/LUFA/Build/lufa_cppcheck.mk +++ b/LUFA/Build/lufa_cppcheck.mk @@ -11,15 +11,16 @@ LUFA_BUILD_TARGETS += cppcheck cppcheck-config LUFA_BUILD_MANDATORY_VARS += SRC LUFA_BUILD_OPTIONAL_VARS += CPPCHECK_INCLUDES CPPCHECK_EXCLUDES CPPCHECK_MSG_TEMPLATE CPPCHECK_ENABLE \ CPPCHECK_SUPPRESS CPPCHECK_FAIL_ON_WARNING CPPCHECK_QUIET CPPCHECK_FLAGS -LUFA_BUILD_PROVIDED_VARS += -LUFA_BUILD_PROVIDED_MACROS += +LUFA_BUILD_PROVIDED_VARS += +LUFA_BUILD_PROVIDED_MACROS += # ----------------------------------------------------------------------------- # LUFA CPPCheck Buildsystem Makefile Module. # ----------------------------------------------------------------------------- # DESCRIPTION: # Provides a set of targets to scan a project with the free "cppcheck" static -# analysis tool, to check for code errors at runtime (see http://cppcheck.sourceforge.net). +# analysis tool, to check for code errors at runtime +# (see http://cppcheck.sourceforge.net). # ----------------------------------------------------------------------------- # TARGETS: # @@ -68,7 +69,7 @@ CPPCHECK_ENABLE ?= all CPPCHECK_SUPPRESS ?= variableScope missingInclude CPPCHECK_FAIL_ON_WARNING ?= Y CPPCHECK_QUIET ?= Y -CPPCHECK_FLAGS ?= +CPPCHECK_FLAGS ?= # Sanity check user supplied values $(foreach MANDATORY_VAR, $(LUFA_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))