Changeset 20a9b85 in mainline for pci/libpci/pci.h


Ignore:
Timestamp:
2006-05-09T10:55:02Z (19 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
46ec2c06
Parents:
4a7c273
Message:

Change libpci coding style.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • pci/libpci/pci.h

    r4a7c273 r20a9b85  
    2424
    2525enum pci_access_type {
    26   /* Known access methods, remember to update access.c as well */
    27   PCI_ACCESS_I386_TYPE1,                /* i386 ports, type 1 (params: none) */
    28   PCI_ACCESS_I386_TYPE2,                /* i386 ports, type 2 (params: none) */
    29   PCI_ACCESS_MAX
     26        /* Known access methods, remember to update access.c as well */
     27        PCI_ACCESS_I386_TYPE1,  /* i386 ports, type 1 (params: none) */
     28        PCI_ACCESS_I386_TYPE2,  /* i386 ports, type 2 (params: none) */
     29        PCI_ACCESS_MAX
    3030};
    3131
    3232struct pci_access {
    33   /* Options you can change: */
    34   unsigned int method;                  /* Access method */
    35   char *method_params[PCI_ACCESS_MAX];  /* Parameters for the methods */
    36   int writeable;                        /* Open in read/write mode */
    37   int buscentric;                       /* Bus-centric view of the world */
    38   int numeric_ids;                      /* Don't resolve device IDs to names */
    39   int debugging;                        /* Turn on debugging messages */
     33        /* Options you can change: */
     34        unsigned int method;    /* Access method */
     35        char *method_params[PCI_ACCESS_MAX];    /* Parameters for the methods */
     36        int writeable;          /* Open in read/write mode */
     37        int buscentric;         /* Bus-centric view of the world */
     38        int numeric_ids;        /* Don't resolve device IDs to names */
     39        int debugging;          /* Turn on debugging messages */
    4040
    41   /* 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 */
     41        /* 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 */
    4545
    46   struct pci_dev *devices;              /* Devices found on this bus */
     46        struct pci_dev *devices;        /* Devices found on this bus */
    4747
    48   /* Fields used internally: */
    49   struct pci_methods *methods;
    50   struct id_entry **id_hash;            /* names.c */
    51   struct id_bucket *current_id_bucket;
    52   int fd;                               /* proc: fd */
    53   int fd_rw;                            /* proc: fd opened read-write */
    54   struct pci_dev *cached_dev;           /* proc: device the fd is for */
    55   int fd_pos;                           /* proc: current position */
     48        /* Fields used internally: */
     49        struct pci_methods *methods;
     50        struct id_entry **id_hash;      /* names.c */
     51        struct id_bucket *current_id_bucket;
     52        int fd;                 /* proc: fd */
     53        int fd_rw;              /* proc: fd opened read-write */
     54        struct pci_dev *cached_dev;     /* proc: device the fd is for */
     55        int fd_pos;             /* proc: current position */
    5656};
    5757
    … …  
    6363/* Scanning of devices */
    6464void pci_scan_bus(struct pci_access *acc);
    65 struct pci_dev *pci_get_dev(struct pci_access *acc, int domain, int bus, int dev, int func); /* Raw access to specified device */
     65struct pci_dev *pci_get_dev(struct pci_access *acc, int domain, int bus, int dev, int func);    /* Raw access to specified device */
    6666void pci_free_dev(struct pci_dev *);
    6767
    … …  
    7171
    7272struct pci_dev {
    73   struct pci_dev *next;                 /* Next device in the chain */
    74   u16 domain;                           /* PCI domain (host bridge) */
    75   u8 bus, dev, func;                    /* Bus inside domain, device and function */
     73        struct pci_dev *next;   /* Next device in the chain */
     74        u16 domain;             /* PCI domain (host bridge) */
     75        u8 bus, dev, func;      /* Bus inside domain, device and function */
    7676
    77   /* These fields are set by pci_fill_info() */
    78   int known_fields;                     /* Set of info fields already known */
    79   u16 vendor_id, device_id;             /* Identity of the device */
    80   int irq;                              /* IRQ number */
    81   pciaddr_t base_addr[6];               /* Base addresses */
    82   pciaddr_t size[6];                    /* Region sizes */
    83   pciaddr_t rom_base_addr;              /* Expansion ROM base address */
    84   pciaddr_t rom_size;                   /* Expansion ROM size */
     77        /* These fields are set by pci_fill_info() */
     78        int known_fields;       /* Set of info fields already known */
     79        u16 vendor_id, device_id;       /* Identity of the device */
     80        int irq;                /* IRQ number */
     81        pciaddr_t base_addr[6]; /* Base addresses */
     82        pciaddr_t size[6];      /* Region sizes */
     83        pciaddr_t rom_base_addr;        /* Expansion ROM base address */
     84        pciaddr_t rom_size;     /* Expansion ROM size */
    8585
    86   /* Fields used internally: */
    87   struct pci_access *access;
    88   struct pci_methods *methods;
    89   u8 *cache;                            /* Cached config registers */
    90   int cache_len;
    91   int hdrtype;                          /* Cached low 7 bits of header type, -1 if unknown */
    92   void *aux;                            /* Auxillary data */
     86        /* Fields used internally: */
     87        struct pci_access *access;
     88        struct pci_methods *methods;
     89        u8 *cache;              /* Cached config registers */
     90        int cache_len;
     91        int hdrtype;            /* Cached low 7 bits of header type, -1 if unknown */
     92        void *aux;              /* Auxillary data */
    9393};
    9494
    … …  
    9696#define PCI_ADDR_MEM_MASK (~(pciaddr_t) 0xf)
    9797
    98 u8 pci_read_byte(struct pci_dev *, int pos); /* Access to configuration space */
     98u8 pci_read_byte(struct pci_dev *, int pos);    /* Access to configuration space */
    9999u16 pci_read_word(struct pci_dev *, int pos);
    100 u32  pci_read_long(struct pci_dev *, int pos);
    101 int pci_read_block(struct pci_dev *, int pos, u8 *buf, int len);
     100u32 pci_read_long(struct pci_dev *, int pos);
     101int pci_read_block(struct pci_dev *, int pos, u8 * buf, int len);
    102102int pci_write_byte(struct pci_dev *, int pos, u8 data);
    103103int pci_write_word(struct pci_dev *, int pos, u16 data);
    104104int pci_write_long(struct pci_dev *, int pos, u32 data);
    105 int pci_write_block(struct pci_dev *, int pos, u8 *buf, int len);
     105int pci_write_block(struct pci_dev *, int pos, u8 * buf, int len);
    106106
    107 int pci_fill_info(struct pci_dev *, int flags); /* Fill in device information */
     107int pci_fill_info(struct pci_dev *, int flags); /* Fill in device information */
    108108
    109109#define PCI_FILL_IDENT          1
    … …  
    114114#define PCI_FILL_RESCAN         0x10000
    115115
    116 void pci_setup_cache(struct pci_dev *, u8 *cache, int len);
     116void pci_setup_cache(struct pci_dev *, u8 * cache, int len);
    117117
    118118/*
    … …  
    121121
    122122struct pci_filter {
    123   int domain, bus, slot, func;                  /* -1 = ANY */
    124   int vendor, device;
     123        int domain, bus, slot, func;    /* -1 = ANY */
     124        int vendor, device;
    125125};
    126126
    … …  
    146146 */
    147147
    148 char *pci_lookup_name(struct pci_access *a, char *buf, int size, int flags, ...);
     148char *pci_lookup_name(struct pci_access *a, char *buf, int size, int flags,
     149                      ...);
    149150
    150151int pci_load_name_list(struct pci_access *a);   /* Called automatically by pci_lookup_*() when needed; returns success */
    … …  
    152153
    153154enum pci_lookup_mode {
    154   PCI_LOOKUP_VENDOR = 1,                /* Vendor name (args: vendorID) */
    155   PCI_LOOKUP_DEVICE = 2,                /* Device name (args: vendorID, deviceID) */
    156   PCI_LOOKUP_CLASS = 4,                 /* Device class (args: classID) */
    157   PCI_LOOKUP_SUBSYSTEM = 8,
    158   PCI_LOOKUP_PROGIF = 16,               /* Programming interface (args: classID, prog_if) */
    159   PCI_LOOKUP_NUMERIC = 0x10000,         /* Want only formatted numbers; default if access->numeric_ids is set */
    160   PCI_LOOKUP_NO_NUMBERS = 0x20000       /* Return NULL if not found in the database; default is to print numerically */
     155        PCI_LOOKUP_VENDOR = 1,  /* Vendor name (args: vendorID) */
     156        PCI_LOOKUP_DEVICE = 2,  /* Device name (args: vendorID, deviceID) */
     157        PCI_LOOKUP_CLASS = 4,   /* Device class (args: classID) */
     158        PCI_LOOKUP_SUBSYSTEM = 8,
     159        PCI_LOOKUP_PROGIF = 16, /* Programming interface (args: classID, prog_if) */
     160        PCI_LOOKUP_NUMERIC = 0x10000,   /* Want only formatted numbers; default if access->numeric_ids is set */
     161        PCI_LOOKUP_NO_NUMBERS = 0x20000 /* Return NULL if not found in the database; default is to print numerically */
    161162};
    162163
Note: See TracChangeset for help on using the changeset viewer.