← 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/bus/sparcPci.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/bus/sparcPci.c
592
592
 
593
593
#ifndef INCLUDE_XF86_NO_DOMAIN
594
594
 
595
 
int
 
595
_X_EXPORT int
596
596
xf86GetPciDomain(PCITAG Tag)
597
597
{
598
598
    return PCI_DOM_FROM_TAG(Tag);
599
599
}
600
600
 
601
 
pointer
 
601
_X_EXPORT pointer
602
602
xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag,
603
603
                    ADDRESS Base, unsigned long Size)
604
604
{
622
622
    return result;
623
623
}
624
624
 
625
 
IOADDRESS
 
625
_X_EXPORT IOADDRESS
626
626
xf86MapDomainIO(int ScreenNum, int Flags, PCITAG Tag,
627
627
                IOADDRESS Base, unsigned long Size)
628
628
{
649
649
    return (IOADDRESS)pDomain->io + Base;
650
650
}
651
651
 
652
 
int
 
652
_X_EXPORT int
653
653
xf86ReadDomainMemory(PCITAG Tag, ADDRESS Base, int Len, unsigned char *Buf)
654
654
{
655
655
    unsigned char *ptr, *src;