change log for rtems (2011-04-11)

rtems-vc at rtems.org rtems-vc at rtems.org
Mon Apr 11 18:10:32 UTC 2011


 *joel*:
2011-04-11	Joel Sherrill <joel.sherrill at 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.

M   1.79  c/src/lib/libbsp/i386/ChangeLog
M   1.25  c/src/lib/libbsp/i386/shared/irq/irq_asm.S

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
@@ -1,3 +1,9 @@
+2011-04-11	Joel Sherrill <joel.sherrill at 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.
+
 2011-04-04	Joel Sherrill <joel.sherrilL at OARcorp.com>
 
 	PR 1768/bsps

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
@@ -32,8 +32,9 @@
 #define EBP_OFF 12       /* code restoring ebp/esp relies on */
 #define ESP_OFF 16       /* esp being on top of ebp!         */
 #ifdef __SSE__
-#define FRM_SIZ (20+512)
-#define SSE_OFF 20
+/* need to be on 16 byte boundary for SSE */
+#define FRM_SIZ (20+12+512)
+#define SSE_OFF 32
 #else
 #define FRM_SIZ 20
 #endif


 *joel*:
2011-04-11	Joel Sherrill <joel.sherrill at oarcorp.com>

	* Makefile.am: Add schedulersimple.h

M    1.5  tools/schedsim/rtems/ChangeLog
M    1.3  tools/schedsim/rtems/Makefile.am

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
@@ -1,3 +1,7 @@
+2011-04-11	Joel Sherrill <joel.sherrill at oarcorp.com>
+
+	* Makefile.am: Add schedulersimple.h
+
 2011-04-07	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	* Makefile.am, wkspace.c: Compiles now and do not core dump when RTEMS

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
@@ -298,6 +298,7 @@
   ${cpukitdir}/score/include/rtems/score/thread.h \
   ${cpukitdir}/score/include/rtems/score/coremsg.h \
   ${cpukitdir}/score/include/rtems/score/schedulerpriority.h \
+  ${cpukitdir}/score/include/rtems/score/schedulersimple.h \
   ${cpukitdir}/score/include/rtems/score/timespec.h \
   ${cpukitdir}/score/include/rtems/score/tqdata.h \
   ${cpukitdir}/score/include/rtems/score/bitfield.h \


 *joel*:
2011-04-11	Joel Sherrill <joel.sherrill at oarcorp.com>

	* sapi/include/confdefs.h, score/cpu/i386/cpu.c: Fix typos so you
	really can define a user scheduler.

M 1.2798  cpukit/ChangeLog
M  1.163  cpukit/sapi/include/confdefs.h
M   1.48  cpukit/score/cpu/i386/cpu.c

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
@@ -1,3 +1,8 @@
+2011-04-11	Joel Sherrill <joel.sherrill at oarcorp.com>
+
+	* sapi/include/confdefs.h, score/cpu/i386/cpu.c: Fix typos so you
+	really can define a user scheduler.
+
 2011-04-05	Joel Sherrill <joel.sherrilL at OARcorp.com>
 
 	PR 1701/filesystems

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
@@ -601,7 +601,7 @@
  */
 #if defined(CONFIGURE_SCHEDULER_PRIORITY)
   #include <rtems/score/schedulerpriority.h>
-  #define SCHEDULER_ENTRY_POINTS SCHEDULER_PRIORITY_ENTRY_POINTS
+  #define CONFIGURE_SCHEDULER_ENTRY_POINTS SCHEDULER_PRIORITY_ENTRY_POINTS
 
   /**
    * This defines the memory used by the priority scheduler.
@@ -619,7 +619,7 @@
  */
 #if defined(CONFIGURE_SCHEDULER_SIMPLE)
   #include <rtems/score/schedulersimple.h>
-  #define SCHEDULER_ENTRY_POINTS SCHEDULER_SIMPLE_ENTRY_POINTS
+  #define CONFIGURE_SCHEDULER_ENTRY_POINTS SCHEDULER_SIMPLE_ENTRY_POINTS
 
   /**
    * define the memory used by the simple scheduler
@@ -630,14 +630,19 @@
   #define CONFIGURE_MEMORY_PER_TASK_FOR_SCHEDULER (0)
 #endif
 
+#if defined(CONFIGURE_SCHEDULER_USER)
+  #define CONFIGURE_SCHEDULER_ENTRY_POINTS \
+          CONFIGURE_SCHEDULER_USER_ENTRY_POINTS
+#endif
+
 /* 
  * 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 = {
-    NULL,                   /* Scheduler Specific Data Pointer */
-    SCHEDULER_ENTRY_POINTS  /* Scheduler Operations */
+    NULL,                             /* Scheduler Specific Data Pointer */
+    CONFIGURE_SCHEDULER_ENTRY_POINTS  /* Scheduler Operations */
   };
 #endif
 

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
@@ -1,7 +1,6 @@
 /*
  *  Intel i386 Dependent Source
  *
- *
  *  COPYRIGHT (c) 1989-1999.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -171,8 +170,11 @@
      * OK I could probably use a simplified version but at least this
      * should work.
      */
