Rev 3222 | Rev 3256 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3222 | Rev 3243 | ||
|---|---|---|---|
| Line 49... | Line 49... | ||
| 49 | { |
49 | { |
| 50 | while (get_cons_phone() < 0) |
50 | while (get_cons_phone() < 0) |
| 51 | usleep(50000); // FIXME |
51 | usleep(50000); // FIXME |
| 52 | } |
52 | } |
| 53 | 53 | ||
| 54 | static bool mount_tmpfs(void) |
54 | static bool mount_fs(const char *fstype) |
| 55 | { |
55 | { |
| 56 | int rc = -1; |
56 | int rc = -1; |
| 57 | 57 | ||
| 58 | while (rc < 0) { |
58 | while (rc < 0) { |
| 59 | rc = mount("tmpfs", "/", "initrd"); |
59 | rc = mount(fstype, "/", "initrd"); |
| 60 | 60 | ||
| 61 | switch (rc) { |
61 | switch (rc) { |
| 62 | case EOK: |
62 | case EOK: |
| 63 | printf(NAME ": Root filesystem mounted\n"); |
63 | printf(NAME ": Root filesystem mounted\n"); |
| 64 | break; |
64 | break; |
| Line 93... | Line 93... | ||
| 93 | 93 | ||
| 94 | int main(int argc, char *argv[]) |
94 | int main(int argc, char *argv[]) |
| 95 | { |
95 | { |
| 96 | info_print(); |
96 | info_print(); |
| 97 | sleep(5); // FIXME |
97 | sleep(5); // FIXME |
| - | 98 | bool has_tmpfs = false; |
|
| - | 99 | bool has_fat = false; |
|
| 98 | 100 | ||
| 99 | if (!mount_tmpfs()) { |
101 | if (!(has_tmpfs = mount_fs("tmpfs")) && !(has_fat = mount_fs("fat"))) { |
| 100 | printf(NAME ": Exiting\n"); |
102 | printf(NAME ": Exiting\n"); |
| 101 | return -1; |
103 | return -1; |
| 102 | } |
104 | } |
| 103 | 105 | ||
| 104 | // FIXME: spawn("/sbin/pci"); |
106 | // FIXME: spawn("/sbin/pci"); |
| Line 107... | Line 109... | ||
| 107 | spawn("/sbin/console"); |
109 | spawn("/sbin/console"); |
| 108 | 110 | ||
| 109 | console_wait(); |
111 | console_wait(); |
| 110 | version_print(); |
112 | version_print(); |
| 111 | 113 | ||
| - | 114 | /* |
|
| - | 115 | * Spawn file system servers that were not loaded as init tasks. |
|
| - | 116 | */ |
|
| - | 117 | if (!has_fat) |
|
| 112 | spawn("/sbin/fat"); |
118 | spawn("/sbin/fat"); |
| - | 119 | if (!has_tmpfs) |
|
| - | 120 | spawn("/sbin/tmpfs"); |
|
| - | 121 | ||
| 113 | spawn("/sbin/tetris"); |
122 | spawn("/sbin/tetris"); |
| 114 | spawn("/sbin/cli"); |
123 | spawn("/sbin/cli"); |
| 115 | // FIXME: spawn("/sbin/tester"); |
124 | // FIXME: spawn("/sbin/tester"); |
| 116 | spawn("/sbin/klog"); |
125 | spawn("/sbin/klog"); |
| 117 | 126 | ||