Changes for Z8Encore\! compile

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@668 42af7a65-404d-4744-a932-0658087f49c3

7 files changed, 18 insertions, 17 deletions

diff --git a/nuttx/sched/clock_abstime2ticks.c b/nuttx/sched/clock_abstime2ticks.c
index 7cd3eb495..b93fb8eac 100644
--- a/nuttx/sched/clock_abstime2ticks.c
+++ b/nuttx/sched/clock_abstime2ticks.c
@@ -1,7 +1,7 @@
 /********************************************************************************
  * clock_abstime2ticks.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -88,8 +88,8 @@
  *
  ********************************************************************************/
 
-extern int clock_abstime2ticks(clockid_t clockid, const struct timespec *abstime,
-                               int *ticks)
+int clock_abstime2ticks(clockid_t clockid, FAR const struct timespec *abstime,
+                        FAR int *ticks)
 {
   struct timespec currtime;
   struct timespec reltime;
diff --git a/nuttx/sched/clock_internal.h b/nuttx/sched/clock_internal.h
index 3c394520c..2c298983b 100644
--- a/nuttx/sched/clock_internal.h
+++ b/nuttx/sched/clock_internal.h
@@ -1,7 +1,7 @@
 /********************************************************************************
  * clock_internal.h
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -79,9 +79,10 @@ extern void weak_function clock_initialize(void);
 extern void weak_function clock_timer(void);
 
 extern time_t clock_calendar2utc(int year, int month, int day);
-extern int    clock_abstime2ticks(clockid_t clockid, const struct timespec *abstime,
-                int *ticks);
-extern int    clock_time2ticks(const struct timespec *reltime, int *ticks);
-extern int    clock_ticks2time(int ticks, struct timespec *reltime);
+extern int    clock_abstime2ticks(clockid_t clockid,
+                                  FAR const struct timespec *abstime,
+                                  FAR int *ticks);
+extern int    clock_time2ticks(FAR const struct timespec *reltime, FAR int *ticks);
+extern int    clock_ticks2time(int ticks, FAR struct timespec *reltime);
 
 #endif /* __CLOCK_INTERNAL_H */
diff --git a/nuttx/sched/clock_ticks2time.c b/nuttx/sched/clock_ticks2time.c
index a7ef5dc9b..f0218df47 100644
--- a/nuttx/sched/clock_ticks2time.c
+++ b/nuttx/sched/clock_ticks2time.c
@@ -1,7 +1,7 @@
 /********************************************************************************
  * clock_ticks2time.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -83,7 +83,7 @@
  *
  ********************************************************************************/
 
-int clock_ticks2time(int ticks, struct timespec *reltime)
+int clock_ticks2time(int ticks, FAR struct timespec *reltime)
 {
   int remainder;
 
diff --git a/nuttx/sched/clock_time2ticks.c b/nuttx/sched/clock_time2ticks.c
index 91c5e976c..5414dfe75 100644
--- a/nuttx/sched/clock_time2ticks.c
+++ b/nuttx/sched/clock_time2ticks.c
@@ -85,7 +85,7 @@
  *
  ********************************************************************************/
 
-int clock_time2ticks(const struct timespec *reltime, int *ticks)
+int clock_time2ticks(FAR const struct timespec *reltime, FAR int *ticks)
 {
   sint32 relusec;
 
diff --git a/nuttx/sched/mq_timedreceive.c b/nuttx/sched/mq_timedreceive.c
index ca4b4aa85..a6cf00338 100644
--- a/nuttx/sched/mq_timedreceive.c
+++ b/nuttx/sched/mq_timedreceive.c
@@ -242,7 +242,7 @@ ssize_t mq_timedreceive(mqd_t mqdes, void *msg, size_t msglen,
 
   if (mqdes->msgq->msglist.head == NULL)
     {
-      sint32 ticks;
+      int ticks;
 
       /* Convert the timespec to clock ticks.  We must have interrupts
        * disabled here so that this time stays valid until the wait begins.
diff --git a/nuttx/sched/mq_timedsend.c b/nuttx/sched/mq_timedsend.c
index 012bd2ab0..4cd508d3b 100644
--- a/nuttx/sched/mq_timedsend.c
+++ b/nuttx/sched/mq_timedsend.c
@@ -239,7 +239,7 @@ int mq_timedsend(mqd_t mqdes, const char *msg, size_t msglen, int prio,
     }
   else
     {
-      sint32 ticks;
+      int ticks;
 
       /* We are not in an interupt handler and the message queue is full.
        * set up a timed wait for the message queue to become non-full.
diff --git a/nuttx/sched/pthread_condtimedwait.c b/nuttx/sched/pthread_condtimedwait.c
index 78110c624..0a1bc7ca9 100644
--- a/nuttx/sched/pthread_condtimedwait.c
+++ b/nuttx/sched/pthread_condtimedwait.c
@@ -132,7 +132,7 @@ int pthread_cond_timedwait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex,
                            FAR const struct timespec *abstime)
 {
   WDOG_ID         wdog;
-  sint32          ticks;
+  int             ticks;
   int             mypid = (int)getpid();
   irqstate_t      int_state;
   int             ret = OK;