From 71ae8b0b9f8289d8c173b4c2b7d1d200c6040df4 Mon Sep 17 00:00:00 2001
From: vimalrajr <vimalraj.r@atmel.com>
Date: Fri, 21 Aug 2015 15:12:19 +0530
Subject: [PATCH] Adding support for SAMD21G18A in SDK tests.

---
 libraries/tests/mbed/i2c_master/main.cpp         | 2 +-
 libraries/tests/mbed/i2c_slave/main.cpp          | 2 +-
 libraries/tests/mbed/interrupt_chaining/main.cpp | 2 +-
 libraries/tests/mbed/pwm/main.cpp                | 2 +-
 libraries/tests/mbed/sleep/main.cpp              | 2 ++
 libraries/tests/mbed/spi/main.cpp                | 2 +-
 libraries/tests/mbed/spi_master/main.cpp         | 2 +-
 libraries/tests/mbed/spi_slave/main.cpp          | 2 +-
 8 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/libraries/tests/mbed/i2c_master/main.cpp b/libraries/tests/mbed/i2c_master/main.cpp
index 917b0ca56a..6af43ee58b 100644
--- a/libraries/tests/mbed/i2c_master/main.cpp
+++ b/libraries/tests/mbed/i2c_master/main.cpp
@@ -26,7 +26,7 @@ I2C i2c(TEST_SDA_PIN, TEST_SCL_PIN);
 #define TEST_SDA_PIN PA16
 #define TEST_SCL_PIN PA17
 I2C i2c(TEST_SDA_PIN, TEST_SCL_PIN);
-#elif defined(TARGET_SAMD21J18A)
+#elif defined(TARGET_SAMD21J18A) || defined(TARGET_SAMD21G18A)
 #define TEST_SDA_PIN PA08
 #define TEST_SCL_PIN PA09
 I2C i2c(TEST_SDA_PIN, TEST_SCL_PIN);
diff --git a/libraries/tests/mbed/i2c_slave/main.cpp b/libraries/tests/mbed/i2c_slave/main.cpp
index eb3bd60cf5..ff262f735b 100644
--- a/libraries/tests/mbed/i2c_slave/main.cpp
+++ b/libraries/tests/mbed/i2c_slave/main.cpp
@@ -10,7 +10,7 @@ I2CSlave slave(PTE0, PTE1);
 I2CSlave slave(p9, p10);
 #elif defined(TARGET_SAMR21G18A)
 I2CSlave slave(PA16, PA17);
-#elif defined(TARGET_SAMD21J18A)
+#elif defined(TARGET_SAMD21J18A) || defined(TARGET_SAMD21G18A)
 I2CSlave slave(PA08, PA09);
 #else
 I2CSlave slave(p28, p27);
diff --git a/libraries/tests/mbed/interrupt_chaining/main.cpp b/libraries/tests/mbed/interrupt_chaining/main.cpp
index 890f884267..2ccc843f01 100644
--- a/libraries/tests/mbed/interrupt_chaining/main.cpp
+++ b/libraries/tests/mbed/interrupt_chaining/main.cpp
@@ -11,7 +11,7 @@
 #define TIMER_IRQ       LPTimer_IRQn
 #elif defined(TARGET_LPC2368) || defined(TARGET_LPC2460)
 #define TIMER_IRQ       TIMER3_IRQn
-#elif defined(TARGET_SAMR21G18A) || defined(TARGET_SAMD21J18A)
+#elif defined(TARGET_SAMR21G18A) || defined(TARGET_SAMD21J18A) || defined(TARGET_SAMD21G18A)
 #define TIMER_IRQ       TC4_IRQn
 #else
 #error This test can't run on this target.
