Changeset 1180a88e in mainline

Timestamp:

2006-06-02T08:52:59Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

838c48e

Parents:

10569b1

Message:

Doc updates.

Location:

fb

Files:

• ega.c (modified) (1 diff)
• fb.c (modified) (7 diffs)
• sysio.c (modified) (5 diffs)

fb/ega.c

@@ -123 +123 @@
                 return -1;
         
-        map_physmem(ega_ph_addr, scr_addr, (scr_width*scr_height+PAGE_SIZE-1)>>PAGE_WIDTH,
+        map_physmem(ega_ph_addr, scr_addr, (scr_width*scr_height*2+PAGE_SIZE-1)>>PAGE_WIDTH,
                     AS_AREA_READ | AS_AREA_WRITE);
 

fb/fb.c

@@ -166 +166 @@
 }
 
+/** Put pixel into viewport 
+ *
+ * @param vp Viewport identification
+ * @param x X coord relative to viewport
+ * @param y Y coord relative to viewport
+ * @param color RGB color 
+ */
 static void putpixel(int vp, unsigned int x, unsigned int y, int color)
 {
         screen.putpixel(viewports[vp].x + x, viewports[vp].y + y, color);
 }
+/** Get pixel from viewport */
 static int getpixel(int vp, unsigned int x, unsigned int y)
 {
@@ -258 +266 @@
 
 /** Draw character at given position */
-static void draw_glyph(int vp,__u8 glyph, unsigned int row, unsigned int col)
+static void draw_glyph(int vp,__u8 glyph, unsigned int sx, unsigned int sy)
 {
         unsigned int y;
 
         for (y = 0; y < FONT_SCANLINES; y++)
-                draw_glyph_line(vp ,fb_font[glyph * FONT_SCANLINES + y], col * COL_WIDTH, row * FONT_SCANLINES + y);
+                draw_glyph_line(vp ,fb_font[glyph * FONT_SCANLINES + y], sx, sy + y);
 }
 
@@ -308 +316 @@
         int i;
 
-        for (i=0; i < MAX_VIEWPORTS; i++) {
+for (i=0; i < MAX_VIEWPORTS; i++) {
                 if (!viewports[i].initialized)
                         break;
@@ -388 +396 @@
 }
 
+/** Draw character at given position relative to viewport 
+ * 
+ * @param vp Viewport identification
+ * @param c Character to print
+ * @param row Screen position relative to viewport
+ * @param col Screen position relative to viewport
+ */
 static void draw_char(int vp, char c, unsigned int row, unsigned int col)
 {
@@ -395 +410 @@
                 invert_char(vp, vport->cur_row, vport->cur_col);
         
-        draw_glyph(vp, c, row, col);
+        draw_glyph(vp, c, col * COL_WIDTH, row * FONT_SCANLINES);
 
         vport->cur_col = col;
@@ -411 +426 @@
 }
 
+/** Function for handling connections to FB
+ *
+ */
 static void fb_client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -546 +564 @@
 }
 
+/** Initialization of framebuffer */
 int fb_init(void)
 {

fb/sysio.c

@@ -41 +41 @@
 static int client_connected = 0;
 
-#define CLRSCR   "\033[2J"
-
 static void sysput(char c)
 {
@@ -53 +51 @@
 }
 
+/** Send clearscreen sequence to console */
+static void clrscr(void)
+{
+        sysputs("\033[2J");
+}
+
+/** Send ansi sequence to console to change cursor position */
 static void curs_goto(unsigned int row, unsigned int col)
 {
         char control[20];
 
-        if (row > 100 || col > 100)
+        if (row > 200 || col > 200)
                 return;
 
@@ -64 +69 @@
 }
 
+/** ANSI terminal emulation main thread */
 static void sysio_client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -107 +113 @@
                         continue;
                 case FB_CLEAR:
-                        sysputs(CLRSCR);
+                        clrscr();
                         retval = 0;
                         break;
@@ -117 +123 @@
 }
 
+/** ANSI terminal emulation initialization */
 void sysio_init(void)
 {
         async_set_client_connection(sysio_client_connection);
-        sysputs(CLRSCR);
+        clrscr();
         curs_goto(0,0);
 }