Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 1560 → Rev 1561

/uspace/trunk/fb/main.c
56,28 → 56,19
ipcarg_t phonead;
int initialized = 0;
 
#ifdef ia32
#ifdef FB_ENABLED
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
 
#ifdef amd64
if (sysinfo_value("fb.kind") == 1) {
if (fb_init() == 0)
initialized = 1;
} else if (sysinfo_value("fb.kind") == 2) {
#ifdef EGA_ENABLED
if (! initialized && sysinfo_value("fb.kind") == 2) {
if (ega_init() == 0)
initialized = 1;
}
#endif
 
 
if (!initialized)
sysio_init();
 
/uspace/trunk/fb/Makefile
34,9 → 34,6
include $(LIBC_PREFIX)/Makefile.toolchain
 
CFLAGS += -I../libipc/include
ifeq ($(ARCH), mips32)
CFLAGS += -DFB_BIG_ENDIAN
endif
 
LIBS = $(LIBC_PREFIX)/libc.a
 
49,16 → 46,23
sysio.c \
ppm.c
 
ifneq ($(ARCH), ia64)
SOURCES += fb.c \
font-8x16.c
CFLAGS += -DFB_ENABLED
endif
 
ifeq ($(ARCH), ia32)
SOURCES += fb.c \
font-8x16.c \
ega.c
SOURCES += ega.c
CFLAGS += -DEGA_ENABLED
endif
ifeq ($(ARCH), amd64)
SORCES += fb.c \
font-8x16.c \
ega.c
SOURCES += ega.c
CFLAGS += -DEGA_ENABLED
endif
ifeq ($(ARCH), mips32)
CFLAGS += -DFB_BIG_ENDIAN
endif
 
CFLAGS += -D$(ARCH)