Purge ForceDevice option - unneeded.

We're smart enough to detect if the device is running off a serial port or
off a USB port. The only thing we did with the ForceDevice option was to set
it once (based on a serial ioctl) and then check for it later during the
BaudRate xorg.conf option parsing.

Get rid of the field, parse the BaudRate for all devices even though we
don't actually care about it in the USB code. So setting an invalid baud
rate for a USB device will fail the device init but then again - don't do
that.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

6 files changed, 11 insertions, 31 deletions

diff --git a/conf/50-wacom.conf b/conf/50-wacom.conf
index 39abdf2..ce49613 100644
--- a/conf/50-wacom.conf
+++ b/conf/50-wacom.conf
@@ -12,14 +12,12 @@ Section "InputClass"
 	Identifier "Wacom serial class"
 	MatchProduct "Serial Wacom Tablet"
 	Driver "wacom"
-	Option "ForceDevice" "ISDV4"
 EndSection
 
 Section "InputClass"
         Identifier "Wacom serial class identifiers"
         MatchProduct "WACf|FUJ02e5|FUJ02e7"
         Driver "wacom"
-        Option "ForceDevice" "ISDV4"
 EndSection
 
 
diff --git a/conf/wacom.fdi b/conf/wacom.fdi
index 5c71563..984eaf9 100644
--- a/conf/wacom.fdi
+++ b/conf/wacom.fdi
@@ -11,7 +11,6 @@
       <match key="@info.parent:pnp.id" contains_outof="WACf;FUJ02e5;FUJ02e7">
 	<append key="info.capabilities" type="strlist">input</append>
 	<merge key="input.x11_driver" type="string">wacom</merge>
-	<merge key="input.x11_options.ForceDevice" type="string">ISDV4</merge>
 	<merge key="input.device" type="copy_property">serial.device</merge>
       </match>
     </match>
diff --git a/man/wacom.man b/man/wacom.man
index 6870fb2..4b4a90f 100644
--- a/man/wacom.man
+++ b/man/wacom.man
@@ -51,11 +51,6 @@ the tablet is plugged.  You have to specify it for each subsection with
 the same value if you want to have multiple devices with the same tablet.
 This option is mandatory.
 .TP 4
-.B Option \fI"ForceDevice"\fP \fI"ISDV4"\fP
-tells the driver to dialog with the tablet the serial Tablet PC way.  It 
-is a special Wacom IV protocol, called ISDV4 protocol.  This option is 
-mandatory for serial Tablet PCs only.
-.TP 4
 .B Option \fI"Suppress"\fP \fI"number"\fP
 sets the position increment under which not to transmit coordinates.
 This entry must be specified only in the first Wacom subsection if you have
diff --git a/src/wcmISDV4.c b/src/wcmISDV4.c
index d341a22..61275d2 100644
--- a/src/wcmISDV4.c
+++ b/src/wcmISDV4.c
@@ -144,8 +144,6 @@ static int wcmSerialValidate(LocalDevicePtr local, const unsigned char* data)
 
 static Bool isdv4Detect(LocalDevicePtr local)
 {
-	WacomDevicePtr priv = (WacomDevicePtr) local->private;
-	WacomCommonPtr common = priv->common;
 	struct serial_struct ser;
 	int rc;
 
@@ -153,9 +151,6 @@ static Bool isdv4Detect(LocalDevicePtr local)
 	if (rc == -1)
 		return FALSE;
 
-	/* only ISDV4 are supported on X server 1.7 and later */
-	common->wcmForceDevice = DEVICE_ISDV4;
-
 	return TRUE;
 }
 
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index b22738a..9defdfb 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -417,7 +417,7 @@ int wcmParseOptions(LocalDevicePtr local, int hotplugged)
 	WacomDevicePtr  priv = (WacomDevicePtr)local->private;
 	WacomCommonPtr  common = priv->common;
 	char            *s, b[12];
-	int		i, oldButton;
+	int		i, oldButton, baud;
 	WacomToolPtr    tool = NULL;
 	WacomToolAreaPtr area = NULL;
 
@@ -689,23 +689,19 @@ int wcmParseOptions(LocalDevicePtr local, int hotplugged)
 		priv->button[i] = xf86SetIntOption(local->options, b, priv->button[i]);
 	}
 
-	if (common->wcmForceDevice == DEVICE_ISDV4)
-        {
-		int val;
-		val = xf86SetIntOption(local->options, "BaudRate", 38400);
+	baud = xf86SetIntOption(local->options, "BaudRate", 38400);
 
-		switch(val)
-		{
-			case 38400:
-			case 19200:
-				common->wcmISDV4Speed = val;
-				break;
-			default:
-				xf86Msg(X_ERROR, "%s: Illegal speed value "
+	switch (baud)
+	{
+		case 38400:
+		case 19200:
+			common->wcmISDV4Speed = baud;
+			break;
+		default:
+			xf86Msg(X_ERROR, "%s: Illegal speed value "
 					"(must be 19200 or 38400).",
 					local->name);
-				break;
-		}
+			break;
 	}
 
 	s = xf86SetStrOption(local->options, "Twinview", NULL);
diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h
index 00f3fbc..e876331 100644
--- a/src/xf86WacomDefs.h
+++ b/src/xf86WacomDefs.h
@@ -352,8 +352,6 @@ extern WacomDeviceClass gWacomISDV4Device;
 #define USE_SYN_REPORTS_FLAG	8
 #define AUTODEV_FLAG		16
 
-#define DEVICE_ISDV4 		0x000C
-
 #define MAX_CHANNELS 2
 #define MAX_FINGERS  2
 
@@ -409,7 +407,6 @@ struct _WacomCommonRec
 	int wcmPktLength;            /* length of a packet */
 	int wcmProtocolLevel;        /* 4 for Wacom IV, 5 for Wacom V */
 	float wcmVersion;            /* ROM version */
-	int wcmForceDevice;          /* force device type (used by ISD V4) */
 	int wcmRotate;               /* rotate screen (for TabletPC) */
 	int wcmThreshold;            /* Threshold for button pressure */
 	WacomChannel wcmChannel[MAX_CHANNELS]; /* channel device state */