Changeset aa85487 in mainline for uspace/lib/libpci


Ignore:
Timestamp:
2010-03-07T15:11:56Z (15 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
aadf01e
Parents:
2e99277 (diff), 137691a (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, revision 308

Location:
uspace/lib/libpci
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/libpci/access.c

    r2e99277 raa85487  
    5151}
    5252
    53 static void pci_generic_error(char *msg, ...)
     53static void pci_generic_error(const char *msg, ...)
    5454{
    5555        va_list args;
    … …  
    6262}
    6363
    64 static void pci_generic_warn(char *msg, ...)
     64static void pci_generic_warn(const char *msg, ...)
    6565{
    6666        va_list args;
    … …  
    7272}
    7373
    74 static void pci_generic_debug(char *msg, ...)
     74static void pci_generic_debug(const char *msg, ...)
    7575{
    7676        va_list args;
    … …  
    8181}
    8282
    83 static void pci_null_debug(char *msg UNUSED, ...)
     83static void pci_null_debug(const char *msg UNUSED, ...)
    8484{
    8585}

  • uspace/lib/libpci/internal.h

    r2e99277 raa85487  
    1313
    1414struct pci_methods {
    15         char *name;
     15        const char *name;
    1616        void (*config) (struct pci_access *);
    1717        int (*detect) (struct pci_access *);

  • uspace/lib/libpci/names.c

    r2e99277 raa85487  
    299299}
    300300
    301 char *pci_lookup_name(struct pci_access *a, char *buf, int size, int flags,
     301const char *pci_lookup_name(struct pci_access *a, char *buf, int size, int flags,
    302302                      ...)
    303303{

  • uspace/lib/libpci/pci.h

    r2e99277 raa85487  
    4040
    4141        /* Functions you can override: */
    42         void (*error) (char *msg, ...); /* Write error message and quit */
    43         void (*warning) (char *msg, ...);       /* Write a warning message */
    44         void (*debug) (char *msg, ...); /* Write a debugging message */
     42        void (*error) (const char *msg, ...);   /* Write error message and quit */
     43        void (*warning) (const char *msg, ...); /* Write a warning message */
     44        void (*debug) (const char *msg, ...);   /* Write a debugging message */
    4545
    4646        struct pci_dev *devices;        /* Devices found on this bus */
    … …  
    128128 */
    129129
    130 char *pci_lookup_name(struct pci_access *a, char *buf, int size, int flags,
    131                       ...);
     130const char *pci_lookup_name(struct pci_access *a, char *buf, int size,
     131    int flags, ...);
    132132
    133133int pci_load_name_list(struct pci_access *a);   /* Called automatically by pci_lookup_*() when needed; returns success */

  • uspace/lib/libpci/pci_ids.h

    r2e99277 raa85487  
    11/* DO NOT EDIT, THIS FILE IS AUTOMATICALLY GENERATED */
    2 char *pci_ids[] = {
     2const char *pci_ids[] = {
    33"0000  Gammagraphx, Inc.",
    44"001a  Ascend Communications, Inc.",
Note: See TracChangeset for help on using the changeset viewer.