Commit 37b0b65f authored by Roman Zippel's avatar Roman Zippel Committed by Geert Uytterhoeven

m68k/atari: ARAnyM - Add support for console access

[geert: Cleanups and updates]
Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarPetr Stehlik <pstehlik@sophics.cz>
parent b2edd2fd
......@@ -255,6 +255,14 @@ config NFBLOCK
which allows direct access to the hard drives without using
the hardware emulation.
config NFCON
tristate "NatFeat console driver"
depends on NATFEAT
help
Say Y to include support for the ARAnyM NatFeat console driver
which allows the console output to be redirected to the stderr
output of ARAnyM.
comment "Processor type"
config M68020
......
......@@ -5,3 +5,4 @@
obj-y += natfeat.o
obj-$(CONFIG_NFBLOCK) += nfblock.o
obj-$(CONFIG_NFCON) += nfcon.o
......@@ -35,24 +35,6 @@ asm("\n"
EXPORT_SYMBOL_GPL(nf_get_id);
EXPORT_SYMBOL_GPL(nf_call);
static int stderr_id;
static void nf_write(struct console *co, const char *str, unsigned int count)
{
char buf[68];
buf[64] = 0;
while (count > 64) {
memcpy(buf, str, 64);
nf_call(stderr_id, buf);
str += 64;
count -= 64;
}
memcpy(buf, str, count);
buf[count] = 0;
nf_call(stderr_id, buf);
}
void nfprint(const char *fmt, ...)
{
static char buf[256];
......@@ -65,26 +47,6 @@ void nfprint(const char *fmt, ...)
va_end(ap);
}
static struct console nf_console_driver = {
.name = "debug",
.write = nf_write,
.flags = CON_PRINTBUFFER,
.index = -1,
};
static int __init nf_debug_setup(char *arg)
{
if (strcmp(arg, "emu"))
return 0;
stderr_id = nf_get_id("NF_STDERR");
if (stderr_id)
register_console(&nf_console_driver);
return 0;
}
early_param("debug", nf_debug_setup);
static void nf_poweroff(void)
{
long id = nf_get_id("NF_SHUTDOWN");
......
/*
* ARAnyM console driver
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of this archive
* for more details.
*/
#include <linux/module.h>
#include <linux/init.h>
#include <linux/console.h>
#include <linux/tty.h>
#include <linux/tty_driver.h>
#include <linux/tty_flip.h>
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/uaccess.h>
#include <asm/natfeat.h>
static int stderr_id;
static struct tty_driver *nfcon_tty_driver;
static void nfputs(const char *str, unsigned int count)
{
char buf[68];
buf[64] = 0;
while (count > 64) {
memcpy(buf, str, 64);
nf_call(stderr_id, buf);
str += 64;
count -= 64;
}
memcpy(buf, str, count);
buf[count] = 0;
nf_call(stderr_id, buf);
}
static void nfcon_write(struct console *con, const char *str,
unsigned int count)
{
nfputs(str, count);
}
static struct tty_driver *nfcon_device(struct console *con, int *index)
{
*index = 0;
return (con->flags & CON_ENABLED) ? nfcon_tty_driver : NULL;
}
static struct console nf_console = {
.name = "nfcon",
.write = nfcon_write,
.device = nfcon_device,
.flags = CON_PRINTBUFFER,
.index = -1,
};
static int nfcon_tty_open(struct tty_struct *tty, struct file *filp)
{
return 0;
}
static void nfcon_tty_close(struct tty_struct *tty, struct file *filp)
{
}
static int nfcon_tty_write(struct tty_struct *tty, const unsigned char *buf,
int count)
{
nfputs(buf, count);
return count;
}
static int nfcon_tty_put_char(struct tty_struct *tty, unsigned char ch)
{
char temp[2] = { ch, 0 };
nf_call(stderr_id, temp);
return 1;
}
static int nfcon_tty_write_room(struct tty_struct *tty)
{
return 64;
}
static const struct tty_operations nfcon_tty_ops = {
.open = nfcon_tty_open,
.close = nfcon_tty_close,
.write = nfcon_tty_write,
.put_char = nfcon_tty_put_char,
.write_room = nfcon_tty_write_room,
};
#ifndef MODULE
static int __init nf_debug_setup(char *arg)
{
if (strcmp(arg, "nfcon"))
return 0;
stderr_id = nf_get_id("NF_STDERR");
if (stderr_id) {
nf_console.flags |= CON_ENABLED;
register_console(&nf_console);
}
return 0;
}
early_param("debug", nf_debug_setup);
#endif /* !MODULE */
static int __init nfcon_init(void)
{
int res;
stderr_id = nf_get_id("NF_STDERR");
if (!stderr_id)
return -ENODEV;
nfcon_tty_driver = alloc_tty_driver(1);
if (!nfcon_tty_driver)
return -ENOMEM;
nfcon_tty_driver->owner = THIS_MODULE;
nfcon_tty_driver->driver_name = "nfcon";
nfcon_tty_driver->name = "nfcon";
nfcon_tty_driver->type = TTY_DRIVER_TYPE_SYSTEM;
nfcon_tty_driver->subtype = SYSTEM_TYPE_TTY;
nfcon_tty_driver->init_termios = tty_std_termios;
nfcon_tty_driver->flags = TTY_DRIVER_REAL_RAW;
tty_set_operations(nfcon_tty_driver, &nfcon_tty_ops);
res = tty_register_driver(nfcon_tty_driver);
if (res) {
pr_err("failed to register nfcon tty driver\n");
put_tty_driver(nfcon_tty_driver);
return res;
}
if (!(nf_console.flags & CON_ENABLED))
register_console(&nf_console);
return 0;
}
static void __exit nfcon_exit(void)
{
unregister_console(&nf_console);
tty_unregister_driver(nfcon_tty_driver);
put_tty_driver(nfcon_tty_driver);
}
module_init(nfcon_init);
module_exit(nfcon_exit);
MODULE_LICENSE("GPL");
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment