Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 1375 → Rev 1376

/kernel/trunk/genarch/include/fb/fb.h
35,4 → 35,7
extern spinlock_t fb_lock;
void fb_init(__address addr, unsigned int x, unsigned int y, unsigned int bpp, unsigned int scan);
 
/* To be implemented by architecture. */
void fb_map_arch(__address virtaddr, __address physaddr, size_t size);
 
#endif
/kernel/trunk/genarch/Makefile.inc
67,6 → 67,10
genarch/src/fb/font-8x16.c \
genarch/src/fb/fb.c
DEFS += -DCONFIG_FB
ifneq ($(CONFIG_FB_MAP_ARCH),y)
GENARCH_SOURCES += \
genarch/src/fb/fb_map.c
endif
endif
 
## i8042 controller
/kernel/trunk/genarch/src/fb/fb_map.c
0,0 → 1,41
/*
* Copyright (C) 2006 Martin Decky
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* - The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
#include <genarch/fb/fb.h>
#include <mm/as.h>
#include <mm/page.h>
#include <mm/frame.h>
#include <align.h>
 
void fb_map_arch(__address virtaddr, __address physaddr, size_t size)
{
pfn_t i;
for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
page_mapping_insert(AS_KERNEL, (__address) virtaddr + PFN2ADDR(i), physaddr + PFN2ADDR(i),
PAGE_NOT_CACHEABLE);
}
/kernel/trunk/genarch/src/fb/fb.c
32,7 → 32,6
#include <console/console.h>
#include <sysinfo/sysinfo.h>
#include <mm/slab.h>
#include <mm/as.h>
#include <bitops.h>
#include <align.h>
#include <panic.h>
360,9 → 359,7
/* Map the framebuffer */
fbaddress = (__u8 *) PA2KA(PFN2ADDR(frame_alloc(fborder, FRAME_KA)));
pfn_t i;
for (i = 0; i < ADDR2PFN(ALIGN_UP(fbsize, PAGE_SIZE)); i++)
page_mapping_insert(AS_KERNEL, (__address) fbaddress + PFN2ADDR(i), addr + PFN2ADDR(i), PAGE_NOT_CACHEABLE);
fb_map_arch((__address) fbaddress, (__address) addr, fbsize);
xres = x;
yres = y;
/kernel/trunk/arch/sparc64/Makefile.inc
61,9 → 61,11
CONFIG_ASID_FIFO = y
 
## Compile with support for framebuffer.
## Mapping of the framebuffer is implemented by a sparc64-specific function.
#
 
CONFIG_FB = y
CONFIG_FB_MAP_ARCH = y
 
## Compile with support for i8042 controller.
#
/kernel/trunk/arch/sparc64/src/console.c
71,6 → 71,12
ofw_console_active = 1;
}
 
void fb_map_arch(__address virtaddr, __address physaddr, size_t size)
{
dtlb_insert_mapping(virtaddr, physaddr, PAGESIZE_512K, true, false);
dtlb_insert_mapping(virtaddr + 512*1024, physaddr + 512*1024, PAGESIZE_512K, true, false);
}
 
/** Initialize kernel console to use framebuffer and keyboard directly. */
void standalone_sparc64_console_init(void)
{
77,10 → 83,9
ofw_console_active = 0;
stdin = NULL;
 
dtlb_insert_mapping(FB_VIRT_ADDRESS, FB_PHYS_ADDRESS, PAGESIZE_4M, true, false);
dtlb_insert_mapping(KBD_VIRT_ADDRESS, KBD_PHYS_ADDRESS, PAGESIZE_8K, true, false);
 
fb_init(FB_VIRT_ADDRESS, FB_X_RES, FB_Y_RES, FB_COLOR_DEPTH, FB_X_RES * FB_COLOR_DEPTH / 8);
fb_init(FB_PHYS_ADDRESS, FB_X_RES, FB_Y_RES, FB_COLOR_DEPTH, FB_X_RES * FB_COLOR_DEPTH / 8);
i8042_init();
}