Skip to content

Commit 1c5909d

Browse files
0xc01700xc0170
authored
Merge pull request #10870 from maciejbocianski/i2c_add_guards
HAL I2C: adds missing DEVICE_I2C guards
2 parents 979f26f + fcde82b commit 1c5909d

File tree

34 files changed

+170
-9
lines changed

34 files changed

+170
-9
lines changed

‎targets/TARGET_ARM_FM/TARGET_FVP_MPS2/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
* limitations under the License.
1515
*/
1616
#include "i2c_api.h"
17+
18+
#if DEVICE_I2C
19+
1720
#include "cmsis.h"
1821
#include "pinmap.h"
1922
#include "mbed_error.h"
@@ -607,3 +610,5 @@ const PinMap *i2c_slave_scl_pinmap()
607610
{
608611
return PinMap_I2C_SCL;
609612
}
613+
614+
#endif // #if DEVICE_I2C

‎targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
* limitations under the License.
1515
*/
1616
#include "i2c_api.h"
17+
18+
#if DEVICE_I2C
19+
1720
#include "cmsis.h"
1821
#include "mbed_error.h"
1922
#include "mbed_wait_api.h"
@@ -291,3 +294,5 @@ const PinMap *i2c_slave_scl_pinmap()
291294
{
292295
return PinMap_I2C_SCL;
293296
}
297+
298+
#endif // #if DEVICE_I2C

‎targets/TARGET_ARM_SSG/TARGET_IOTSS/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
* limitations under the License.
1515
*/
1616
#include "i2c_api.h"
17+
18+
#if DEVICE_I2C
19+
1720
#include "cmsis.h"
1821
#include "pinmap.h"
1922
#include "mbed_error.h"
@@ -541,3 +544,5 @@ const PinMap *i2c_slave_scl_pinmap()
541544
{
542545
return PinMap_I2C_SCL;
543546
}
547+
548+
#endif // #if DEVICE_I2C

‎targets/TARGET_ARM_SSG/TARGET_MPS2/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
* limitations under the License.
1515
*/
1616
#include "i2c_api.h"
17+
18+
#if DEVICE_I2C
19+
1720
#include "cmsis.h"
1821
#include "pinmap.h"
1922
#include "mbed_error.h"
@@ -551,3 +554,5 @@ const PinMap *i2c_slave_scl_pinmap()
551554
{
552555
return PinMap_I2C_SCL;
553556
}
557+
558+
#endif // #if DEVICE_I2C

‎targets/TARGET_Atmel/TARGET_SAM_CortexM0P/i2c_api.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include "mbed_assert.h"
1717
#include "i2c_api.h"
1818

19+
#if DEVICE_I2C
20+
1921
#include <math.h>
2022

2123
#include "cmsis.h"
@@ -1013,3 +1015,5 @@ void i2c_abort_asynch(i2c_t *obj)
10131015
}
10141016

10151017
#endif
1018+
1019+
#endif // #if DEVICE_I2C

‎targets/TARGET_Atmel/TARGET_SAM_CortexM4/i2c_api.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
#include "i2c_api.h"
17+
18+
#if DEVICE_I2C
1619

1720
#include "device.h"
1821
#include "buffer.h"
1922
#include "dma_api.h"
20-
#include "i2c_api.h"
2123
#include "PeripheralPins.h"
2224
#include "twi.h"
2325
#include "pdc.h"
@@ -733,3 +735,5 @@ void i2c_abort_asynch(i2c_t *obj)
733735
}
734736

735737
#endif
738+
739+
#endif // #if DEVICE_I2C

‎targets/TARGET_Cypress/TARGET_PSOC6/i2c_api.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19+
#include "mbed_assert.h"
20+
#include "i2c_api.h"
21+
22+
#if DEVICE_I2C
1923

2024
#include "cmsis.h"
21-
#include "mbed_assert.h"
2225
#include "mbed_error.h"
2326
#include "PeripheralPins.h"
2427
#include "pinmap.h"
25-
#include "i2c_api.h"
28+
2629
#include "psoc6_utils.h"
2730

2831
#include "cy_sysclk.h"
@@ -652,3 +655,5 @@ void i2c_abort_asynch(i2c_t *obj_in)
652655
}
653656

654657
#endif // DEVICE_ASYNCH
658+
659+
#endif // #if DEVICE_I2C

