Put now-power_off() into init.h
uint32_t *base_page_dir;
#ifdef FILESYS
uint32_t *base_page_dir;
#ifdef FILESYS
-/* Format the filesystem? */
+/* -f: Format the filesystem? */
static bool format_filesys;
#endif
#ifdef USERPROG
static bool format_filesys;
#endif
#ifdef USERPROG
-/* Initial program to run. */
+/* -ex: Initial program to run. */
static char *initial_program;
#endif
static char *initial_program;
#endif
-/* Power off after running requested actions? */
-static bool power_off;
+/* -q: Power off after running requested actions? */
+static bool do_power_off;
static void ram_init (void);
static void paging_init (void);
static void argv_init (void);
static void ram_init (void);
static void paging_init (void);
static void argv_init (void);
-static void do_power_off (void);
int main (void) NO_RETURN;
int main (void) NO_RETURN;
- if (power_off)
- do_power_off ();
+ if (do_power_off)
+ power_off ();
/* Terminate this thread. */
thread_exit ();
/* Terminate this thread. */
thread_exit ();
else if (!strcmp (argv[i], "-d"))
debug_enable (argv[++i]);
else if (!strcmp (argv[i], "-q"))
else if (!strcmp (argv[i], "-d"))
debug_enable (argv[++i]);
else if (!strcmp (argv[i], "-q"))
#ifdef USERPROG
else if (!strcmp (argv[i], "-ex"))
initial_program = argv[++i];
#ifdef USERPROG
else if (!strcmp (argv[i], "-ex"))
initial_program = argv[++i];
" -q Power off after doing requested actions.\n"
" -u Print this help message and power off.\n"
);
" -q Power off after doing requested actions.\n"
" -u Print this help message and power off.\n"
);
}
else
PANIC ("unknown option `%s' (use -u for help)", argv[i]);
}
else
PANIC ("unknown option `%s' (use -u for help)", argv[i]);
/* Powers down the machine we're running on,
as long as we're running on Bochs or qemu. */
void
/* Powers down the machine we're running on,
as long as we're running on Bochs or qemu. */
void
{
const char s[] = "Shutdown";
const char *p;
{
const char s[] = "Shutdown";
const char *p;
#ifndef THREADS_INIT_H
#define THREADS_INIT_H
#ifndef THREADS_INIT_H
#define THREADS_INIT_H
#include <stddef.h>
#include <stdint.h>
#include <stddef.h>
#include <stdint.h>
/* Page directory with kernel mappings only. */
extern uint32_t *base_page_dir;
/* Page directory with kernel mappings only. */
extern uint32_t *base_page_dir;
+void power_off (void) NO_RETURN;
+
#endif /* threads/init.h */
#endif /* threads/init.h */