Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 585 → Rev 586

/kernel/trunk/generic/include/interrupt.h
32,7 → 32,7
#include <arch/interrupt.h>
 
#ifndef IVT_ITEMS
# define IVT_ITEMS 1
# define IVT_ITEMS 0
#endif
 
typedef void (* iroutine)(int n, void *stack);
/kernel/trunk/generic/include/console/chardev.h
36,14 → 36,11
 
#define CHARDEV_BUFLEN 512
 
struct chardev;
 
/* Character device operations interface. */
struct chardev_operations {
void (* suspend)(struct chardev *);/**< Suspend pushing characters. */
void (* resume)(struct chardev *); /**< Resume pushing characters. */
/** Write character to stream */
void (* write)(struct chardev *, char c);
void (* suspend)(chardev_t *); /**< Suspend pushing characters. */
void (* resume)(chardev_t *); /**< Resume pushing characters. */
void (* write)(chardev_t *, char c); /**< Write character to stream. */
};
 
typedef struct chardev_operations chardev_operations_t;
/kernel/trunk/generic/src/interrupt/interrupt.c
112,7 → 112,7
 
static cmd_info_t exc_info = {
.name = "pexc",
.description = "Print exception table",
.description = "Print exception table.",
.func = exc_print_cmd,
.help = NULL,
.argc = 0,
/kernel/trunk/arch/sparc64/include/console.h
0,0 → 1,34
/*
* 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.
*/
 
#ifndef __sparc64_CONSOLE_H__
#define __sparc64_CONSOLE_H__
 
extern void ofw_sparc64_console_init(void);
 
#endif
/kernel/trunk/arch/sparc64/src/console.c
26,14 → 26,29
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
#include <putchar.h>
#include <arch/console.h>
#include <genarch/ofw/ofw.h>
#include <console/chardev.h>
#include <console/console.h>
 
static void ofw_sparc64_putchar(chardev_t *d, const char ch);
 
static chardev_t ofw_sparc64_console;
static chardev_operations_t ofw_sparc64_console_ops = {
.write = ofw_sparc64_putchar
};
 
void ofw_sparc64_console_init(void)
{
chardev_initialize("ofw_sparc64_console", &ofw_sparc64_console, &ofw_sparc64_console_ops);
stdout = &ofw_sparc64_console;
}
 
/** Print one character.
*
* @param ch Character to be printed.
*/
void putchar(const char ch)
void ofw_sparc64_putchar(chardev_t *d, const char ch)
{
if (ch == '\n')
ofw_putchar('\r');
/kernel/trunk/arch/sparc64/src/sparc64.c
31,9 → 31,11
#include <arch/asm.h>
#include <memstr.h>
#include <arch/trap_table.h>
#include <arch/console.h>
 
void arch_pre_mm_init(void)
{
ofw_sparc64_console_init();
}
 
void arch_post_mm_init(void)
/kernel/trunk/arch/ia64/src/ski/ski.c
33,7 → 33,7
static chardev_t ski_console;
static bool kb_disable;
 
static void ski_write(chardev_t *d, const char ch);
static void ski_putchar(chardev_t *d, const char ch);
static __s32 ski_getchar(void);
 
/** Display character on debug console
44,7 → 44,7
* @param d Character device.
* @param ch Character to be printed.
*/
void ski_write(chardev_t *d, const char ch)
void ski_putchar(chardev_t *d, const char ch)
{
__asm__ (
"mov r15=%0\n"
56,7 → 56,7
);
if (ch == '\n')
ski_write(d, '\r');
ski_putchar(d, '\r');
}
 
/** Ask debug console if a key was pressed.
116,7 → 116,7
static chardev_operations_t ski_ops = {
.resume = ski_kb_enable,
.suspend = ski_kb_disable,
.write = ski_write
.write = ski_putchar
};
 
 
/kernel/trunk/arch/ppc32/include/console.h
0,0 → 1,34
/*
* 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.
*/
 
#ifndef __ppc32_CONSOLE_H__
#define __ppc32_CONSOLE_H__
 
extern void ofw_ppc32_console_init(void);
 
#endif
/kernel/trunk/arch/ppc32/src/console.c
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
#include <putchar.h>
#include <arch/console.h>
#include <genarch/ofw/ofw.h>
#include <console/chardev.h>
#include <console/console.h>
35,19 → 35,19
*
* @param ch Character to be printed.
*/
static void ofw_write(chardev_t *d, const char ch)
static void ofw_ppc32_putchar(chardev_t *d, const char ch)
{
ofw_putchar(ch);
}
 
chardev_t ofw_console;
static chardev_operations_t ofw_ops = {
.write = ofw_write
static chardev_t ofw_ppc32_console;
static chardev_operations_t ofw_ppc32_console_ops = {
.write = ofw_ppc32_putchar
};
 
/** Initialize console to use ofw output */
void console_init(void)
void ofw_ppc32_console_init(void)
{
chardev_initialize("ofw_out", &ofw_console, &ofw_ops);
stdout = &ofw_console;
chardev_initialize("ofw_out", &ofw_ppc32_console, &ofw_ppc32_console_ops);
stdout = &ofw_ppc32_console;
}
/kernel/trunk/arch/ppc32/src/ppc32.c
27,9 → 27,11
*/
 
#include <arch.h>
#include <arch/console.h>
 
void arch_pre_mm_init(void)
{
ofw_ppc32_console_init();
}
 
void arch_post_mm_init(void)