Changeset df49c60 in rtems for c/src/lib/libcpu/powerpc/mpc860


Ignore:
Timestamp:
Jun 12, 2000, 3:00:15 PM (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
edeed26
Parents:
0ab65474
Message:

Merged from 4.5.0-beta3a

Location:
c/src/lib/libcpu/powerpc/mpc860
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libcpu/powerpc/mpc860/Makefile.am

    r0ab65474 rdf49c60  
    1 ## 
     1##
    22## $Id$
    3 ## 
     3##
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
  • c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am

    r0ab65474 rdf49c60  
    1 ## 
     1##
    22## $Id$
    3 ## 
     3##
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
     
    1818#
    1919
    20 AM_CFLAGS = $(CFLAGS_OS_V)
    21 
    2220$(PGM): $(clock_rel_OBJECTS)
    2321        $(make-rel)
  • c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am

    r0ab65474 rdf49c60  
    1 ## 
     1##
    22## $Id$
    3 ## 
     3##
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
     
    1818#
    1919
    20 AM_CFLAGS = $(CFLAGS_OS_V)
    21 
    2220$(PGM): $(console_generic_rel_OBJECTS)
    2321        $(make-rel)
  • c/src/lib/libcpu/powerpc/mpc860/console-generic/console-generic.c

    r0ab65474 rdf49c60  
    7575static int m860_get_brg_cd(int);
    7676unsigned char m860_get_brg_clk(int);
    77 void m860_console_reserve_resources(rtems_configuration_table *);
    7877unsigned char m860_get_brg_clk(int);
    7978
     
    103102unsigned char m860_get_brg_clk(int baud)
    104103{
    105   static short brg_spd[4];
    106   static char  brg_used[4];
     104  static int brg_spd[4];
     105  static char brg_used[4];
    107106  int i;
    108107
     
    386385   * Put SMC in NMSI mode, connect SMC to BRG
    387386   */
    388   m860.simode &= ~0x7000 << ((port-1) * 8);
    389   m860.simode |= brg << (12 + ((port-1) * 8));
     387  m860.simode &= ~(0x7000 << ((port-1) * 16));
     388  m860.simode |= brg << (12 + ((port-1) * 16));
    390389
    391390  /*
     
    769768  TxBd[minor]->status = M860_BD_READY | M860_BD_WRAP;
    770769  return 0;
    771 }
    772 
    773 /*
    774  * This is needed in case we use TERMIOS
    775  */
    776 void m860_console_reserve_resources(rtems_configuration_table *configuration)
    777 {
    778   rtems_termios_reserve_resources (configuration, 1);
    779770}
    780771
  • c/src/lib/libcpu/powerpc/mpc860/include/Makefile.am

    r0ab65474 rdf49c60  
    1 ## 
     1##
    22## $Id$
    3 ## 
     3##
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
     
    1010noinst_HEADERS = $(H_FILES) $(MPC860_H_FILES)
    1111
    12 PREINSTALL_FILES = \
    13 $(PROJECT_INCLUDE)/mpc860 \
    14 $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
    15 $(MPC860_H_FILES:%.h=$(PROJECT_INCLUDE)/mpc860/%.h)
     12PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc860 \
     13    $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
     14    $(MPC860_H_FILES:%.h=$(PROJECT_INCLUDE)/mpc860/%.h)
    1615
    1716$(PROJECT_INCLUDE)/mpc860:
     
    2423        $(INSTALL_DATA) $< $@
    2524
    26 all-local: $(PREINSTALL_FILES) 
     25all-local: $(PREINSTALL_FILES)
    2726
    2827include $(top_srcdir)/../../../../../automake/local.am
  • c/src/lib/libcpu/powerpc/mpc860/include/mpc860.h

    r0ab65474 rdf49c60  
    113113 */
    114114typedef struct m860MEMCRegisters_ {
    115   rtems_unsigned32        br;
    116   rtems_unsigned32        or;
     115  rtems_unsigned32        _br;
     116  rtems_unsigned32        _or;
    117117} m860MEMCRegisters_t;
    118118
  • c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am

    r0ab65474 rdf49c60  
    1 ## 
     1##
    22## $Id$
    3 ## 
     3##
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
     
    1818#
    1919
    20 AM_CFLAGS = $(CFLAGS_OS_V)
    21 
    2220$(PGM): $(timer_rel_OBJECTS)
    2321        $(make-rel)
  • c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.am

    r0ab65474 rdf49c60  
    1 ## 
     1##
    22## $Id$
    3 ## 
     3##
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
     7VPATH = @srcdir@:@srcdir@/../../ppc403/vectors
     8
    79## FIXME
    8 VPATH = @srcdir@:@srcdir@/../../ppc403/vectors
    910
    1011PGM = ${ARCH}/vectors.rel
     
    2223#
    2324
    24 AM_CFLAGS = $(CFLAGS_OS_V)
    25 
    2625$(PGM): $(vectors_rel_OBJECTS)
    2726        $(make-rel)
Note: See TracChangeset for help on using the changeset viewer.