Changeset f2962621 in mainline for uspace/srv/hid/console/console.c

Timestamp:

2010-12-17T10:14:01Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6e5dc07

Parents:

9223dc5c (diff), 11658b64 (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 with usb/development

File:

• uspace/srv/hid/console/console.c (modified) (13 diffs)

uspace/srv/hid/console/console.c

@@ -74 +74 @@
 struct {
         int phone;           /**< Framebuffer phone */
-        ipcarg_t cols;       /**< Framebuffer columns */
-        ipcarg_t rows;       /**< Framebuffer rows */
-        ipcarg_t color_cap;  /**< Color capabilities (FB_CCAP_xxx) */
+        sysarg_t cols;       /**< Framebuffer columns */
+        sysarg_t rows;       /**< Framebuffer rows */
+        sysarg_t color_cap;  /**< Color capabilities (FB_CCAP_xxx) */
 } fb_info;
 
@@ -101 +101 @@
 /** Information on row-span yet unsent to FB driver. */
 struct {
-        ipcarg_t col;  /**< Leftmost column of the span. */
-        ipcarg_t row;  /**< Row where the span lies. */
-        ipcarg_t cnt;  /**< Width of the span. */
+        sysarg_t col;  /**< Leftmost column of the span. */
+        sysarg_t row;  /**< Row where the span lies. */
+        sysarg_t cnt;  /**< Width of the span. */
 } fb_pending;
 
@@ -119 +119 @@
 }
 
-static void curs_goto(ipcarg_t x, ipcarg_t y)
+static void curs_goto(sysarg_t x, sysarg_t y)
 {
         async_msg_2(fb_info.phone, FB_CURSOR_GOTO, x, y);
@@ -180 +180 @@
 }
 
-static int ccap_fb_to_con(ipcarg_t ccap_fb, ipcarg_t *ccap_con)
+static int ccap_fb_to_con(sysarg_t ccap_fb, sysarg_t *ccap_con)
 {
         switch (ccap_fb) {
@@ -203 +203 @@
 
 /** Send an area of screenbuffer to the FB driver. */
-static void fb_update_area(console_t *cons, ipcarg_t x0, ipcarg_t y0, ipcarg_t width, ipcarg_t height)
+static void fb_update_area(console_t *cons, sysarg_t x0, sysarg_t y0, sysarg_t width, sysarg_t height)
 {
         if (interbuffer) {
-                ipcarg_t x;
-                ipcarg_t y;
+                sysarg_t x;
+                sysarg_t y;
                 
                 for (y = 0; y < height; y++) {
@@ -237 +237 @@
  *
  */
-static void cell_mark_changed(ipcarg_t col, ipcarg_t row)
+static void cell_mark_changed(sysarg_t col, sysarg_t row)
 {
         if (fb_pending.cnt != 0) {
@@ -255 +255 @@
 
 /** Print a character to the active VC with buffering. */
-static void fb_putchar(wchar_t c, ipcarg_t col, ipcarg_t row)
+static void fb_putchar(wchar_t c, sysarg_t col, sysarg_t row)
 {
         async_msg_3(fb_info.phone, FB_PUTCHAR, c, col, row);
@@ -352 +352 @@
                 curs_visibility(false);
                 
-                ipcarg_t x;
-                ipcarg_t y;
+                sysarg_t x;
+                sysarg_t y;
                 int rc = 0;
                 
@@ -408 +408 @@
                 console_event_t ev;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */
@@ -451 +451 @@
                 int retval;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */
@@ -584 +584 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t arg1;
-        ipcarg_t arg2;
-        ipcarg_t arg3;
+        sysarg_t arg1;
+        sysarg_t arg2;
+        sysarg_t arg3;
         
         int rc;
@@ -608 +608 @@
                 arg3 = 0;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         cons->refcount--;
@@ -726 +726 @@
         
         /* NB: The callback connection is slotted for removal */
-        ipcarg_t phonehash;
+        sysarg_t phonehash;
         if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
                 printf(NAME ": Failed to create callback from input device\n");