diff options
| author | Blair Sadewitz <blair.sadewitz@gmail.com> | 2007-08-19 20:29:22 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@bluenote.herrb.com> | 2007-08-19 20:29:22 +0200 |
| commit | 65a49f0ca198e0366175367729a101211388b16b (patch) | |
| tree | 3384877e332e2c2ea597e7e0b646c7c32690356f | |
| parent | 3c448b0eb67337b56641e09a6d168aad6745e3ef (diff) | |
Autoconfiguration of wsmouse for NetBSD.
| -rw-r--r-- | hw/xfree86/os-support/bsd/bsd_mouse.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/xfree86/os-support/bsd/bsd_mouse.c b/hw/xfree86/os-support/bsd/bsd_mouse.c index 21fe1ff18..ca2c1bbd5 100644 --- a/hw/xfree86/os-support/bsd/bsd_mouse.c +++ b/hw/xfree86/os-support/bsd/bsd_mouse.c @@ -83,7 +83,7 @@ static const char *mouseDevs[] = { DEFAULT_PS2_DEV, NULL }; -#elif defined(__OpenBSD__) && defined(WSCONS_SUPPORT) +#elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT) /* Only wsmouse mices are autoconfigured for now on OpenBSD */ #define DEFAULT_WSMOUSE_DEV "/dev/wsmouse" #define DEFAULT_WSMOUSE0_DEV "/dev/wsmouse0" @@ -154,7 +154,7 @@ DefaultProtocol(void) { #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) return "Auto"; -#elif defined(__OpenBSD__) && defined(WSCONS_SUPPORT) +#elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT) return "WSMouse"; #else return NULL; @@ -340,7 +340,7 @@ FindDevice(InputInfoPtr pInfo, const char *protocol, int flags) } #endif -#if defined(__OpenBSD__) && defined(WSCONS_SUPPORT) +#if (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT) /* Only support wsmouse configuration for now */ static const char * @@ -381,7 +381,7 @@ FindDevice(InputInfoPtr pInfo, const char *protocol, int flags) } return *pdev; } -#endif /* __OpenBSD__ && WSCONS_SUPPORT */ +#endif /* __OpenBSD__ || __NetBSD__ && WSCONS_SUPPORT */ #ifdef WSCONS_SUPPORT #define NUMEVENTS 64 @@ -779,11 +779,11 @@ xf86OSMouseInit(int flags) p->SetBMRes = SetSysMouseRes; p->SetMiscRes = SetSysMouseRes; #endif -#if defined(__OpenBSD__) && defined(WSCONS_SUPPORT) +#if (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT) p->SetupAuto = SetupAuto; p->SetMiscRes = SetMouseRes; #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; #endif p->PreInit = bsdMousePreInit; |