Changeset b74959bd in mainline for uspace/srv/fb/ega.c

Timestamp:

2007-11-20T21:33:32Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8498915

Parents:

3209923

Message:

Modify ipc_answer_*() to make use of all six syscall arguments. The recommended
means of answering calls is via the ipc_answer_m() macros (where m denotes the
number of return arguments) that automatically decide between the fast register
version or the slow universal version of ipc_answer().

File:

• uspace/srv/fb/ega.c (modified) (11 diffs)

uspace/srv/fb/ega.c

@@ -83 +83 @@
         int i;
         
-        for (i = 0; i < scr_width*scr_height; i++) {
+        for (i = 0; i < scr_width * scr_height; i++) {
                 scr_addr[i * 2] = ' ';
                 scr_addr[i * 2 + 1] = style;
@@ -126 +126 @@
         if (rows > 0) {
                 memcpy(scr_addr, ((char *) scr_addr) + rows * scr_width * 2,
-                        scr_width * scr_height * 2 - rows * scr_width * 2);
+                    scr_width * scr_height * 2 - rows * scr_width * 2);
                 for (i = 0; i < rows * scr_width; i++)
                         (((short *) scr_addr) + scr_width * scr_height - rows *
-                                scr_width)[i] = ((style << 8) + ' ');
+                            scr_width)[i] = ((style << 8) + ' ');
         } else if (rows < 0) {
                 memcpy(((char *)scr_addr) - rows * scr_width * 2, scr_addr,
-                        scr_width * scr_height * 2 + rows * scr_width * 2);
+                    scr_width * scr_height * 2 + rows * scr_width * 2);
                 for (i = 0; i < -rows * scr_width; i++)
                         ((short *)scr_addr)[i] = ((style << 8 ) + ' ');
@@ -153 +153 @@
                 scr_addr[i * 2] = data[i].character;
                 scr_addr[i * 2 + 1] = EGA_STYLE(data[i].style.fg_color,
-                        data[i].style.bg_color);
+                    data[i].style.bg_color);
         }
 }
@@ -161 +161 @@
         int i;
 
-        for (i=0; (i < MAX_SAVED_SCREENS) && (saved_screens[i].data); i++)
+        for (i = 0; (i < MAX_SAVED_SCREENS) && (saved_screens[i].data); i++)
                 ;
         if (i == MAX_SAVED_SCREENS) 
@@ -176 +176 @@
         if (saved_screens[i].data)
                 memcpy(scr_addr, saved_screens[i].data, 2 * scr_width *
-                        scr_height);
+                    scr_height);
         else
                 return EINVAL;
@@ -196 +196 @@
 
         if (client_connected) {
-                ipc_answer_fast(iid, ELIMIT, 0,0);
+                ipc_answer_0(iid, ELIMIT);
                 return;
         }
         client_connected = 1;
-        ipc_answer_fast(iid, 0, 0, 0); /* Accept connection */
+        ipc_answer_0(iid, EOK); /* Accept connection */
 
         while (1) {
@@ -207 +207 @@
                 case IPC_M_PHONE_HUNGUP:
                         client_connected = 0;
-                        ipc_answer_fast(callid, 0, 0, 0);
+                        ipc_answer_0(callid, EOK);
                         return; /* Exit thread */
                 case IPC_M_AS_AREA_SEND:
@@ -213 +213 @@
                         intersize = IPC_GET_ARG2(call);
                         if (intersize >= scr_width * scr_height *
-                                sizeof(*interbuf)) {
-                                receive_comm_area(callid, &call, (void *)
-                                        &interbuf);
+                            sizeof(*interbuf)) {
+                                receive_comm_area(callid, &call,
+                                    (void *) &interbuf);
                                 continue;
                         }
@@ -229 +229 @@
                         break;
                 case FB_GET_CSIZE:
-                        ipc_answer_fast(callid, 0, scr_height, scr_width);
+                        ipc_answer_2(callid, EOK, scr_height, scr_width);
                         continue;
                 case FB_CLEAR:
@@ -301 +301 @@
                         retval = ENOENT;
                 }
-                ipc_answer_fast(callid, retval, 0, 0);
+                ipc_answer_0(callid, retval);
         }
 }
@@ -319 +319 @@
 
         physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >>
-                PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+            PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
 
         async_set_client_connection(ega_client_connection);