Subversion Repositories HelenOS

Rev

Rev 1888 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1888 Rev 1936
Line 35... Line 35...
35 
#include <interrupt.h>
 35 
#include <interrupt.h>
36 
#include <arch/cp0.h>
 36 
#include <arch/cp0.h>
37 
#include <arch/drivers/serial.h>
 37 
#include <arch/drivers/serial.h>
38 
#include <console/chardev.h>
 38 
#include <console/chardev.h>
39 
#include <console/console.h>
 39 
#include <console/console.h>
- 
 
 40 
#include <ddi/irq.h>
40 
 
 41 
 
- 
 
 42 
#define SERIAL_IRQ 2
- 
 
 43 
 
- 
 
 44 
static irq_t serial_irq;
41 
static chardev_t console;
 45 
static chardev_t console;
42 
static serial_t sconf[SERIAL_MAX];
 46 
static serial_t sconf[SERIAL_MAX];
43 
static bool kb_enabled;
 47 
static bool kb_enabled;
44 
 
 48 
 
45 
static void serial_write(chardev_t *d, const char ch)
 49 
static void serial_write(chardev_t *d, const char ch)
Line 89... Line 93...
89 
    if (ch =='\r')
 93 
    if (ch =='\r')
90 
        ch = '\n';
 94 
        ch = '\n';
91 
    return ch;
 95 
    return ch;
92 
}
 96 
}
93 
 
 97 
 
94 
 
 - 
 
95 
/** Process keyboard interrupt. Does not work in simics? */
 - 
 
96 
static void serial_interrupt(int n, void *stack)
 98 
static void serial_handler(void)
97 
{
 99 
{
98 
    serial_t *sd = (serial_t *)console.data;
 100 
    serial_t *sd = (serial_t *) console.data;
99 
    char ch;
 101 
    char ch;
100 
 
 102 
 
101 
    if (!(SERIAL_READ_LSR(sd->port) & 1))
 103 
    if (!(SERIAL_READ_LSR(sd->port) & 1))
102 
        return;
 104 
        return;
103 
    ch = SERIAL_READ(sd->port);
 105 
    ch = SERIAL_READ(sd->port);
Line 105... Line 107...
105 
    if (ch =='\r')
 107 
    if (ch =='\r')
106 
        ch = '\n';
 108 
        ch = '\n';
107 
    chardev_push_character(&console, ch);
 109 
    chardev_push_character(&console, ch);
108 
}
 110 
}
109 
 
 111 
 
- 
 
 112 
/** Process keyboard interrupt. Does not work in simics? */
- 
 
 113 
static void serial_irq_handler(irq_t *irq, void *arg, ...)
- 
 
 114 
{
- 
 
 115 
    if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox))
- 
 
 116 
        ipc_irq_send_notif(irq);
- 
 
 117 
    else
- 
 
 118 
        serial_handler();
- 
 
 119 
}
110 
 
 120 
 
- 
 
 121 
static irq_ownership_t serial_claim(void)
- 
 
 122 
{
- 
 
 123 
    return IRQ_ACCEPT;
- 
 
 124 
}
111 
 
 125 
 
112 
static chardev_operations_t serial_ops = {
 126 
static chardev_operations_t serial_ops = {
113 
    .resume = serial_enable,
 127 
    .resume = serial_enable,
114 
    .suspend = serial_disable,
 128 
    .suspend = serial_disable,
115 
    .write = serial_write,
 129 
    .write = serial_write,
116 
    .read = serial_do_read
 130 
    .read = serial_do_read
117 
};
 131 
};
118 
 
 132 
 
119 
iroutine old_timer;
 - 
 
120 
/** Do polling on timer interrupt */
 - 
 
121 
static void timer_replace(int n, istate_t *istate)
 - 
 
122 
{
 - 
 
123 
    old_timer(n, istate);
 - 
 
124 
    serial_interrupt(n, istate);
 - 
 
125 
}
 - 
 
126 
 
 - 
 
127 
void serial_console(void)
 133 
void serial_console(devno_t devno)
128 
{
 134 
{
129 
    serial_t *sd = &sconf[0];
 135 
    serial_t *sd = &sconf[0];
130 
 
 136 
 
131 
 
 137 
 
132 
    chardev_initialize("serial_console", &console, &serial_ops);
 138 
    chardev_initialize("serial_console", &console, &serial_ops);
133 
    console.data = sd;
 139 
    console.data = sd;
134 
    kb_enabled = true;
 140 
    kb_enabled = true;
- 
 
 141 
   
- 
 
 142 
    irq_initialize(&serial_irq);
- 
 
 143 
    serial_irq.devno = devno;
- 
 
 144 
    serial_irq.inr = SERIAL_IRQ;
- 
 
 145 
    serial_irq.claim = serial_claim;
- 
 
 146 
    serial_irq.handler = serial_irq_handler;
- 
 
 147 
    irq_register(&serial_irq);
135 
 
 148 
 
136 
//  int_register(2, "serial_drvr", serial_interrupt);
 - 
 
137 
    /* I don't know why, but the serial interrupts simply
 149 
    /* I don't know why, but the serial interrupts simply
138 
     * don't work on simics
 150 
     * don't work on simics
139 
     */
 151 
     */
140 
    old_timer = int_register(TIMER_IRQ, "serial_drvr_poll", timer_replace);
 152 
    timer_fnc = &serial_handler;
141 
   
 153 
   
142 
    stdin = &console;
 154 
    stdin = &console;
143 
    stdout = &console;
 155 
    stdout = &console;
144 
}
 156 
}
145 
 
 157