Changeset b3f8fb7 in mainline for kernel/generic/include/console

Timestamp:

2007-01-28T13:25:49Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8e8c1a5

Parents:

1ba41c5

Message:

huge type system cleanup
remove cyclical type dependencies across multiple header files
many minor coding style fixes

Location:

kernel/generic/include/console

Files:

• chardev.h (modified) (3 diffs)
• cmd.h (modified) (1 diff)
• console.h (modified) (1 diff)
• kconsole.h (modified) (4 diffs)

kernel/generic/include/console/chardev.h

@@ -36 +36 @@
 #define KERN_CHARDEV_H_
 
-#include <typedefs.h>
 #include <arch/types.h>
 #include <synch/waitq.h>
@@ -43 +42 @@
 #define CHARDEV_BUFLEN 512
 
+struct chardev;
+
 /* Character device operations interface. */
-struct chardev_operations {
-        void (* suspend)(chardev_t *);          /**< Suspend pushing characters. */
-        void (* resume)(chardev_t *);           /**< Resume pushing characters. */
-        void (* write)(chardev_t *, char c);    /**< Write character to stream. */
+typedef struct {
+        void (* suspend)(struct chardev *);             /**< Suspend pushing characters. */
+        void (* resume)(struct chardev *);              /**< Resume pushing characters. */
+        void (* write)(struct chardev *, char c);       /**< Write character to stream. */
         /** Read character directly from device, assume interrupts disabled */
-        char (* read)(chardev_t *); 
-};
-
-typedef struct chardev_operations chardev_operations_t;
+        char (* read)(struct chardev *); 
+} chardev_operations_t;
 
 /** Character input device. */
-struct chardev {
+typedef struct chardev {
         char *name;
         
@@ -65 +64 @@
         index_t index;
         void *data;
-};
+} chardev_t;
 
 extern void chardev_initialize(char *name,

kernel/generic/include/console/cmd.h

@@ -36 +36 @@
 #define KERN_CMD_H_
 
-#include <typedefs.h>
+#include <console/kconsole.h>
 
 extern void cmd_initialize(cmd_info_t *cmd);

kernel/generic/include/console/console.h

@@ -37 +37 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
+#include <console/chardev.h>
 
 extern chardev_t *stdin;

kernel/generic/include/console/kconsole.h

@@ -36 +36 @@
 #define KERN_KCONSOLE_H_
 
-#include <typedefs.h>
 #include <adt/list.h>
 #include <synch/spinlock.h>
@@ -43 +42 @@
 #define KCONSOLE_HISTORY 10
 
-enum cmd_arg_type {
+typedef enum {
         ARG_TYPE_INVALID = 0,
         ARG_TYPE_INT,
         ARG_TYPE_STRING,
         ARG_TYPE_VAR      /**< Variable type - either symbol or string */
-};
+} cmd_arg_type_t;
 
 /** Structure representing one argument of kconsole command line. */
-struct cmd_arg {
+typedef struct {
         cmd_arg_type_t type;            /**< Type descriptor. */
         void *buffer;                   /**< Buffer where to store data. */
@@ -57 +56 @@
         unative_t intval;                /**< Integer value */
         cmd_arg_type_t vartype;         /**< Resulting type of variable arg */
-};
+} cmd_arg_t;
 
 /** Structure representing one kconsole command. */
-struct cmd_info {
+typedef struct {
         link_t link;                    /**< Command list link. */
         SPINLOCK_DECLARE(lock);         /**< This lock protects everything below. */
@@ -69 +68 @@
         cmd_arg_t *argv;                /**< Argument vector. */
         void (* help)(void);            /**< Function for printing detailed help. */
-};
+} cmd_info_t;
 
 extern spinlock_t cmd_lock;