From d1e82b45682971eb6a1a1c29d20aa9e868549dd3 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Tue, 6 Sep 2011 21:00:48 +0000
Subject: [PATCH] Fix a error the the STM32 I2C timeout logic

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3940 42af7a65-404d-4744-a932-0658087f49c3
---
 ChangeLog                      |  5 +++++
 Documentation/NuttShell.html   |  2 +-
 arch/arm/src/stm32/stm32_i2c.c |  2 +-
 drivers/pm/pm_checkstate.c     |  2 +-
 include/nuttx/pm.h             | 17 +++++++++++++++++
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5743d55ee..32522415b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2052,3 +2052,8 @@
 	* lib/time/lib_gmtimer.c:  Correct several calculations that could lead
 	  to errors in dates.
 	* drivers/pm: Add the beginnings of a NuttX power management sub-system.
+	* arch/arm/src/stm32/stm32_irq.c:  Fix a error introduced in 6.8.
+	  Timeout calculation uses clock_settime() instead of clock_gettime().
+	  Pretty gross error, but actually it works with the side effect of setting
+	  a bad time.
+
diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html
index 6931051669..73bb1bf658 100644
--- a/Documentation/NuttShell.html
+++ b/Documentation/NuttShell.html
@@ -1497,7 +1497,7 @@ ping [-c &lt;count&gt;] [-i &lt;interval&gt;] &lt;ip-address&gt;
   Test the network communication with a remote peer.  Example,
 </p>
 <ul><pre>
-nsh&gt; 10.0.0.1
+nsh&gt; ping 10.0.0.1
 PING 10.0.0.1 56 bytes of data
 56 bytes from 10.0.0.1: icmp_seq=1 time=0 ms
 56 bytes from 10.0.0.1: icmp_seq=2 time=0 ms
diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c
index 6057192464..09f61c05cf 100644
--- a/arch/arm/src/stm32/stm32_i2c.c
+++ b/arch/arm/src/stm32/stm32_i2c.c
@@ -200,7 +200,7 @@ int inline stm32_i2c_sem_waitisr(FAR struct i2c_dev_s *dev)
   flags = irqsave();
   do
     {
-      (void)clock_settime(CLOCK_REALTIME, &abstime);
+      (void)clock_gettime(CLOCK_REALTIME, &abstime);
       abstime.tv_nsec += CONFIG_STM32_I2CTIMEOMS * 1000 * 1000;
       if (abstime.tv_nsec > 1000 * 1000 * 1000)
         {
diff --git a/drivers/pm/pm_checkstate.c b/drivers/pm/pm_checkstate.c
index 93f19a5024..9ecff862eb 100644
--- a/drivers/pm/pm_checkstate.c
+++ b/drivers/pm/pm_checkstate.c
@@ -129,7 +129,7 @@ enum pm_state_e pm_checkstate(void)
    now = clock_systimer();
    if (now - g_pmglobals.stime >= TIME_SLICE_TICKS)
     {
-      int16_t accum;
+       int16_t accum;
 
        /* Sample the count, reset the time and count, and assess the PM
         * state.  This is an atomic operation because interrupts are
diff --git a/include/nuttx/pm.h b/include/nuttx/pm.h
index 898a82b88f..520348ca62 100644
--- a/include/nuttx/pm.h
+++ b/include/nuttx/pm.h
@@ -458,5 +458,22 @@ EXTERN int pm_changestate(enum pm_state_e newstate);
 #endif
 
 #endif /* __ASSEMBLY__ */
+
+/****************************************************************************
+ * Stubs
+ ****************************************************************************/
+
+#else /* CONFIG_PM */
+
+/* Stubbed out versions of all of PM interface functions that may be used to
+ * avoid so much conditional compilation in driver code when PM is disabled:
+ */
+
+#  define pm_initialize()
+#  define pm_register(cb)       (0)
+#  define pm_activity(prio)
+#  define pm_checkstate()       (0)
+#  define pm_changestate(state)
+
 #endif /* CONFIG_PM */
 #endif /* __INCLUDE_NUTTX_PM_H */