X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tmr.c;h=ad30e9c3a99339ecee522de8f46cc8dc82f95a12;hb=f7fae2bd36a4187bc5b0954253466844c2f4ee2b;hp=670d0e142398c57313573e21b8e9666bc814ce6e;hpb=be367d7f046a080f1575ac4e918a94dfad24fa73;p=rgblamp.git

diff --git a/tmr.c b/tmr.c
index 670d0e1..ad30e9c 100644
--- a/tmr.c
+++ b/tmr.c
@@ -1,3 +1,32 @@
+/*
+ * Copyright © 2011, 2012, Titanium Mirror, Inc..
+ * All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - Neither the name of Titanium Mirror, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 /*
  * File:   tmr.c
  *
@@ -37,7 +66,7 @@ static tmr_time_t _tmr_elapsed[TMR_COUNT];
 
 void tmr_init()
 {
-  /* Configure Timer0 to overflow every 32 msec.  Adjust with
+  /* Configure Timer0 to overflow every 32 msec.  Adjust for
    * Fosc as set in picinit.[ch].  At 4 MHz, prescale is 1:128.
    * TMR0CS = 0, PSA = 0, PS = 0b110
   */
@@ -108,7 +137,8 @@ void tmr_isr()
     TMR0IF = 0;
     _tmr_ticks++;
     for (tmr_bitno_t t = 0; t < TMR_COUNT; t++) {
-      if (bit_get(_tmr_on, t) && _tmr_ticks - _tmr_t0[t] <= _tmr_elapsed[t]) {
+      if (bit_get(_tmr_on, t) &&
+          (tmr_time_t)(_tmr_ticks - _tmr_t0[t]) >= _tmr_elapsed[t]) {
         bit_set(_tmr_flag, t);
         if (bit_get(_tmr_periodic, t))
           _tmr_t0[t] += _tmr_elapsed[t];
@@ -119,17 +149,8 @@ void tmr_isr()
   }
 }
 
-/* Wait for a specific timer value t */
-#define tmr_wait(t) while (TMR0 != t);
-
 void tmr_uwait(unsigned us)
 {
-  unsigned t0 = TMR0;
-
-  while (us >= 32768) {
-    tmr_wait(t0);
-    us -= 32768;
-  }
   while (us >= 16384) {
     tmr_cwait(128);
     us -= 16384;
@@ -139,12 +160,6 @@ void tmr_uwait(unsigned us)
 
 void tmr_mwait(unsigned ms)
 {
-  unsigned t0 = TMR0;
-
-  while (ms >= 32) {
-    tmr_wait(t0);
-    ms -= 32;
-  }
   while (ms >= 16) {
     tmr_cwait(128);
     ms -= 16;