Changeset ff3b3197 in mainline for generic/include

Timestamp:

2005-11-25T22:58:38Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f4338d2

Parents:

78c32b4

Message:

Implement basic kernel console command recognition.
Commands without arguments are now recognized.

Location:

generic/include

Files:

• console/console.h (modified) (1 diff)
• func.h (modified) (2 diffs)
• macros.h (added)
• main/kconsole.h (modified) (1 diff)
• typedefs.h (modified) (1 diff)

generic/include/console/console.h

@@ -36 +36 @@
 
 extern __u8 getc(chardev_t *chardev);
-extern void gets(chardev_t *chardev, __u8 *buf, size_t buflen);
+extern count_t gets(chardev_t *chardev, char *buf, size_t buflen);
 
 #endif /* __CHARDEV_H__ */

generic/include/func.h

@@ -31 +31 @@
 
 #include <arch/types.h>
+#include <typedefs.h>
 
 extern __u32 haltstate;
@@ -36 +37 @@
 extern void halt(void);
 
-extern int strcmp(const char *src, const char *dst);
+extern size_t strlen(const char *str);
+extern int strcmp(const char *src, const char *dst, size_t len);
 
 #endif

generic/include/main/kconsole.h

@@ -30 +30 @@
 #define __KCONSOLE_H__
 
+#include <typedefs.h>
+#include <list.h>
+#include <synch/spinlock.h>
+
+enum cmd_arg_type {
+        ARG_TYPE_INVALID = 0,
+        ARG_TYPE_INT,
+        ARG_TYPE_STRING
+};
+
+/** Structure representing one argument of kconsole command line. */
+struct cmd_arg {
+        cmd_arg_type_t type;            /**< Type descriptor. */
+        void *buffer;                   /**< Buffer where to store data. */
+        size_t buflen;                  /**< Size of the buffer. */
+};
+
+/** Structure representing one kconsole command. */
+struct cmd_info {
+        link_t link;                    /**< Command list link. */
+        spinlock_t lock;                /**< This lock protects everything below. */
+        const char *name;               /**< Command name. */
+        const char *description;        /**< Textual description. */
+        int (* func)(cmd_arg_t *cmd);   /**< Function implementing the command. */
+        count_t argc;                   /**< Number of arguments. */
+        cmd_arg_t *argv;                /**< Argument vector. */
+};
+
+extern spinlock_t cmd_lock;
+extern link_t cmd_head;
+
+extern void kconsole_init(void);
 extern void kconsole(void *arg);
 
+extern int cmd_register(cmd_info_t *cmd);
+
 #endif

generic/include/typedefs.h

@@ -82 +82 @@
 typedef struct chardev chardev_t;
 
+typedef enum cmd_arg_type cmd_arg_type_t;
+typedef struct cmd_arg cmd_arg_t;
+typedef struct cmd_info cmd_info_t;
+
 #endif