frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Autoconfiguration of wsmouse for NetBSD.

This commit is contained in:
Blair Sadewitz 2007-08-19 20:29:22 +02:00 committed by Matthieu Herrb
parent 3c448b0eb6
commit 65a49f0ca1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xfree86/os-support/bsd/bsd_mouse.c
View File

@ -83,7 +83,7 @@ static const char *mouseDevs[] = {
DEFAULT_PS2_DEV, DEFAULT_PS2_DEV,
NULL NULL
}; };
#elif defined(__OpenBSD__) && defined(WSCONS_SUPPORT) #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
/* Only wsmouse mices are autoconfigured for now on OpenBSD */ /* Only wsmouse mices are autoconfigured for now on OpenBSD */
#define DEFAULT_WSMOUSE_DEV "/dev/wsmouse" #define DEFAULT_WSMOUSE_DEV "/dev/wsmouse"
#define DEFAULT_WSMOUSE0_DEV "/dev/wsmouse0" #define DEFAULT_WSMOUSE0_DEV "/dev/wsmouse0"
@ -154,7 +154,7 @@ DefaultProtocol(void)
{ {
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
return "Auto"; return "Auto";
#elif defined(__OpenBSD__) && defined(WSCONS_SUPPORT) #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
return "WSMouse"; return "WSMouse";
#else #else
return NULL; return NULL;
@ -340,7 +340,7 @@ FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
} }
#endif #endif
#if defined(__OpenBSD__) && defined(WSCONS_SUPPORT) #if (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
/* Only support wsmouse configuration for now */ /* Only support wsmouse configuration for now */
static const char * static const char *
@ -381,7 +381,7 @@ FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
} }
return *pdev; return *pdev;
} }
#endif /* __OpenBSD__ && WSCONS_SUPPORT */ #endif /* __OpenBSD__ || __NetBSD__ && WSCONS_SUPPORT */
#ifdef WSCONS_SUPPORT #ifdef WSCONS_SUPPORT
#define NUMEVENTS 64 #define NUMEVENTS 64
@ -779,11 +779,11 @@ xf86OSMouseInit(int flags)
p->SetBMRes = SetSysMouseRes; p->SetBMRes = SetSysMouseRes;
p->SetMiscRes = SetSysMouseRes; p->SetMiscRes = SetSysMouseRes;
#endif #endif
#if defined(__OpenBSD__) && defined(WSCONS_SUPPORT) #if (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
p->SetupAuto = SetupAuto; p->SetupAuto = SetupAuto;
p->SetMiscRes = SetMouseRes; p->SetMiscRes = SetMouseRes;
#endif #endif
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
p->FindDevice = FindDevice; p->FindDevice = FindDevice;
#endif #endif
p->PreInit = bsdMousePreInit; p->PreInit = bsdMousePreInit;