Changeset c0c6168 in rtems


Ignore:
Timestamp:
Jan 20, 2003, 8:33:17 PM (17 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
d693386
Parents:
1d36d2af
Message:

2003-01-20 Duane Gustavus <duane@…>

  • console/sci.c, include/mrm332.h, startup/linkcmds, startup/linkcmds_ROM: Various updates to make this run properly from ROM.
Location:
c/src/lib/libbsp/m68k/mrm332
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • c/src/lib/libbsp/m68k/mrm332/ChangeLog

    r1d36d2af rc0c6168  
     12003-01-20      Duane Gustavus <duane@unt.edu>
     2
     3        * console/sci.c, include/mrm332.h, startup/linkcmds,
     4        startup/linkcmds_ROM: Various updates to make this run properly
     5        from ROM.
     6
    172002-12-20      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    28

  • c/src/lib/libbsp/m68k/mrm332/console/sci.c

    r1d36d2af rc0c6168  
    3737*
    3838* $Log$
     39* Revision 1.2  2002/11/04 14:26:47  joel
     40* 2002-11-04    Joel Sherrill <joel@OARcorp.com>
     41*
     42*       * console/sci.c, spurious/spinit.c: Removed warnings.
     43*
    3944* Revision 1.1  2002/02/28 23:10:39  joel
    4045* 2002-02-28    Mike Panetta <ahuitzot@mindspring.com>
    … …  
    121126*****************************************************************************/
    122127
     128#include <rtems.h>
    123129#include <bsp.h>
    124130#include <rtems/bspIo.h>
    … …  
    578584* Desc:     open routine for the interrupt based device driver
    579585*           Default state is 9600 baud, 8 bits, No parity, and 1 stop bit. ??
     586**CHANGED** Default baud rate is now 19200, 8N1
    580587*           called from rtems_termios_open which is called from console_open
    581588* Inputs:   major - device number
    … …  
    616623//  SciSetBaud( 57600);                         // set the baud rate
    617624//  SciSetBaud( 38400);                         // set the baud rate
    618 //  SciSetBaud( 19200);                         // set the baud rate
    619     SciSetBaud(  9600);                         // set the baud rate
     625SciSetBaud( 19200);                         // set the baud rate
     626//    SciSetBaud(  9600);                         // set the baud rate
    620627
    621628    SciSetParity(SCI_PARITY_NONE);              // set parity to none
    … …  
    745752    if (!baud_requested)
    746753    {
    747         baud_requested = B9600;                 // default to 9600 baud
     754//        baud_requested = B9600;                 // default to 9600 baud
     755        baud_requested = B19200;                 // default to 19200 baud
    748756    }
    749757   
    … …  
    854862//  SciSetBaud( 57600);                         // set the baud rate
    855863//  SciSetBaud( 38400);                         // set the baud rate
    856 //  SciSetBaud( 19200);                         // set the baud rate
    857   SciSetBaud(  9600);                         // set the baud rate
     864  SciSetBaud( 19200);                         // set the baud rate
     865//  SciSetBaud(  9600);                         // set the baud rate
    858866
    859867    SciSetParity(SCI_PARITY_NONE);              // set no parity
    … …  
    14941502         * In the first case, higher baud rates will help.
    14951503         */
     1504      /* relinquish processor while waiting */
     1505      rtems_task_wake_after(RTEMS_YIELD_PROCESSOR);
    14961506    }
    14971507
    … …  
    15441554    while ( SciCharAvailable() == 0 )           // anything there?
    15451555    {
    1546         // do nothing
     1556      /* relinquish processor while waiting */
     1557      rtems_task_wake_after(RTEMS_YIELD_PROCESSOR);
    15471558    }
    15481559

  • c/src/lib/libbsp/m68k/mrm332/include/mrm332.h

    r1d36d2af rc0c6168  
    3434#define XTAL 32768.0            /* crystal frequency in Hz */
    3535
    36 #if 1
     36#if 0
    3737/* Default MRM clock rate (8.388688 MHz) set by CPU32: */
    3838#define MRM_W 0                 /* system clock parameters */
    … …  
    4141#endif
    4242
    43 #if 0
     43#if 1
    4444/* 16.77722 MHz: */
    4545#define MRM_W 1                 /* system clock parameters */
    … …  
    5656
    5757#define SYS_CLOCK (XTAL*4.0*(MRM_Y+1)*(1 << (2*MRM_W+MRM_X)))
    58 #define SCI_BAUD 9600           /* RS232 Baud Rate */
     58#define SCI_BAUD 19200          /* RS232 Baud Rate */
    5959
    6060

  • c/src/lib/libbsp/m68k/mrm332/startup/linkcmds

    r1d36d2af rc0c6168  
    3434 * Declare some sizes.
    3535 */
    36 _RamBase = DEFINED(_RamBase) ? _RamBase : 0x03000;
    37 _RamSize = DEFINED(_RamSize) ? _RamSize : 0x7d000;
     36_RamBase = DEFINED(_RamBase) ? _RamBase : 0x10000;
     37_RamSize = DEFINED(_RamSize) ? _RamSize : 0x70000;
    3838_RamEnd = _RamBase + _RamSize;
    3939_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000;
    … …  
    4242MEMORY
    4343{
    44   ram     : ORIGIN = 0x03000, LENGTH = 0x7d000
     44  ram     : ORIGIN = 0x10000, LENGTH = 0x70000
    4545}
    4646
    … …  
    9090                *(.fini)
    9191                *crtn.o(.fini)
     92
     93                /*
     94                 * Special FreeBSD sysctl sections.
     95                 */
     96                . = ALIGN (16);
     97                __start_set_sysctl_set = .;
     98                *(set_sysctl_*);
     99                __stop_set_sysctl_set = ABSOLUTE(.);
     100                *(set_domain_*);
     101                *(set_pseudo_*);
    92102
    93103                /*
    … …  
    144154                . = ALIGN (16);
    145155                PROVIDE (end = .);
    146 
    147156                . += _StackSize;
    148157                . = ALIGN (16);

  • c/src/lib/libbsp/m68k/mrm332/startup/linkcmds_ROM

    r1d36d2af rc0c6168  
    5151_copy_data_from_rom = 1;
    5252_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000;
    53 _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
     53_StackSize = DEFINED(_StackSize) ? _StackSize : 0x2000;
    5454
    5555/*
    … …  
    9292    *crtn.o(.fini)
    9393
    94     *(.eh_fram)
     94    /*
     95     * Special FreeBSD sysctl sections.
     96     */
     97    . = ALIGN (16);
     98    __start_set_sysctl_set = .;
     99    *(set_sysctl_*);
     100    __stop_set_sysctl_set = ABSOLUTE(.);
     101    *(set_domain_*);
     102    *(set_pseudo_*);
     103
     104    /*
     105     * C++ constructors/destructors
     106     *
     107     * gcc uses crtbegin.o to find the start of the constructors
     108     * and destructors so we make sure it is first.  Because this
     109     * is a wildcard, it doesn't matter if the user does not
     110     * actually link against crtbegin.o; the linker won't look for
     111     * a file to match a wildcard.  The wildcard also means that
     112     * it doesn't matter which directory crtbegin.o is in. The
     113     * constructor and destructor list are terminated in
     114     * crtend.o.  The same comments apply to it.
     115     */
     116    . = ALIGN (16);
     117    *crtbegin.o(.ctors)
     118    *(.ctors)
     119    *crtend.o(.ctors)
     120    *crtbegin.o(.dtors)
     121    *(.dtors)
     122    *crtend.o(.dtors)
     123
     124    *(.eh_frame)
    95125    . = ALIGN (16);
    96126
    … …  
    100130    . = ALIGN (16);
    101131    _rodata_start = . ;
    102     *(.rodata)
     132    *(.rodata*)
    103133    *(.gnu.linkonce.r*)
    104134
    … …  
    131161    _sdata = . ;
    132162    *(.data)
     163    *(.gnu.linkonce.d*)
     164    *(.gcc_except_table)
     165    *(.jcr)
     166
    133167    CONSTRUCTORS
    134168    edata = ALIGN(0x10);
    … …  
    147181    *(.bss)
    148182    *(COMMON)
     183    . = ALIGN (16);
    149184    end = .;
    150185    _end = ALIGN(0x8);
Note: See TracChangeset for help on using the changeset viewer.