<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2010-05-24)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-05-24 Peter Dufault <dufault@hda.com>
PR 1530/bsps
* mpc55xx/edma/edma.c: Eliminate use of recently removed macros.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/ChangeLog.diff?r1=text&tr1=1.352&r2=text&tr2=1.353&diff_format=h">M</a></td><td width='1%'>1.353</td><td width='100%'>c/src/lib/libcpu/powerpc/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.9&diff_format=h">M</a></td><td width='1%'>1.9</td><td width='100%'>c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2010-05-24 Peter Dufault <dufault@hda.com>
+
+ PR 1530/bsps
+ * mpc55xx/edma/edma.c: Eliminate use of recently removed macros.
+
</font> 2010-04-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* mpc55xx/include/irq.h: Move defines from
<font color='#006600'>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
</font><font color='#997700'>@@ -25,7 +25,6 @@
</font> #include <string.h>
#include <bsp/irq.h>
<font color='#880000'>-#include <bsp/utility.h>
</font>
#define RTEMS_STATUS_CHECKS_USE_PRINTK
<font color='#997700'>@@ -99,15 +98,15 @@
</font> channel_flags = MPC55XX_EDMA_CHANNEL_FLAG( i) | MPC55XX_EDMA_CHANNEL_FLAG( minor_link) | MPC55XX_EDMA_CHANNEL_FLAG( major_link);
/* Any errors in these channels? */
<font color='#880000'>- if (IS_ANY_FLAG_SET( error_channels, channel_flags)) {
</font><font color='#000088'>+ if ( error_channels & channel_flags ) {
</font> /* Get new error channels */
uint64_t update = (error_channels & channel_flags) ^ channel_flags;
/* Update error channels */
<font color='#880000'>- error_channels = SET_FLAGS( error_channels, channel_flags);
</font><font color='#000088'>+ error_channels |= channel_flags;
</font>
/* Contribute to the update of this round */
<font color='#880000'>- error_channels_update = SET_FLAGS( error_channels_update, update);
</font><font color='#000088'>+ error_channels_update |= update;
</font> }
}
} while (error_channels_update != 0);
<font color='#997700'>@@ -118,7 +117,7 @@
</font> while (!rtems_chain_is_tail( chain, node)) {
mpc55xx_edma_channel_entry *e = (mpc55xx_edma_channel_entry *) node;
<font color='#880000'>- if (IS_FLAG_SET( error_channels, MPC55XX_EDMA_CHANNEL_FLAG( e->channel))) {
</font><font color='#000088'>+ if ( error_channels & MPC55XX_EDMA_CHANNEL_FLAG( e->channel)) {
</font> mpc55xx_edma_enable_hardware_requests( e->channel, false);
/* Notify user */
<font color='#997700'>@@ -130,7 +129,7 @@
</font>
/* Clear the error interrupt requests */
for (i = 0; i < MPC55XX_EDMA_CHANNEL_COUNT; ++i) {
<font color='#880000'>- if (IS_FLAG_SET( error_channels, MPC55XX_EDMA_CHANNEL_FLAG( i))) {
</font><font color='#000088'>+ if ( error_channels & MPC55XX_EDMA_CHANNEL_FLAG( i)) {
</font> EDMA.CER.R = (uint8_t) i;
}
}
<font color='#997700'>@@ -216,13 +215,13 @@
</font> /* Test and set channel occupation flag */
rtems_interrupt_disable( level);
channel_occupation = mpc55xx_edma_channel_occupation;
<font color='#880000'>- 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));
</font><font color='#000088'>+ if ( (channel_occupation & MPC55XX_EDMA_CHANNEL_FLAG( e->channel)) == 0 ) {
+ mpc55xx_edma_channel_occupation = channel_occupation | MPC55XX_EDMA_CHANNEL_FLAG( e->channel);
</font> }
rtems_interrupt_enable( level);
/* Check channel occupation flag */
<font color='#880000'>- if (IS_FLAG_SET( channel_occupation, MPC55XX_EDMA_CHANNEL_FLAG( e->channel))) {
</font><font color='#000088'>+ if ( channel_occupation & MPC55XX_EDMA_CHANNEL_FLAG( e->channel)) {
</font> return RTEMS_RESOURCE_IN_USE;
}
<font color='#997700'>@@ -253,7 +252,7 @@
</font>
/* Clear channel occupation flag */
rtems_interrupt_disable( level);
<font color='#880000'>- mpc55xx_edma_channel_occupation = CLEAR_FLAG( mpc55xx_edma_channel_occupation, MPC55XX_EDMA_CHANNEL_FLAG( e->channel));
</font><font color='#000088'>+ mpc55xx_edma_channel_occupation &= ~MPC55XX_EDMA_CHANNEL_FLAG( e->channel);
</font> rtems_interrupt_enable( level);
/* Disable hardware requests */
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>