diff options
author | Adam Jackson <ajax@redhat.com> | 2018-08-27 15:02:50 -0400 |
---|---|---|
committer | Adam Jackson <ajax@nwnk.net> | 2018-09-12 20:47:15 +0000 |
commit | a2c1260958fb8b4ec81b9107c5d1ca222cc7d770 (patch) | |
tree | 812507c00059f4351966bbb82c38b23b74e26f4c /hw/xfree86 | |
parent | c7414f4d07b69a4b2f0d0af06f032393cf5fe6aa (diff) |
xfree86: Remove vestigial lastScrnFlag
Only the mga XAA code ever set this (hence the compat macro), since XAA
is long gone this can go too.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'hw/xfree86')
-rw-r--r-- | hw/xfree86/common/xf86.h | 4 | ||||
-rw-r--r-- | hw/xfree86/common/xf86Bus.c | 19 | ||||
-rw-r--r-- | hw/xfree86/common/xf86Bus.h | 1 |
3 files changed, 2 insertions, 22 deletions
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index cb8190c95..8d0cb0532 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -155,8 +155,8 @@ extern _X_EXPORT EntityInfoPtr xf86GetEntityInfo(int entityIndex); extern _X_EXPORT Bool xf86IsEntityPrimary(int entityIndex); extern _X_EXPORT ScrnInfoPtr xf86FindScreenForEntity(int entityIndex); -extern _X_EXPORT int xf86GetLastScrnFlag(int entityIndex); -extern _X_EXPORT void xf86SetLastScrnFlag(int entityIndex, int scrnIndex); +#define xf86SetLastScrnFlag(e, s) do { } while (0) + extern _X_EXPORT Bool xf86IsEntityShared(int entityIndex); extern _X_EXPORT void xf86SetEntityShared(int entityIndex); extern _X_EXPORT Bool xf86IsEntitySharable(int entityIndex); diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 6bbf489ab..367feae46 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -553,25 +553,6 @@ xf86PostProbe(void) " for all framebuffer devices\n"); } -int -xf86GetLastScrnFlag(int entityIndex) -{ - if (entityIndex < xf86NumEntities) { - return xf86Entities[entityIndex]->lastScrnFlag; - } - else { - return -1; - } -} - -void -xf86SetLastScrnFlag(int entityIndex, int scrnIndex) -{ - if (entityIndex < xf86NumEntities) { - xf86Entities[entityIndex]->lastScrnFlag = scrnIndex; - } -} - Bool xf86IsEntityShared(int entityIndex) { diff --git a/hw/xfree86/common/xf86Bus.h b/hw/xfree86/common/xf86Bus.h index 52b497af6..0d44a8a61 100644 --- a/hw/xfree86/common/xf86Bus.h +++ b/hw/xfree86/common/xf86Bus.h @@ -51,7 +51,6 @@ typedef struct { Bool active; Bool inUse; BusRec bus; - int lastScrnFlag; DevUnion *entityPrivates; int numInstances; GDevPtr *devices; |