‎targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/i2c_api.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17+
#include "mbed_assert.h"
18+
#include "i2c_api.h"
19+
20+
#if DEVICE_I2C
1721

1822
#include "cmsis.h"
19-
#include "mbed_assert.h"
2023
#include "mbed_error.h"
2124
#include "PeripheralPins.h"
2225
#include "pinmap.h"
23-
#include "i2c_api.h"
2426
#include "psoc6_utils.h"
2527

2628
#include "cy_sysclk.h"
@@ -566,3 +568,5 @@ void i2c_abort_asynch(i2c_t *obj_in)
566568
}
567569

568570
#endif // DEVICE_ASYNCH
571+
572+
#endif // #if DEVICE_I2C

‎targets/TARGET_Freescale/TARGET_K20XX/i2c_api.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include "mbed_assert.h"
1717
#include "i2c_api.h"
1818

19+
#if DEVICE_I2C
20+
1921
#include "cmsis.h"
2022
#include "pinmap.h"
2123
#include "clk_freqs.h"
@@ -390,3 +392,5 @@ void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask) {
390392
obj->i2c->A1 = address & 0xfe;
391393
}
392394
#endif
395+
396+
#endif // #if DEVICE_I2C

‎targets/TARGET_Freescale/TARGET_KLXX/i2c_api.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include "mbed_assert.h"
1717
#include "i2c_api.h"
1818

19+
#if DEVICE_I2C
20+
1921
#include "cmsis.h"
2022
#include "pinmap.h"
2123
#include "clk_freqs.h"
@@ -401,3 +403,4 @@ void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask) {
401403
}
402404
#endif
403405

406+
#endif // #if DEVICE_I2C

‎targets/TARGET_Maxim/TARGET_MAX32600/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333

3434
#include "mbed_assert.h"
3535
#include "i2c_api.h"
36+
37+
#if DEVICE_I2C
38+
3639
#include "cmsis.h"
3740
#include "i2cm_regs.h"
3841
#include "clkman_regs.h"
@@ -446,3 +449,5 @@ const PinMap *i2c_slave_scl_pinmap()
446449
{
447450
return PinMap_I2C_SCL;
448451
}
452+
453+
#endif // #if DEVICE_I2C

‎targets/TARGET_Maxim/TARGET_MAX32610/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333

3434
#include "mbed_assert.h"
3535
#include "i2c_api.h"
36+
37+
#if DEVICE_I2C
38+
3639
#include "cmsis.h"
3740
#include "i2cm_regs.h"
3841
#include "clkman_regs.h"
@@ -446,3 +449,5 @@ const PinMap *i2c_slave_scl_pinmap()
446449
{
447450
return PinMap_I2C_SCL;
448451
}
452+
453+
#endif // #if DEVICE_I2C

‎targets/TARGET_Maxim/TARGET_MAX32620/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333

3434
#include "mbed_assert.h"
3535
#include "i2c_api.h"
36+
37+
#if DEVICE_I2C
38+
3639
#include "cmsis.h"
3740
#include "i2cm_regs.h"
3841
#include "clkman_regs.h"
@@ -450,3 +453,5 @@ const PinMap *i2c_slave_scl_pinmap()
450453
{
451454
return PinMap_I2C_SCL;
452455
}
456+
457+
#endif // #if DEVICE_I2C

‎targets/TARGET_Maxim/TARGET_MAX32620C/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333

3434
#include "mbed_assert.h"
3535
#include "i2c_api.h"
36+
37+
#if DEVICE_I2C
38+
3639
#include "i2cm_regs.h"
3740
#include "i2cm.h"
3841
#include "pinmap.h"
@@ -225,3 +228,5 @@ const PinMap *i2c_slave_scl_pinmap()
225228
{
226229
return PinMap_I2C_SCL;
227230
}
231+
232+
#endif // #if DEVICE_I2C

‎targets/TARGET_Maxim/TARGET_MAX32625/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333

3434
#include "mbed_assert.h"
3535
#include "i2c_api.h"
36+
37+
#if DEVICE_I2C
38+
3639
#include "i2cm_regs.h"
3740
#include "i2cm.h"
3841
#include "pinmap.h"
@@ -226,3 +229,5 @@ const PinMap *i2c_slave_scl_pinmap()
226229
{
227230
return PinMap_I2C_SCL;
228231
}
232+
233+
#endif // #if DEVICE_I2C

