Changeset 973be64e in mainline for generic

Timestamp:

2005-12-10T00:19:57Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fcfac420

Parents:

705b4149

Message:

Added generic exc_register/exc_dispatch functions,
copied from ia32 architecture. Currently only mips32 uses them.

The chardev_t can now be both input & output device (was
needed for serial driver).

Broken other architectures - ia64, sparc, powerpc will not compile.

Mips32 supports input on all msim, gxemul, indy(tested emulation
in gxemul, loses characters), simics. Simics serial line
is done using polling, I was unable to make it produce
an interrupt when the key was pressed.

Location:

generic

Files:

• include/console/chardev.h (modified) (2 diffs)
• include/console/console.h (modified) (1 diff)
• include/interrupt.h (added)
• include/print.h (modified) (1 diff)
• src/console/chardev.c (modified) (2 diffs)
• src/console/console.c (modified) (2 diffs)
• src/interrupt/interrupt.c (added)

generic/include/console/chardev.h

@@ -37 +37 @@
 #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);
 };
 
@@ -47 +51 @@
 /** 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);
 

generic/include/console/console.h

@@ -34 +34 @@
 
 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__ */

generic/include/print.h

@@ -37 +37 @@
 #define INT64   8
 
-extern void putchar(const char c);
 extern void printf(const char *fmt, ...);
 

generic/src/console/chardev.c

@@ -37 +37 @@
  * @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");
@@ -57 +60 @@
         if (chardev->counter == CHARDEV_BUFLEN - 1) {
                 /* buffer full => disable device interrupt */
-                chardev->op->suspend();
+                chardev->op->suspend(chardev);
         }
 

generic/src/console/console.c

@@ -38 +38 @@
 /** Standard input character device. */
 chardev_t *stdin = NULL;
+chardev_t *stdout = NULL;
 
 /** Get string from character device.
@@ -85 +86 @@
         interrupts_restore(ipl);
 
-        chardev->op->resume();
+        chardev->op->resume(chardev);
 
         return ch;
 }
+
+void putchar(char c)
+{
+        stdout->op->write(stdout, c);
+}