#endif
#ifdef FILESYS
#include "devices/disk.h"
+#include "devices/partition.h"
#include "filesys/filesys.h"
#include "filesys/fsutil.h"
#endif
-/* Amount of physical memory, in 4 kB pages. */
-size_t ram_pages;
-
/* Page directory with kernel mappings only. */
uint32_t *base_page_dir;
#ifdef FILESYS
-/* -f: Format the filesystem? */
+/* -f: Format the file system? */
static bool format_filesys;
#endif
/* Initialize memory system. */
palloc_init ();
- malloc_init ();
paging_init ();
+ malloc_init ();
/* Segmentation. */
#ifdef USERPROG
timer_calibrate ();
#ifdef FILESYS
- /* Initialize filesystem. */
+ /* Initialize file system. */
disk_init ();
+ partition_init ();
filesys_init (format_filesys);
fsutil_run ();
#endif
linker as _start_bss and _end_bss. See kernel.lds. */
extern char _start_bss, _end_bss;
memset (&_start_bss, 0, &_end_bss - &_start_bss);
-
- /* Get RAM size from loader. See loader.S. */
- ram_pages = *(uint32_t *) ptov (LOADER_RAM_PAGES);
}
/* Populates the base page directory and page table with the
directory it creates.
At the time this function is called, the active page table
- (set up by loader.S) only maps the first 4 MB of RAM, so we
- should not try to use extravagant amounts of memory.
+ (set up by start.S) only maps the first 4 MB of RAM, so we
+ should not try to access memory beyond that limit.
Fortunately, there is no need to do so. */
static void
paging_init (void)
else if (!strcmp (argv[i], "-ex"))
initial_program = argv[++i];
else if (!strcmp (argv[i], "-ul"))
- user_page_limit = atoi (argv[++i]);
+ max_user_pages = atoi (argv[++i]);
#endif
#ifdef FILESYS
else if (!strcmp (argv[i], "-f"))
" -ul USER_MAX Limit user memory to USER_MAX pages.\n"
#endif
#ifdef FILESYS
- " -f Format the filesystem disk (hdb or hd0:1).\n"
+ " -f Format the file system disk (hdb or hd0:1).\n"
" -ci FILENAME SIZE Copy SIZE bytes from the scratch disk (hdc\n"
- " or hd1:0) into the filesystem as FILENAME\n"
+ " or hd1:0) into the file system as FILENAME\n"
" -co FILENAME Copy FILENAME to the scratch disk, with\n"
" size at start of sector 0 and data afterward\n"
" -p FILENAME Print the contents of FILENAME\n"
" -r FILENAME Delete FILENAME\n"
- " -ls List the files in the filesystem\n"
- " -D Dump complete filesystem contents\n"
+ " -ls List the files in the file system\n"
+ " -D Dump complete file system contents\n"
#endif
" -q Power off after doing requested actions.\n"
" -u Print this help message and power off.\n"