‎targets/TARGET_Maxim/TARGET_MAX32630/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333

3434
#include "mbed_assert.h"
3535
#include "i2c_api.h"
36+
37+
#if DEVICE_I2C
38+
3639
#include "i2cm_regs.h"
3740
#include "i2cm.h"
3841
#include "pinmap.h"
@@ -225,3 +228,5 @@ const PinMap *i2c_slave_scl_pinmap()
225228
{
226229
return PinMap_I2C_SCL;
227230
}
231+
232+
#endif // #if DEVICE_I2C

‎targets/TARGET_NORDIC/TARGET_MCU_NRF51822/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
*/
1616
#include "mbed_assert.h"
1717
#include "i2c_api.h"
18+
19+
#if DEVICE_I2C
20+
1821
#include "cmsis.h"
1922
#include "pinmap.h"
2023
#include "twi_master.h"
@@ -361,3 +364,5 @@ const PinMap *i2c_slave_scl_pinmap()
361364
{
362365
return PinMap_I2C_testing;
363366
}
367+
368+
#endif // #if DEVICE_I2C

‎targets/TARGET_NXP/TARGET_LPC11UXX/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
*/
1616
#include "mbed_assert.h"
1717
#include "i2c_api.h"
18+
19+
#if DEVICE_I2C
20+
1821
#include "cmsis.h"
1922
#include "pinmap.h"
2023
#include "PeripheralPins.h" // For the Peripheral to Pin Definitions found in the individual Target's Platform
@@ -399,3 +402,5 @@ const PinMap *i2c_slave_scl_pinmap()
399402
{
400403
return PinMap_I2C_SCL;
401404
}
405+
406+
#endif // #if DEVICE_I2C

‎targets/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
*/
1616
#include "mbed_assert.h"
1717
#include "i2c_api.h"
18+
19+
#if DEVICE_I2C
20+
1821
#include "cmsis.h"
1922
#include "pinmap.h"
2023
#include "mbed_error.h"
@@ -411,3 +414,5 @@ const PinMap *i2c_slave_scl_pinmap()
411414
{
412415
return PinMap_I2C_SCL;
413416
}
417+
418+
#endif // #if DEVICE_I2C

‎targets/TARGET_NXP/TARGET_LPC13XX/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
*/
1616
#include "mbed_assert.h"
1717
#include "i2c_api.h"
18+
19+
#if DEVICE_I2C
20+
1821
#include "cmsis.h"
1922
#include "pinmap.h"
2023
#include "mbed_error.h"
@@ -410,3 +413,5 @@ const PinMap *i2c_slave_scl_pinmap()
410413
{
411414
return PinMap_I2C_SCL;
412415
}
416+
417+
#endif // #if DEVICE_I2C

‎targets/TARGET_NXP/TARGET_LPC15XX/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
*/
1616
#include "mbed_assert.h"
1717
#include "i2c_api.h"
18+
19+
#if DEVICE_I2C
20+
1821
#include "cmsis.h"
1922
#include "pinmap.h"
2023

@@ -247,3 +250,5 @@ const PinMap *i2c_slave_scl_pinmap()
247250
{
248251
return PinMap_I2C_SCL;
249252
}
253+
254+
#endif // #if DEVICE_I2C

‎targets/TARGET_NXP/TARGET_LPC176X/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
*/
1616
#include "mbed_assert.h"
1717
#include "i2c_api.h"
18+
19+
#if DEVICE_I2C
20+
1821
#include "cmsis.h"
1922
#include "pinmap.h"
2023

@@ -425,3 +428,5 @@ const PinMap *i2c_slave_scl_pinmap()
425428
{
426429
return PinMap_I2C_SCL;
427430
}
431+
432+
#endif // #if DEVICE_I2C

‎targets/TARGET_NXP/TARGET_LPC408X/TARGET_LPC4088/i2c_api.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
*/
1616
#include "mbed_assert.h"
1717
#include "i2c_api.h"
18+
19+
#if DEVICE_I2C
20+
1821
#include "cmsis.h"
1922
#include "pinmap.h"
2023

@@ -440,3 +443,5 @@ const PinMap *i2c_slave_scl_pinmap()
440443
{
441444
return PinMap_I2C_SCL;
442445
}
446+
447+
#endif // #if DEVICE_I2C

0 commit comments

Comments
 (0)