From 6b44a61534417aa636ce21a80d7306f46300a979 Mon Sep 17 00:00:00 2001
From: Marcos Gomes <marcosfg@ua.pt>
Date: Mon, 12 Sep 2016 17:30:18 +0100
Subject: [PATCH] Updated with code style guidelines

---
 .../TARGET_LPC4330/PeripheralNames.h          |  2 +-
 .../TARGET_LPC43XX/TARGET_LPC4330/PinNames.h  |  1 +
 .../TARGET_LPC4337/PeripheralNames.h          | 18 ++++++++++++-
 .../TARGET_LPC43XX/TARGET_LPC4337/PinNames.h  |  1 -
 .../TARGET_NXP/TARGET_LPC43XX/analogin_api.c  | 25 ++++++++-----------
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4330/PeripheralNames.h b/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4330/PeripheralNames.h
index 391495566d..9da90589f7 100644
--- a/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4330/PeripheralNames.h
+++ b/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4330/PeripheralNames.h
@@ -46,7 +46,7 @@ typedef enum {
     ADC1_5,
     ADC1_6,
     ADC1_7,
-    ADC_pin0_0,        // inlcude adc only pin channels
+    ADC_pin0_0,
     ADC_pin0_1,
     ADC_pin0_2,
     ADC_pin0_3,
diff --git a/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4330/PinNames.h b/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4330/PinNames.h
index 3686b71ee6..9a3c5f8382 100644
--- a/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4330/PinNames.h
+++ b/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4330/PinNames.h
@@ -666,6 +666,7 @@ typedef enum {
                       // (*)  if DAC0 is configured, ADC4 is not available
                       // (**) ADC5 requires JP2 mod
 
+    // Analog Only Pins
     adc0_0 = MBED_PIN(NO_PORT, 0, NO_GPIO, 0),
     adc0_1 = MBED_PIN(NO_PORT, 1, NO_GPIO, 0),
     adc0_2 = MBED_PIN(NO_PORT, 2, NO_GPIO, 0),
diff --git a/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4337/PeripheralNames.h b/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4337/PeripheralNames.h
index 2b5eee49a7..75466344c2 100644
--- a/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4337/PeripheralNames.h
+++ b/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4337/PeripheralNames.h
@@ -45,7 +45,23 @@ typedef enum {
     ADC1_4,
     ADC1_5,
     ADC1_6,
-    ADC1_7
+    ADC1_7,
+    ADC_pin0_0,
+    ADC_pin0_1,
+    ADC_pin0_2,
+    ADC_pin0_3,
+    ADC_pin0_4,
+    ADC_pin0_5,
+    ADC_pin0_6,
+    ADC_pin0_7,
+    ADC_pin1_0,
+    ADC_pin1_1,
+    ADC_pin1_2,
+    ADC_pin1_3,
+    ADC_pin1_4,
+    ADC_pin1_5,
+    ADC_pin1_6,
+    ADC_pin1_7
 } ADCName;
 
 typedef enum {
diff --git a/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4337/PinNames.h b/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4337/PinNames.h
index dd92d5c87b..7a58224d6e 100644
--- a/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4337/PinNames.h
+++ b/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/TARGET_LPC4337/PinNames.h
@@ -506,7 +506,6 @@ typedef enum {
     LED4 = LED_RED,
 
     // Analog Only pins
-
     adc0_0 = MBED_PIN(NO_PORT, 0, NO_GPIO, 0),
     adc0_1 = MBED_PIN(NO_PORT, 1, NO_GPIO, 0),
     adc0_2 = MBED_PIN(NO_PORT, 2, NO_GPIO, 0),
diff --git a/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c b/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c
index d9c2a34302..f11c8be819 100644
--- a/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c
+++ b/hal/targets/hal/TARGET_NXP/TARGET_LPC43XX/analogin_api.c
@@ -70,32 +70,27 @@ void analogin_init(analogin_t *obj, PinName pin) {
     MBED_ASSERT(obj->adc != (LPC_ADC_T *)NC);
     
     // Set ADC number
-    if(name < ADC1_0)
-    {
+    if(name < ADC1_0) {
         obj->num = 0;
-    } else if(name < ADC_pin0_0 && name > ADC0_6)
-    {
+    } else if(name < ADC_pin0_0 && name > ADC0_6) {
         obj->num = 1;
-    } else if(name < ADC_pin1_1 && name > ADC1_7)
-    {
+    } else if(name < ADC_pin1_1 && name > ADC1_7) {
         obj->num = 0;
-    } else if(name > ADC_pin0_7)
-    {
+    } else if(name > ADC_pin0_7) {
         obj->num = 1;
     }
 
-    // Set ADC register, number and channel
+    //ADC register and channel
     obj->ch = name % (ADC0_7 + 1);
     obj->adc = (LPC_ADC_T *) (obj->num > 0) ? LPC_ADC1 : LPC_ADC0;
 
     // Reset pin function to GPIO if it is a GPIO pin. for adc only pins it is not necessary
-    if(name < ADC_pin0_0)
-    {
-        gpio_set(pin);
-        // Select ADC on analog function select register in SCU
-        LPC_SCU->ENAIO[obj->num] |= (1 << obj->ch);
+    if(name < ADC_pin0_0) {
+    	gpio_set(pin);
+    	// Select ADC on analog function select register in SCU
+    	LPC_SCU->ENAIO[obj->num] |= (1 << obj->ch);
     } else {
-        LPC_SCU->ENAIO[obj->num] &= ~(1 << obj->ch);
+    	LPC_SCU->ENAIO[obj->num] &= ~(1 << obj->ch);
     }
     
     // Calculate minimum clock divider