← 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/vidmem.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/vidmem.c
188
188
        }
189
189
}
190
190
 
191
 
pointer
 
191
_X_EXPORT pointer
192
192
xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size)
193
193
{
194
194
        pointer vbase = NULL;
234
234
        return vbase;
235
235
}
236
236
 
237
 
void
 
237
_X_EXPORT void
238
238
xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
239
239
{
240
240
        VidMapPtr vp;
261
261
        removeMapping(vp, mp);
262
262
}
263
263
 
264
 
Bool
 
264
_X_EXPORT Bool
265
265
xf86CheckMTRR(int ScreenNum)
266
266
{
267
267
        VidMapPtr vp = getVidMapRec(ScreenNum);
278
278
        return FALSE;
279
279
}
280
280
 
281
 
Bool
 
281
_X_EXPORT Bool
282
282
xf86LinearVidMem()
283
283
{
284
284
        xf86InitVidMem();
285
285
        return vidMemInfo.linearSupported;
286
286
}
287
287
 
288
 
void
 
288
_X_EXPORT void
289
289
xf86MapReadSideEffects(int ScreenNum, int Flags, pointer base,
290
290
                        unsigned long Size)
291
291
{