diff options
| author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2007-04-28 14:36:12 +0200 |
|---|---|---|
| committer | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2007-04-28 14:36:12 +0200 |
| commit | bda0ee988acbae97dc908574c1247cf1ceb5b3c9 (patch) | |
| tree | 21142a4cb4e5410e1d5f0bcdd6f641786b7c52ed | |
| parent | 2b88cc3642a94a58e777d8a931f7bbe9f16e9b93 (diff) | |
Make acecadUSB into a flag.
Introduce USB_FLAG for the flags field in AceCadPrivateRec to tell if we have a USB device or not, instead of having a separate acecadUSB field.
| -rw-r--r-- | src/acecad.c | 6 | ||||
| -rw-r--r-- | src/acecad.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/acecad.c b/src/acecad.c index 4685d68..783b2f1 100644 --- a/src/acecad.c +++ b/src/acecad.c @@ -394,7 +394,7 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags) #ifdef LINUX_INPUT if(IsUSBLine(local->fd)){ - priv->acecadUSB = 1; + priv->flags |= USB_FLAG; local->read_input = USBReadInput; @@ -406,7 +406,7 @@ AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags) } else #endif { - priv->acecadUSB = 0; + priv->flags &= ~USB_FLAG; local->read_input = ReadInput; @@ -549,7 +549,7 @@ DeviceOn (DeviceIntPtr dev) } - if (priv->acecadUSB == 0){ + if (!(priv->flags & USB_FLAG)) { priv->buffer = XisbNew(local->fd, 200); if (!priv->buffer) { diff --git a/src/acecad.h b/src/acecad.h index 713e2d2..acba153 100644 --- a/src/acecad.h +++ b/src/acecad.h @@ -57,6 +57,7 @@ #define COORD_BITS 0x7f #define ABSOLUTE_FLAG 1 +#define USB_FLAG 2 #define milisleep(ms) xf86usleep (ms * 1000) @@ -77,7 +78,6 @@ typedef struct int acecadMaxY; /* max Y value */ int acecadMaxZ; /* max Y value */ char acecadReportSpeed; /* report speed */ - int acecadUSB; /* USB flag*/ BOOL acecadAutoDev; /* are using auto-dev */ int flags; /* various flags */ int packeti; /* number of bytes read */ |