← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Devices/Bus/PCIInternal.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Bus/PCIInternal.h
97
97
    /** Set if the specific device fun was requested by PDM.
98
98
     * If clear the device and it's functions can be relocated to satisfy the slot request of another device. */
99
99
    bool                            fRequestedDevFn;
100
 
    /** Flag whether the device is a pci-to-pci bridge. */
 
100
    /** Flag whether the device is a pci-to-pci bridge.
 
101
     * This is set prior to device registration.  */
101
102
    bool                            fPciToPciBridge;
102
103
    /** Current state of the IRQ pin of the device. */
103
104
    int32_t                         uIrqPinState;
114
115
} PCIDEVICEINT;
115
116
 
116
117
/* Indicate that PCIDEVICE::Int.s can be declared. */
117
 
#define __PCIDEVICEINT_DECLARED__
 
118
#define PCIDEVICEINT_DECLARED
118
119
 
119
120
#endif