I2C. Merged code from trunk.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3561 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 4 insertions, 19 deletions

diff --git a/boards/ST_STM3220G_EVAL/board.h b/boards/ST_STM3220G_EVAL/board.h
index e10a5203c..219a9a738 100644
--- a/boards/ST_STM3220G_EVAL/board.h
+++ b/boards/ST_STM3220G_EVAL/board.h
@@ -84,22 +84,7 @@
 #define PIN_PUDR_FLOATING(n)        (0 << ((n) * 2))

 #define PIN_PUDR_PULLUP(n)          (1 << ((n) * 2))

 #define PIN_PUDR_PULLDOWN(n)        (2 << ((n) * 2))

-#define PIN_AFIO_AF0(n)             (0 << ((n % 8) * 4))

-#define PIN_AFIO_AF1(n)             (1 << ((n % 8) * 4))

-#define PIN_AFIO_AF2(n)             (2 << ((n % 8) * 4))

-#define PIN_AFIO_AF3(n)             (3 << ((n % 8) * 4))

-#define PIN_AFIO_AF4(n)             (4 << ((n % 8) * 4))

-#define PIN_AFIO_AF5(n)             (5 << ((n % 8) * 4))

-#define PIN_AFIO_AF6(n)             (6 << ((n % 8) * 4))

-#define PIN_AFIO_AF7(n)             (7 << ((n % 8) * 4))

-#define PIN_AFIO_AF8(n)             (8 << ((n % 8) * 4))

-#define PIN_AFIO_AF9(n)             (9 << ((n % 8) * 4))

-#define PIN_AFIO_AF10(n)            (10 << ((n % 8) * 4))

-#define PIN_AFIO_AF11(n)            (11 << ((n % 8) * 4))

-#define PIN_AFIO_AF12(n)            (12 << ((n % 8) * 4))

-#define PIN_AFIO_AF13(n)            (13 << ((n % 8) * 4))

-#define PIN_AFIO_AF14(n)            (14 << ((n % 8) * 4))

-#define PIN_AFIO_AF15(n)            (15 << ((n % 8) * 4))

+#define PIN_AFIO_AF(n, v)           ((v##U) << ((n % 8) * 4))

 

 /*

  * Port A setup.

@@ -157,8 +142,8 @@
                                        PIN_PUDR_FLOATING(15)))

 #define VAL_GPIOC_ODR               0xFFFFFFFF

 #define VAL_GPIOC_AFRL				0x00000000

-#define VAL_GPIOC_AFRH				(PIN_AFIO_AF7(10)         | \

-                                     PIN_AFIO_AF7(11))

+#define VAL_GPIOC_AFRH				(PIN_AFIO_AF(7, 10)       | \

+                                     PIN_AFIO_AF(7, 11))

 

 /*

  * Port D setup.

diff --git a/boards/ST_STM32L_DISCOVERY/board.h b/boards/ST_STM32L_DISCOVERY/board.h
index 6326c5e4d..978d91456 100644
--- a/boards/ST_STM32L_DISCOVERY/board.h
+++ b/boards/ST_STM32L_DISCOVERY/board.h
@@ -69,7 +69,7 @@
 #define PIN_PUDR_FLOATING(n)        (0U << ((n) * 2))

 #define PIN_PUDR_PULLUP(n)          (1U << ((n) * 2))

 #define PIN_PUDR_PULLDOWN(n)        (2U << ((n) * 2))

-#define PIN_AFIO_AF(n, v)           ((v)U << ((n % 8) * 4))

+#define PIN_AFIO_AF(n, v)           ((v##U) << ((n % 8) * 4))

 

 /*

  * Port A setup.