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

ADS7843 updates

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4042 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-10-12 17:37:15 +00:00
parent a6d062fbeb
commit 43edab2dd8
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/src/pic32mx/pic32mx-head.S
View File

@ -538,7 +538,7 @@ devconfig3:
devconfig2: devconfig2:
.long CONFIG_PIC32MX_PLLIDIV | CONFIG_PIC32MX_PLLMULT | \ .long CONFIG_PIC32MX_PLLIDIV | CONFIG_PIC32MX_PLLMULT | \
CONFIG_PIC32MX_UPLLIDIV | DEVCFG2_FPLLODIV_DIV1 | \ CONFIG_PIC32MX_UPLLIDIV | CONFIG_PIC32MX_PLLODIV | \
DEVCFG2_UNUSED DEVCFG2_UNUSED
devconfig1: devconfig1:

2
configs/sam3u-ek/src/up_spi.c
View File

@ -161,7 +161,6 @@ void weak_function sam3u_spiinitialize(void)
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SAM3U_SPI
int sam3u_spicsnumber(enum spi_dev_e devid) int sam3u_spicsnumber(enum spi_dev_e devid)
{ {
int cs = -EINVAL; int cs = -EINVAL;
@ -240,6 +239,5 @@ uint8_t sam3u_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{ {
return 0; return 0;
} }
#endif
#endif /* CONFIG_SAM3U_SPI */ #endif /* CONFIG_SAM3U_SPI */

12
configs/sam3u-ek/src/up_touchscreen.c
View File

@ -179,10 +179,20 @@ static void tsc_clear(FAR struct ads7843e_config_s *state)
static bool tsc_busy(FAR struct ads7843e_config_s *state) static bool tsc_busy(FAR struct ads7843e_config_s *state)
{ {
#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_VERBOSE)
static bool last = (bool)-1;
#endif
/* REVISIT: This might need to be inverted */ /* REVISIT: This might need to be inverted */
bool busy = sam3u_gpioread(GPIO_TCS_BUSY); bool busy = sam3u_gpioread(GPIO_TCS_BUSY);
ivdbg("busy:%d\n", busy); #if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_VERBOSE)
if (busy != last)
{
ivdbg("busy:%d\n", busy);
last = busy;
}
#endif
return busy; return busy;
} }

4
drivers/input/ads7843e.h
View File

@ -72,11 +72,11 @@
#define ADS7843E_CMD_DFR (1 << 2) /* SER/DFR */ #define ADS7843E_CMD_DFR (1 << 2) /* SER/DFR */
#define ADS7843E_CMD_EIGHT_BITS_MOD (1 << 3) /* Mode */ #define ADS7843E_CMD_EIGHT_BITS_MOD (1 << 3) /* Mode */
#define ADS7843E_CMD_START (1 << 7) /* Start Bit */ #define ADS7843E_CMD_START (1 << 7) /* Start Bit */
#define ADS7843E_CMD_SWITCH_SHIFT 4 /* Address setting */ #define ADS7843E_CMD_SWITCH_SHIFT 4 /* Address setting */
/* ADS7843E Commands */ /* ADS7843E Commands */
#define ADS7843_CMD_YPOSITION \ #define ADS7843_CMD_YPOSITION \
((1 << ADS7843E_CMD_SWITCH_SHIFT)|ADS7843E_CMD_START|ADS7843E_CMD_PD0|ADS7843E_CMD_PD1) ((1 << ADS7843E_CMD_SWITCH_SHIFT)|ADS7843E_CMD_START|ADS7843E_CMD_PD0|ADS7843E_CMD_PD1)
#define ADS7843_CMD_XPOSITION \ #define ADS7843_CMD_XPOSITION \
((5 << ADS7843E_CMD_SWITCH_SHIFT)|ADS7843E_CMD_START|ADS7843E_CMD_PD0|ADS7843E_CMD_PD1) ((5 << ADS7843E_CMD_SWITCH_SHIFT)|ADS7843E_CMD_START|ADS7843E_CMD_PD0|ADS7843E_CMD_PD1)