sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the BOARDIOC_TSCTEST_TEARNDOWN boardctl() command. Remove all implementations of board_tsc_teardown() (the were all stubs anyway except for the simulation).

Browse Source
This commit is contained in:
Gregory Nutt 2018-01-16 18:03:21 -06:00
parent 53db5c80f3
commit e276d4d16d
22 changed files with 5 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configs/Kconfig
View File

@ -2357,8 +2357,7 @@ config BOARDCTL_TSCTEST
---help---
Enables support for the BOARDIOC_TSCTEST_SETUP and
BOARDIOC_TSCTEST_TEARDOWN boardctl() commands. Architecture
specific logic must provide board_tsc_setup() and
board_tsc_teardown() interfaces.
specific logic must provide the board_tsc_setup() interface.
config BOARDCTL_IOCTL
bool "Board-specific boardctl() commands"

23
configs/arduino-due/src/sam_touchscreen.c
View File

@ -405,27 +405,4 @@ int board_tsc_setup(int minor)
return OK;
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* No support for un-initializing the touchscreen XPT2046 device. It will
* continue to run and process touch interrupts in the background.
*/
}
#endif /* CONFIG_ARDUINO_ITHEAD_TFT && CONFIG_SPI_BITBANG && CONFIG_INPUT_ADS7843E */

14
configs/boardctl.c
View File

@ -414,20 +414,6 @@ int boardctl(unsigned int cmd, uintptr_t arg)
ret = board_tsc_setup((int)arg);
}
break;
/* CMD: BOARDIOC_TSCTEST_TEARDOWN
* DESCRIPTION: Touchscreen controller test configuration
* ARG: None
* CONFIGURATION: CONFIG_LIB_BOARDCTL && CONFIG_BOARDCTL_TSCTEST
* DEPENDENCIES: Board logic must provide board_tsc_teardown()
*/
case BOARDIOC_TSCTEST_TEARDOWN:
{
board_tsc_teardown();
ret = OK;
}
break;
#endif
default:

21
configs/hymini-stm32v/src/stm32_ts.c
View File

@ -172,24 +172,3 @@ int board_tsc_setup(int minor)
return ads7843e_register(dev, &ts_cfg, minor);
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None.
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* FIXME What can/should we do here ? */
}

7
configs/lpcxpresso-lpc54628/src/lpc54_ft5x06.c
View File

@ -246,7 +246,7 @@ int lpc54_ft5x06_register(void)
}
/****************************************************************************
* Name: board_tsc_setup and board_tsc_teardown
* Name: board_tsc_setup
*
* Description:
* Stubs for expected interfaces. This implementation does not permit the
@ -261,9 +261,4 @@ int board_tsc_setup(int minor)
return OK;
}
void board_tsc_teardown(void)
{
}
#endif
#endif /* HAVE_FT5x06*/

21
configs/mikroe-stm32f4/src/stm32_touchscreen.c
View File

@ -1583,25 +1583,4 @@ errout_with_priv:
return ret;
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None.
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* Need to unregister the /dev/inputN device here. */
}
#endif /* CONFIG_INPUT */

23
configs/olimex-lpc1766stk/src/lpc17_hidmouse.c
View File

@ -132,27 +132,4 @@ int board_tsc_setup(int minor)
return OK;
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* No support for un-initializing the USB mouse driver. It will continue
* to run and process touch interrupts in the background.
*/
}
#endif /* CONFIG_USBHOST_HIDMOUSE */

21
configs/open1788/src/lpc17_touchscreen.c
View File

@ -323,25 +323,4 @@ int board_tsc_setup(int minor)
return OK;
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None.
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* No support for un-initializing the touchscreen XPT2046 device yet */
}
#endif /* CONFIG_INPUT_ADS7843E */

21
configs/pic32mx7mmb/src/pic32_touchscreen.c
View File

@ -1435,25 +1435,4 @@ errout_with_priv:
return ret;
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None.
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* Need to unregister the /dev/inputN device here. */
}
#endif /* CONFIG_INPUT */

21
configs/sam3u-ek/src/sam_touchscreen.c
View File

@ -272,26 +272,5 @@ int board_tsc_setup(int minor)
return OK;
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None.
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* No support for un-initializing the touchscreen ADS7843E device yet */
}
#endif /* CONFIG_INPUT_ADS7843E */

21
configs/sam4e-ek/src/sam_ads7843e.c
View File

@ -269,25 +269,4 @@ int board_tsc_setup(int minor)
return OK;
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None.
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* No support for un-initializing the touchscreen ADS7843E device yet */
}
#endif /* CONFIG_INPUT && CONFIG_INPUT_ADS7843E */

21
configs/sama5d3x-ek/src/sam_touchscreen.c
View File

@ -142,25 +142,4 @@ int board_tsc_setup(int minor)
return OK;
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None.
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* No support for un-initializing the touchscreen yet */
}
#endif /* CONFIG_INPUT_ADS7843E */

23
configs/sama5d4-ek/src/sam_maxtouch.c
View File

@ -290,27 +290,4 @@ int board_tsc_setup(int minor)
return OK;
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* No support for un-initializing the touchscreen maXTouch device. It will
* continue to run and process touch interrupts in the background.
*/
}
#endif /* HAVE_MAXTOUCH */

