WebSVN – HelenOS-historic – Diff – //kernel/trunk/generic/src/console/cmd.c

 #include <arch.h>
 #include <func.h>
 #include <macros.h>
 #include <debug.h>
 #include <symtab.h>
+#include <cpu.h>
 #include <mm/tlb.h>
 #include <arch/mm/tlb.h>
 #include <mm/frame.h>
+#include <main/version.h>
 /** Data and methods for 'help' command. */
 static int cmd_help(cmd_arg_t *argv);
 static cmd_info_t help_info = {
     .name = "help",
     .func = cmd_set4,
     .argc = 2,
     .argv = set4_argv
 };
 /** Data and methods for 'call0' command. */
 static char call0_buf[MAX_CMDLINE+1];
 static char carg1_buf[MAX_CMDLINE+1];
 static char carg2_buf[MAX_CMDLINE+1];
 static char carg3_buf[MAX_CMDLINE+1];
     .description = "Halt the kernel.",
     .func = cmd_halt,
     .argc = 0
 };
-/** Data and methods for 'ptlb' command. */
+/** Data and methods for 'tlb' command. */
-static int cmd_ptlb(cmd_arg_t *argv);
+static int cmd_tlb(cmd_arg_t *argv);
-cmd_info_t ptlb_info = {
+cmd_info_t tlb_info = {
-    .name = "ptlb",
+    .name = "tlb",
     .description = "Print TLB of current processor.",
     .help = NULL,
-    .func = cmd_ptlb,
+    .func = cmd_tlb,
     .argc = 0,
     .argv = NULL
 };
     .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
 };
+/** Data and methods for 'cpus' command. */
+static int cmd_cpus(cmd_arg_t *argv);
+cmd_info_t cpus_info = {
+    .name = "cpus",
+    .description = "List all processors.",
+    .help = NULL,
+    .func = cmd_cpus,
+    .argc = 0,
+    .argv = NULL
+};
+/** Data and methods for 'version' command. */
+static int cmd_version(cmd_arg_t *argv);
+cmd_info_t version_info = {
+    .name = "version",
+    .description = "Print version information.",
+    .help = NULL,
+    .func = cmd_version,
+    .argc = 0,
+    .argv = NULL
+};
 /** Initialize command info structure.
+ *
  * @param cmd Command info structure.
     cmd_initialize(&halt_info);
     if (!cmd_register(&halt_info))
         panic("could not register command %s\n", halt_info.name);
-    cmd_initialize(&ptlb_info);
+    cmd_initialize(&tlb_info);
-    if (!cmd_register(&ptlb_info))
+    if (!cmd_register(&tlb_info))
-        panic("could not register command %s\n", ptlb_info.name);
+        panic("could not register command %s\n", tlb_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);
+    cmd_initialize(&cpus_info);
+    if (!cmd_register(&cpus_info))
+        panic("could not register command %s\n", cpus_info.name);
+    cmd_initialize(&version_info);
+    if (!cmd_register(&version_info))
+        panic("could not register command %s\n", version_info.name);
+}
 /** List supported commands.
+ *
  * @param argv Not used.
+ *
  * @return Always returns 1.
  */
-int cmd_ptlb(cmd_arg_t *argv)
+int cmd_tlb(cmd_arg_t *argv)
+{
     tlb_print();
     return 1;
+}
+    }
     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;
+}
+/** Command for listing processors.
+ *
+ * @param argv Ignored.
+ *
+ * return Always 1.
+ */
+int cmd_cpus(cmd_arg_t *argv)
+{
+    cpu_list();
+    return 1;
+}
+/** Command for printing kernel version.
+ *
+ * @param argv Ignored.
+ *
+ * return Always 1.
+ */
+int cmd_version(cmd_arg_t *argv)
+{
+    version_print();
+    return 1;
+}

Subversion Repositories HelenOS-historic

(root)//kernel/trunk/generic/src/console/cmd.c – Rev 668 → 673