From 28b4cb23b1540ca8e2ec43445f9a56202f3a35fa Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Mon, 3 Oct 2011 18:50:53 +0000
Subject: [PATCH] Fix typos that cause compilations errors with CONFIG_RTC
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4015 42af7a65-404d-4744-a932-0658087f49c3
---
ChangeLog | 3 +++
include/nuttx/input/touchscreen.h | 16 ++++++++--------
sched/clock_gettime.c | 4 ++--
sched/clock_settime.c | 4 ++--
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cb62cc8b5c..2579eb9488 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2131,3 +2131,6 @@
* 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
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.
diff --git a/include/nuttx/input/touchscreen.h b/include/nuttx/input/touchscreen.h
index 861680e593..de888e38d7 100644
--- a/include/nuttx/input/touchscreen.h
+++ b/include/nuttx/input/touchscreen.h
@@ -68,7 +68,7 @@
* 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_UP (1 << 2) /* The touch contact was lost */
#define TOUCH_ID_VALID (1 << 3) /* Touch ID is uncertain */
@@ -86,13 +86,13 @@
struct touch_point_s
{
- uint8_t id; /* Unique identifies contact; Same in all reports for the contact */
- uint8_t flags; /* See TOUCH_* definitions above */
- int16_t x; /* X 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 w; /* Width of touch point (uncalibrated) */
- uint16_t pressure; /* Touch pressure */
+ uint8_t id; /* Unique identifies contact; Same in all reports for the contact */
+ uint8_t flags; /* See TOUCH_* definitions above */
+ int16_t x; /* X 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 w; /* Width of touch point (uncalibrated) */
+ uint16_t pressure; /* Touch pressure */
};
/* The typical touchscreen driver is a read-only, input character device driver.
diff --git a/sched/clock_gettime.c b/sched/clock_gettime.c
index 9a84d320f4..341b4bed9b 100644
--- a/sched/clock_gettime.c
+++ b/sched/clock_gettime.c
@@ -111,7 +111,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
*/
#ifdef CONFIG_RTC
- if (clock_id == CLOCK_REALTIME || clockid == CLOCK_ACTIVETIME)
+ if (clock_id == CLOCK_REALTIME || clock_id == CLOCK_ACTIVETIME)
#else
if (clock_id == CLOCK_REALTIME)
#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? */
#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 */
diff --git a/sched/clock_settime.c b/sched/clock_settime.c
index fdb6a6c57d..aa48b4592b 100644
--- a/sched/clock_settime.c
+++ b/sched/clock_settime.c
@@ -101,7 +101,7 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp)
*/
#ifdef CONFIG_RTC
- if (clock_id == CLOCK_REALTIME || clockid == CLOCK_ACTIVETIME)
+ if (clock_id == CLOCK_REALTIME || clock_id == CLOCK_ACTIVETIME)
#else
if (clock_id == CLOCK_REALTIME)
#endif
@@ -127,7 +127,7 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp)
/* Setup the RTC (lo- or high-res) */
#ifdef CONFIG_RTC
- if (g_rtc_enabled && clockid != CLOCK_ACTIVETIME)
+ if (g_rtc_enabled && clock_id != CLOCK_ACTIVETIME)
{
up_rtc_settime(tp);
}
--
GitLab