← Back to branch summary

~ubuntu-branches/ubuntu/quantal/xorg-server/quantal-proposed

« back to all changes in this revision

Viewing changes to hw/xfree86/os-support/xf86OSpriv.h

  • Committer: Package Import Robot
  • Author(s): Bryce Harrington, Maarten Lankhorst, Bryce Harrington
  • Date: 2012-06-04 19:12:23 UTC
  • mfrom: (0.11.40 sid)
  • Revision ID: package-import@ubuntu.com-20120604191223-7gt8pm5dtw7k340f
Tags: 2:1.12.1.902-1ubuntu1
[ Maarten Lankhorst ]
* Refresh patches to apply on x-server 1.12
  - patch-x-indent.sh from xorg-pkg-tools was used to redo coding style
* Deleted following patches because they have been committed upstream
  - 224_return_BadWindow_not_BadMatch.diff
  - 225_non-root_config_paths.patch
  - 505_query_pointer_touchscreen.patch
  - 506_touchscreen_pointer_emulation_checks.patch
  - 507_touchscreen_fixes.patch
* Non-trivial refresh of 500_pointer_barrier_thresholds.diff, based on 
  xorg-edgers
* Rest was refreshed with patch-x-indent.sh to survive coding style changes
* Add upstream patches for proper device disabling:
  - 510-dix-return-early-from-DisableDevice-if-the-device-is.patch
  - 511-dix-move-freeing-the-sprite-into-a-function.patch
  - 512-dix-free-the-sprite-when-disabling-the-device.patch
  - 513-dix-disable-non-sprite-owners-first-when-disabling-p.patch
  - 514-Xi-drop-forced-unpairing-when-changing-the-hierarchy.patch
  - 515-dix-disable-all-devices-before-shutdown.patch

[ Bryce Harrington ]
* Drop 209_add_legacy_bgnone_option.patch: lightdm and other *dm's have
  switched to the new standard -background option.  No need to continue
  providing the legacy -nr synonym.
* Drop 201_report-real-dpi.patch:  Commented out in series.
* Drop 198_nohwaccess.patch: Rootless-X no longer a development focus
  for us; the patch would need reworked anyway to provide proper
  support.
* Drop 166_nullptr_xinerama_keyrepeat.patch: Fixed differently upstream
  in commit 24e682d0, as verified by original reporter.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xfree86/os-support/xf86OSpriv.h
32
32
#ifndef _XF86OSPRIV_H
33
33
#define _XF86OSPRIV_H
34
34
 
35
 
typedef pointer (*MapMemProcPtr)(int, unsigned long, unsigned long, int);
36
 
typedef void (*UnmapMemProcPtr)(int, pointer, unsigned long);
37
 
typedef pointer (*SetWCProcPtr)(int, unsigned long, unsigned long, Bool,
38
 
                                MessageType);
39
 
typedef void (*ProtectMemProcPtr)(int, pointer, unsigned long, Bool); 
40
 
typedef void (*UndoWCProcPtr)(int, pointer);
41
 
typedef void (*ReadSideEffectsProcPtr)(int, pointer, unsigned long);
 
35
typedef pointer (*MapMemProcPtr) (int, unsigned long, unsigned long, int);
 
36
typedef void (*UnmapMemProcPtr) (int, pointer, unsigned long);
 
37
typedef pointer (*SetWCProcPtr) (int, unsigned long, unsigned long, Bool,
 
38
                                 MessageType);
 
39
typedef void (*ProtectMemProcPtr) (int, pointer, unsigned long, Bool);
 
40
typedef void (*UndoWCProcPtr) (int, pointer);
 
41
typedef void (*ReadSideEffectsProcPtr) (int, pointer, unsigned long);
42
42
 
43
43
typedef struct {
44
 
        Bool                    initialised;
45
 
        MapMemProcPtr           mapMem;
46
 
        UnmapMemProcPtr         unmapMem;
47
 
        ProtectMemProcPtr       protectMem;
48
 
        SetWCProcPtr            setWC;
49
 
        UndoWCProcPtr           undoWC;
50
 
        ReadSideEffectsProcPtr  readSideEffects;
51
 
        Bool                    linearSupported;
 
44
    Bool initialised;
 
45
    MapMemProcPtr mapMem;
 
46
    UnmapMemProcPtr unmapMem;
 
47
    ProtectMemProcPtr protectMem;
 
48
    SetWCProcPtr setWC;
 
49
    UndoWCProcPtr undoWC;
 
50
    ReadSideEffectsProcPtr readSideEffects;
 
51
    Bool linearSupported;
52
52
} VidMemInfo, *VidMemInfoPtr;
53
53
 
54
54
void xf86OSInitVidMem(VidMemInfoPtr);
55
55
 
56
 
#endif /* _XF86OSPRIV_H */
 
56
#endif                          /* _XF86OSPRIV_H */