diff --git a/libraries/tests/mbed/pwm/main.cpp b/libraries/tests/mbed/pwm/main.cpp
index bb023cb7cf..196c21a1af 100644
--- a/libraries/tests/mbed/pwm/main.cpp
+++ b/libraries/tests/mbed/pwm/main.cpp
@@ -166,7 +166,7 @@ int main() {
 
     printf("Initialize PWM on pin P1.2 with duty cycle: %.2f\n", pwm_1.read());
     printf("Initialize PWM on pin P1.3 with duty cycle: %.2f\n", pwm_2.read());
-#elif defined(TARGET_SAMR21G18A) || defined(TARGET_SAMD21J18A)
+#elif defined(TARGET_SAMR21G18A) || defined(TARGET_SAMD21J18A) || defined(TARGET_SAMD21G18A)
     PwmOut pwm(LED1);
 
     pwm.period_ms(1000);
diff --git a/libraries/tests/mbed/sleep/main.cpp b/libraries/tests/mbed/sleep/main.cpp
index 39537bdcf2..7f863b2b1c 100644
--- a/libraries/tests/mbed/sleep/main.cpp
+++ b/libraries/tests/mbed/sleep/main.cpp
@@ -10,6 +10,8 @@ InterruptIn wkp(P0_16);
 InterruptIn wkp(PA28);
 #elif defined(TARGET_SAMD21J18A)
 InterruptIn wkp(PA15);
+#elif defined(TARGET_SAMD21G18A)
+InterruptIn wkp(PB23);
 #else
 InterruptIn wkp(p14);
 #endif
diff --git a/libraries/tests/mbed/spi/main.cpp b/libraries/tests/mbed/spi/main.cpp
index 69b92c5e4b..d9cbf6e3c6 100644
--- a/libraries/tests/mbed/spi/main.cpp
+++ b/libraries/tests/mbed/spi/main.cpp
@@ -3,7 +3,7 @@
 #if defined(TARGET_SAMR21G18A)
 SPI spi(PB22, PB02, PB23);   // mosi, miso, sclk
 DigitalOut latchpin(PB03);
-#elif defined(TARGET_SAMD21J18A)
+#elif defined(TARGET_SAMD21J18A) || defined(TARGET_SAMD21G18A)
 SPI spi(PA18, PA16, PA19);   // mosi, miso, sclk
 DigitalOut latchpin(PA17);
 #else
diff --git a/libraries/tests/mbed/spi_master/main.cpp b/libraries/tests/mbed/spi_master/main.cpp
index 88e8371e91..467965fb65 100644
--- a/libraries/tests/mbed/spi_master/main.cpp
+++ b/libraries/tests/mbed/spi_master/main.cpp
@@ -28,7 +28,7 @@ DigitalOut cs(PE13);
 #elif defined(TARGET_SAMR21G18A)
 SPI spi(PB22, PB02, PB23);   // mosi, miso, sclk
 DigitalOut cs(PB03);
-#elif defined(TARGET_SAMD21J18A)
+#elif defined(TARGET_SAMD21J18A) || defined(TARGET_SAMD21G18A)
 SPI spi(PA18, PA16, PA19);   // mosi, miso, sclk
 DigitalOut cs(PA17);
 #else
diff --git a/libraries/tests/mbed/spi_slave/main.cpp b/libraries/tests/mbed/spi_slave/main.cpp
index 32f7fae6e3..be81056708 100644
--- a/libraries/tests/mbed/spi_slave/main.cpp
+++ b/libraries/tests/mbed/spi_slave/main.cpp
@@ -12,7 +12,7 @@ SPISlave device(D11, D12, D13, D10);       // mosi, miso, sclk, ssel
 SPISlave device(dp2, dp1, dp6, dp25);            // mosi, miso, sclk, ssel
 #elif defined(TARGET_SAMR21G18A)
 SPISlave device(PB22, PB02, PB23, PB03);		// mosi, miso, sclk, ssel
-#elif defined(TARGET_SAMD21J18A)
+#elif defined(TARGET_SAMD21J18A) || defined(TARGET_SAMD21G18A)
 SPISlave device(PA18, PA16, PA19, PA17);		// mosi, miso, sclk, ssel
 #else
 SPISlave device(p5, p6, p7, p8);            // mosi, miso, sclk, ssel