Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3234 → Rev 3233

/trunk/uspace/srv/fb/msim.c
File deleted
/trunk/uspace/srv/fb/msim.h
File deleted
/trunk/uspace/srv/fb/Makefile
50,6 → 50,7
font-8x16.c
CFLAGS += -DFB_ENABLED
endif
 
ifeq ($(ARCH), ia32)
SOURCES += ega.c
CFLAGS += -DEGA_ENABLED
59,8 → 60,7
CFLAGS += -DEGA_ENABLED
endif
ifeq ($(ARCH), mips32)
SOURCES += msim.c
CFLAGS += -DMSIM_ENABLED -DFB_INVERT_ENDIAN
CFLAGS += -DFB_INVERT_ENDIAN
endif
 
CFLAGS += -D$(ARCH)
/trunk/uspace/srv/fb/main.c
37,7 → 37,6
 
#include "fb.h"
#include "ega.h"
#include "msim.h"
#include "main.h"
 
#define NAME "fb"
59,26 → 58,20
printf(NAME ": HelenOS Framebuffer service\n");
ipcarg_t phonead;
bool initialized = false;
int initialized = 0;
 
#ifdef FB_ENABLED
if (sysinfo_value("fb.kind") == 1) {
if (fb_init() == 0)
initialized = true;
initialized = 1;
}
#endif
#ifdef EGA_ENABLED
if ((!initialized) && (sysinfo_value("fb.kind") == 2)) {
if (!initialized && sysinfo_value("fb.kind") == 2) {
if (ega_init() == 0)
initialized = true;
initialized = 1;
}
#endif
#ifdef MSIM_ENABLED
if ((!initialized) && (sysinfo_value("fb.kind") == 3)) {
if (msim_init() == 0)
initialized = true;
}
#endif
 
if (!initialized)
return -1;