change log for rtems (2011-11-18)

rtems-vc at rtems.org rtems-vc at rtems.org
Fri Nov 18 20:15:13 UTC 2011


 *jennifer*:
2011-11-18	Jennifer Averett <Jennifer.Averett at OARcorp.com>

	* user/conf.t: Added a bsp override option for MAXIMUM_DEVICES.

M  1.321  doc/ChangeLog
M   1.75  doc/user/conf.t

diff -u rtems/doc/ChangeLog:1.320 rtems/doc/ChangeLog:1.321
--- rtems/doc/ChangeLog:1.320	Mon Oct 31 08:46:43 2011
+++ rtems/doc/ChangeLog	Fri Nov 18 14:04:02 2011
@@ -1,3 +1,7 @@
+2011-11-18	Jennifer Averett <Jennifer.Averett at OARcorp.com>
+
+	* user/conf.t: Added a bsp override option for MAXIMUM_DEVICES.
+
 2011-10-31	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	PR 1947/doc

diff -u rtems/doc/user/conf.t:1.74 rtems/doc/user/conf.t:1.75
--- rtems/doc/user/conf.t:1.74	Wed Oct  5 14:59:47 2011
+++ rtems/doc/user/conf.t	Fri Nov 18 14:04:02 2011
@@ -537,7 +537,10 @@
 @findex CONFIGURE_MAXIMUM_DEVICES
 @item @code{CONFIGURE_MAXIMUM_DEVICES} is defined
 to the number of individual devices that may be registered
-in the system.  By default, this is set to 4.
+in the system.  Unless @code{BSP_MAXIMUM_DEVICES} is set
+by the BSP, the default value for this is set to 4.
+If overridden by the BSP the value is set to the value
+specified by the BSP.
 
 @findex CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 @item @code{CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER}


 *jennifer*:
2011-11-18	Jennifer Averett <Jennifer.Averett at OARcorp.com>

	* sapi/include/confdefs.h: Added a bsp override option for
	MAXIMUM_DEVICES.

M 1.2992  cpukit/ChangeLog
M  1.175  cpukit/sapi/include/confdefs.h

diff -u rtems/cpukit/ChangeLog:1.2991 rtems/cpukit/ChangeLog:1.2992
--- rtems/cpukit/ChangeLog:1.2991	Thu Nov 10 09:36:55 2011
+++ rtems/cpukit/ChangeLog	Fri Nov 18 14:04:39 2011
@@ -1,3 +1,8 @@
+2011-11-18	Jennifer Averett <Jennifer.Averett at OARcorp.com>
+
+	* sapi/include/confdefs.h: Added a bsp override option for
+	MAXIMUM_DEVICES.
+
 2011-11-10	Sebastian Huber <sebastian.huber at embedded-brains.de>
 
 	* rtems/include/rtems/rtems/event.h: Revert parameter name change.

diff -u rtems/cpukit/sapi/include/confdefs.h:1.174 rtems/cpukit/sapi/include/confdefs.h:1.175
--- rtems/cpukit/sapi/include/confdefs.h:1.174	Thu Nov 10 08:40:13 2011
+++ rtems/cpukit/sapi/include/confdefs.h	Fri Nov 18 14:04:49 2011
@@ -418,14 +418,24 @@
 
 #ifdef CONFIGURE_INIT
 
-  /*
+  /**
    *  DEVFS variables.
+   *
+   *  The number of individual devices that may be registered
+   *  in the system or the CONFIGURE_MAXIMUM_DEVICES variable
+   *  is defaulted to 4 when a filesystem is enabled, unless
+   *  the bsp overwrides this.  In which case the value is set
+   *  to BSP_MAXIMUM_DEVICES.
    */
   #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM)
     #define CONFIGURE_MEMORY_FOR_DEVFS  0
   #elif defined(CONFIGURE_FILESYSTEM_DEVFS)
     #ifndef CONFIGURE_MAXIMUM_DEVICES
-      #define CONFIGURE_MAXIMUM_DEVICES 4
+      #if defined(BSP_MAXIMUM_DEVICES)
+        #define CONFIGURE_MAXIMUM_DEVICES BSP_MAXIMUM_DEVICES
+      #else
+        #define CONFIGURE_MAXIMUM_DEVICES 4
+      #endif
     #endif
     #include <rtems/devfs.h>
     uint32_t rtems_device_table_size = CONFIGURE_MAXIMUM_DEVICES;


 *jennifer*:
2011-11-18	Jennifer Averett <Jennifer.Averett at OARcorp.com>

	* console.c: Added a some error checks and fixed a error message.

M  1.198  c/src/lib/libbsp/shared/ChangeLog
M   1.22  c/src/lib/libbsp/shared/console.c

diff -u rtems/c/src/lib/libbsp/shared/ChangeLog:1.197 rtems/c/src/lib/libbsp/shared/ChangeLog:1.198
--- rtems/c/src/lib/libbsp/shared/ChangeLog:1.197	Thu Nov 10 08:42:08 2011
+++ rtems/c/src/lib/libbsp/shared/ChangeLog	Fri Nov 18 14:08:14 2011
@@ -1,3 +1,7 @@
+2011-11-18	Jennifer Averett <Jennifer.Averett at OARcorp.com>
+
+	* console.c: Added a some error checks and fixed a error message.
+
 2011-11-10	Sebastian Huber <sebastian.huber at embedded-brains.de>
 
 	PR 1924/cpukit

diff -u rtems/c/src/lib/libbsp/shared/console.c:1.21 rtems/c/src/lib/libbsp/shared/console.c:1.22
--- rtems/c/src/lib/libbsp/shared/console.c:1.21	Mon Nov  7 02:20:26 2011
+++ rtems/c/src/lib/libbsp/shared/console.c	Fri Nov 18 14:08:15 2011
@@ -292,15 +292,18 @@
     if ( (!port->deviceProbe || port->deviceProbe(minor)) &&
          port->pDeviceFns->deviceProbe(minor)) {
 
-      status = rtems_io_register_name( port->sDeviceName, major, minor );
-      if (status != RTEMS_SUCCESSFUL) {
-        printk( "Unable to register /dev/console\n" );
-        rtems_fatal_error_occurred(status);
+      if (port->sDeviceName != NULL) {
+        status = rtems_io_register_name( port->sDeviceName, major, minor );
+        if (status != RTEMS_SUCCESSFUL) {
+          printk( "Unable to register %s\n",  port->sDeviceName );
+          rtems_fatal_error_occurred(status);
+        }
       }
 
       if (minor == Console_Port_Minor) {
 #if defined(RTEMS_DEBUG)
-          printk( "Register %s as the CONSOLE\n", port->sDeviceName );
+          if (port->sDeviceName != NULL)
+            printk( "Register %s as the CONSOLE\n", port->sDeviceName );
 #endif
         status = rtems_io_register_name( "dev/console", major, minor );
         if (status != RTEMS_SUCCESSFUL) {



--

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/20111118/4c6267d7/attachment-0001.html>


More information about the vc mailing list