change log for rtems (2010-05-24)

[rtems-vc at rtems.org]

 *joel*:
2010-05-24	Peter Dufault <dufault at hda.com>

	PR 1530/bsps
	* mpc55xx/edma/edma.c: Eliminate use of recently removed macros.

M  1.353  c/src/lib/libcpu/powerpc/ChangeLog
M    1.9  c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c

diff -u rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.352 rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.353
--- rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.352	Fri Apr 30 06:59:04 2010
+++ rtems/c/src/lib/libcpu/powerpc/ChangeLog	Mon May 24 10:19:40 2010
@@ -1,3 +1,8 @@
+2010-05-24	Peter Dufault <dufault at hda.com>
+
+	PR 1530/bsps
+	* mpc55xx/edma/edma.c: Eliminate use of recently removed macros.
+
 2010-04-30	Sebastian Huber <sebastian.huber at embedded-brains.de>
 
 	* mpc55xx/include/irq.h: Move defines from

diff -u rtems/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c:1.8 rtems/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c:1.9
--- rtems/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c:1.8	Wed Apr  7 09:19:55 2010
+++ rtems/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c	Mon May 24 10:19:40 2010
@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include <bsp/irq.h>
-#include <bsp/utility.h>
 
 #define RTEMS_STATUS_CHECKS_USE_PRINTK
 
@@ -99,15 +98,15 @@
 			channel_flags = MPC55XX_EDMA_CHANNEL_FLAG( i) | MPC55XX_EDMA_CHANNEL_FLAG( minor_link) | MPC55XX_EDMA_CHANNEL_FLAG( major_link);
 
 			/* Any errors in these channels? */
-			if (IS_ANY_FLAG_SET( error_channels, channel_flags)) {
+			if ( error_channels & channel_flags ) {
 				/* Get new error channels */
 				uint64_t update = (error_channels & channel_flags) ^ channel_flags;
 
 				/* Update error channels */
-				error_channels = SET_FLAGS( error_channels, channel_flags);
+				error_channels |= channel_flags;
 
 				/* Contribute to the update of this round */
-				error_channels_update = SET_FLAGS( error_channels_update, update);
+				error_channels_update |=  update;
 			}
 		}
 	} while (error_channels_update != 0);
@@ -118,7 +117,7 @@
 	while (!rtems_chain_is_tail( chain, node)) {
 		mpc55xx_edma_channel_entry *e = (mpc55xx_edma_channel_entry *) node;
 
-		if (IS_FLAG_SET( error_channels, MPC55XX_EDMA_CHANNEL_FLAG( e->channel))) {
+		if ( error_channels & MPC55XX_EDMA_CHANNEL_FLAG( e->channel)) {
 			mpc55xx_edma_enable_hardware_requests( e->channel, false);
 
 			/* Notify user */
@@ -130,7 +129,7 @@
 
 	/* Clear the error interrupt requests */
 	for (i = 0; i < MPC55XX_EDMA_CHANNEL_COUNT; ++i) {
-		if (IS_FLAG_SET( error_channels, MPC55XX_EDMA_CHANNEL_FLAG( i))) {
+		if ( error_channels & MPC55XX_EDMA_CHANNEL_FLAG( i)) {
 			EDMA.CER.R = (uint8_t) i;
 		}
 	}
@@ -216,13 +215,13 @@
 	/* Test and set channel occupation flag */
 	rtems_interrupt_disable( level);
 	channel_occupation = mpc55xx_edma_channel_occupation;
-	if (IS_FLAG_CLEARED( channel_occupation, MPC55XX_EDMA_CHANNEL_FLAG( e->channel))) {
-		mpc55xx_edma_channel_occupation = SET_FLAG( channel_occupation, MPC55XX_EDMA_CHANNEL_FLAG( e->channel));
+	if ( (channel_occupation & MPC55XX_EDMA_CHANNEL_FLAG( e->channel)) == 0 ) {
+		mpc55xx_edma_channel_occupation = channel_occupation | MPC55XX_EDMA_CHANNEL_FLAG( e->channel);
 	}
 	rtems_interrupt_enable( level);
 
 	/* Check channel occupation flag */
-	if (IS_FLAG_SET( channel_occupation, MPC55XX_EDMA_CHANNEL_FLAG( e->channel))) {
+	if ( channel_occupation & MPC55XX_EDMA_CHANNEL_FLAG( e->channel)) {
 		return RTEMS_RESOURCE_IN_USE;
 	}
 
@@ -253,7 +252,7 @@
 
 	/* Clear channel occupation flag */
 	rtems_interrupt_disable( level);
-	mpc55xx_edma_channel_occupation = CLEAR_FLAG( mpc55xx_edma_channel_occupation, MPC55XX_EDMA_CHANNEL_FLAG( e->channel));
+	mpc55xx_edma_channel_occupation &= ~MPC55XX_EDMA_CHANNEL_FLAG( e->channel);
 	rtems_interrupt_enable( level);
 
 	/* Disable hardware requests */



--

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/20100524/63ac64cc/attachment-0001.html>