diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-06 11:04:47 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-06 12:58:39 +1000 |
| commit | b773b4e8e0087993406d1d8c2df895db4d6301ff (patch) | |
| tree | 1a48b476aceeef6b37e1ca472afef1446ae0a874 | |
| parent | 183c075d2f9d5f6effa1ce7ab135fb0c2e46085a (diff) | |
s/MAX_DEVICES/MAXDEVICES/ updates.
The number of input devices is MAXDEVICES, not MAX_DEVICES (f781a752e6)
Two comments updated to refer to MAXDEVICES.
MAX_FUNCS in sigio.c was set to 16 if MAX_DEVICES was undefined. If more
than 15 physical input devices were present, this could result in a
failure to install the SIGIO handler for any device above 15.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | hw/xfree86/os-support/shared/sigio.c | 6 | ||||
| -rw-r--r-- | include/inputstr.h | 2 | ||||
| -rw-r--r-- | mi/midispcur.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c index 5ba0b7e1c..44136ccfb 100644 --- a/hw/xfree86/os-support/shared/sigio.c +++ b/hw/xfree86/os-support/shared/sigio.c @@ -75,11 +75,11 @@ # define O_ASYNC FASYNC #endif -#ifdef MAX_DEVICES -/* MAX_DEVICES represents the maximimum number of input devices usable +#ifdef MAXDEVICES +/* MAXDEVICES represents the maximimum number of input devices usable * at the same time plus one entry for DRM support. */ -# define MAX_FUNCS (MAX_DEVICES + 1) +# define MAX_FUNCS (MAXDEVICES + 1) #else # define MAX_FUNCS 16 #endif diff --git a/include/inputstr.h b/include/inputstr.h index b284ea4e9..73750e0e3 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -119,7 +119,7 @@ typedef struct _InputClients { * OtherInputMasks struct and exactly one InputClients struct hanging off * inputClients. Each further client appends to the inputClients list. * Each Mask field is per-device, with the device id as the index. - * Exception: for non-device events (Presence events), the MAX_DEVICES + * Exception: for non-device events (Presence events), the MAXDEVICES * deviceid is used. */ typedef struct _OtherInputMasks { diff --git a/mi/midispcur.c b/mi/midispcur.c index 7b3ce292e..3fb7e02b5 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -51,7 +51,7 @@ in this Software without prior written authorization from The Open Group. # include "picturestr.h" #endif -# include "inputstr.h" /* for MAX_DEVICES */ +# include "inputstr.h" /* per-screen private data */ static int miDCScreenKeyIndex; |