[NUCLEO_L152RE] Add gpio_irq api

Author: bcostm

libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/device.h

@@ -34,7 +34,7 @@
 #define DEVICE_PORTOUT          1
 #define DEVICE_PORTINOUT        1
 
-#define DEVICE_INTERRUPTIN      0
+#define DEVICE_INTERRUPTIN      1
 
 #define DEVICE_ANALOGIN         1
 #define DEVICE_ANALOGOUT        1

libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c

@@ -87,9 +87,8 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
 
     if (pin == NC) return -1;
 
-    uint32_t pin_number = (uint32_t)pin;
-    uint32_t pin_index  = (pin_number & 0xF);  
-    uint32_t port_index = (pin_number >> 4); 
+    uint32_t port_index = STM_PORT(pin);
+    uint32_t pin_index  = STM_PIN(pin);
 
     // Select irq number and vector
     switch (pin_index) {
@@ -161,12 +160,33 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
             return -1;
     }
 
-    // Enable GPIO and AFIO clocks
-    RCC_APB2PeriphClockCmd((uint32_t)(RCC_APB2Periph_GPIOA << port_index), ENABLE);
-    RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO, ENABLE);
+    // Enable GPIO clock
+    switch (port_index) {
+        case PortA:
+            RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOA, ENABLE);
+            break;
+        case PortB:
+            RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOB, ENABLE);
+            break;
+        case PortC:
+            RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOC, ENABLE);
+            break;
+        case PortD:
+            RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOD, ENABLE);
+            break;
+        case PortH:
+            RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOH, ENABLE);
+            break;
+        default:
+            error("GPIO port number is not correct.");
+            break;          
+    }
 
+    // Enable SYSCFG clock
+    RCC_APB2PeriphClockCmd(RCC_APB2Periph_SYSCFG, ENABLE);
+    
     // Connect EXTI line to pin
-    GPIO_EXTILineConfig(port_index, pin_index);
+    SYSCFG_EXTILineConfig(port_index, pin_index);
 
     // Configure EXTI line
     EXTI_InitTypeDef EXTI_InitStructure;    

libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/port_api.c

@@ -43,10 +43,10 @@ PinName port_pin(PortName port, int pin_n) {
 void port_init(port_t *obj, PortName port, int mask, PinDirection dir) {
     GPIO_TypeDef *gpio;
 
-    uint32_t port_index = (uint32_t)port;
+    uint32_t port_index = (uint32_t)port; // (0=A, 1=B, 2=C, 3=D, 4=E, 5=F, ...)
 
     // Get GPIO structure base address and enable clock
-     switch (port_index) {
+    switch (port_index) {
         case PortA:
             gpio = (GPIO_TypeDef *)GPIOA_BASE;
             RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOA, ENABLE);

libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/us_ticker.c

@@ -34,11 +34,11 @@
 
 #define TIM_MST     TIM9
 #define TIM_MST_IRQ TIM9_IRQn
-#define TIM_MST_RCC RCC_APB2Periph_TIM9
+#define TIM_MST_RCC RCC_APB2PeriphClockCmd(RCC_APB2Periph_TIM9, ENABLE)
 
 #define TIM_SLV     TIM4
 #define TIM_SLV_IRQ TIM4_IRQn
-#define TIM_SLV_RCC RCC_APB1Periph_TIM4
+#define TIM_SLV_RCC RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM4, ENABLE)
 
 #define MST_SLV_ITR TIM_TS_ITR3
 
@@ -53,8 +53,8 @@ void us_ticker_init(void) {
     us_ticker_inited = 1;
 
     // Enable Timers clock
-    RCC_APB2PeriphClockCmd(TIM_MST_RCC, ENABLE);
-    RCC_APB1PeriphClockCmd(TIM_SLV_RCC, ENABLE);
+    TIM_MST_RCC;
+    TIM_SLV_RCC;
 
     // Master and Slave timers time base configuration
     TIM_TimeBaseStructInit(&TIM_TimeBaseStructure);
@@ -94,9 +94,11 @@ uint32_t us_ticker_read() {
     // previous (incorrect) value of Slave and the new value of Master, which would return a
     // value in the past. Avoid this by computing consecutive values of the timer until they
     // are properly ordered.
-    counter = counter2 = (uint32_t)((uint32_t)TIM_GetCounter(TIM_SLV) << 16) + (uint32_t)TIM_GetCounter(TIM_MST);
+    counter = (uint32_t)((uint32_t)TIM_GetCounter(TIM_SLV) << 16);
+    counter += (uint32_t)TIM_GetCounter(TIM_MST);
     while (1) {
-        counter2 = (uint32_t)((uint32_t)TIM_GetCounter(TIM_SLV) << 16) + (uint32_t)TIM_GetCounter(TIM_MST);
+        counter2 = (uint32_t)((uint32_t)TIM_GetCounter(TIM_SLV) << 16);
+        counter2 += (uint32_t)TIM_GetCounter(TIM_MST);
         if (counter2 > counter) {
             break;
         }