change log for rtems (2010-05-21)

rtems-vc at rtems.org rtems-vc at rtems.org
Fri May 21 08:10:38 UTC 2010


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

	* include/utility.h: Macros use now first and last bit values instead
	of shift and length parameters.

M  1.171  c/src/lib/libbsp/shared/ChangeLog
M    1.5  c/src/lib/libbsp/shared/include/utility.h

diff -u rtems/c/src/lib/libbsp/shared/ChangeLog:1.170 rtems/c/src/lib/libbsp/shared/ChangeLog:1.171
--- rtems/c/src/lib/libbsp/shared/ChangeLog:1.170	Thu May 20 09:19:57 2010
+++ rtems/c/src/lib/libbsp/shared/ChangeLog	Fri May 21 03:01:13 2010
@@ -1,3 +1,8 @@
+2010-05-21	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* include/utility.h: Macros use now first and last bit values instead
+	of shift and length parameters.
+
 2010-05-20	Sebastian Huber <sebastian.huber at embedded-brains.de>
 
 	* include/utility.h: Removed superfluous macros.

diff -u rtems/c/src/lib/libbsp/shared/include/utility.h:1.4 rtems/c/src/lib/libbsp/shared/include/utility.h:1.5
--- rtems/c/src/lib/libbsp/shared/include/utility.h:1.4	Thu May 20 09:19:58 2010
+++ rtems/c/src/lib/libbsp/shared/include/utility.h	Fri May 21 03:01:14 2010
@@ -27,16 +27,16 @@
 #define BIT32(bit) \
   ((uint32_t) 1 << (bit))
 
-#define MASK32(shift, length) \
-  ((BIT32(length) - (uint32_t) 1) << (shift))
+#define MASK32(first_bit, last_bit) \
+  ((BIT32((last_bit) - (first_bit) + 1) - (uint32_t) 1) << (first_bit))
 
-#define FIELD32(val, shift, length) \
-  (((uint32_t) (val) << (shift)) & MASK32(shift, length)) 
+#define FIELD32(val, first_bit, last_bit) \
+  (((uint32_t) (val) << (first_bit)) & MASK32(first_bit, last_bit)) 
 
-#define GETFIELD32(reg, shift, length) \
-  (((uint32_t) (reg) & MASK32(shift, length)) >> (shift)) 
+#define GETFIELD32(reg, first_bit, last_bit) \
+  (((reg) & MASK32(first_bit, last_bit)) >> (first_bit)) 
 
-#define SETFIELD32(reg, val, shift, length) \
-  (((uint32_t) (reg) & ~MASK32(shift, length)) | FIELD(val, shift, length))
+#define SETFIELD32(reg, val, first_bit, last_bit) \
+  (((reg) & ~MASK32(first_bit, last_bit)) | FIELD32(val, first_bit, last_bit))
 
 #endif /* LIBCPU_SHARED_UTILITY_H */


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

	* include/lpc32xx.h: Update for utility macro changes.

M   1.13  c/src/lib/libbsp/arm/lpc32xx/ChangeLog
M    1.7  c/src/lib/libbsp/arm/lpc32xx/include/lpc32xx.h

diff -u rtems/c/src/lib/libbsp/arm/lpc32xx/ChangeLog:1.12 rtems/c/src/lib/libbsp/arm/lpc32xx/ChangeLog:1.13
--- rtems/c/src/lib/libbsp/arm/lpc32xx/ChangeLog:1.12	Thu May 20 09:52:32 2010
+++ rtems/c/src/lib/libbsp/arm/lpc32xx/ChangeLog	Fri May 21 03:02:23 2010
@@ -1,3 +1,7 @@
+2010-05-21	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* include/lpc32xx.h: Update for utility macro changes.
+
 2010-05-20	Sebastian Huber <sebastian.huber at embedded-brains.de>
 
 	* configure.ac: Fixed BSP option.

diff -u rtems/c/src/lib/libbsp/arm/lpc32xx/include/lpc32xx.h:1.6 rtems/c/src/lib/libbsp/arm/lpc32xx/include/lpc32xx.h:1.7
--- rtems/c/src/lib/libbsp/arm/lpc32xx/include/lpc32xx.h:1.6	Thu May 20 09:52:32 2010
+++ rtems/c/src/lib/libbsp/arm/lpc32xx/include/lpc32xx.h	Fri May 21 03:02:23 2010
@@ -229,8 +229,8 @@
 
 #define HCLK_PLL_LOCK BIT32(0)
 #define HCLK_PLL_M(val) FIELD32(val, 1, 8)
-#define HCLK_PLL_N(val) FIELD32(val, 9, 2)
-#define HCLK_PLL_P(val) FIELD32(val, 11, 2)
+#define HCLK_PLL_N(val) FIELD32(val, 9, 10)
+#define HCLK_PLL_P(val) FIELD32(val, 11, 12)
 #define HCLK_PLL_FBD_FCLKOUT BIT32(13)
 #define HCLK_PLL_DIRECT BIT32(14)
 #define HCLK_PLL_BYPASS BIT32(15)
@@ -244,9 +244,9 @@
  * @{
  */
 
-#define HCLK_DIV_HCLK(val) FIELD32(val, 0, 2)
-#define HCLK_DIV_PERIPH_CLK(val) FIELD32(val, 2, 5)
-#define HCLK_DIV_DDRAM_CLK(val) FIELD32(val, 7, 2)
+#define HCLK_DIV_HCLK(val) FIELD32(val, 0, 1)
+#define HCLK_DIV_PERIPH_CLK(val) FIELD32(val, 2, 6)
+#define HCLK_DIV_DDRAM_CLK(val) FIELD32(val, 7, 8)
 
 /** @} */
 



--

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/20100521/9447efbe/attachment.html>


More information about the vc mailing list