Changeset 357b5f5 in mainline for uspace/srv/hid/fb/ega.c

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/srv/hid/fb/ega.c

@@ -230 +230 @@
 static int save_screen(void)
 {
-        ipcarg_t i;
+        sysarg_t i;
         
         /* Find empty screen */
@@ -245 +245 @@
 }
 
-static int print_screen(ipcarg_t i)
+static int print_screen(sysarg_t i)
 {
         if ((i >= MAX_SAVED_SCREENS) || (saved_screens[i].data))
@@ -276 +276 @@
                 wchar_t c;
                 
-                ipcarg_t col;
-                ipcarg_t row;
-                ipcarg_t w;
-                ipcarg_t h;
+                sysarg_t col;
+                sysarg_t row;
+                sysarg_t w;
+                sysarg_t h;
                 
                 ssize_t rows;
@@ -290 +290 @@
                 uint32_t bg_rgb;
                 
-                ipcarg_t scr;
+                sysarg_t scr;
                 int retval;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         client_connected = 0;
@@ -370 +370 @@
                         
                         if (rows >= 0) {
-                                if ((ipcarg_t) rows > scr_height) {
+                                if ((sysarg_t) rows > scr_height) {
                                         retval = EINVAL;
                                         break;
                                 }
                         } else {
-                                if ((ipcarg_t) (-rows) > scr_height) {
+                                if ((sysarg_t) (-rows) > scr_height) {
                                         retval = EINVAL;
                                         break;