← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to hw/xfree86/os-support/shared/stdResource.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xfree86/os-support/shared/stdResource.c
56
56
#define xf86StdPciBusAccWindowsFromOS xf86PciBusAccWindowsFromOS
57
57
#define xf86StdIsaBusAccWindowsFromOS xf86IsaBusAccWindowsFromOS
58
58
 
59
 
resRange PciAvoid[] = {_PCI_AVOID_PC_STYLE, _END};
 
59
_X_EXPORT resRange PciAvoid[] = {_PCI_AVOID_PC_STYLE, _END};
60
60
#endif
61
61
 
62
62
#ifdef INCLUDE_XF86_NO_DOMAIN
150
150
    ret = xf86AddResToList(ret, &range, -1);
151
151
    RANGE(range, 0xfee00000, 0xfeefffff, ResExcMemBlock | ResBios);
152
152
    ret = xf86AddResToList(ret, &range, -1);
153
 
#endif
 
153
    /* airlied - remove BIOS range it shouldn't be here 
 
154
       this should use E820 - or THE OS */
154
155
    RANGE(range, 0xffe00000, 0xffffffff, ResExcMemBlock | ResBios);
155
156
    ret = xf86AddResToList(ret, &range, -1);
156
 
 
 
157
#endif
157
158
    /*
158
159
     * Fallback would be to claim well known ports in the 0x0 - 0x3ff range
159
160
     * along with their sparse I/O aliases, but that's too imprecise.  Instead