Ignore:
Timestamp:
2013-05-27T13:18:13Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f2c19b0
Parents:
d120133 (diff), c90aed4 (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:
1 edited

Legend:

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

    rd120133 r192565b  
    9595#define PCI_BRIDGE_CTL                  0x3E
    9696
     97/* PCI command flags */
     98#define PCI_COMMAND_IO            0x001
     99#define PCI_COMMAND_MEMORY        0x002
     100#define PCI_COMMAND_MASTER        0x004
     101#define PCI_COMMAND_SPECIAL       0x008
     102#define PCI_COMMAND_INVALIDATE    0x010
     103#define PCI_COMMAND_VGA_PALETTE   0x020
     104#define PCI_COMMAND_PARITY        0x040
     105#define PCI_COMMAND_WAIT          0x080
     106#define PCI_COMMAND_SERR          0x100
     107#define PCI_COMMAND_FAST_BACK     0x200
     108#define PCI_COMMAND_INTX_DISABLE  0x400
     109
    97110#endif
    98111
Note: See TracChangeset for help on using the changeset viewer.