From 033585af1abc8f609f3104419023457dec1cfd72 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 3 Mar 2013 08:45:54 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5345 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- boards/ST_STM32373C_EVAL/board.h | 16 ++++++++-------- boards/ST_STM32373C_EVAL/board.mk | 4 ++-- boards/ST_STM32373C_EVAL/cfg/board.chcfg | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'boards') diff --git a/boards/ST_STM32373C_EVAL/board.h b/boards/ST_STM32373C_EVAL/board.h index 8bad43693..a615cce14 100644 --- a/boards/ST_STM32373C_EVAL/board.h +++ b/boards/ST_STM32373C_EVAL/board.h @@ -59,7 +59,7 @@ #define GPIOA_PIN4 4 #define GPIOA_PIN5 5 #define GPIOA_PIN6 6 -#define GPIOA_COMP2 OUT 7 +#define GPIOA_COMP2_OUT 7 #define GPIOA_I2C2_SMB 8 #define GPIOA_I2C2_SCL 9 #define GPIOA_I2C2_SDA 10 @@ -186,7 +186,7 @@ * PA4 - PIN4 (input pullup). * PA5 - PIN5 (input floating). * PA6 - PIN6 (input pullup). - * PA7 - COMP2 OUT (output pushpull maximum). + * PA7 - COMP2_OUT (output pushpull maximum). * PA8 - I2C2_SMB (input floating). * PA9 - I2C2_SCL (alternate 4). * PA10 - I2C2_SDA (alternate 4). @@ -203,7 +203,7 @@ PIN_MODE_INPUT(GPIOA_PIN4) | \ PIN_MODE_INPUT(GPIOA_PIN5) | \ PIN_MODE_INPUT(GPIOA_PIN6) | \ - PIN_MODE_OUTPUT(GPIOA_COMP2 OUT) | \ + PIN_MODE_OUTPUT(GPIOA_COMP2_OUT) | \ PIN_MODE_INPUT(GPIOA_I2C2_SMB) | \ PIN_MODE_ALTERNATE(GPIOA_I2C2_SCL) | \ PIN_MODE_ALTERNATE(GPIOA_I2C2_SDA) | \ @@ -219,7 +219,7 @@ PIN_OTYPE_PUSHPULL(GPIOA_PIN4) | \ PIN_OTYPE_PUSHPULL(GPIOA_PIN5) | \ PIN_OTYPE_PUSHPULL(GPIOA_PIN6) | \ - PIN_OTYPE_PUSHPULL(GPIOA_COMP2 OUT) | \ + PIN_OTYPE_PUSHPULL(GPIOA_COMP2_OUT) | \ PIN_OTYPE_PUSHPULL(GPIOA_I2C2_SMB) | \ PIN_OTYPE_OPENDRAIN(GPIOA_I2C2_SCL) | \ PIN_OTYPE_PUSHPULL(GPIOA_I2C2_SDA) | \ @@ -235,7 +235,7 @@ PIN_OSPEED_2M(GPIOA_PIN4) | \ PIN_OSPEED_100M(GPIOA_PIN5) | \ PIN_OSPEED_2M(GPIOA_PIN6) | \ - PIN_OSPEED_100M(GPIOA_COMP2 OUT) | \ + PIN_OSPEED_100M(GPIOA_COMP2_OUT) | \ PIN_OSPEED_2M(GPIOA_I2C2_SMB) | \ PIN_OSPEED_100M(GPIOA_I2C2_SCL) | \ PIN_OSPEED_100M(GPIOA_I2C2_SDA) | \ @@ -251,7 +251,7 @@ PIN_PUPDR_PULLUP(GPIOA_PIN4) | \ PIN_PUPDR_FLOATING(GPIOA_PIN5) | \ PIN_PUPDR_PULLUP(GPIOA_PIN6) | \ - PIN_PUPDR_FLOATING(GPIOA_COMP2 OUT) | \ + PIN_PUPDR_FLOATING(GPIOA_COMP2_OUT) | \ PIN_PUPDR_FLOATING(GPIOA_I2C2_SMB) | \ PIN_PUPDR_FLOATING(GPIOA_I2C2_SCL) | \ PIN_PUPDR_FLOATING(GPIOA_I2C2_SDA) | \ @@ -267,7 +267,7 @@ PIN_ODR_HIGH(GPIOA_PIN4) | \ PIN_ODR_HIGH(GPIOA_PIN5) | \ PIN_ODR_HIGH(GPIOA_PIN6) | \ - PIN_ODR_LOW(GPIOA_COMP2 OUT) | \ + PIN_ODR_LOW(GPIOA_COMP2_OUT) | \ PIN_ODR_HIGH(GPIOA_I2C2_SMB) | \ PIN_ODR_HIGH(GPIOA_I2C2_SCL) | \ PIN_ODR_HIGH(GPIOA_I2C2_SDA) | \ @@ -283,7 +283,7 @@ PIN_AFIO_AF(GPIOA_PIN4, 0) | \ PIN_AFIO_AF(GPIOA_PIN5, 5) | \ PIN_AFIO_AF(GPIOA_PIN6, 0) | \ - PIN_AFIO_AF(GPIOA_COMP2 OUT, 0)) + PIN_AFIO_AF(GPIOA_COMP2_OUT, 0)) #define VAL_GPIOA_AFRH (PIN_AFIO_AF(GPIOA_I2C2_SMB, 0) | \ PIN_AFIO_AF(GPIOA_I2C2_SCL, 4) | \ PIN_AFIO_AF(GPIOA_I2C2_SDA, 4) | \ diff --git a/boards/ST_STM32373C_EVAL/board.mk b/boards/ST_STM32373C_EVAL/board.mk index aab2565a4..98a37d006 100644 --- a/boards/ST_STM32373C_EVAL/board.mk +++ b/boards/ST_STM32373C_EVAL/board.mk @@ -1,5 +1,5 @@ # List of all the board related files. -BOARDSRC = ${CHIBIOS}/boards/ST STM32373C-EVAL/board.c +BOARDSRC = ${CHIBIOS}/boards/ST_STM32373C_EVAL/board.c # Required include directories -BOARDINC = ${CHIBIOS}/boards/ST STM32373C-EVAL +BOARDINC = ${CHIBIOS}/boards/ST_STM32373C_EVAL diff --git a/boards/ST_STM32373C_EVAL/cfg/board.chcfg b/boards/ST_STM32373C_EVAL/cfg/board.chcfg index f73560510..1aafa29f8 100644 --- a/boards/ST_STM32373C_EVAL/cfg/board.chcfg +++ b/boards/ST_STM32373C_EVAL/cfg/board.chcfg @@ -72,7 +72,7 @@ Mode="Input" Alternate="0" />