Changeset ff381a7 in mainline for uspace/drv/bus/isa/isa.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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/drv/bus/isa/isa.c (modified) (2 diffs)

uspace/drv/bus/isa/isa.c

@@ -270 +270 @@
         }
 
-        r = read_all(fd, buf, len);
+        r = read(fd, buf, len);
         if (r < 0) {
                 ddf_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
@@ -616 +616 @@
         list_initialize(&isa->functions);
 
-        sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
+        sess = ddf_dev_parent_sess_create(dev);
         if (sess == NULL) {
                 ddf_msg(LVL_ERROR, "isa_dev_add failed to connect to the "