Changeset f2962621 in mainline for uspace/srv/hid/fb/serial_console.c

Timestamp:

2010-12-17T10:14:01Z (14 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/fb/serial_console.c (modified) (7 diffs)

uspace/srv/hid/fb/serial_console.c

@@ -55 +55 @@
 #define MAX_CONTROL 20
 
-static ipcarg_t scr_width;
-static ipcarg_t scr_height;
+static sysarg_t scr_width;
+static sysarg_t scr_height;
 static bool color = true;    /**< True if producing color output. */
 static bool utf8 = false;    /**< True if producing UTF8 output. */
 static putc_function_t putc_function;
 
-static ipcarg_t lastcol = 0;
-static ipcarg_t lastrow = 0;
+static sysarg_t lastcol = 0;
+static sysarg_t lastrow = 0;
 static attrs_t cur_attr = {
         .t = at_style,
@@ -130 +130 @@
 }
 
-void serial_goto(const ipcarg_t col, const ipcarg_t row)
+void serial_goto(const sysarg_t col, const sysarg_t row)
 {
         if ((col > scr_width) || (row > scr_height))
@@ -252 +252 @@
 
 /** Set scrolling region. */
-void serial_set_scroll_region(ipcarg_t last_row)
+void serial_set_scroll_region(sysarg_t last_row)
 {
         char control[MAX_CONTROL];
@@ -269 +269 @@
 }
 
-void serial_console_init(putc_function_t putc_fn, ipcarg_t w, ipcarg_t h)
+void serial_console_init(putc_function_t putc_fn, sysarg_t w, sysarg_t h)
 {
         scr_width = w;
@@ -286 +286 @@
  *
  */
-static void draw_text_data(keyfield_t *data, ipcarg_t x0, ipcarg_t y0,
-    ipcarg_t width, ipcarg_t height)
+static void draw_text_data(keyfield_t *data, sysarg_t x0, sysarg_t y0,
+    sysarg_t width, sysarg_t height)
 {
         attrs_t *a0 = &data[0].attrs;
         serial_set_attrs(a0);
         
-        ipcarg_t y;
+        sysarg_t y;
         for (y = 0; y < height; y++) {
                 serial_goto(x0, y0 + y);
                 
-                ipcarg_t x;
+                sysarg_t x;
                 for (x = 0; x < width; x++) {
                         attrs_t *attr = &data[y * width + x].attrs;
@@ -337 +337 @@
                 
                 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;
                 
                 int retval;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         client_connected = 0;
@@ -442 +442 @@
                         
                         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;