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
update readme
[lunaix-os.git]
/
lunaix-os
/
kernel
/
proc0.c
diff --git
a/lunaix-os/kernel/proc0.c
b/lunaix-os/kernel/proc0.c
index 61a6dfc16164e44fe1e1ab318f558613f64c4020..663eff254743b8419627b45112b6faf705037323 100644
(file)
--- a/
lunaix-os/kernel/proc0.c
+++ b/
lunaix-os/kernel/proc0.c
@@
-32,19
+32,35
@@
unlock_reserved_memory();
void
__do_reserved_memory(int unlock);
void
__do_reserved_memory(int unlock);
-//#define DEMO_SIGNAL
+#define DEMO_SIGNAL
+
+extern void
+_pconsole_main();
+
+extern void
+_signal_demo_main();
+
+extern void
+_lxinit_main();
void __USER__
__proc0_usr()
{
void __USER__
__proc0_usr()
{
+ pid_t p;
if (!fork()) {
if (!fork()) {
+ _pconsole_main();
+ }
+
+ if (!(p = fork())) {
#ifdef DEMO_SIGNAL
#ifdef DEMO_SIGNAL
-
asm("jmp _signal_demo_main"
);
+
_signal_demo_main(
);
#else
#else
-
asm("jmp _lxinit_main"
);
+
_lxinit_main(
);
#endif
}
#endif
}
+ // waitpid(p, 0, 0);
+
while (1) {
yield();
}
while (1) {
yield();
}