/uspace/trunk/fb/main.c |
---|
56,6 → 56,7 |
ipcarg_t phonead; |
int initialized = 0; |
#ifdef ia32 |
if (sysinfo_value("fb.kind") == 1) { |
if (fb_init() == 0) |
initialized = 1; |
63,6 → 64,19 |
if (ega_init() == 0) |
initialized = 1; |
} |
#endif |
#ifdef amd64 |
if (sysinfo_value("fb.kind") == 1) { |
if (fb_init() == 0) |
initialized = 1; |
} else if (sysinfo_value("fb.kind") == 2) { |
if (ega_init() == 0) |
initialized = 1; |
} |
#endif |
if (!initialized) |
sysio_init(); |
/uspace/trunk/fb/Makefile |
---|
45,13 → 45,24 |
OUTPUT = fb |
SOURCES = \ |
fb.c \ |
font-8x16.c \ |
main.c \ |
sysio.c \ |
ega.c \ |
ppm.c |
ifeq ($(ARCH), ia32) |
SOURCES += fb.c \ |
font-8x16.c \ |
ega.c |
endif |
ifeq ($(ARCH), amd64) |
SORCES += fb.c \ |
font-8x16.c \ |
ega.c |
endif |
CFLAGS += -D$(ARCH) |
OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) |
.PHONY: all clean depend disasm |