View | Details | Raw Unified | Return to bug 625041
Collapse All | Expand All

(-)a/src/vmmouse.c (+21 lines)
Lines 65-70 Link Here
65
#include "xf86Xinput.h"
65
#include "xf86Xinput.h"
66
#include "xf86_OSproc.h"
66
#include "xf86_OSproc.h"
67
#include "xf86OSmouse.h"
67
#include "xf86OSmouse.h"
68
#include "xf86Priv.h"
68
#include "compiler.h"
69
#include "compiler.h"
69
70
70
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
71
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
Lines 320-325 Link Here
320
#endif
321
#endif
321
322
322
   /*
323
   /*
324
    * enable hardware access
325
    */
326
   if (!xorgHWAccess) {
327
      if (xf86EnableIO())
328
          xorgHWAccess = TRUE;
329
      else
330
          return NULL;
331
  }
332
333
   /*
323
    * try to enable vmmouse here
334
    * try to enable vmmouse here
324
    */
335
    */
325
   if (!VMMouseClient_Enable()) {
336
   if (!VMMouseClient_Enable()) {
Lines 380-385 Link Here
380
   VMMousePrivPtr mPriv = NULL;
391
   VMMousePrivPtr mPriv = NULL;
381
   int rc = Success;
392
   int rc = Success;
382
393
394
   /* Enable hardware access. */
395
   if (!xorgHWAccess) {
396
      if (xf86EnableIO())
397
          xorgHWAccess = TRUE;
398
      else {
399
          rc = BadValue;
400
          goto error;
401
      }
402
  }
403
383
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
404
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
384
   /* For ABI < 12, we need to return the wrapped driver's pInfo (see
405
   /* For ABI < 12, we need to return the wrapped driver's pInfo (see
385
    * above). ABI 12, we call NIDR and are done */
406
    * above). ABI 12, we call NIDR and are done */

Return to bug 625041