← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox-ose/vivid

« back to all changes in this revision

Viewing changes to src/VBox/Additions/x11/x11include/4.2/programs/Xserver/hw/xfree86/common/xf86Resources.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-09-14 18:25:07 UTC
  • mfrom: (0.4.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090914182507-c98g07mq16hjmn6d
Tags: 3.0.6-dfsg-1ubuntu1
https://launchpad.net/bugs/429697
https://launchpad.net/bugs/267097
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/379878
* Merge from debian unstable (LP: #429697), remaining changes:
  - Enable DKMS support on virtualbox host and guest modules (LP: #267097)
    - Drop virtualbox-ose{-guest,}-modules-* package templates
    - Recommend *-source instead of *-modules packages
    - Replace error messages related to missing/mismatched
      kernel module accordingly
  - Autoload kernel module
    - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default
  - Disable update action
    - patches/u01-disable-update-action.dpatch
  - Virtualbox should go in Accessories, not in System tools (LP: #288590)
    - virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add apport hook
    - virtualbox-ose.files/source_virtualbox-ose.py
    - virtualbox-ose.install
  - Add launchpad integration
    - control
    - lpi-bug.xpm
    - patches/u02-lp-integration.dpatch
  - virtualbox, virtualbox-* (names of the upstream proprietary packages)
    conflict with virtualbox-ose (LP: #379878)
* Make debug package depend on normal or guest utils package
* Drop patches/22-pulseaudio-stubs.dpatch (applied upstream)
* Rename Ubuntu specific patches to uXX-*.dpatch
* Fix lintian warnings in maintainer scripts

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/x11/x11include/4.2/programs/Xserver/hw/xfree86/common/xf86Resources.h
1
 
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Resources.h,v 1.13 2001/06/01 18:43:49 tsi Exp $ */
2
 
 
3
 
#ifndef _XF86_RESOURCES_H
4
 
 
5
 
#define _XF86_RESOURCES_H
6
 
 
7
 
#include "xf86str.h"
8
 
 
9
 
#define _END {ResEnd,0,0}
10
 
 
11
 
#define _VGA_EXCLUSIVE \
12
 
                {ResExcMemBlock | ResBios | ResBus, 0x000A0000, 0x000AFFFF},\
13
 
                {ResExcMemBlock | ResBios | ResBus, 0x000B0000, 0x000B7FFF},\
14
 
                {ResExcMemBlock | ResBios | ResBus, 0x000B8000, 0x000BFFFF},\
15
 
                {ResExcIoBlock  | ResBios | ResBus,     0x03B0,     0x03BB},\
16
 
                {ResExcIoBlock  | ResBios | ResBus,     0x03C0,     0x03DF}
17
 
 
18
 
#define _VGA_SHARED \
19
 
                {ResShrMemBlock | ResBios | ResBus, 0x000A0000, 0x000AFFFF},\
20
 
                {ResShrMemBlock | ResBios | ResBus, 0x000B0000, 0x000B7FFF},\
21
 
                {ResShrMemBlock | ResBios | ResBus, 0x000B8000, 0x000BFFFF},\
22
 
                {ResShrIoBlock  | ResBios | ResBus,     0x03B0,     0x03BB},\
23
 
                {ResShrIoBlock  | ResBios | ResBus,     0x03C0,     0x03DF}
24
 
 
25
 
#define _VGA_SHARED_MEM \
26
 
                {ResShrMemBlock | ResBios | ResBus, 0x000A0000, 0x000AFFFF},\
27
 
                {ResShrMemBlock | ResBios | ResBus, 0x000B0000, 0x000B7FFF},\
28
 
                {ResShrMemBlock | ResBios | ResBus, 0x000B8000, 0x000BFFFF}
29
 
 
30
 
#define _VGA_SHARED_IO \
31
 
                {ResShrIoBlock  | ResBios | ResBus,     0x03B0,     0x03BB},\
32
 
                {ResShrIoBlock  | ResBios | ResBus,     0x03C0,     0x03DF}
33
 
 
34
 
/*
35
 
 * Exclusive unused VGA:  resources unneeded but cannot be disabled.
36
 
 * Like old Millennium.
37
 
 */
38
 
#define _VGA_EXCLUSIVE_UNUSED \
39
 
        {ResExcUusdMemBlock | ResBios | ResBus, 0x000A0000, 0x000AFFFF},\
40
 
        {ResExcUusdMemBlock | ResBios | ResBus, 0x000B0000, 0x000B7FFF},\
41
 
        {ResExcUusdMemBlock | ResBios | ResBus, 0x000B8000, 0x000BFFFF},\
42
 
        {ResExcUusdIoBlock  | ResBios | ResBus,     0x03B0,     0x03BB},\
43
 
        {ResExcUusdIoBlock  | ResBios | ResBus,     0x03C0,     0x03DF}
44
 
 
45
 
/*
46
 
 * Shared unused VGA:  resources unneeded but cannot be disabled
47
 
 * independently.  This is used to determine if a device needs RAC.
48
 
 */
49
 
#define _VGA_SHARED_UNUSED \
50
 
        {ResShrUusdMemBlock | ResBios | ResBus, 0x000A0000, 0x000AFFFF},\
51
 
        {ResShrUusdMemBlock | ResBios | ResBus, 0x000B0000, 0x000B7FFF},\
52
 
        {ResShrUusdMemBlock | ResBios | ResBus, 0x000B8000, 0x000BFFFF},\
53
 
        {ResShrUusdIoBlock  | ResBios | ResBus,     0x03B0,     0x03BB},\
54
 
        {ResShrUusdIoBlock  | ResBios | ResBus,     0x03C0,     0x03DF}
55
 
 
56
 
/*
57
 
 * Sparse versions of the above for those adapters that respond to all ISA
58
 
 * aliases of VGA ports.
59
 
 */
60
 
#define _VGA_EXCLUSIVE_SPARSE \
61
 
        {ResExcMemBlock | ResBios | ResBus, 0x000A0000, 0x000AFFFF},\
62
 
        {ResExcMemBlock | ResBios | ResBus, 0x000B0000, 0x000B7FFF},\
63
 
        {ResExcMemBlock | ResBios | ResBus, 0x000B8000, 0x000BFFFF},\
64
 
        {ResExcIoSparse | ResBios | ResBus,     0x03B0,     0x03F8},\
65
 
        {ResExcIoSparse | ResBios | ResBus,     0x03B8,     0x03FC},\
66
 
        {ResExcIoSparse | ResBios | ResBus,     0x03C0,     0x03E0}
67
 
 
68
 
#define _VGA_SHARED_SPARSE \
69
 
        {ResShrMemBlock | ResBios | ResBus, 0x000A0000, 0x000AFFFF},\
70
 
        {ResShrMemBlock | ResBios | ResBus, 0x000B0000, 0x000B7FFF},\
71
 
        {ResShrMemBlock | ResBios | ResBus, 0x000B8000, 0x000BFFFF},\
72
 
        {ResShrIoSparse | ResBios | ResBus,     0x03B0,     0x03F8},\
73
 
        {ResShrIoSparse | ResBios | ResBus,     0x03B8,     0x03FC},\
74
 
        {ResShrIoSparse | ResBios | ResBus,     0x03C0,     0x03E0}
75
 
 
76
 
#define _8514_EXCLUSIVE \
77
 
        {ResExcIoSparse | ResBios | ResBus, 0x02E8, 0x03F8}
78
 
 
79
 
#define _8514_SHARED \
80
 
        {ResShrIoSparse | ResBios | ResBus, 0x02E8, 0x03F8}
81
 
 
82
 
/* predefined resources */
83
 
extern resRange resVgaExclusive[];
84
 
extern resRange resVgaShared[];
85
 
extern resRange resVgaIoShared[];
86
 
extern resRange resVgaMemShared[];
87
 
extern resRange resVgaUnusedExclusive[];
88
 
extern resRange resVgaUnusedShared[];
89
 
extern resRange resVgaSparseExclusive[];
90
 
extern resRange resVgaSparseShared[];
91
 
extern resRange res8514Exclusive[];
92
 
extern resRange res8514Shared[];
93
 
 
94
 
/* Less misleading aliases for xf86SetOpratingState() */
95
 
#define resVgaMem resVgaMemShared
96
 
#define resVgaIo  resVgaIoShared
97
 
 
98
 
/* old style names */
99
 
#define RES_EXCLUSIVE_VGA   resVgaExclusive
100
 
#define RES_SHARED_VGA      resVgaShared
101
 
#define RES_EXCLUSIVE_8514  res8514Exclusive
102
 
#define RES_SHARED_8514     res8514Shared
103
 
 
104
 
#define _PCI_AVOID_PC_STYLE \
105
 
        {ResExcIoSparse | ResBus, 0x0100, 0x0300},\
106
 
        {ResExcIoSparse | ResBus, 0x0200, 0x0200},\
107
 
        {ResExcMemBlock | ResBus, 0xA0000,0xFFFFF}
108
 
 
109
 
extern resRange PciAvoid[];
110
 
 
111
 
#define RES_UNDEFINED NULL
112
 
#endif