summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--device/cons.c11
-rw-r--r--device/ds_routines.c4
-rw-r--r--device/kmsg.c247
-rw-r--r--device/kmsg.h15
4 files changed, 276 insertions, 1 deletions
diff --git a/device/cons.c b/device/cons.c
index 954f527..a06fdf3 100644
--- a/device/cons.c
+++ b/device/cons.c
@@ -37,6 +37,11 @@
#include <hpdev/cons.h>
#endif
+#ifdef MACH_KMSG
+#include <device/io_req.h>
+#include <kmsg.h>
+#endif
+
static int cn_inited = 0;
static struct consdev *cn_tab = 0; /* physical console device info */
#ifndef MACH_KERNEL
@@ -86,6 +91,7 @@ cninit()
(cn_tab == NULL || cp->cn_pri > cn_tab->cn_pri))
cn_tab = cp;
}
+
/*
* Found a console, initialize it.
*/
@@ -243,6 +249,11 @@ cnputc(c)
if (c == 0)
return;
+#ifdef MACH_KMSG
+ /* XXX: Assume that All output routines always use cnputc. */
+ kmsg_putchar (c);
+#endif
+
if (cn_tab) {
(*cn_tab->cn_putc)(cn_tab->cn_dev, c);
if (c == '\n')
diff --git a/device/ds_routines.c b/device/ds_routines.c
index e370503..7b74ad5 100644
--- a/device/ds_routines.c
+++ b/device/ds_routines.c
@@ -66,7 +66,9 @@
#ifdef i386
#include <i386at/device_emul.h>
-#include <i386/device-drivers.h>
+#ifdef LINUX_DEV
+#include <i386/linux/device-drivers.h>
+#endif
#endif
#ifdef i386
diff --git a/device/kmsg.c b/device/kmsg.c
new file mode 100644
index 0000000..a887666
--- /dev/null
+++ b/device/kmsg.c
@@ -0,0 +1,247 @@
+/* GNU Mach Kernel Message Device.
+ Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Written by OKUJI Yoshinori.
+
+This is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with the software; see the file COPYING. If not, write to
+the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+/* Now kmsg provides stream interface, not random access methods. */
+
+#include <sys/types.h>
+#include <device/conf.h>
+#include <device/io_req.h>
+#include <mach/boolean.h>
+#include <kern/lock.h>
+#include <kmsg.h>
+
+
+#define KMSGBUFSIZE (4096) /* XXX */
+
+/* Simple array for buffering messages */
+static char kmsg_buffer[KMSGBUFSIZE];
+/* Point to the offset to write */
+static int kmsg_write_offset;
+/* Point to the offset to read */
+static int kmsg_read_offset;
+/* I/O request queue for blocking read */
+static queue_head_t kmsg_read_queue;
+/* Used for exclusive access to the device */
+static int kmsg_in_use;
+/* Used for exclusive access to the routines */
+static simple_lock_data_t kmsg_lock;
+/* If already initialized or not */
+static int kmsg_init_done = 0;
+
+/* Kernel Message Initializer */
+static void
+kmsginit (void)
+{
+ kmsg_write_offset = 0;
+ kmsg_read_offset = 0;
+ queue_init (&kmsg_read_queue);
+ kmsg_in_use = 0;
+ simple_lock_init (&kmsg_lock);
+}
+
+/* Kernel Message Open Handler */
+io_return_t
+kmsgopen (dev_t dev, int flag, io_req_t ior)
+{
+ simple_lock (&kmsg_lock);
+ if (kmsg_in_use)
+ {
+ simple_unlock (&kmsg_lock);
+ return D_ALREADY_OPEN;
+ }
+
+ kmsg_in_use = 1;
+
+ simple_unlock (&kmsg_lock);
+ return D_SUCCESS;
+}
+
+/* Kernel Message Close Handler */
+io_return_t
+kmsgclose (dev_t dev, int flag)
+{
+ simple_lock (&kmsg_lock);
+ kmsg_in_use = 0;
+
+ simple_unlock (&kmsg_lock);
+ return D_SUCCESS;
+}
+
+static boolean_t kmsg_read_done (io_req_t ior);
+
+/* Kernel Message Read Handler */
+io_return_t
+kmsgread (dev_t dev, io_req_t ior)
+{
+ int err;
+ int amt, len;
+
+ err = device_read_alloc (ior, ior->io_count);
+ if (err != KERN_SUCCESS)
+ return err;
+
+ simple_lock (&kmsg_lock);
+ if (kmsg_read_offset == kmsg_write_offset)
+ {
+ /* The queue is empty. */
+ if (ior->io_mode & D_NOWAIT)
+ {
+ simple_unlock (&kmsg_lock);
+ return D_WOULD_BLOCK;
+ }
+
+ ior->io_done = kmsg_read_done;
+ enqueue_tail (&kmsg_read_queue, ior);
+ simple_unlock (&kmsg_lock);
+ return D_IO_QUEUED;
+ }
+
+ len = kmsg_write_offset - kmsg_read_offset;
+ if (len < 0)
+ len += KMSGBUFSIZE;
+
+ amt = ior->io_count;
+ if (amt > len)
+ amt = len;
+
+ if (kmsg_read_offset + amt <= KMSGBUFSIZE)
+ {
+ memcpy (ior->io_data, kmsg_buffer + kmsg_read_offset, amt);
+ }
+ else
+ {
+ int cnt;
+
+ cnt = KMSGBUFSIZE - kmsg_read_offset;
+ memcpy (ior->io_data, kmsg_buffer + kmsg_read_offset, cnt);
+ memcpy (ior->io_data + cnt, kmsg_buffer, amt - cnt);
+ }
+
+ kmsg_read_offset += amt;
+ if (kmsg_read_offset >= KMSGBUFSIZE)
+ kmsg_read_offset -= KMSGBUFSIZE;
+
+ ior->io_residual = ior->io_count - amt;
+
+ simple_unlock (&kmsg_lock);
+ return D_SUCCESS;
+}
+
+static boolean_t
+kmsg_read_done (io_req_t ior)
+{
+ int err;
+ int amt, len;
+
+ simple_lock (&kmsg_lock);
+ if (kmsg_read_offset == kmsg_write_offset)
+ {
+ /* The queue is empty. */
+ ior->io_done = kmsg_read_done;
+ enqueue_tail (&kmsg_read_queue, ior);
+ simple_unlock (&kmsg_lock);
+ return FALSE;
+ }
+
+ len = kmsg_write_offset - kmsg_read_offset;
+ if (len < 0)
+ len += KMSGBUFSIZE;
+
+ amt = ior->io_count;
+ if (amt > len)
+ amt = len;
+
+ if (kmsg_read_offset + amt <= KMSGBUFSIZE)
+ {
+ memcpy (ior->io_data, kmsg_buffer + kmsg_read_offset, amt);
+ }
+ else
+ {
+ int cnt;
+
+ cnt = KMSGBUFSIZE - kmsg_read_offset;
+ memcpy (ior->io_data, kmsg_buffer + kmsg_read_offset, cnt);
+ memcpy (ior->io_data + cnt, kmsg_buffer, amt - cnt);
+ }
+
+ kmsg_read_offset += amt;
+ if (kmsg_read_offset >= KMSGBUFSIZE)
+ kmsg_read_offset -= KMSGBUFSIZE;
+
+ ior->io_residual = ior->io_count - amt;
+
+ simple_unlock (&kmsg_lock);
+ ds_read_done (ior);
+
+ return TRUE;
+}
+
+io_return_t
+kmsggetstat (dev_t dev, int flavor, int *data, unsigned int *count)
+{
+ switch (flavor)
+ {
+ case DEV_GET_SIZE:
+ data[DEV_GET_SIZE_DEVICE_SIZE] = 0;
+ data[DEV_GET_SIZE_RECORD_SIZE] = 1;
+ *count = DEV_GET_SIZE_COUNT;
+ break;
+
+ default:
+ return D_INVALID_OPERATION;
+ }
+
+ return D_SUCCESS;
+}
+
+/* Write to Kernel Message Buffer */
+void
+kmsg_putchar (int c)
+{
+ io_req_t ior;
+ int offset;
+
+ /* XXX: cninit is not called before cnputc is used. So call kmsginit
+ here if not initialized yet. */
+ if (!kmsg_init_done)
+ {
+ kmsginit ();
+ kmsg_init_done = 1;
+ }
+
+ simple_lock (&kmsg_lock);
+ offset = kmsg_write_offset + 1;
+ if (offset == KMSGBUFSIZE)
+ offset = 0;
+
+ if (offset == kmsg_read_offset)
+ {
+ /* Discard C. */
+ simple_unlock (&kmsg_lock);
+ return;
+ }
+
+ kmsg_buffer[kmsg_write_offset++] = c;
+ if (kmsg_write_offset == KMSGBUFSIZE)
+ kmsg_write_offset = 0;
+
+ while ((ior = (io_req_t) dequeue_head (&kmsg_read_queue)) != NULL)
+ iodone (ior);
+
+ simple_unlock (&kmsg_lock);
+}
diff --git a/device/kmsg.h b/device/kmsg.h
new file mode 100644
index 0000000..e0e7a67
--- /dev/null
+++ b/device/kmsg.h
@@ -0,0 +1,15 @@
+#ifndef _DEVICE_KMSG_H_
+#define _DEVICE_KMSG_H_ 1
+
+#ifdef MACH_KERNEL
+
+io_return_t kmsgopen (dev_t dev, int flag, io_req_t ior);
+io_return_t kmsgclose (dev_t dev, int flag);
+io_return_t kmsgread (dev_t dev, io_req_t ior);
+io_return_t kmsggetstat (dev_t dev, int flavor,
+ int *data, unsigned int *count);
+void kmsg_putchar (int c);
+
+#endif /* MACH_KERNEL */
+
+#endif /* !_DEVICE_KMSG_H_ */