Changeset df688cd in mainline

Timestamp:

2006-06-02T00:26:44Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

10569b1

Parents:

46bd593f

Message:

Added support ega framebuffer.
Removed taskid parameter from map_physmem. The same effect
can (and should) be performed using IPC.

Files:

• fb/Makefile (modified) (1 diff)
• fb/ega.c (added)
• fb/ega.h (added)
• fb/fb.c (modified) (1 diff)
• fb/main.c (modified) (2 diffs)
• libc/generic/ddi.c (modified) (1 diff)
• libc/include/ddi.h (modified) (1 diff)
• ns/ns.c (modified) (1 diff)

fb/Makefile

@@ -49 +49 @@
         font-8x16.c \
         main.c \
-        sysio.c
+        sysio.c \
+        ega.c
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))

fb/fb.c

@@ -565 +565 @@
         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);

fb/main.c

@@ -34 +34 @@
 #include "fb.h"
 #include "sysio.h"
+#include "ega.h"
 
 int main(int argc, char *argv[])
@@ -43 +44 @@
                 if (fb_init() == 0)
                         initialized = 1;
+        } else if (sysinfo_value("fb.kind") == 2) {
+                if (ega_init() == 0)
+                        initialized = 1;
         }
+        
         if (!initialized)
                 sysio_init();

libc/generic/ddi.c

@@ -46 +46 @@
  *         was some problem in creating address space area.
  */
-int map_physmem(task_id_t id, void *pf, void *vp, unsigned long pages, int flags)
+int map_physmem(void *pf, void *vp, unsigned long pages, int flags)
 {
-        task_id_t task_id;
-        ddi_memarg_t arg;
-
-        arg.task_id = id;
-        arg.phys_base = pf;
-        arg.virt_base = vp;
-        arg.pages = pages;
-        arg.flags = flags;
-
-        return __SYSCALL1(SYS_MAP_PHYSMEM, (sysarg_t) &arg);
+        return __SYSCALL4(SYS_MAP_PHYSMEM, (sysarg_t) pf, (sysarg_t)vp, pages, flags);
 }
 

libc/include/ddi.h

@@ -32 +32 @@
 #include <task.h>
 
-extern int map_physmem(task_id_t id, void *pf, void *vp, unsigned long pages, int flags);
+extern int map_physmem(void *pf, void *vp, unsigned long pages, int flags);
 extern int iospace_enable(task_id_t id, void *ioaddr, unsigned long size);
 extern int preemption_control(int enable);

ns/ns.c

@@ -89 +89 @@
                 }
                 addr = (void *)(200*1024*1024); /* TODO: intelligent freemem space */
-                map_physmem(task_get_id(), ph_addr, addr, 1,
-                            AS_AREA_READ | AS_AREA_CACHEABLE);
+                map_physmem(ph_addr, addr, 1, AS_AREA_READ | AS_AREA_CACHEABLE);
         }
         ipc_answer_fast(callid, 0, (ipcarg_t)addr, AS_AREA_READ | AS_AREA_CACHEABLE);