Changeset b9f1585 in mainline for uspace/lib/c

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/c

Files:

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

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;