Changeset 1515522 in mainline


Ignore:
Timestamp:
2009-03-07T20:21:15Z (16 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1c6b3a2
Parents:
901cda3
Message:

Nuke the mips32-specific ns16550 driver.
Remove the conflicting console_init() too.

Location:
kernel/arch/mips32
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/mips32/Makefile.inc

    r901cda3 r1515522  
    8787        arch/$(KARCH)/src/ddi/ddi.c \
    8888        arch/$(KARCH)/src/drivers/msim.c \
    89         arch/$(KARCH)/src/drivers/serial.c \
    9089        arch/$(KARCH)/src/smp/dorder.c \
    9190        arch/$(KARCH)/src/smp/smp.c

  • kernel/arch/mips32/include/console.h

    r901cda3 r1515522  
    3636#define KERN_mips32_CONSOLE_H_
    3737
    38 extern void console_init(devno_t devno);
    39 
    4038#endif
    4139

  • kernel/arch/mips32/include/drivers/serial.h

    r901cda3 r1515522  
    3636#define KERN_mips32_SERIAL_H_
    3737
    38 #include <console/chardev.h>
    39 
    4038#define SERIAL_ADDRESS    0x98000000
    41 
    42 #define SERIAL_MAX        4
    43 #define SERIAL_COM1       0x3f8
    44 #define SERIAL_COM1_IRQ   4
    45 #define SERIAL_COM2       0x2f8
    46 #define SERIAL_COM2_IRQ   3
    47 
    48 #define P_WRITEB(where, what)     (*((volatile char *) (SERIAL_ADDRESS + where)) = what)
    49 #define P_READB(where)            (*((volatile char *) (SERIAL_ADDRESS + where)))
    50 
    51 #define SERIAL_READ(x)            P_READB(x)
    52 #define SERIAL_WRITE(x, c)        P_WRITEB(x, c)
    53 
    54 /* Interrupt enable register */
    55 #define SERIAL_READ_IER(x)              (P_READB((x) + 1))
    56 #define SERIAL_WRITE_IER(x,c)           (P_WRITEB((x) + 1, c))
    57 
    58 /* Interrupt identification register */
    59 #define SERIAL_READ_IIR(x)             (P_READB((x) + 2))
    60 
    61 /* Line status register */
    62 #define SERIAL_READ_LSR(x)             (P_READB((x) + 5))
    63 #define TRANSMIT_EMPTY_BIT      5         
    64 
    65 typedef struct {
    66         int port;
    67         int irq;
    68 }serial_t;
    69 
    70 extern void serial_console(devno_t devno);
    71 extern int serial_init(void);
    7239
    7340#endif

  • kernel/arch/mips32/src/console.c

    r901cda3 r1515522  
    3939#include <genarch/fb/fb.h>
    4040
    41 void console_init(devno_t devno)
    42 {
    43         if (serial_init())
    44                 serial_console(devno);
    45         else
    46                 msim_console(devno);
    47 }
    48 
    4941/** Acquire console back for kernel
    5042 *

  • kernel/arch/mips32/src/mips32.c

    r901cda3 r1515522  
    5757#include <config.h>
    5858#include <string.h>
     59#include <arch/drivers/msim.h>
    5960
    6061#include <arch/asm/regname.h>
    … …  
    133134{
    134135        interrupt_init();
    135         console_init(device_assign_devno());
     136        msim_console(device_assign_devno());
    136137#ifdef CONFIG_FB
    137138        /* GXemul framebuffer */
Note: See TracChangeset for help on using the changeset viewer.