Changeset 99c2c69e in mainline for uspace/drv/bus/pci/pciintel/pci.h


Ignore:
Timestamp:
2013-09-13T00:36:30Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
67fbd5e
Parents:
7f84430 (diff), 11d41be5 (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:

mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/pci/pciintel/pci.h

    r7f84430 r99c2c69e  
    4040#include "pci_regs.h"
    4141
    42 #define PCI_MAX_HW_RES 8
     42#define PCI_MAX_HW_RES 10
    4343
    4444typedef struct pciintel_bus {
    4545        /** DDF device node */
    4646        ddf_dev_t *dnode;
    47         uint32_t conf_io_addr;
    48         uint32_t conf_io_data;
    49         void *conf_data_port;
    50         void *conf_addr_port;
     47        ioport32_t *conf_addr_reg;
     48        ioport32_t *conf_data_reg;
     49        pio_window_t pio_win;
    5150        fibril_mutex_t conf_mutex;
    5251} pci_bus_t;
     
    6867        hw_resource_list_t hw_resources;
    6968        hw_resource_t resources[PCI_MAX_HW_RES];
     69        pio_window_t pio_window;
    7070} pci_fun_t;
    7171
Note: See TracChangeset for help on using the changeset viewer.