+#if 0
     printk(" ************ FAULTY THREAD WILL BE SUSPENDED **************\n");
     rtems_task_suspend(_Thread_Executing->Object.id);
+#endif
+    bsp_reset();
   }
 }
 


 *joel* (on branch rtems-4-10-branch):
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.

M 1.192.2.8  c/src/lib/libbsp/i386/pc386/ChangeLog
M 1.257.2.3  c/src/lib/libbsp/i386/pc386/ChangeLog
M 1.21.2.1  c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
M 1.23.2.1  c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c

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
@@ -1,3 +1,8 @@
+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.
+
 2011-03-07	Joel Sherrill <joel.sherrilL at OARcorp.com>
 
 	PR 1756/bsps

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
@@ -1,3 +1,8 @@
+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.
+
 2011-03-07	Joel Sherrill <joel.sherrilL at OARcorp.com>
 
 	PR 1756/bsps

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
@@ -504,6 +504,9 @@
   /* accept broadcast */
   outport_byte (port + RCR, (sc->accept_broadcasts ? MSK_AB : 0));
 
+  /* accept multicast */
+  outport_byte (port + RCR, MSK_AM);
+
   /* Start interface */
   outport_byte (port + CMDR, MSK_PG0 | MSK_RD2 | MSK_STA);
 
@@ -1072,6 +1075,28 @@
   printf ("          Interrupts: %-8lu\n", sc->stats.interrupts);
 }
 
+static int ne_set_multicast_filter(struct ne_softc* sc)
+{
+  int i=0;
+  unsigned int port = sc->port;
+  unsigned char cmd = 0;
+  	
+  /* 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); 
+
+  return 0;
+}
+
 /* NE2000 driver ioctl handler.  */
 
 static int
@@ -1105,13 +1130,25 @@
       break;
     }
     break;
+  
+  case SIOCADDMULTI:
+  case SIOCDELMULTI:
+  {
+    struct ifreq* ifr = (struct ifreq*) data;
+    error = (command == SIOCADDMULTI ? 
+      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;
+  }
 
   case SIO_RTEMS_SHOW_STATS:
     ne_stats (sc);
     break;
 
-    /* FIXME: Multicast commands must be added here.  */
-
   default:
     error = EINVAL;
     break;
@@ -1247,7 +1284,7 @@
   ifp->if_watchdog = ne_watchdog;
   ifp->if_start = ne_start;
   ifp->if_output = ether_output;
-  ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
+  ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
   if (ifp->if_snd.ifq_maxlen == 0)
     ifp->if_snd.ifq_maxlen = ifqmaxlen;
 

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
@@ -505,6 +505,9 @@
   /* accept broadcast */
   outport_byte (port + RCR, (sc->accept_broadcasts ? MSK_AB : 0));
 
+  /* accept multicast */
+  outport_byte (port + RCR, MSK_AM);
+
   /* Start interface */
   outport_byte (port + CMDR, MSK_PG0 | MSK_RD2 | MSK_STA);
 
@@ -1073,6 +1076,28 @@
   printf ("          Interrupts: %-8lu\n", sc->stats.interrupts);
 }
 
+static int ne_set_multicast_filter(struct ne_softc* sc)
+{
+  int i=0;
+  unsigned int port = sc->port;
+  unsigned char cmd = 0;
+  	
+  /* 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); 
+
+  return 0;
+}
+
 /* NE2000 driver ioctl handler.  */
 
 static int
@@ -1106,13 +1131,25 @@
       break;
     }
     break;
+  
+  case SIOCADDMULTI:
+  case SIOCDELMULTI:
+  {
+    struct ifreq* ifr = (struct ifreq*) data;
+    error = (command == SIOCADDMULTI ? 
+      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;
+  }
 
   case SIO_RTEMS_SHOW_STATS:
     ne_stats (sc);
     break;
 
-    /* FIXME: Multicast commands must be added here.  */
-
   default:
     error = EINVAL;
     break;
@@ -1264,7 +1301,7 @@
   ifp->if_watchdog = ne_watchdog;
   ifp->if_start = ne_start;
   ifp->if_output = ether_output;
-  ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
+  ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
   if (ifp->if_snd.ifq_maxlen == 0)
     ifp->if_snd.ifq_maxlen = ifqmaxlen;
 



--

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/20110411/877a59a5/attachment-0001.html>


More information about the vc mailing list