Changeset b9f1585 in mainline for uspace/lib

Timestamp:

2019-01-03T06:53:22Z (7 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

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

Children:

043d464f

Parents:

b4a4ad94 (diff), 7acd787 (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 upstream changes

Location:

uspace/lib

Files:

• c/Makefile (modified) (1 diff)
• c/generic/io/chargrid.c (modified) (1 diff)
• c/generic/pci.c (added)
• c/include/ipc/pci.h (added)
• c/include/pci.h (added)
• c/include/types/pci.h (added)
• clui/tinput.c (modified) (5 diffs)

uspace/lib/c/Makefile

@@ -165 +165 @@
         generic/assert.c \
         generic/bsearch.c \
+        generic/pci.c \
         generic/pio_trace.c \
         generic/qsort.c \

uspace/lib/c/generic/io/chargrid.c

@@ -263 +263 @@
 void chargrid_set_cursor(chargrid_t *scrbuf, sysarg_t col, sysarg_t row)
 {
+        if (col >= scrbuf->cols || row >= scrbuf->rows)
+                return;
+
         scrbuf->col = col;
         scrbuf->row = row;

uspace/lib/clui/tinput.c

@@ -56 +56 @@
 } seek_dir_t;
 
+static void tinput_update_origin(tinput_t *);
 static void tinput_init(tinput_t *);
 static void tinput_insert_string(tinput_t *, const char *);
@@ -71 +72 @@
 static void tinput_console_set_lpos(tinput_t *ti, unsigned lpos)
 {
-        console_set_pos(ti->console, LIN_TO_COL(ti, lpos),
-            LIN_TO_ROW(ti, lpos));
+        unsigned col = LIN_TO_COL(ti, lpos);
+        unsigned row = LIN_TO_ROW(ti, lpos);
+
+        assert(col < ti->con_cols);
+        assert(row < ti->con_rows);
+        console_set_pos(ti->console, col, row);
 }
 
@@ -163 +168 @@
 static void tinput_position_caret(tinput_t *ti)
 {
+        tinput_update_origin(ti);
         tinput_console_set_lpos(ti, ti->text_coord + ti->pos);
 }
@@ -232 +238 @@
 
         tinput_display_tail(ti, ti->pos - 1, 0);
-        tinput_update_origin(ti);
         tinput_position_caret(ti);
 }
@@ -276 +281 @@
 
         tinput_display_tail(ti, ti->pos - ilen, 0);
-        tinput_update_origin(ti);
         tinput_position_caret(ti);
 }