change log for rtems (2010-10-14)

rtems-vc at rtems.org rtems-vc at rtems.org
Thu Oct 14 07:10:38 UTC 2010


 *sh*:
2010-10-14	Sebastian Huber <sebastian.huber at embedded-brains.de>

	* misc/system-clocks.c: Fixed lpc24xx_micro_seconds_delay().

M   1.54  c/src/lib/libbsp/arm/lpc24xx/ChangeLog
M    1.7  c/src/lib/libbsp/arm/lpc24xx/misc/io.c
M    1.9  c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c

diff -u rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog:1.53 rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog:1.54
--- rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog:1.53	Wed Jun 23 03:11:27 2010
+++ rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog	Thu Oct 14 01:52:46 2010
@@ -1,3 +1,7 @@
+2010-10-14	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* misc/system-clocks.c: Fixed lpc24xx_micro_seconds_delay().
+
 2010-06-23	Sebastian Huber <sebastian.huber at embedded-brains.de>
 
 	* make/custom/lpc23xx_tli800.cfg, startup/linkcmds.lpc23xx_tli800: New

diff -u rtems/c/src/lib/libbsp/arm/lpc24xx/misc/io.c:1.6 rtems/c/src/lib/libbsp/arm/lpc24xx/misc/io.c:1.7
--- rtems/c/src/lib/libbsp/arm/lpc24xx/misc/io.c:1.6	Fri Apr  9 07:24:48 2010
+++ rtems/c/src/lib/libbsp/arm/lpc24xx/misc/io.c	Thu Oct 14 01:52:46 2010
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2009
+ * Copyright (c) 2009, 2010
  * embedded brains GmbH
  * Obere Lagerstr. 30
  * D-82178 Puchheim
@@ -110,6 +110,14 @@
   /* PWM */
   LPC24XX_IO_ENTRY(LPC24XX_MODULE_PWM_1, 0, 2, 0, 2, 0, LPC24XX_IO_ALTERNATE_0),
 
+  /* LCD */
+  LPC24XX_IO_ENTRY(LPC24XX_MODULE_LCD, 0, 0, 4, 0, 9, LPC24XX_IO_ALTERNATE_0),
+  LPC24XX_IO_ENTRY(LPC24XX_MODULE_LCD, 0, 1, 20, 1, 29, LPC24XX_IO_ALTERNATE_0),
+  LPC24XX_IO_ENTRY(LPC24XX_MODULE_LCD, 0, 2, 0, 2, 3, LPC24XX_IO_ALTERNATE_2),
+  LPC24XX_IO_ENTRY(LPC24XX_MODULE_LCD, 0, 2, 5, 2, 9, LPC24XX_IO_ALTERNATE_2),
+  LPC24XX_IO_ENTRY(LPC24XX_MODULE_LCD, 0, 2, 12, 2, 13, LPC24XX_IO_ALTERNATE_0),
+  LPC24XX_IO_ENTRY(LPC24XX_MODULE_LCD, 0, 4, 28, 4, 29, LPC24XX_IO_ALTERNATE_1),
+
   /* Terminate */
   LPC24XX_IO_ENTRY(LPC24XX_MODULE_COUNT, 0, 0, 0, 0, 0, 0)
 };

diff -u rtems/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c:1.8 rtems/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c:1.9
--- rtems/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c:1.8	Thu May 20 09:23:13 2010
+++ rtems/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c	Thu Oct 14 01:52:46 2010
@@ -63,12 +63,12 @@
 void lpc24xx_micro_seconds_delay(unsigned us)
 {
   unsigned start = lpc24xx_timer();
-  unsigned end = start + us * (lpc24xx_cclk() / 1000000);
-  unsigned now = 0;
+  unsigned delay = us * (lpc24xx_cclk() / 1000000);
+  unsigned elapsed = 0;
 
   do {
-    now = lpc24xx_timer();
-  } while (now < end);
+    elapsed = lpc24xx_timer() - start;
+  } while (elapsed <= delay);
 }
 
 unsigned lpc24xx_pllclk(void)


 *sh*:
Typo.

M   1.10  c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c

diff -u rtems/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c:1.9 rtems/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c:1.10
--- rtems/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c:1.9	Thu Oct 14 01:52:46 2010
+++ rtems/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c	Thu Oct 14 01:56:03 2010
@@ -68,7 +68,7 @@
 
   do {
     elapsed = lpc24xx_timer() - start;
-  } while (elapsed <= delay);
+  } while (elapsed < delay);
 }
 
 unsigned lpc24xx_pllclk(void)



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20101014/060beb30/attachment.html>


More information about the vc mailing list