Changeset c47e1a8 in mainline for uspace/srv/drivers/isa/isa.c

Timestamp:

2010-05-21T07:50:04Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

• uspace/srv/drivers/isa/isa.c (modified) (3 diffs)

uspace/srv/drivers/isa/isa.c

@@ -42 +42 @@
 #include <fibril_synch.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <ctype.h>
 #include <macros.h>
@@ -136 +136 @@
         bool opened = false;
         int fd;         
-        off_t len = 0;
+        size_t len = 0;
         
         fd = open(conf_path, O_RDONLY);
@@ -458 +458 @@
 }
 
-static char * parse_dev_conf(char *conf, device_t *parent)
+static void parse_dev_conf(char *conf, device_t *parent)
 {
         while (NULL != conf && 0 != *conf) {