Changeset 7715994 in mainline for uspace/lib/libpci/pci.h

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/lib/libpci/pci.h (modified) (2 diffs)

uspace/lib/libpci/pci.h

@@ -40 +40 @@
 
         /* Functions you can override: */
-        void (*error) (char *msg, ...); /* Write error message and quit */
-        void (*warning) (char *msg, ...);       /* Write a warning message */
-        void (*debug) (char *msg, ...); /* Write a debugging message */
+        void (*error) (const char *msg, ...);   /* Write error message and quit */
+        void (*warning) (const char *msg, ...); /* Write a warning message */
+        void (*debug) (const char *msg, ...);   /* Write a debugging message */
 
         struct pci_dev *devices;        /* Devices found on this bus */
@@ -128 +128 @@
  */
 
-char *pci_lookup_name(struct pci_access *a, char *buf, int size, int flags,
-                      ...);
+const char *pci_lookup_name(struct pci_access *a, char *buf, int size,
+    int flags, ...);
 
 int pci_load_name_list(struct pci_access *a);   /* Called automatically by pci_lookup_*() when needed; returns success */