Index: fb/Makefile =================================================================== --- fb/Makefile (revision 46bd593f8b19eab1ef78d0cf427b42afd47bd1a3) +++ fb/Makefile (revision 10569b1da9438ff3a5f5539af9c24ca4bb57d2e3) @@ -49,5 +49,6 @@ font-8x16.c \ main.c \ - sysio.c + sysio.c \ + ega.c OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) Index: fb/ega.c =================================================================== --- fb/ega.c (revision 10569b1da9438ff3a5f5539af9c24ca4bb57d2e3) +++ fb/ega.c (revision 10569b1da9438ff3a5f5539af9c24ca4bb57d2e3) @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2006 Ondrej Palkovsky + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ega.h" + +/* Allow only 1 connection */ +static int client_connected = 0; + +static unsigned int scr_width; +static unsigned int scr_height; +static char *scr_addr; + +static void clrscr(void) +{ + int i; + + for (i=0; i < scr_width*scr_height; i++) + scr_addr[i*2] = ' '; +} + +static void printchar(char c, unsigned int row, unsigned int col) +{ + scr_addr[(row*scr_width + col)*2] = c; +} + +static void ega_client_connection(ipc_callid_t iid, ipc_call_t *icall) +{ + int retval; + ipc_callid_t callid; + ipc_call_t call; + char c; + unsigned int row, col; + + if (client_connected) { + ipc_answer_fast(iid, ELIMIT, 0,0); + return; + } + client_connected = 1; + ipc_answer_fast(iid, 0, 0, 0); /* Accept connection */ + + while (1) { + callid = async_get_call(&call); + switch (IPC_GET_METHOD(call)) { + case IPC_M_PHONE_HUNGUP: + client_connected = 0; + ipc_answer_fast(callid,0,0,0); + return; /* Exit thread */ + case FB_GET_CSIZE: + ipc_answer_fast(callid, 0, scr_width, scr_height); + continue; + case FB_CLEAR: + clrscr(); + retval = 0; + break; + case FB_PUTCHAR: + c = IPC_GET_ARG1(call); + row = IPC_GET_ARG2(call); + col = IPC_GET_ARG3(call); + if (row >= scr_width || col >= scr_height) { + retval = EINVAL; + break; + } + printchar(c,row,col); + retval = 0; + break; + default: + retval = ENOENT; + } + ipc_answer_fast(callid,retval,0,0); + } +} + +int ega_init(void) +{ + void *ega_ph_addr; + + + ega_ph_addr=(void *)sysinfo_value("fb.address.physical"); + scr_width=sysinfo_value("fb.width"); + scr_height=sysinfo_value("fb.height"); + + scr_addr=(void *)ALIGN_UP(((__address)set_maxheapsize(USER_ADDRESS_SPACE_SIZE_ARCH>>1)),PAGE_SIZE); + + if (ega_ph_addr != ALIGN_DOWN((unsigned long)ega_ph_addr, PAGE_SIZE)) + return -1; + + map_physmem(ega_ph_addr, scr_addr, (scr_width*scr_height+PAGE_SIZE-1)>>PAGE_WIDTH, + AS_AREA_READ | AS_AREA_WRITE); + + + async_set_client_connection(ega_client_connection); + + clrscr(); + + return 0; +} Index: fb/ega.h =================================================================== --- fb/ega.h (revision 10569b1da9438ff3a5f5539af9c24ca4bb57d2e3) +++ fb/ega.h (revision 10569b1da9438ff3a5f5539af9c24ca4bb57d2e3) @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2006 Ondrej Palkovsky + * 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. + */ + +#ifndef _EGA_H_ +#define _EGA_H_ + +int ega_init(void); + +#endif Index: fb/fb.c =================================================================== --- fb/fb.c (revision 46bd593f8b19eab1ef78d0cf427b42afd47bd1a3) +++ fb/fb.c (revision 10569b1da9438ff3a5f5539af9c24ca4bb57d2e3) @@ -565,5 +565,5 @@ fb_addr=ALIGN_UP(((__address)set_maxheapsize(USER_ADDRESS_SPACE_SIZE_ARCH>>1)),PAGE_SIZE); - map_physmem(task_get_id(),(void *)((__address)fb_ph_addr),(void *)fb_addr, + map_physmem((void *)((__address)fb_ph_addr),(void *)fb_addr, (fb_scanline*fb_height+PAGE_SIZE-1)>>PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE); Index: fb/main.c =================================================================== --- fb/main.c (revision 46bd593f8b19eab1ef78d0cf427b42afd47bd1a3) +++ fb/main.c (revision 10569b1da9438ff3a5f5539af9c24ca4bb57d2e3) @@ -34,4 +34,5 @@ #include "fb.h" #include "sysio.h" +#include "ega.h" int main(int argc, char *argv[]) @@ -43,5 +44,9 @@ if (fb_init() == 0) initialized = 1; + } else if (sysinfo_value("fb.kind") == 2) { + if (ega_init() == 0) + initialized = 1; } + if (!initialized) sysio_init();