Changeset 46ec2c06 in mainline for pci/libpci/access.c

Timestamp:

2006-05-11T16:08:50Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7981e3cc

Parents:

20a9b85

Message:

SYS_AS_AREA_DESTROY support for uspace.

Formatting fixes in libpci.

File:

• pci/libpci/access.c (modified) (5 diffs)

pci/libpci/access.c

@@ -26 +26 @@
         int i;
 
+        if (!a)
+                return NULL;
+                
         bzero(a, sizeof(*a));
         for (i = 0; i < PCI_ACCESS_MAX; i++)
@@ -38 +41 @@
 
         if (!x)
-                a->error("Out of memory (allocation of %d bytes failed)",
-                         size);
+                a->error("Out of memory (allocation of %d bytes failed)", size);
         return x;
 }
@@ -219 +221 @@
 {
         if (pos & (len - 1))
-                d->access->error("Unaligned write: pos=%02x,len=%d", pos,
-                                 len);
+                d->access->error("Unaligned write: pos=%02x,len=%d", pos, len);
         if (pos + len <= d->cache_len)
                 memcpy(d->cache + pos, buf, len);
@@ -246 +247 @@
 {
         if (pos < d->cache_len) {
-                int l =
-                    (pos + len >=
-                     d->cache_len) ? (d->cache_len - pos) : len;
+                int l = (pos + len >= d->cache_len) ? (d->cache_len - pos) : len;
                 memcpy(d->cache + pos, buf, l);
         }
@@ -261 +260 @@
         }
         if (flags & ~d->known_fields)
-                d->known_fields |=
-                    d->methods->fill_info(d, flags & ~d->known_fields);
+                d->known_fields |= d->methods->fill_info(d, flags & ~d->known_fields);
         return d->known_fields;
 }