23
configs/samv71-xult/src/sam_maxtouch.c
View File

@ -289,27 +289,4 @@ int board_tsc_setup(int minor)
return OK;
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* No support for un-initializing the touchscreen maXTouch device. It will
* continue to run and process touch interrupts in the background.
*/
}
#endif /* HAVE_MAXTOUCH */

21
configs/shenzhou/src/stm32_touchscreen.c
View File

@ -281,26 +281,5 @@ int board_tsc_setup(int minor)
return OK;
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None.
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* No support for un-initializing the touchscreen ADS7843E device yet */
}
#endif /* CONFIG_INPUT_ADS7843E */

20
configs/sim/src/sim_touchscreen.c
View File

@ -263,23 +263,3 @@ errout:
return ret;
}
/****************************************************************************
* Name: board_tsc_teardown()
*
* Description:
* Perform architecuture-specific un-initialization of the touchscreen
* hardware. This interface must be provided by all configurations
* using apps/examples/touchscreen
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* Shut down the touchscreen driver */
sim_tsc_uninitialize();
/* Close NX */
nx_disconnect(g_simtc.hnx);
}

21
configs/stm3220g-eval/src/stm32_stmpe811.c
View File

@ -336,26 +336,5 @@ int board_tsc_setup(int minor)
#endif
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None.
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* No support for un-initializing the touchscreen STMPE811 device yet */
}
#endif /* CONFIG_INPUT_STMPE811 */

21
configs/stm3240g-eval/src/stm32_stmpe811.c
View File

@ -336,26 +336,5 @@ int board_tsc_setup(int minor)
#endif
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None.
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* No support for un-initializing the touchscreen STMPE811 device yet */
}
#endif /* CONFIG_INPUT_STMPE811 */

21
configs/stm32f429i-disco/src/stm32_stmpe811.c
View File

@ -339,26 +339,5 @@ int board_tsc_setup(int minor)
#endif
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None.
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* No support for un-initializing the touchscreen STMPE811 device yet */
}
#endif /* CONFIG_INPUT_STMPE811 */

23
configs/viewtool-stm32f107/src/stm32_touchscreen.c
View File

@ -304,27 +304,4 @@ int board_tsc_setup(int minor)
return OK;
}
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* Input Parameters:
* None
*
* Returned Value:
* None
*
****************************************************************************/
void board_tsc_teardown(void)
{
/* No support for un-initializing the touchscreen XPT2046 device. It will
* continue to run and process touch interrupts in the background.
*/
}
#endif /* CONFIG_INPUT_ADS7843E */

27
include/nuttx/board.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* include/nuttx/board.h
*
* Copyright (C) 2015-2017 Gregory Nutt. All rights reserved.
* Copyright (C) 2015-2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -312,31 +312,6 @@ FAR void *board_composite_connect(int port, int configid);
int board_tsc_setup(int minor);
/****************************************************************************
* Name: board_tsc_teardown
*
* Description:
* Each board that supports a touchscreen device must provide this function.
* This function is called by application-specific, setup logic to
* uninitialize the touchscreen device.
*
* This is an internal OS interface but may be invoked indirectly from
* application-level touchscreen testing logic (perhaps by
* apps/examples/touchscreen). If CONFIG_LIB_BOARDCTL=y and
* CONFIG_BOARDCTL_TSCTEST=y, then this functions will be invoked via the
* (non-standard) boardctl() interface using the BOARDIOC_TSCTEST_TEARDOWN
* command.
*
* Input Parameters:
* None
*
* Returned Value:
* None.
*
****************************************************************************/
void board_tsc_teardown(void);
/****************************************************************************
* Name: board_graphics_setup
*

11
include/sys/boardctl.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* include/sys/boardctl.h
*
* Copyright (C) 2015-2017 Gregory Nutt. All rights reserved.
* Copyright (C) 2015-2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -120,12 +120,6 @@
* ARG: Touch controller device minor number
* CONFIGURATION: CONFIG_LIB_BOARDCTL && CONFIG_BOARDCTL_TSCTEST
* DEPENDENCIES: Board logic must provide board_tsc_setup()
*
* CMD: BOARDIOC_TSCTEST_TEARDOWN
* DESCRIPTION: Touchscreen controller test configuration
* ARG: None
* CONFIGURATION: CONFIG_LIB_BOARDCTL && CONFIG_BOARDCTL_TSCTEST
* DEPENDENCIES: Board logic must provide board_tsc_teardown()
*/
#define BOARDIOC_INIT _BOARDIOC(0x0001)
@ -137,7 +131,6 @@
#define BOARDIOC_USBDEV_CONTROL _BOARDIOC(0x0007)
#define BOARDIOC_NX_START _BOARDIOC(0x0008)
#define BOARDIOC_TSCTEST_SETUP _BOARDIOC(0x0009)
#define BOARDIOC_TSCTEST_TEARDOWN _BOARDIOC(0x000a)
/* If CONFIG_BOARDCTL_IOCTL=y, then board-specific commands will be support.
* In this case, all commands not recognized by boardctl() will be forwarded
@ -146,7 +139,7 @@
* User defined board commands may begin with this value:
*/
#define BOARDIOC_USER _BOARDIOC(0x000b)
#define BOARDIOC_USER _BOARDIOC(0x000a)
/****************************************************************************
* Public Type Definitions