<!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 (2011-04-11)</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>2011-04-11 Joel Sherrill <joel.sherrill@oarcorp.com>
* shared/irq/irq_asm.S: Rename rtems_smp_maximum_processors to
rtems_configuration_smp_maximum_processors since it is defined in
confdefs.h.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/i386/ChangeLog.diff?r1=text&tr1=1.78&r2=text&tr2=1.79&diff_format=h">M</a></td><td width='1%'>1.79</td><td width='100%'>c/src/lib/libbsp/i386/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/i386/shared/irq/irq_asm.S.diff?r1=text&tr1=1.24&r2=text&tr2=1.25&diff_format=h">M</a></td><td width='1%'>1.25</td><td width='100%'>c/src/lib/libbsp/i386/shared/irq/irq_asm.S</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/i386/ChangeLog:1.78 rtems/c/src/lib/libbsp/i386/ChangeLog:1.79
--- rtems/c/src/lib/libbsp/i386/ChangeLog:1.78 Mon Apr 4 11:44:46 2011
+++ rtems/c/src/lib/libbsp/i386/ChangeLog Mon Apr 11 12:16:49 2011
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2011-04-11 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * shared/irq/irq_asm.S: Rename rtems_smp_maximum_processors to
+ rtems_configuration_smp_maximum_processors since it is defined in
+ confdefs.h.
+
</font> 2011-04-04 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1768/bsps
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/i386/shared/irq/irq_asm.S:1.24 rtems/c/src/lib/libbsp/i386/shared/irq/irq_asm.S:1.25
--- rtems/c/src/lib/libbsp/i386/shared/irq/irq_asm.S:1.24 Mon Apr 4 11:44:46 2011
+++ rtems/c/src/lib/libbsp/i386/shared/irq/irq_asm.S Mon Apr 11 12:16:50 2011
</font><font color='#997700'>@@ -32,8 +32,9 @@
</font> #define EBP_OFF 12 /* code restoring ebp/esp relies on */
#define ESP_OFF 16 /* esp being on top of ebp! */
#ifdef __SSE__
<font color='#880000'>-#define FRM_SIZ (20+512)
-#define SSE_OFF 20
</font><font color='#000088'>+/* need to be on 16 byte boundary for SSE */
+#define FRM_SIZ (20+12+512)
+#define SSE_OFF 32
</font> #else
#define FRM_SIZ 20
#endif
</pre>
<p> </p>
<a name='cs2'></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>2011-04-11 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am: Add schedulersimple.h
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/tools/schedsim/rtems/ChangeLog.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>tools/schedsim/rtems/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/tools/schedsim/rtems/Makefile.am.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=h">M</a></td><td width='1%'>1.3</td><td width='100%'>tools/schedsim/rtems/Makefile.am</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/tools/schedsim/rtems/ChangeLog:1.4 rtems/tools/schedsim/rtems/ChangeLog:1.5
--- rtems/tools/schedsim/rtems/ChangeLog:1.4 Thu Apr 7 13:12:39 2011
+++ rtems/tools/schedsim/rtems/ChangeLog Mon Apr 11 12:22:46 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-04-11 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * Makefile.am: Add schedulersimple.h
+
</font> 2011-04-07 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, wkspace.c: Compiles now and do not core dump when RTEMS
<font color='#006600'>diff -u rtems/tools/schedsim/rtems/Makefile.am:1.2 rtems/tools/schedsim/rtems/Makefile.am:1.3
--- rtems/tools/schedsim/rtems/Makefile.am:1.2 Thu Apr 7 13:12:39 2011
+++ rtems/tools/schedsim/rtems/Makefile.am Mon Apr 11 12:22:46 2011
</font><font color='#997700'>@@ -298,6 +298,7 @@
</font> ${cpukitdir}/score/include/rtems/score/thread.h \
${cpukitdir}/score/include/rtems/score/coremsg.h \
${cpukitdir}/score/include/rtems/score/schedulerpriority.h \
<font color='#000088'>+ ${cpukitdir}/score/include/rtems/score/schedulersimple.h \
</font> ${cpukitdir}/score/include/rtems/score/timespec.h \
${cpukitdir}/score/include/rtems/score/tqdata.h \
${cpukitdir}/score/include/rtems/score/bitfield.h \
</pre>
<p> </p>
<a name='cs3'></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>2011-04-11 Joel Sherrill <joel.sherrill@oarcorp.com>
* sapi/include/confdefs.h, score/cpu/i386/cpu.c: Fix typos so you
really can define a user scheduler.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2797&r2=text&tr2=1.2798&diff_format=h">M</a></td><td width='1%'>1.2798</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/sapi/include/confdefs.h.diff?r1=text&tr1=1.162&r2=text&tr2=1.163&diff_format=h">M</a></td><td width='1%'>1.163</td><td width='100%'>cpukit/sapi/include/confdefs.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/cpu/i386/cpu.c.diff?r1=text&tr1=1.47&r2=text&tr2=1.48&diff_format=h">M</a></td><td width='1%'>1.48</td><td width='100%'>cpukit/score/cpu/i386/cpu.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2797 rtems/cpukit/ChangeLog:1.2798
--- rtems/cpukit/ChangeLog:1.2797 Tue Apr 5 08:38:48 2011
+++ rtems/cpukit/ChangeLog Mon Apr 11 12:23:03 2011
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2011-04-11 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * sapi/include/confdefs.h, score/cpu/i386/cpu.c: Fix typos so you
+ really can define a user scheduler.
+
</font> 2011-04-05 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1701/filesystems
<font color='#006600'>diff -u rtems/cpukit/sapi/include/confdefs.h:1.162 rtems/cpukit/sapi/include/confdefs.h:1.163
--- rtems/cpukit/sapi/include/confdefs.h:1.162 Mon Apr 4 11:40:00 2011
+++ rtems/cpukit/sapi/include/confdefs.h Mon Apr 11 12:23:05 2011
</font><font color='#997700'>@@ -601,7 +601,7 @@
</font> */
#if defined(CONFIGURE_SCHEDULER_PRIORITY)
#include <rtems/score/schedulerpriority.h>
<font color='#880000'>- #define SCHEDULER_ENTRY_POINTS SCHEDULER_PRIORITY_ENTRY_POINTS
</font><font color='#000088'>+ #define CONFIGURE_SCHEDULER_ENTRY_POINTS SCHEDULER_PRIORITY_ENTRY_POINTS
</font>
/**
* This defines the memory used by the priority scheduler.
<font color='#997700'>@@ -619,7 +619,7 @@
</font> */
#if defined(CONFIGURE_SCHEDULER_SIMPLE)
#include <rtems/score/schedulersimple.h>
<font color='#880000'>- #define SCHEDULER_ENTRY_POINTS SCHEDULER_SIMPLE_ENTRY_POINTS
</font><font color='#000088'>+ #define CONFIGURE_SCHEDULER_ENTRY_POINTS SCHEDULER_SIMPLE_ENTRY_POINTS
</font>
/**
* define the memory used by the simple scheduler
<font color='#997700'>@@ -630,14 +630,19 @@
</font> #define CONFIGURE_MEMORY_PER_TASK_FOR_SCHEDULER (0)
#endif
<font color='#000088'>+#if defined(CONFIGURE_SCHEDULER_USER)
+ #define CONFIGURE_SCHEDULER_ENTRY_POINTS \
+ CONFIGURE_SCHEDULER_USER_ENTRY_POINTS
+#endif
+
</font> /*<span style="background-color: #FF0000"> </span>
* Set up the scheduler entry points table. The scheduling code uses
* this code to know which scheduler is configured by the user.
*/
#ifdef CONFIGURE_INIT
Scheduler_Control _Scheduler = {
<font color='#880000'>- NULL, /* Scheduler Specific Data Pointer */
- SCHEDULER_ENTRY_POINTS /* Scheduler Operations */
</font><font color='#000088'>+ NULL, /* Scheduler Specific Data Pointer */
+ CONFIGURE_SCHEDULER_ENTRY_POINTS /* Scheduler Operations */
</font> };
#endif
<font color='#006600'>diff -u rtems/cpukit/score/cpu/i386/cpu.c:1.47 rtems/cpukit/score/cpu/i386/cpu.c:1.48
--- rtems/cpukit/score/cpu/i386/cpu.c:1.47 Fri Feb 11 03:14:20 2011
+++ rtems/cpukit/score/cpu/i386/cpu.c Mon Apr 11 12:23:06 2011
</font><font color='#997700'>@@ -1,7 +1,6 @@
</font> /*
* Intel i386 Dependent Source
*
<font color='#880000'>- *
</font> * COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR).
*
<font color='#997700'>@@ -171,8 +170,11 @@
</font> * OK I could probably use a simplified version but at least this
* should work.
*/
<font color='#000088'>+#if 0
</font> printk(" ************ FAULTY THREAD WILL BE SUSPENDED **************\n");
rtems_task_suspend(_Thread_Executing->Object.id);
<font color='#000088'>+#endif
+ bsp_reset();
</font> }
}
</pre>
<p> </p>
<a name='cs4'></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>
<font color='#225522'><em>(on branch rtems-4-10-branch)</em></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-04-11 Keith Robertson <kjrobert at alumni dot uwaterloo dot ca>
* ne2000/ne2000.c: Add multicast support. Patch submitted to mailing
list 2005-12-21.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/i386/pc386/ChangeLog.diff?r1=text&tr1=1.192.2.7&r2=text&tr2=1.192.2.8&diff_format=h">M</a></td><td width='1%'>1.192.2.8</td><td width='100%'>c/src/lib/libbsp/i386/pc386/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/i386/pc386/ChangeLog.diff?r1=text&tr1=1.257.2.2&r2=text&tr2=1.257.2.3&diff_format=h">M</a></td><td width='1%'>1.257.2.3</td><td width='100%'>c/src/lib/libbsp/i386/pc386/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c.diff?r1=text&tr1=1.21&r2=text&tr2=1.21.2.1&diff_format=h">M</a></td><td width='1%'>1.21.2.1</td><td width='100%'>c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c.diff?r1=text&tr1=1.23&r2=text&tr2=1.23.2.1&diff_format=h">M</a></td><td width='1%'>1.23.2.1</td><td width='100%'>c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.192.2.7 rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.192.2.8
--- rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.192.2.7 Mon Mar 7 11:36:01 2011
+++ rtems/c/src/lib/libbsp/i386/pc386/ChangeLog Mon Apr 11 12:28:04 2011
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2011-04-11 Keith Robertson <kjrobert at alumni dot uwaterloo dot ca>
+
+ * ne2000/ne2000.c: Add multicast support. Patch submitted to mailing
+ list 2005-12-21.
+
</font> 2011-03-07 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1756/bsps
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.257.2.2 rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.257.2.3
--- rtems/c/src/lib/libbsp/i386/pc386/ChangeLog:1.257.2.2 Mon Mar 7 11:35:52 2011
+++ rtems/c/src/lib/libbsp/i386/pc386/ChangeLog Mon Apr 11 12:27:57 2011
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2011-04-11 Keith Robertson <kjrobert at alumni dot uwaterloo dot ca>
+
+ * ne2000/ne2000.c: Add multicast support. Patch submitted to mailing
+ list 2005-12-21.
+
</font> 2011-03-07 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1756/bsps
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c:1.21 rtems/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c:1.21.2.1
--- rtems/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c:1.21 Tue Sep 2 08:49:37 2008
+++ rtems/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c Mon Apr 11 12:28:04 2011
</font><font color='#997700'>@@ -504,6 +504,9 @@
</font> /* accept broadcast */
outport_byte (port + RCR, (sc->accept_broadcasts ? MSK_AB : 0));
<font color='#000088'>+ /* accept multicast */
+ outport_byte (port + RCR, MSK_AM);
+
</font> /* Start interface */
outport_byte (port + CMDR, MSK_PG0 | MSK_RD2 | MSK_STA);
<font color='#997700'>@@ -1072,6 +1075,28 @@
</font> printf (" Interrupts: %-8lu\n", sc->stats.interrupts);
}
<font color='#000088'>+static int ne_set_multicast_filter(struct ne_softc* sc)
+{
+ int i=0;
+ unsigned int port = sc->port;
+ unsigned char cmd = 0;
+<span style="background-color: #FF0000"><span style="background-color: #FF0000"> </span> </span>
+ /* Save CMDR settings */
+ inport_byte(port + CMDR, cmd);
+ /* Change to page 1 */
+ outport_byte(port + CMDR, cmd | MSK_PG1);
+
+ /* Set MAR to accept _all_ multicast packets */
+ for (i = 0; i < MARsize; ++i) {
+ outport_byte (port + MAR + i, 0xFF);
+ }
+
+ /* Revert to original CMDR settings */
+ outport_byte(port + CMDR, cmd);<span style="background-color: #FF0000"> </span>
+
+ return 0;
+}
+
</font> /* NE2000 driver ioctl handler. */
static int
<font color='#997700'>@@ -1105,13 +1130,25 @@
</font> break;
}
break;
<font color='#000088'>+<span style="background-color: #FF0000"> </span>
+ case SIOCADDMULTI:
+ case SIOCDELMULTI:
+ {
+ struct ifreq* ifr = (struct ifreq*) data;
+ error = (command == SIOCADDMULTI ?<span style="background-color: #FF0000"> </span>
+ ether_addmulti(ifr, &(sc->arpcom)) :
+ ether_delmulti(ifr, &(sc->arpcom)) );
+ /* ENETRESET indicates that driver should update its multicast filters */
+ if(error == ENETRESET) {
+ error = ne_set_multicast_filter(sc);
+ }
+ break;
+ }
</font>
case SIO_RTEMS_SHOW_STATS:
ne_stats (sc);
break;
<font color='#880000'>- /* FIXME: Multicast commands must be added here. */
-
</font> default:
error = EINVAL;
break;
<font color='#997700'>@@ -1247,7 +1284,7 @@
</font> ifp->if_watchdog = ne_watchdog;
ifp->if_start = ne_start;
ifp->if_output = ether_output;
<font color='#880000'>- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
</font><font color='#000088'>+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
</font> if (ifp->if_snd.ifq_maxlen == 0)
ifp->if_snd.ifq_maxlen = ifqmaxlen;
<font color='#006600'>diff -u rtems/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c:1.23 rtems/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c:1.23.2.1
--- rtems/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c:1.23 Mon Nov 23 12:26:55 2009
+++ rtems/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c Mon Apr 11 12:27:57 2011
</font><font color='#997700'>@@ -505,6 +505,9 @@
</font> /* accept broadcast */
outport_byte (port + RCR, (sc->accept_broadcasts ? MSK_AB : 0));
<font color='#000088'>+ /* accept multicast */
+ outport_byte (port + RCR, MSK_AM);
+
</font> /* Start interface */
outport_byte (port + CMDR, MSK_PG0 | MSK_RD2 | MSK_STA);
<font color='#997700'>@@ -1073,6 +1076,28 @@
</font> printf (" Interrupts: %-8lu\n", sc->stats.interrupts);
}
<font color='#000088'>+static int ne_set_multicast_filter(struct ne_softc* sc)
+{
+ int i=0;
+ unsigned int port = sc->port;
+ unsigned char cmd = 0;
+<span style="background-color: #FF0000"><span style="background-color: #FF0000"> </span> </span>
+ /* Save CMDR settings */
+ inport_byte(port + CMDR, cmd);
+ /* Change to page 1 */
+ outport_byte(port + CMDR, cmd | MSK_PG1);
+
+ /* Set MAR to accept _all_ multicast packets */
+ for (i = 0; i < MARsize; ++i) {
+ outport_byte (port + MAR + i, 0xFF);
+ }
+
+ /* Revert to original CMDR settings */
+ outport_byte(port + CMDR, cmd);<span style="background-color: #FF0000"> </span>
+
+ return 0;
+}
+
</font> /* NE2000 driver ioctl handler. */
static int
<font color='#997700'>@@ -1106,13 +1131,25 @@
</font> break;
}
break;
<font color='#000088'>+<span style="background-color: #FF0000"> </span>
+ case SIOCADDMULTI:
+ case SIOCDELMULTI:
+ {
+ struct ifreq* ifr = (struct ifreq*) data;
+ error = (command == SIOCADDMULTI ?<span style="background-color: #FF0000"> </span>
+ ether_addmulti(ifr, &(sc->arpcom)) :
+ ether_delmulti(ifr, &(sc->arpcom)) );
+ /* ENETRESET indicates that driver should update its multicast filters */
+ if(error == ENETRESET) {
+ error = ne_set_multicast_filter(sc);
+ }
+ break;
+ }
</font>
case SIO_RTEMS_SHOW_STATS:
ne_stats (sc);
break;
<font color='#880000'>- /* FIXME: Multicast commands must be added here. */
-
</font> default:
error = EINVAL;
break;
<font color='#997700'>@@ -1264,7 +1301,7 @@
</font> ifp->if_watchdog = ne_watchdog;
ifp->if_start = ne_start;
ifp->if_output = ether_output;
<font color='#880000'>- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
</font><font color='#000088'>+ ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
</font> if (ifp->if_snd.ifq_maxlen == 0)
ifp->if_snd.ifq_maxlen = ifqmaxlen;
</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>