git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feat: (iso9660) directory read support
[lunaix-os.git]
/
lunaix-os
/
kernel
/
proc0.c
diff --git
a/lunaix-os/kernel/proc0.c
b/lunaix-os/kernel/proc0.c
index 1e54e59e6d9ea9531470907bd481f5d4f88ec762..19f04dce4d077b59bcd7c47099071ee5dc69d7b7 100644
(file)
--- a/
lunaix-os/kernel/proc0.c
+++ b/
lunaix-os/kernel/proc0.c
@@
-1,8
+1,10
@@
#include <lunaix/block.h>
#include <lunaix/common.h>
#include <lunaix/fctrl.h>
#include <lunaix/block.h>
#include <lunaix/common.h>
#include <lunaix/fctrl.h>
+#include <lunaix/foptions.h>
#include <lunaix/fs.h>
#include <lunaix/fs/twifs.h>
#include <lunaix/fs.h>
#include <lunaix/fs/twifs.h>
+#include <lunaix/lunaix.h>
#include <lunaix/lunistd.h>
#include <lunaix/lxconsole.h>
#include <lunaix/mm/cake.h>
#include <lunaix/lunistd.h>
#include <lunaix/lxconsole.h>
#include <lunaix/mm/cake.h>
@@
-11,11
+13,11
@@
#include <lunaix/mm/vmm.h>
#include <lunaix/peripheral/ps2kbd.h>
#include <lunaix/peripheral/serial.h>
#include <lunaix/mm/vmm.h>
#include <lunaix/peripheral/ps2kbd.h>
#include <lunaix/peripheral/serial.h>
-#include <lunaix/proc.h>
#include <lunaix/spike.h>
#include <lunaix/syscall.h>
#include <lunaix/syslog.h>
#include <lunaix/types.h>
#include <lunaix/spike.h>
#include <lunaix/syscall.h>
#include <lunaix/syslog.h>
#include <lunaix/types.h>
+
#include <sdbg/protocol.h>
#include <hal/acpi/acpi.h>
#include <sdbg/protocol.h>
#include <hal/acpi/acpi.h>
@@
-76,6
+78,18
@@
input_test();
extern void
sh_main();
extern void
sh_main();
+void __USER__
+__setup_dir()
+{
+ int errno;
+ mkdir("/mnt");
+ mkdir("/mnt/lunaix-os");
+
+ if ((errno = mount("/dev/sdb", "/mnt/lunaix-os", "iso9660", 0))) {
+ syslog(2, "fail mounting boot medium. (%d)\n", errno);
+ }
+}
+
void __USER__
__proc0_usr()
{
void __USER__
__proc0_usr()
{
@@
-85,6
+99,8
@@
__proc0_usr()
int fdstdout = open("/dev/tty", 0);
int fdstdin = dup2(stdout, 1);
int fdstdout = open("/dev/tty", 0);
int fdstdin = dup2(stdout, 1);
+ __setup_dir();
+
pid_t p;
if (!(p = fork())) {
pid_t p;
if (!(p = fork())) {
@@
-154,7
+170,9
@@
extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
void
init_platform()
{
void
init_platform()
{
- kprintf(KINFO "\033[11;0mLunaixOS \033[39;49m\n");
+ kprintf(KINFO "\033[11;0mLunaixOS (gcc v%s, %s)\033[39;49m\n",
+ __VERSION__,
+ __TIME__);
// 锁定所有系统预留页(内存映射IO,ACPI之类的),并且进行1:1映射
lock_reserved_memory();
// 锁定所有系统预留页(内存映射IO,ACPI之类的),并且进行1:1映射
lock_reserved_memory();