← 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/solaris/sun_vid.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/solaris/sun_vid.c
46
46
 
47
47
char *apertureDevName = NULL;
48
48
 
49
 
Bool
 
49
_X_EXPORT Bool
50
50
xf86LinearVidMem(void)
51
51
{
52
52
        int     mmapFd;
76
76
        return TRUE;
77
77
}
78
78
 
79
 
pointer
 
79
_X_EXPORT pointer
80
80
xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size)
81
81
{
82
82
        pointer base;
139
139
}
140
140
 
141
141
/* ARGSUSED */
142
 
void
 
142
_X_EXPORT void
143
143
xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
144
144
{
145
145
        munmap(Base, Size);
153
153
static Bool ExtendedEnabled = FALSE;
154
154
#endif
155
155
 
156
 
Bool
 
156
_X_EXPORT Bool
157
157
xf86EnableIO(void)
158
158
{
159
159
#if defined(i386) || defined(__x86)
169
169
        return TRUE;
170
170
}
171
171
 
172
 
void
 
172
_X_EXPORT void
173
173
xf86DisableIO(void)
174
174
{
175
175
#if defined(i386) || defined(__x86)
187
187
/* Interrupt Handling section                                              */
188
188
/***************************************************************************/
189
189
 
190
 
Bool xf86DisableInterrupts(void)
 
190
_X_EXPORT Bool xf86DisableInterrupts(void)
191
191
{
192
192
#if defined(i386) || defined(__x86)
193
193
        if (!ExtendedEnabled && (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0))
206
206
        return TRUE;
207
207
}
208
208
 
209
 
void xf86EnableInterrupts(void)
 
209
_X_EXPORT void xf86EnableInterrupts(void)
210
210
{
211
211
#if defined(i386) || defined(__x86)
212
212
        if (!ExtendedEnabled && (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0))
223
223
#endif /* i386 */
224
224
}
225
225
 
226
 
void
 
226
_X_EXPORT void
227
227
xf86MapReadSideEffects(int ScreenNum, int Flags, pointer Base,
228
228
        unsigned long Size)
229
229
{
230
230
}
231
231
 
232
 
Bool
 
232
_X_EXPORT Bool
233
233
xf86CheckMTRR(int ScreenNum)
234
234
{
235
235
        return FALSE;