Changeset adb2ebf8 in mainline


Ignore:
Timestamp:
2005-12-10T16:07:08Z (19 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f7f6f25
Parents:
91c78c9
Message:

Fix ppc32 and sparc64 to compile again.
Fix sparc64 to function again.

Files:
2 added
8 edited

Legend:

Unmodified
Added
Removed

  • arch/ia64/src/ski/ski.c

    r91c78c9 radb2ebf8  
    3434static bool kb_disable;
    3535
    36 static void ski_write(chardev_t *d, const char ch);
     36static void ski_putchar(chardev_t *d, const char ch);
    3737static __s32 ski_getchar(void);
    3838
    … …  
    4545 * @param ch Character to be printed.
    4646 */
    47 void ski_write(chardev_t *d, const char ch)
     47void ski_putchar(chardev_t *d, const char ch)
    4848{
    4949        __asm__ (
    … …  
    5757       
    5858        if (ch == '\n')
    59                 ski_write(d, '\r');
     59                ski_putchar(d, '\r');
    6060}
    6161
    … …  
    117117        .resume = ski_kb_enable,
    118118        .suspend = ski_kb_disable,
    119         .write = ski_write
     119        .write = ski_putchar
    120120};
    121121

  • arch/ppc32/src/console.c

    r91c78c9 radb2ebf8  
    2727 */
    2828
    29 #include <putchar.h>
     29#include <arch/console.h>
    3030#include <genarch/ofw/ofw.h>
    3131#include <console/chardev.h>
    … …  
    3636 * @param ch Character to be printed.
    3737 */
    38 static void ofw_write(chardev_t *d, const char ch)
     38static void ofw_ppc32_putchar(chardev_t *d, const char ch)
    3939{
    4040        ofw_putchar(ch);
    4141}
    4242
    43 chardev_t ofw_console;
    44 static chardev_operations_t ofw_ops = {
    45         .write = ofw_write
     43static chardev_t ofw_ppc32_console;
     44static chardev_operations_t ofw_ppc32_console_ops = {
     45        .write = ofw_ppc32_putchar
    4646};
    4747
    4848/** Initialize console to use ofw output */
    49 void console_init(void)
     49void ofw_ppc32_console_init(void)
    5050{
    51         chardev_initialize("ofw_out", &ofw_console, &ofw_ops);
    52         stdout = &ofw_console;
     51        chardev_initialize("ofw_out", &ofw_ppc32_console, &ofw_ppc32_console_ops);
     52        stdout = &ofw_ppc32_console;
    5353}

  • arch/ppc32/src/ppc32.c

    r91c78c9 radb2ebf8  
    2828
    2929#include <arch.h>
     30#include <arch/console.h>
    3031
    3132void arch_pre_mm_init(void)
    3233{
     34        ofw_ppc32_console_init();
    3335}
    3436

  • arch/sparc64/src/console.c

    r91c78c9 radb2ebf8  
    2727 */
    2828
    29 #include <putchar.h>
     29#include <arch/console.h>
    3030#include <genarch/ofw/ofw.h>
     31#include <console/chardev.h>
     32#include <console/console.h>
     33
     34static void ofw_sparc64_putchar(chardev_t *d, const char ch);
     35
     36static chardev_t ofw_sparc64_console;
     37static chardev_operations_t ofw_sparc64_console_ops = {
     38        .write = ofw_sparc64_putchar
     39};
     40
     41void ofw_sparc64_console_init(void)
     42{
     43        chardev_initialize("ofw_sparc64_console", &ofw_sparc64_console, &ofw_sparc64_console_ops);
     44        stdout = &ofw_sparc64_console;
     45}
    3146
    3247/** Print one character.
    … …  
    3449 * @param ch Character to be printed.
    3550 */
    36 void putchar(const char ch)
     51void ofw_sparc64_putchar(chardev_t *d, const char ch)
    3752{
    3853        if (ch == '\n')

  • arch/sparc64/src/sparc64.c

    r91c78c9 radb2ebf8  
    3232#include <memstr.h>
    3333#include <arch/trap_table.h>
     34#include <arch/console.h>
    3435
    3536void arch_pre_mm_init(void)
    3637{
     38        ofw_sparc64_console_init();
    3739}
    3840

  • generic/include/console/chardev.h

    r91c78c9 radb2ebf8  
    3737#define CHARDEV_BUFLEN 512
    3838
    39 struct chardev;
    40 
    4139/* Character device operations interface. */
    4240struct chardev_operations {
    43         void (* suspend)(struct chardev *);/**< Suspend pushing characters. */
    44         void (* resume)(struct chardev *); /**< Resume pushing characters. */
    45         /** Write character to stream */
    46         void (* write)(struct chardev *, char c);
     41        void (* suspend)(chardev_t *);          /**< Suspend pushing characters. */
     42        void (* resume)(chardev_t *);           /**< Resume pushing characters. */
     43        void (* write)(chardev_t *, char c);    /**< Write character to stream. */
    4744};
    4845

  • generic/include/interrupt.h

    r91c78c9 radb2ebf8  
    3333
    3434#ifndef IVT_ITEMS
    35 #  define IVT_ITEMS 1
     35#  define IVT_ITEMS 0
    3636#endif
    3737

  • generic/src/interrupt/interrupt.c

    r91c78c9 radb2ebf8  
    113113static cmd_info_t exc_info = {
    114114        .name = "pexc",
    115         .description = "Print exception table",
     115        .description = "Print exception table.",
    116116        .func = exc_print_cmd,
    117117        .help = NULL,
Note: See TracChangeset for help on using the changeset viewer.