Changeset 80bff342 in mainline

Timestamp:

2005-12-30T15:39:00Z (19 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

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

Children:

65fb232

Parents:

feb5915

Message:

Zones related commands infrastructure for console. Also fixed small bug that caused infinite loop during command parsing

Location:

generic/src/console

Files:

• cmd.c (modified) (5 diffs)
• kconsole.c (modified) (5 diffs)

generic/src/console/cmd.c

@@ -49 +49 @@
 #include <mm/tlb.h>
 #include <arch/mm/tlb.h>
+#include <mm/frame.h>
 
 /** Data and methods for 'help' command. */
@@ -118 +119 @@
         .argv = set4_argv
 };
+
 
 
@@ -242 +244 @@
 };
 
+
+/** Data and methods for 'zones' command */
+static int cmd_zones(cmd_arg_t *argv);
+static cmd_info_t zones_info = {
+        .name = "zones",
+        .description = "List of memory zones.",
+        .func = cmd_zones,
+        .argc = 0
+};
+
+/** Data and methods for 'zone' command */
+static int cmd_zone(cmd_arg_t *argv);
+static char zone_buf[MAX_CMDLINE+1];
+static cmd_arg_t zone_argv = {
+        .type = ARG_TYPE_INT,
+        .buffer = zone_buf,
+        .len = sizeof(zone_buf)
+};
+
+
+static cmd_info_t zone_info = {
+        .name = "zone",
+        .description = "Show memory zone structure.",
+        .func = cmd_zone,
+        .argc = 1,
+        .argv = &zone_argv
+};
+
+
+
 /** Initialize command info structure.
  *
@@ -299 +331 @@
         if (!cmd_register(&ptlb_info))
                 panic("could not register command %s\n", ptlb_info.name);
+
+        cmd_initialize(&zones_info);
+        if (!cmd_register(&zones_info))
+                panic("could not register command %s\n", zones_info.name);
+
+        cmd_initialize(&zone_info);
+        if (!cmd_register(&zone_info))
+                panic("could not register command %s\n", zone_info.name);
+
+
 }
 
@@ -534 +576 @@
         return 1;
 }
+
+
+int cmd_zones(cmd_arg_t * argv) {
+        printf("Zones listing not implemented\n");
+        return 1;
+}
+int cmd_zone(cmd_arg_t * argv) {
+        printf("Zone details not implemented\n");
+        return 1;
+}
+

generic/src/console/kconsole.c

@@ -472 +472 @@
         link_t *cur;
         int i;
+        int error = 0;
         
         if (!parse_argument(cmdline, len, &start, &end)) {
@@ -521 +522 @@
                 }
                 
+                error = 0;
                 switch (cmd->argv[i].type) {
                 case ARG_TYPE_STRING:
@@ -530 +532 @@
                         if (parse_int_arg(cmdline+start, end-start+1, 
                                           &cmd->argv[i].intval))
-                                return NULL;
+                                error = 1;
                         break;
                 case ARG_TYPE_VAR:
@@ -545 +547 @@
                         else {
                                 printf("Unrecognized variable argument.\n");
-                                return NULL;
+                                error = 1;
                         }
                         break;
@@ -551 +553 @@
                 default:
                         printf("invalid argument type\n");
-                        return NULL;
+                        error = 1;
                         break;
                 }
+        }
+        
+        if (error) {
+                spinlock_unlock(&cmd->lock);
+                return NULL;
         }