Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 575 → Rev 574

/kernel/trunk/arch/mips32/src/drivers/msim.c
File deleted
/kernel/trunk/arch/mips32/src/drivers/serial.c
File deleted
/kernel/trunk/arch/mips32/src/drivers/keyboard.c
0,0 → 1,117
/*
* Copyright (C) 2003 Josef Cejka
* Copyright (C) 2005 Jakub Jermar
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* - The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
#include <arch/drivers/keyboard.h>
#include <console/chardev.h>
#include <console/console.h>
#include <arch/cp0.h>
#include <putchar.h>
#include <synch/spinlock.h>
#include <synch/waitq.h>
#include <typedefs.h>
#include <arch/drivers/arc.h>
 
static void keyboard_enable(void);
static void keyboard_disable(void);
static void arc_kb_disable(void);
static void arc_kb_enable(void);
 
static chardev_t kbrd;
 
static chardev_operations_t arc_ops = {
.resume = arc_kb_enable,
.suspend = arc_kb_disable
};
 
static chardev_operations_t msim_ops = {
.resume = keyboard_enable,
.suspend = keyboard_disable
};
 
static int arc_kb_enabled;
 
/** Initialize keyboard subsystem. */
void keyboard_init(void)
{
if (arc_enabled()) {
chardev_initialize(&kbrd, &arc_ops);
arc_kb_enabled = 1;
} else {
cp0_unmask_int(KEYBOARD_IRQ);
chardev_initialize(&kbrd, &msim_ops);
}
stdin = &kbrd;
}
 
/** Process keyboard interrupt. */
void keyboard(void)
{
char ch;
 
ch = *((char *) KEYBOARD_ADDRESS);
if (ch =='\r')
ch = '\n';
chardev_push_character(&kbrd, ch);
}
 
/* Called from getc(). */
void keyboard_enable(void)
{
cp0_unmask_int(KEYBOARD_IRQ);
}
 
/* Called from getc(). */
void keyboard_disable(void)
{
cp0_mask_int(KEYBOARD_IRQ);
}
 
/*****************************/
/* Arc keyboard */
 
void keyboard_poll(void)
{
int ch;
 
if (!arc_enabled() || !arc_kb_enabled)
return;
while ((ch = arc_getchar()) != -1)
chardev_push_character(&kbrd, ch);
}
 
static void arc_kb_enable(void)
{
arc_kb_enabled = 1;
}
 
/* Called from getc(). */
static void arc_kb_disable(void)
{
arc_kb_enabled = 0;
}
/kernel/trunk/arch/mips32/src/drivers/arc.c
33,7 → 33,6
#include <arch/byteorder.h>
#include <arch/mm/frame.h>
#include <mm/frame.h>
#include <interrupt.h>
 
/* This is a good joke, SGI HAS different types than NT bioses... */
/* Here is the SGI type */
98,9 → 97,26
static arc_sbp *sbp = (arc_sbp *)PA2KA(0x1000);
static arc_func_vector_t *arc_entry;
 
static void _arc_putchar(char ch);
 
static void arc_putchar(char ch);
/** Initialize ARC structure
*
* @return 0 - ARC OK, -1 - ARC does not exist
*/
int arc_init(void)
{
if (sbp->signature != ARC_MAGIC) {
sbp = NULL;
return -1;
}
arc_entry = sbp->firmwarevector;
 
arc_putchar('A');
arc_putchar('R');
arc_putchar('C');
arc_putchar('\n');
}
 
/** Return true if ARC is available */
int arc_enabled(void)
{
113,8 → 129,8
 
printf("%s: ",ctypes[c->type]);
for (i=0;i < c->identifier_len;i++)
arc_putchar(c->identifier[i]);
arc_putchar('\n');
putchar(c->identifier[i]);
putchar('\n');
}
 
void arc_print_devices(void)
158,7 → 174,7
}
 
/** Print charactor to console */
static void arc_putchar(char ch)
void arc_putchar(char ch)
{
__u32 cnt;
ipl_t ipl;
170,89 → 186,25
}
 
/** Initialize ARC structure
*
* @return 0 - ARC OK, -1 - ARC does not exist
*/
int arc_init(void)
{
if (sbp->signature != ARC_MAGIC) {
sbp = NULL;
return -1;
}
arc_entry = sbp->firmwarevector;
 
arc_putchar('A');
arc_putchar('R');
arc_putchar('C');
arc_putchar('\n');
}
 
static int kbd_polling_enabled;
static chardev_t console;
 
/** Try to get character, return character or -1 if not available */
static void arc_keyboard_poll(void)
int arc_getchar(void)
{
char ch;
__u32 count;
long result;
if (! kbd_polling_enabled)
return;
 
if (arc_entry->getreadstatus(0))
return;
return -1;
result = arc_entry->read(0, &ch, 1, &count);
if (result || count!=1) {
return;
cpu_halt();
return -1;
}
if (ch == '\r')
ch = '\n';
 
chardev_push_character(&console, ch);
return '\n';
return ch;
}
 
static void arc_write(chardev_t *dev, const char ch)
{
arc_putchar(ch);
}
 
static void arc_enable(chardev_t *dev)
{
kbd_polling_enabled = 1;
}
 
static void arc_disable(chardev_t *dev)
{
kbd_polling_enabled = 0;
}
 
static chardev_operations_t arc_ops = {
.resume = arc_enable,
.suspend = arc_disable,
.write = arc_write
};
 
iroutine old_timer;
/** Do polling on timer interrupt */
static void timer_replace(int n, void *stack)
{
arc_keyboard_poll();
old_timer(n, stack);
arc_keyboard_poll();
}
 
 
chardev_t * arc_console(void)
{
kbd_polling_enabled = 1;
chardev_initialize("arc_console", &console, &arc_ops);
old_timer = exc_register(TIMER_IRQ, "arc_kb_poll", timer_replace);
return &console;
}
 
/* Initialize frame zones from ARC firmware.
* In the future we may use even the FirmwareTemporary regions,
* currently we use the FreeMemory (what about the LoadedProgram?)