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

Fix typos that cause compilations errors with CONFIG_RTC

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4015 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-10-03 18:50:53 +00:00
parent 43e69f745d
commit 28b4cb23b1
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2131,3 +2131,6 @@
* CONFIG_SYSTEM_TIME16: Added support for an optional 64-bit system timer. * CONFIG_SYSTEM_TIME16: Added support for an optional 64-bit system timer.
* fs/fat/fs_fat32util.c: Add support for FAT date/time stamps; Enabled via * fs/fat/fs_fat32util.c: Add support for FAT date/time stamps; Enabled via
CONFIG_FS_FATTIME. CONFIG_FS_FATTIME.
* arch/arm/src/sam3u/sam3u_spi.c: Add an SPI driver for the AT91SAM3U.
* drivers/input/ads7843e.c and include/nuttx/input/ads7843e.h: Add a
driver for the TI ADS7843E touchscreen controller.

16
include/nuttx/input/touchscreen.h
View File

@ -68,7 +68,7 @@
* reported in the struct touch_point_s flags. * reported in the struct touch_point_s flags.
*/ */
#define TOUCH_DOWN (1 << 0) /* A new touch contact is establed */ #define TOUCH_DOWN (1 << 0) /* A new touch contact is established */
#define TOUCH_MOVE (1 << 1) /* Movement occurred with previously reported contact */ #define TOUCH_MOVE (1 << 1) /* Movement occurred with previously reported contact */
#define TOUCH_UP (1 << 2) /* The touch contact was lost */ #define TOUCH_UP (1 << 2) /* The touch contact was lost */
#define TOUCH_ID_VALID (1 << 3) /* Touch ID is uncertain */ #define TOUCH_ID_VALID (1 << 3) /* Touch ID is uncertain */
@ -86,13 +86,13 @@
struct touch_point_s struct touch_point_s
{ {
uint8_t id; /* Unique identifies contact; Same in all reports for the contact */ uint8_t id; /* Unique identifies contact; Same in all reports for the contact */
uint8_t flags; /* See TOUCH_* definitions above */ uint8_t flags; /* See TOUCH_* definitions above */
int16_t x; /* X coordinate of the touch point (uncalibrated) */ int16_t x; /* X coordinate of the touch point (uncalibrated) */
int16_t y; /* Y coordinate of the touch point (uncalibrated) */ int16_t y; /* Y coordinate of the touch point (uncalibrated) */
int16_t h; /* Height of touch point (uncalibrated) */ int16_t h; /* Height of touch point (uncalibrated) */
int16_t w; /* Width of touch point (uncalibrated) */ int16_t w; /* Width of touch point (uncalibrated) */
uint16_t pressure; /* Touch pressure */ uint16_t pressure; /* Touch pressure */
}; };
/* The typical touchscreen driver is a read-only, input character device driver. /* The typical touchscreen driver is a read-only, input character device driver.

4
sched/clock_gettime.c
View File

@ -111,7 +111,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
*/ */
#ifdef CONFIG_RTC #ifdef CONFIG_RTC
if (clock_id == CLOCK_REALTIME || clockid == CLOCK_ACTIVETIME) if (clock_id == CLOCK_REALTIME || clock_id == CLOCK_ACTIVETIME)
#else #else
if (clock_id == CLOCK_REALTIME) if (clock_id == CLOCK_REALTIME)
#endif #endif
@ -119,7 +119,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
/* Do we have a high-resolution RTC that can provie us with the time? */ /* Do we have a high-resolution RTC that can provie us with the time? */
#ifdef CONFIG_RTC_HIRES #ifdef CONFIG_RTC_HIRES
if (g_rtc_enabled && clockid != CLOCK_ACTIVETIME) if (g_rtc_enabled && clock_id != CLOCK_ACTIVETIME)
{ {
/* Yes.. Get the hi-resolution time from the RTC */ /* Yes.. Get the hi-resolution time from the RTC */

4
sched/clock_settime.c
View File

@ -101,7 +101,7 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp)
*/ */
#ifdef CONFIG_RTC #ifdef CONFIG_RTC
if (clock_id == CLOCK_REALTIME || clockid == CLOCK_ACTIVETIME) if (clock_id == CLOCK_REALTIME || clock_id == CLOCK_ACTIVETIME)
#else #else
if (clock_id == CLOCK_REALTIME) if (clock_id == CLOCK_REALTIME)
#endif #endif
@ -127,7 +127,7 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp)
/* Setup the RTC (lo- or high-res) */ /* Setup the RTC (lo- or high-res) */
#ifdef CONFIG_RTC #ifdef CONFIG_RTC
if (g_rtc_enabled && clockid != CLOCK_ACTIVETIME) if (g_rtc_enabled && clock_id != CLOCK_ACTIVETIME)
{ {
up_rtc_settime(tp); up_rtc_settime(tp);
} }