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

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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/serial_console.c (modified) (6 diffs)

uspace/srv/hid/fb/serial_console.c

@@ -57 +57 @@
 void serial_putchar(wchar_t ch);
 
-static int scr_width;
-static int scr_height;
+static unsigned int scr_width;
+static unsigned int scr_height;
 static bool color = true;       /** True if producing color output. */
 static bool utf8 = false;       /** True if producing UTF8 output. */
@@ -108 +108 @@
 void serial_putchar(wchar_t ch)
 {
-        uint8_t buf[STR_BOUNDS(1)];
+        char buf[STR_BOUNDS(1)];
         size_t offs;
         size_t i;
@@ -294 +294 @@
 }
 
-int lastcol = 0;
-int lastrow = 0;
+unsigned int lastcol = 0;
+unsigned int lastrow = 0;
 
 /**
@@ -309 +309 @@
 
         wchar_t c;
-        int col, row, w, h;
+        unsigned int col;
+        unsigned int row;
+        unsigned int w;
+        unsigned int h;
         int i;
 
@@ -358 +361 @@
                                 break;
                         }
-                        if (col + w > scr_width || row + h > scr_height) {
+                        if ((col + w > scr_width) || (row + h > scr_height)) {
                                 retval = EINVAL;
                                 break;
@@ -424 +427 @@
                 case FB_SCROLL:
                         i = IPC_GET_ARG1(call);
-                        if ((i > scr_height) || (i < -scr_height)) {
+                        if ((i > (int) scr_height) || (i < -((int) scr_height))) {
                                 retval = EINVAL;
                                 break;