Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

arch/arm/tiva: simplify TIVA_CAN option usage

Browse Source 
Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
This commit is contained in:
Petro Karashchenko
2023-01-26 01:34:19 +02:00
committed by Xiang Xiao
parent bd7cb522a1
commit a58e73add8
3 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/tiva/Kconfig
+1 -2
View File
@@ -435,6 +435,7 @@ config TIVA_HAVE_ADC1
config TIVA_CAN config TIVA_CAN
bool bool
default n default n
select CAN
select ARCH_HAVE_CAN_ERRORS select ARCH_HAVE_CAN_ERRORS
select CAN_TXREADY select CAN_TXREADY
select CAN_USE_RTR select CAN_USE_RTR
@@ -610,7 +611,6 @@ config TIVA_CAN0
bool "CAN0" bool "CAN0"
default n default n
depends on TIVA_HAVE_CAN0 depends on TIVA_HAVE_CAN0
select CAN
select TIVA_CAN select TIVA_CAN
config TIVA_CAN0_PRIO config TIVA_CAN0_PRIO
@@ -627,7 +627,6 @@ config TIVA_CAN1
bool "CAN1" bool "CAN1"
default n default n
depends on TIVA_HAVE_CAN1 depends on TIVA_HAVE_CAN1
select CAN
select TIVA_CAN select TIVA_CAN
config TIVA_CAN1_PRIO config TIVA_CAN1_PRIO
boards/arm/tiva/tm4c123g-launchpad/src/tm4c_can.c
+3 -12
View File
@@ -58,7 +58,7 @@
#include "tiva_gpio.h" #include "tiva_gpio.h"
#include "hardware/tiva_pinmap.h" #include "hardware/tiva_pinmap.h"
#ifdef CONFIG_CAN #ifdef CONFIG_TIVA_CAN
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@@ -78,21 +78,18 @@
int tm4c_can_setup(void) int tm4c_can_setup(void)
{ {
#ifdef CONFIG_TIVA_CAN int ret = ERROR;
int ret;
# ifdef CONFIG_TIVA_CAN0 # ifdef CONFIG_TIVA_CAN0
tiva_can0_enableclk(); tiva_can0_enableclk();
ret = tiva_configgpio(GPIO_CAN0_RX); ret = tiva_configgpio(GPIO_CAN0_RX);
if (ret < 0) if (ret < 0)
{ {
goto configgpio_error; goto configgpio_error;
} }
ret = tiva_configgpio(GPIO_CAN0_TX); ret = tiva_configgpio(GPIO_CAN0_TX);
if (ret < 0) if (ret < 0)
{ {
goto configgpio_error; goto configgpio_error;
@@ -114,14 +111,12 @@ int tm4c_can_setup(void)
tiva_can1_enableclk(); tiva_can1_enableclk();
ret = tiva_configgpio(GPIO_CAN1_RX); ret = tiva_configgpio(GPIO_CAN1_RX);
if (ret < 0) if (ret < 0)
{ {
goto configgpio_error; goto configgpio_error;
} }
ret = tiva_configgpio(GPIO_CAN1_TX); ret = tiva_configgpio(GPIO_CAN1_TX);
if (ret < 0) if (ret < 0)
{ {
goto configgpio_error; goto configgpio_error;
@@ -144,10 +139,6 @@ int tm4c_can_setup(void)
configgpio_error: configgpio_error:
canerr("ERROR: failed to configure CAN GPIO pin.\n"); canerr("ERROR: failed to configure CAN GPIO pin.\n");
return ret; return ret;
#else
return -ENODEV;
#endif
} }
#endif /* CONFIG_CAN */ #endif /* CONFIG_TIVA_CAN */
boards/arm/tiva/tm4c1294-launchpad/src/tm4c_can.c
+3 -12
View File
@@ -41,7 +41,7 @@
#include "tiva_gpio.h" #include "tiva_gpio.h"
#include "hardware/tiva_pinmap.h" #include "hardware/tiva_pinmap.h"
#ifdef CONFIG_CAN #ifdef CONFIG_TIVA_CAN
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@@ -61,21 +61,18 @@
int tm4c_can_setup(void) int tm4c_can_setup(void)
{ {
#ifdef CONFIG_TIVA_CAN int ret = ERROR;
int ret;
# ifdef CONFIG_TIVA_CAN0 # ifdef CONFIG_TIVA_CAN0
tiva_can0_enableclk(); tiva_can0_enableclk();
ret = tiva_configgpio(GPIO_CAN0_RX); ret = tiva_configgpio(GPIO_CAN0_RX);
if (ret < 0) if (ret < 0)
{ {
goto configgpio_error; goto configgpio_error;
} }
ret = tiva_configgpio(GPIO_CAN0_TX); ret = tiva_configgpio(GPIO_CAN0_TX);
if (ret < 0) if (ret < 0)
{ {
goto configgpio_error; goto configgpio_error;
@@ -97,14 +94,12 @@ int tm4c_can_setup(void)
tiva_can1_enableclk(); tiva_can1_enableclk();
ret = tiva_configgpio(GPIO_CAN1_RX); ret = tiva_configgpio(GPIO_CAN1_RX);
if (ret < 0) if (ret < 0)
{ {
goto configgpio_error; goto configgpio_error;
} }
ret = tiva_configgpio(GPIO_CAN1_TX); ret = tiva_configgpio(GPIO_CAN1_TX);
if (ret < 0) if (ret < 0)
{ {
goto configgpio_error; goto configgpio_error;
@@ -127,10 +122,6 @@ int tm4c_can_setup(void)
configgpio_error: configgpio_error:
canerr("ERROR: failed to configure CAN GPIO pin.\n"); canerr("ERROR: failed to configure CAN GPIO pin.\n");
return ret; return ret;
#else
return -ENODEV;
#endif
} }
#endif /* CONFIG_CAN */ #endif /* CONFIG_TIVA_CAN */