Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4631 → Rev 4622

/branches/arm/uspace/srv/fb/fb.c
176,21 → 176,6
((color >> 16) & 0xff);
}
 
static void bgr_byte8880(void *dst, int rgb)
{
uint8_t *scr = (uint8_t *) dst;
scr[3] = RED(rgb, 8);
scr[2] = GREEN(rgb, 8);
scr[1] = BLUE(rgb, 8);
}
 
static int byte8880_bgr(void *src)
{
uint8_t *scr = (uint8_t *) src;
return scr[3] << 16 | scr[2] << 8 | scr[1];
}
 
 
static void
rgb_byte888(void *dst, int rgb)
{
575,11 → 560,6
screen.scr2rgb = byte0888_bgr;
screen.pixelbytes = 4;
break;
case VISUAL_BGR_8_8_8_0:
screen.rgb2scr = bgr_byte8880;
screen.scr2rgb = byte8880_bgr;
screen.pixelbytes = 4;
break;
default:
return false;
}
/branches/arm/uspace/srv/kbd/Makefile
72,18 → 72,9
genarch/src/kbd.c
endif
ifeq ($(ARCH), arm32)
GENARCH_SOURCES = \
genarch/src/kbd.c
ifeq ($(MACHINE), gxemul_testarm)
ARCH_SOURCES += \
arch/$(ARCH)/src/kbd_gxemul.c
endif
ifeq ($(MACHINE), qemu_icp)
ARCH_SOURCES += \
arch/$(ARCH)/src/kbd_icp.c \
arch/$(ARCH)/src/scanc.c
endif
endif
 
 
GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
/branches/arm/uspace/srv/kbd/arch/arm32/include/scanc.h
File deleted
/branches/arm/uspace/srv/kbd/arch/arm32/include/pl050.h
File deleted
/branches/arm/uspace/srv/kbd/arch/arm32/src/kbd_icp.c
File deleted
/branches/arm/uspace/srv/kbd/arch/arm32/src/scanc.c
File deleted