Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Don't use the private vm_map_physical_memory() but just

Browse Source 
map_physical_memory().
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22330 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2007-09-27 12:45:11 +00:00
parent e6dc7903e4
commit 9ef250072b
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/add-ons/kernel/console/vga_text/vga_text.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. * Copyright 2005-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@ -11,7 +11,6 @@
#include <Drivers.h> #include <Drivers.h>
#include <ISA.h> #include <ISA.h>
#include <vm_address_space.h>
#include <console.h> #include <console.h>
#include <string.h> #include <string.h>
@ -28,8 +27,8 @@
#define TEXT_CURSOR_LO 0x0f #define TEXT_CURSOR_LO 0x0f
#define TEXT_CURSOR_HI 0x0e #define TEXT_CURSOR_HI 0x0e
static uint16 *gOrigin; static uint16 *sOrigin;
static isa_module_info *isa; static isa_module_info *sISA;
static int static int
@ -37,20 +36,18 @@ text_init(void)
{ {
addr_t i; addr_t i;
if (get_module(B_ISA_MODULE_NAME, (module_info **)&isa) < 0) { if (get_module(B_ISA_MODULE_NAME, (module_info **)&sISA) < 0) {
dprintf("text module_init: no isa bus found..\n"); dprintf("text module_init: no isa bus found..\n");
return -1; return -1;
} }
/* we always succeede, so init our stuff */ map_physical_memory("video_mem", (void *)SCREEN_START, SCREEN_END - SCREEN_START,
dprintf("console/text: mapping vid mem\n"); B_ANY_KERNEL_ADDRESS, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, (void *)&sOrigin);
vm_map_physical_memory(vm_kernel_address_space_id(), "vid_mem", (void *)&gOrigin, dprintf("console/text: mapped vid mem to virtual address %p\n", sOrigin);
B_ANY_KERNEL_ADDRESS, SCREEN_END - SCREEN_START,
B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, SCREEN_START);
dprintf("console/text: mapped vid mem to virtual address %p\n", gOrigin);
/* pre-touch all of the memory so that we dont fault while deep inside the kernel and displaying something */ /* pre-touch all of the memory so that we dont fault while deep inside the kernel and displaying something */
for(i = (addr_t)gOrigin; i < (addr_t)gOrigin + (SCREEN_END - SCREEN_START); i += B_PAGE_SIZE) { for (i = (addr_t)sOrigin; i < (addr_t)sOrigin + (SCREEN_END - SCREEN_START);
i += B_PAGE_SIZE) {
uint16 val = *(volatile uint16 *)i; uint16 val = *(volatile uint16 *)i;
*(volatile uint16 *)i = val; *(volatile uint16 *)i = val;
} }
@ -87,10 +84,10 @@ move_cursor(int32 x, int32 y)
else else
pos = y * COLUMNS + x; pos = y * COLUMNS + x;
isa->write_io_8(TEXT_INDEX, TEXT_CURSOR_LO); sISA->write_io_8(TEXT_INDEX, TEXT_CURSOR_LO);
isa->write_io_8(TEXT_DATA, (char)pos); sISA->write_io_8(TEXT_DATA, (char)pos);
isa->write_io_8(TEXT_INDEX, TEXT_CURSOR_HI); sISA->write_io_8(TEXT_INDEX, TEXT_CURSOR_HI);
isa->write_io_8(TEXT_DATA, (char)(pos >> 8)); sISA->write_io_8(TEXT_DATA, (char)(pos >> 8));
} }
@ -98,7 +95,7 @@ static void
put_glyph(int32 x, int32 y, uint8 glyph, uint8 attr) put_glyph(int32 x, int32 y, uint8 glyph, uint8 attr)
{ {
uint16 pair = ((uint16)attr << 8) | (uint16)glyph; uint16 pair = ((uint16)attr << 8) | (uint16)glyph;
uint16 *p = gOrigin+(y*COLUMNS)+x; uint16 *p = sOrigin + (y * COLUMNS) + x;
*p = pair; *p = pair;
} }
@ -110,7 +107,7 @@ fill_glyph(int32 x, int32 y, int32 width, int32 height, uint8 glyph, uint8 attr)
int32 y_limit = y + height; int32 y_limit = y + height;
while (y < y_limit) { while (y < y_limit) {
uint16 *p = gOrigin + (y * COLUMNS) + x; uint16 *p = sOrigin + (y * COLUMNS) + x;
uint16 *p_limit = p + width; uint16 *p_limit = p + width;
while (p < p_limit) *p++ = pair; while (p < p_limit) *p++ = pair;
y++; y++;
@ -123,7 +120,7 @@ blit(int32 srcx, int32 srcy, int32 width, int32 height, int32 destx, int32 desty
{ {
if ((srcx == 0) && (width == COLUMNS)) { if ((srcx == 0) && (width == COLUMNS)) {
// whole lines // whole lines
memmove(gOrigin + (desty * COLUMNS), gOrigin + (srcy * COLUMNS), height * COLUMNS * 2); memmove(sOrigin + (desty * COLUMNS), sOrigin + (srcy * COLUMNS), height * COLUMNS * 2);
} else { } else {
// FIXME // FIXME
} }
@ -133,7 +130,7 @@ blit(int32 srcx, int32 srcy, int32 width, int32 height, int32 destx, int32 desty
static void static void
clear(uint8 attr) clear(uint8 attr)
{ {
uint16 *base = (uint16 *)gOrigin; uint16 *base = (uint16 *)sOrigin;
uint32 i; uint32 i;
for (i = 0; i < COLUMNS * LINES; i++) for (i = 0; i < COLUMNS * LINES; i++)