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/console-generic
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.