Rev 1560 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1560 | Rev 1561 | ||
|---|---|---|---|
| Line 54... | Line 54... | ||
| 54 | int main(int argc, char *argv[]) |
54 | int main(int argc, char *argv[]) |
| 55 | { |
55 | { |
| 56 | ipcarg_t phonead; |
56 | ipcarg_t phonead; |
| 57 | int initialized = 0; |
57 | int initialized = 0; |
| 58 | 58 | ||
| 59 | #ifdef ia32 |
59 | #ifdef FB_ENABLED |
| 60 | if (sysinfo_value("fb.kind") == 1) { |
60 | if (sysinfo_value("fb.kind") == 1) { |
| 61 | if (fb_init() == 0) |
61 | if (fb_init() == 0) |
| 62 | initialized = 1; |
62 | initialized = 1; |
| 63 | } else if (sysinfo_value("fb.kind") == 2) { |
- | |
| 64 | if (ega_init() == 0) |
- | |
| 65 | initialized = 1; |
- | |
| 66 | } |
63 | } |
| 67 | #endif |
64 | #endif |
| 68 | - | ||
| 69 | #ifdef amd64 |
65 | #ifdef EGA_ENABLED |
| 70 | if (sysinfo_value("fb.kind") == 1) { |
- | |
| 71 | if (fb_init() == 0) |
- | |
| 72 | initialized = 1; |
- | |
| 73 | } else if (sysinfo_value("fb.kind") == 2) { |
66 | if (! initialized && sysinfo_value("fb.kind") == 2) { |
| 74 | if (ega_init() == 0) |
67 | if (ega_init() == 0) |
| 75 | initialized = 1; |
68 | initialized = 1; |
| 76 | } |
69 | } |
| 77 | #endif |
70 | #endif |
| 78 | 71 | ||
| 79 | - | ||
| 80 | - | ||
| 81 | if (!initialized) |
72 | if (!initialized) |
| 82 | sysio_init(); |
73 | sysio_init(); |
| 83 | 74 | ||
| 84 | if (ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, &phonead) != 0) |
75 | if (ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, &phonead) != 0) |
| 85 | return -1; |
76 | return -1; |