Changeset a70ec6cb in rtems


Ignore:
Timestamp:
Dec 12, 2007, 5:08:20 PM (12 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.9, master
Children:
5e74ec1
Parents:
20cdfd4
Message:

2007-12-12 Joel Sherrill <joel.sherrill@…>

  • Makefile.am, startup/bspstart.c: Links and runs again.
  • console/console-io.c: New file.
Location:
c/src/lib/libbsp/unix/posix
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/unix/posix/ChangeLog

    r20cdfd4 ra70ec6cb  
     12007-12-12      Joel Sherrill <joel.sherrill@OARcorp.com>
     2
     3        * Makefile.am, startup/bspstart.c: Links and runs again.
     4        * console/console-io.c: New file.
     5
    162007-12-11      Joel Sherrill <joel.sherrill@OARcorp.com>
    27
  • c/src/lib/libbsp/unix/posix/Makefile.am

    r20cdfd4 ra70ec6cb  
    4242noinst_PROGRAMS += startup.rel
    4343startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    44     startup/bspstart.c startup/setvec.c ../../shared/bootcard.c
     44    ../../shared/bsppredriverhook.c startup/bspstart.c \
     45    startup/setvec.c ../../shared/bootcard.c
    4546## for now always using main.c style startup
    4647##if !HAS_CXX
     
    5758
    5859noinst_PROGRAMS += console.rel
    59 console_rel_SOURCES = console/console.c
     60console_rel_SOURCES = console/console.c console/console-io.c
    6061console_rel_CPPFLAGS = $(AM_CPPFLAGS)
    6162console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
  • c/src/lib/libbsp/unix/posix/startup/bspstart.c

    r20cdfd4 ra70ec6cb  
    107107void bsp_start(void)
    108108{
    109     uintptr_t   workspace_ptr;
     109  uintptr_t   workspace_ptr;
    110110
     111  cpu_number = 0;
     112
     113  #if defined(RTEMS_MULTIPROCESSING)
    111114    /*
    112115     *  If the node number is -1 then the application better provide
     
    114117     *  Ditto for RTEMS_MAXIMUM_NODES
    115118     */
     119    if (Configuration.User_multiprocessing_table) {
     120      char *p;
    116121
    117     if (Configuration.User_multiprocessing_table) {
    118         char *p;
     122      if (Configuration.User_multiprocessing_table->node == -1) {
     123        p = getenv("RTEMS_NODE");
     124        Configuration.User_multiprocessing_table->node = p ? atoi(p) : 1;
     125      }
    119126
    120         if (Configuration.User_multiprocessing_table->node == -1) {
    121             p = getenv("RTEMS_NODE");
    122             Configuration.User_multiprocessing_table->node = p ? atoi(p) : 1;
    123         }
    124 
    125         /* If needed provide maximum_nodes also */
    126         if (Configuration.User_multiprocessing_table->maximum_nodes == -1) {
    127             p = getenv("RTEMS_MAXIMUM_NODES");
    128             Configuration.User_multiprocessing_table->maximum_nodes = p ? atoi(p) : 1;
    129         }
     127      /* If needed provide maximum_nodes also */
     128      if (Configuration.User_multiprocessing_table->maximum_nodes == -1) {
     129        p = getenv("RTEMS_MAXIMUM_NODES");
     130       Configuration.User_multiprocessing_table->maximum_nodes = p ? atoi(p) : 1;
     131      }
    130132    }
    131133
     
    133135     * Set cpu_number to accurately reflect our cpu number
    134136     */
    135 
    136     if (Configuration.User_multiprocessing_table->User_multiprocessing_table)
     137      if (Configuration.User_multiprocessing_table)
    137138        cpu_number = Configuration.User_multiprocessing_table->node - 1;
    138     else
    139         cpu_number = 0;
     139   #endif
    140140
    141141    if (getenv("RTEMS_WORKSPACE_SIZE"))
Note: See TracChangeset for help on using the changeset viewer.