Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 574 → Rev 575

/kernel/trunk/generic/include/print.h
36,7 → 36,6
#define INT32 4
#define INT64 8
 
extern void putchar(const char c);
extern void printf(const char *fmt, ...);
 
#endif
/kernel/trunk/generic/include/interrupt.h
0,0 → 1,43
/*
* Copyright (C) 2005 Ondrej Palkovsky
* 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 __INTERRUPT_H__
#define __INTERRUPT_H__
 
#include <arch/interrupt.h>
 
#ifndef IVT_ITEMS
# define IVT_ITEMS 1
#endif
 
typedef void (* iroutine)(int n, void *stack);
 
extern iroutine exc_register(int n, char *name, iroutine f);
extern void exc_dispatch(int n, void *stack);
 
#endif
/kernel/trunk/generic/include/console/chardev.h
36,10 → 36,14
 
#define CHARDEV_BUFLEN 512
 
struct chardev;
 
/* Character device operations interface. */
struct chardev_operations {
void (* suspend)(void); /**< Suspend pushing characters. */
void (* resume)(void); /**< Resume pushing characters. */
void (* suspend)(struct chardev *);/**< Suspend pushing characters. */
void (* resume)(struct chardev *); /**< Resume pushing characters. */
/** Write character to stream */
void (* write)(struct chardev *, char c);
};
 
typedef struct chardev_operations chardev_operations_t;
46,15 → 50,20
 
/** Character input device. */
struct chardev {
char *name;
waitq_t wq;
spinlock_t lock; /**< Protects everything below. */
__u8 buffer[CHARDEV_BUFLEN];
count_t counter;
chardev_operations_t *op; /**< Implementation of chardev operations. */
index_t index;
chardev_operations_t *op; /**< Implementation of chardev operations. */
void *data;
};
 
extern void chardev_initialize(chardev_t *chardev, chardev_operations_t *op);
extern void chardev_initialize(char *name,
chardev_t *chardev,
chardev_operations_t *op);
void chardev_push_character(chardev_t *chardev, __u8 ch);
 
#endif /* __CHARDEV_H__ */
/kernel/trunk/generic/include/console/console.h
33,8 → 33,10
#include <typedefs.h>
 
extern chardev_t *stdin;
extern chardev_t *stdout;
 
extern __u8 getc(chardev_t *chardev);
extern count_t gets(chardev_t *chardev, char *buf, size_t buflen);
extern void putchar(char c);
 
#endif /* __CHARDEV_H__ */
/kernel/trunk/generic/src/console/console.c
37,6 → 37,7
 
/** Standard input character device. */
chardev_t *stdin = NULL;
chardev_t *stdout = NULL;
 
/** Get string from character device.
*
84,7 → 85,12
spinlock_unlock(&chardev->lock);
interrupts_restore(ipl);
 
chardev->op->resume();
chardev->op->resume(chardev);
 
return ch;
}
 
void putchar(char c)
{
stdout->op->write(stdout, c);
}
/kernel/trunk/generic/src/console/chardev.c
36,8 → 36,11
* @param chardev Character device.
* @param op Implementation of character device operations.
*/
void chardev_initialize(chardev_t *chardev, chardev_operations_t *op)
void chardev_initialize(char *name,chardev_t *chardev,
chardev_operations_t *op)
{
chardev->name = name;
 
waitq_initialize(&chardev->wq);
spinlock_initialize(&chardev->lock, "chardev");
chardev->counter = 0;
56,7 → 59,7
chardev->counter++;
if (chardev->counter == CHARDEV_BUFLEN - 1) {
/* buffer full => disable device interrupt */
chardev->op->suspend();
chardev->op->suspend(chardev);
}
 
putchar(ch);
/kernel/trunk/generic/src/interrupt/interrupt.c
0,0 → 1,59
/*
* Copyright (C) 2005 Ondrej Palkovsky
* 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 <interrupt.h>
#include <debug.h>
 
static struct {
char *name;
iroutine f;
} ivt[IVT_ITEMS];
 
iroutine exc_register(int n, char *name, iroutine f)
{
ASSERT(n < IVT_ITEMS);
iroutine old;
old = ivt[n].f;
ivt[n].f = f;
ivt[n].name = name;
return old;
}
 
/*
* Called directly from the assembler code.
* CPU is interrupts_disable()'d.
*/
void exc_dispatch(int n, void *stack)
{
ASSERT(n < IVT_ITEMS);
ivt[n].f(n, stack);
}