Fix errors in the SingleUSBModeTest build test. Fix logic errors in USBMode.h.

[pub/lufa.git] / LUFA / Build / lufa.cppcheck.in

diff --git a/LUFA/Build/lufa.cppcheck.in b/LUFA/Build/lufa.cppcheck.in
index d307580..35ec1e4 100644 (file)
--- a/LUFA/Build/lufa.cppcheck.in
+++ b/LUFA/Build/lufa.cppcheck.in
@@ -10,7 +10,8 @@ LUFA_BUILD_MODULES        += CPPCHECK
 LUFA_BUILD_TARGETS        += cppcheck cppcheck-config\r
 LUFA_BUILD_MANDATORY_VARS += \r
 LUFA_BUILD_OPTIONAL_VARS  += CPPCHECK_PATH CPPCHECK_INCLUDES CPPCHECK_EXCLUDES CPPCHECK_MSG_TEMPLATE \\r
 LUFA_BUILD_TARGETS        += cppcheck cppcheck-config\r
 LUFA_BUILD_MANDATORY_VARS += \r
 LUFA_BUILD_OPTIONAL_VARS  += CPPCHECK_PATH CPPCHECK_INCLUDES CPPCHECK_EXCLUDES CPPCHECK_MSG_TEMPLATE \\r

-                             CPPCHECK_ENABLE CPPCHECK_SUPPRESS CPPCHECK_FAIL_ON_WARNING CPPCHECK_QUIET\r
+                             CPPCHECK_ENABLE CPPCHECK_SUPPRESS CPPCHECK_FAIL_ON_WARNING CPPCHECK_QUIET \\r
+                             CPPCHECK_FLAGS\r

 \r
 # -----------------------------------------------------------------------------\r
 #                LUFA CPPCheck Buildsystem Makefile Module.\r
 \r
 # -----------------------------------------------------------------------------\r
 #                LUFA CPPCheck Buildsystem Makefile Module.\r


@@ -41,6 +42,7 @@ LUFA_BUILD_OPTIONAL_VARS  += CPPCHECK_PATH CPPCHECK_INCLUDES CPPCHECK_EXCLUDES C
 #    CPPCHECK_FAIL_ON_WARNING  - Set to Y to fail the build on cppcheck\r
 #                                warnings, N to continue even if warnings occur\r
 #    CPPCHECK_QUIET            - Enable cppcheck verbose or quiet output mode\r
 #    CPPCHECK_FAIL_ON_WARNING  - Set to Y to fail the build on cppcheck\r
 #                                warnings, N to continue even if warnings occur\r
 #    CPPCHECK_QUIET            - Enable cppcheck verbose or quiet output mode\r

+#    CPPCHECK_FLAGS            - Additional flags to pass to cppcheck\r

 #\r
 # -----------------------------------------------------------------------------\r
 \r
 #\r
 # -----------------------------------------------------------------------------\r
 \r


@@ -53,23 +55,22 @@ CPPCHECK_ENABLE              ?= all
 CPPCHECK_SUPPRESS            ?= variableScope missingInclude\r
 CPPCHECK_FAIL_ON_WARNING     ?= Y\r
 CPPCHECK_QUIET               ?= Y\r
 CPPCHECK_SUPPRESS            ?= variableScope missingInclude\r
 CPPCHECK_FAIL_ON_WARNING     ?= Y\r
 CPPCHECK_QUIET               ?= Y\r

+CPPCHECK_FLAGS               ?= \r

 \r
 # Build a default argument list for cppcheck\r
 \r
 # Build a default argument list for cppcheck\r

-CPPCHECK_OPTIONS := --template="$(CPPCHECK_MSG_TEMPLATE)" $(CPPCHECK_INCLUDES:%=-I%) $(CPPCHECK_EXCLUDES:%=-i%) --inline-suppr --force --std=c99\r
+BASE_CPPCHECK_FLAGS := --template="$(CPPCHECK_MSG_TEMPLATE)" $(CPPCHECK_INCLUDES:%=-I%) $(CPPCHECK_EXCLUDES:%=-i%) --inline-suppr --force --std=c99\r

 \r
 # Sanity check parameters and construct additional command line arguments to cppcheck\r
 \r
 # Sanity check parameters and construct additional command line arguments to cppcheck\r

-ifeq ($(CPPCHECK_PATH),)\r
-   $(error Makefile CPPCHECK_PATH option cannot be blank)\r
-endif\r
+\r

 ifeq ($(CPPCHECK_FAIL_ON_WARNING), Y)\r
 ifeq ($(CPPCHECK_FAIL_ON_WARNING), Y)\r

-   CPPCHECK_OPTIONS += --error-exitcode=1\r
+   BASE_CPPCHECK_FLAGS += --error-exitcode=1\r

 else ifneq ($(CPPCHECK_FAIL_ON_WARNING), N)\r
        $(error CPPCHECK_FAIL_ON_WARNING must be Y or N)\r
 endif\r
 ifeq ($(CPPCHECK_QUIET), Y)\r
 else ifneq ($(CPPCHECK_FAIL_ON_WARNING), N)\r
        $(error CPPCHECK_FAIL_ON_WARNING must be Y or N)\r
 endif\r
 ifeq ($(CPPCHECK_QUIET), Y)\r

-   CPPCHECK_OPTIONS += --quiet\r
+   BASE_CPPCHECK_FLAGS += --quiet\r

 else ifneq ($(CPPCHECK_QUIET), N)\r
 else ifneq ($(CPPCHECK_QUIET), N)\r

-       $(error CPPCHECK_QUIET must be Y or N)\r
+   $(error CPPCHECK_QUIET must be Y or N)\r

 endif\r
 \r
 # Output Messages\r
 endif\r
 \r
 # Output Messages\r


@@ -77,11 +78,11 @@ MSG_CPPCHECK_CMD         := ' [CPPCHECK]:'
 \r
 cppcheck-config:\r
        @echo $(MSG_CPPCHECK_CMD) Checking cppcheck configuration for path \"$(CPPCHECK_PATH)\"\r
 \r
 cppcheck-config:\r
        @echo $(MSG_CPPCHECK_CMD) Checking cppcheck configuration for path \"$(CPPCHECK_PATH)\"\r

-       cppcheck $(CPPCHECK_OPTIONS) --check-config $(CPPCHECK_PATH)\r
+       cppcheck $(BASE_CPPCHECK_FLAGS) --check-config $(CPPCHECK_FLAGS) $(CPPCHECK_PATH)\r

 \r
 cppcheck:\r
        @echo $(MSG_CPPCHECK_CMD) Performing cppcheck analysis on path \"$(CPPCHECK_PATH)\"\r
 \r
 cppcheck:\r
        @echo $(MSG_CPPCHECK_CMD) Performing cppcheck analysis on path \"$(CPPCHECK_PATH)\"\r

-       cppcheck $(CPPCHECK_OPTIONS) --enable=$(CPPCHECK_ENABLE) $(CPPCHECK_SUPPRESS:%=--suppress=%) $(CPPCHECK_PATH)\r
+       cppcheck $(BASE_CPPCHECK_FLAGS) --enable=$(CPPCHECK_ENABLE) $(CPPCHECK_SUPPRESS:%=--suppress=%) $(CPPCHECK_FLAGS) $(CPPCHECK_PATH)\r

 \r
 # Phony build targets for this module\r
 .PHONY: cppcheck-config cppcheck\r
 \r
 # Phony build targets for this module\r
 .PHONY: cppcheck-config cppcheck\r