Changed tab size from 4 to the standard value 8. Reindented

code so that it still looks sane.

4 files changed, 1628 insertions, 1651 deletions

diff --git a/ps2comm.c b/ps2comm.c
index ae58a20..03515ad 100644
--- a/ps2comm.c
+++ b/ps2comm.c
@@ -79,22 +79,22 @@
 static Bool
 ps2_getbyte(int fd, byte *b)
 {
-	if(xf86WaitForInput(fd, 50000) > 0) {
-		if(xf86ReadSerial(fd, b, 1) != 1) {
+    if(xf86WaitForInput(fd, 50000) > 0) {
+	if(xf86ReadSerial(fd, b, 1) != 1) {
 #ifdef DEBUG
-			ErrorF("ps2_getbyte: No byte read\n");
+	    ErrorF("ps2_getbyte: No byte read\n");
 #endif
-			return !Success;
-		}
+	    return !Success;
+	}
 #ifdef DEBUG
-		ErrorF("ps2_getbyte: byte %02X read\n", *b);
+	ErrorF("ps2_getbyte: byte %02X read\n", *b);
 #endif
-		return Success;
-	}
+	return Success;
+    }
 #ifdef DEBUG
-	ErrorF("ps2_getbyte: timeout xf86WaitForInput\n");
+    ErrorF("ps2_getbyte: timeout xf86WaitForInput\n");
 #endif
-	return !Success;
+    return !Success;
 }
 
 /*
@@ -103,28 +103,28 @@ ps2_getbyte(int fd, byte *b)
 static Bool
 ps2_putbyte(int fd, byte b)
 {
-	byte ack;
+    byte ack;
 
-	if(xf86WriteSerial(fd, &b, 1) != 1) {
+    if(xf86WriteSerial(fd, &b, 1) != 1) {
 #ifdef DEBUG
-		ErrorF("ps2_putbyte: error xf86WriteSerial\n");
+	ErrorF("ps2_putbyte: error xf86WriteSerial\n");
 #endif
-		return !Success;
-	}
+	return !Success;
+    }
 #ifdef DEBUG
-	ErrorF("ps2_putbyte: byte %02X send\n", b);
+    ErrorF("ps2_putbyte: byte %02X send\n", b);
 #endif
-	/* wait for an ACK */
-	if(ps2_getbyte(fd, &ack) != Success) {
-		return !Success;
-	}
-	if(ack != PS2_ACK) {
+    /* wait for an ACK */
+    if(ps2_getbyte(fd, &ack) != Success) {
+	return !Success;
+    }
+    if(ack != PS2_ACK) {
 #ifdef DEBUG
-		ErrorF("ps2_putbyte: wrong acknowledge 0x%02x\n", ack);
+	ErrorF("ps2_putbyte: wrong acknowledge 0x%02x\n", ack);
 #endif
-		return !Success;
-	}
-	return Success;
+	return !Success;
+    }
+    return Success;
 }
 
 /*
@@ -136,20 +136,20 @@ ps2_putbyte(int fd, byte b)
 static Bool
 ps2_special_cmd(int fd, byte cmd)
 {
-	int i;
-
-	/* initialize with 'inert' command */
-	if(ps2_putbyte(fd, PS2_CMD_SET_SCALING_1_1) == Success)
-		/* send 4x 2-bits with set resolution command */
-		for (i=0; i<4; i++) {
-			if(((ps2_putbyte(fd, PS2_CMD_SET_RESOLUTION)) != Success) ||
-			   ((ps2_putbyte(fd, (cmd>>6)&0x3) != Success)))
-				return !Success;
-			cmd<<=2;
-		}
-	else
+    int i;
+
+    /* initialize with 'inert' command */
+    if(ps2_putbyte(fd, PS2_CMD_SET_SCALING_1_1) == Success)
+	/* send 4x 2-bits with set resolution command */
+	for (i=0; i<4; i++) {
+	    if(((ps2_putbyte(fd, PS2_CMD_SET_RESOLUTION)) != Success) ||
+	       ((ps2_putbyte(fd, (cmd>>6)&0x3) != Success)))
 		return !Success;
-	return Success;
+	    cmd<<=2;
+	}
+    else
+	return !Success;
+    return Success;
 }
 
 /*
@@ -159,9 +159,9 @@ static Bool
 ps2_send_cmd(int fd, byte c)
 {
 #ifdef DEBUG
-	ErrorF("send command: 0x%02X\n", c);
+    ErrorF("send command: 0x%02X\n", c);
 #endif
-	return(ps2_special_cmd(fd, c) || ps2_putbyte(fd, PS2_CMD_STATUS_REQUEST));
+    return(ps2_special_cmd(fd, c) || ps2_putbyte(fd, PS2_CMD_STATUS_REQUEST));
 }
 
 /*****************************************************************************
@@ -175,11 +175,11 @@ Bool
 synaptics_set_mode(int fd, byte mode)
 {
 #ifdef DEBUG
-	ErrorF("set mode byte to: 0x%02X\n", mode);
+    ErrorF("set mode byte to: 0x%02X\n", mode);
 #endif
-	return(ps2_special_cmd(fd, mode) ||
-	       ps2_putbyte(fd, PS2_CMD_SET_SAMPLE_RATE) ||
-	       ps2_putbyte(fd, 0x14));
+    return(ps2_special_cmd(fd, mode) ||
+	   ps2_putbyte(fd, PS2_CMD_SET_SAMPLE_RATE) ||
+	   ps2_putbyte(fd, 0x14));
 }
 
 /*
@@ -188,37 +188,37 @@ synaptics_set_mode(int fd, byte mode)
 Bool
 synaptics_reset(int fd)
 {
-	byte r[2];
+    byte r[2];
 
-	xf86FlushInput(fd);
+    xf86FlushInput(fd);
 #ifdef DEBUG
-	ErrorF("Reset the Touchpad...\n");
+    ErrorF("Reset the Touchpad...\n");
 #endif
-	if(ps2_putbyte(fd, PS2_CMD_RESET) != Success) {
+    if(ps2_putbyte(fd, PS2_CMD_RESET) != Success) {
 #ifdef DEBUG
-		ErrorF("...failed\n");
+	ErrorF("...failed\n");
 #endif
-		return !Success;
-	}
-	xf86WaitForInput(fd, 4000000);
-	if((ps2_getbyte(fd, &r[0]) == Success) &&
-	   (ps2_getbyte(fd, &r[1]) == Success)) {
-		if(r[0] == 0xAA && r[1] == 0x00) {
+	return !Success;
+    }
+    xf86WaitForInput(fd, 4000000);
+    if((ps2_getbyte(fd, &r[0]) == Success) &&
+       (ps2_getbyte(fd, &r[1]) == Success)) {
+	if(r[0] == 0xAA && r[1] == 0x00) {
 #ifdef DEBUG
-			ErrorF("...done\n");
+	    ErrorF("...done\n");
 #endif
-			return Success;
-		} else {
+	    return Success;
+	} else {
 #ifdef DEBUG
-			ErrorF("...failed. Wrong reset ack 0x%02x, 0x%02x\n", r[0], r[1]);
+	    ErrorF("...failed. Wrong reset ack 0x%02x, 0x%02x\n", r[0], r[1]);
 #endif
-			return !Success;
-		}
+	    return !Success;
 	}
+    }
 #ifdef DEBUG
-		ErrorF("...failed\n");
+    ErrorF("...failed\n");
 #endif
-	return !Success;
+    return !Success;
 }
 
 /*
@@ -228,29 +228,29 @@ synaptics_reset(int fd)
 Bool
 synaptics_model_id(int fd, unsigned long int *model_id)
 {
-	byte mi[3];
+    byte mi[3];
 
 #ifdef DEBUG
-	ErrorF("Read mode id...\n");
+    ErrorF("Read mode id...\n");
 #endif
 
-	if((ps2_send_cmd(fd, SYN_QUE_MODEL) == Success) &&
-	   (ps2_getbyte(fd, &mi[0]) == Success) &&
-	   (ps2_getbyte(fd, &mi[1]) == Success) &&
-   	   (ps2_getbyte(fd, &mi[2]) == Success)) {
-		*model_id = (mi[0]<<16) | (mi[1]<<8) | mi[2];
+    if((ps2_send_cmd(fd, SYN_QUE_MODEL) == Success) &&
+       (ps2_getbyte(fd, &mi[0]) == Success) &&
+       (ps2_getbyte(fd, &mi[1]) == Success) &&
+       (ps2_getbyte(fd, &mi[2]) == Success)) {
+	*model_id = (mi[0]<<16) | (mi[1]<<8) | mi[2];
 #ifdef DEBUG
-		ErrorF("mode-id %06X\n", *model_id);
+	ErrorF("mode-id %06X\n", *model_id);
 #endif
 #ifdef DEBUG
-		ErrorF("...done.\n");
+	ErrorF("...done.\n");
 #endif
-		return Success;
-	}
+	return Success;
+    }
 #ifdef DEBUG
-		ErrorF("...failed.\n");
+    ErrorF("...failed.\n");
 #endif
-	return !Success;
+    return !Success;
 }
 
 /*
@@ -260,45 +260,45 @@ synaptics_model_id(int fd, unsigned long int *model_id)
 Bool
 synaptics_capability(int fd, unsigned long int *capability, unsigned long int *ext_capab)
 {
-	byte cap[3];
+    byte cap[3];
 
 #ifdef DEBUG
-	ErrorF("Read capabilites...\n");
+    ErrorF("Read capabilites...\n");
 #endif
 
-	*ext_capab = 0;
-	if((ps2_send_cmd(fd, SYN_QUE_CAPABILITIES) == Success) &&
-	   (ps2_getbyte(fd, &cap[0]) == Success) &&
-	   (ps2_getbyte(fd, &cap[1]) == Success) &&
-	   (ps2_getbyte(fd, &cap[2]) == Success)) {
-		*capability = (cap[0]<<16) | (cap[1]<<8) | cap[2];
+    *ext_capab = 0;
+    if((ps2_send_cmd(fd, SYN_QUE_CAPABILITIES) == Success) &&
+       (ps2_getbyte(fd, &cap[0]) == Success) &&
+       (ps2_getbyte(fd, &cap[1]) == Success) &&
+       (ps2_getbyte(fd, &cap[2]) == Success)) {
+	*capability = (cap[0]<<16) | (cap[1]<<8) | cap[2];
 #ifdef DEBUG
-		ErrorF("capability %06X\n", *capability);
+	ErrorF("capability %06X\n", *capability);
 #endif
-		if(SYN_CAP_VALID(*capability)) {
-			if(SYN_EXT_CAP_REQUESTS(*capability)) {
-				if((ps2_send_cmd(fd, SYN_QUE_EXT_CAPAB) == Success) &&
-				   (ps2_getbyte(fd, &cap[0]) == Success) &&
-				   (ps2_getbyte(fd, &cap[1]) == Success) &&
-				   (ps2_getbyte(fd, &cap[2]) == Success)) {
-				  *ext_capab = (cap[0]<<16) | (cap[1]<<8) | cap[2];
+	if(SYN_CAP_VALID(*capability)) {
+	    if(SYN_EXT_CAP_REQUESTS(*capability)) {
+		if((ps2_send_cmd(fd, SYN_QUE_EXT_CAPAB) == Success) &&
+		   (ps2_getbyte(fd, &cap[0]) == Success) &&
+		   (ps2_getbyte(fd, &cap[1]) == Success) &&
+		   (ps2_getbyte(fd, &cap[2]) == Success)) {
+		    *ext_capab = (cap[0]<<16) | (cap[1]<<8) | cap[2];
 #ifdef DEBUG
-					ErrorF("ext-capability %06X\n", *ext_capab);
+		    ErrorF("ext-capability %06X\n", *ext_capab);
 #endif
-				} else {
-					ErrorF("synaptics says, that it has extended-capabilities, but I cannot read them.");
-				}
-			}
+		} else {
+		    ErrorF("synaptics says, that it has extended-capabilities, but I cannot read them.");
+		}
+	    }
 #ifdef DEBUG
-			ErrorF("...done.\n");
+	    ErrorF("...done.\n");
 #endif
-			return Success;
-		}
+	    return Success;
 	}
+    }
 #ifdef DEBUG
-	ErrorF("...failed.\n");
+    ErrorF("...failed.\n");
 #endif
-	return !Success;
+    return !Success;
 }
 
 /*
@@ -308,31 +308,31 @@ synaptics_capability(int fd, unsigned long int *capability, unsigned long int *e
 Bool
 synaptics_identify(int fd, unsigned long int *ident)
 {
-	byte id[3];
+    byte id[3];
 
 #ifdef DEBUG
-	ErrorF("Identify Touchpad...\n");
+    ErrorF("Identify Touchpad...\n");
 #endif
 
-	if((ps2_send_cmd(fd, SYN_QUE_IDENTIFY) == Success) &&
-	   (ps2_getbyte(fd, &id[0]) == Success) &&
-	   (ps2_getbyte(fd, &id[1]) == Success) &&
-	   (ps2_getbyte(fd, &id[2]) == Success)) {
-		*ident = (id[0]<<16) | (id[1]<<8) | id[2];
+    if((ps2_send_cmd(fd, SYN_QUE_IDENTIFY) == Success) &&
+       (ps2_getbyte(fd, &id[0]) == Success) &&
+       (ps2_getbyte(fd, &id[1]) == Success) &&
+       (ps2_getbyte(fd, &id[2]) == Success)) {
+	*ident = (id[0]<<16) | (id[1]<<8) | id[2];
 #ifdef DEBUG
-		ErrorF("ident %06X\n", *ident);
+	ErrorF("ident %06X\n", *ident);
 #endif
-		if(SYN_ID_IS_SYNAPTICS(*ident)) {
+	if(SYN_ID_IS_SYNAPTICS(*ident)) {
 #ifdef DEBUG
-			ErrorF("...done.\n");
+	    ErrorF("...done.\n");
 #endif
-			return Success;
-		}
+	    return Success;
 	}
+    }
 #ifdef DEBUG
-	ErrorF("...failed.\n");
+    ErrorF("...failed.\n");
 #endif
-	return !Success;
+    return !Success;
 }
 
 /*
@@ -341,71 +341,64 @@ synaptics_identify(int fd, unsigned long int *ident)
 Bool
 synaptics_read_mode(int fd, unsigned char *mode)
 {
-	byte modes[3];
+    byte modes[3];
 
 #ifdef DEBUG
-	ErrorF("Read mode byte...\n");
+    ErrorF("Read mode byte...\n");
 #endif
 
-	if((ps2_send_cmd(fd, SYN_QUE_MODES) == Success) &&
-	   (ps2_getbyte(fd, &modes[0]) == Success) &&
-	   (ps2_getbyte(fd, &modes[1]) == Success) &&
-	   (ps2_getbyte(fd, &modes[2]) == Success)) {
+    if((ps2_send_cmd(fd, SYN_QUE_MODES) == Success) &&
+       (ps2_getbyte(fd, &modes[0]) == Success) &&
+       (ps2_getbyte(fd, &modes[1]) == Success) &&
+       (ps2_getbyte(fd, &modes[2]) == Success)) {
 
-		*mode = modes[2];
+	*mode = modes[2];
 #ifdef DEBUG
-		ErrorF("modes byte %02X%02X%02X\n", modes[0], modes[1], modes[2]);
+	ErrorF("modes byte %02X%02X%02X\n", modes[0], modes[1], modes[2]);
 #endif
-		if((modes[0] == 0x3B) && (modes[1] == 0x47)) {
+	if((modes[0] == 0x3B) && (modes[1] == 0x47)) {
 #ifdef DEBUG
-			ErrorF("...done.\n");
+	    ErrorF("...done.\n");
 #endif
-			return Success;
-		}
+	    return Success;
 	}
+    }
 #ifdef DEBUG
-	ErrorF("...failed.\n");
+    ErrorF("...failed.\n");
 #endif
-	return !Success;
+    return !Success;
 }
 
 Bool
 SynapticsEnableDevice(int fd)
 {
-	return(ps2_putbyte(fd, PS2_CMD_ENABLE));
+    return(ps2_putbyte(fd, PS2_CMD_ENABLE));
 }
 
 Bool
 SynapticsDisableDevice(int fd)
 {
-	xf86FlushInput(fd);
-	return ps2_putbyte(fd, PS2_CMD_DISABLE);
+    xf86FlushInput(fd);
+    return ps2_putbyte(fd, PS2_CMD_DISABLE);
 }
 
 Bool
 QueryIsSynaptics(int fd)
 {
-	unsigned long id;
-	int i;
-
-	for (i = 0; i < 3; i++) {
-		if (SynapticsDisableDevice(fd) == Success)
-			break;
-	}
-
-	xf86WaitForInput(fd, 20000);
-	xf86FlushInput(fd);
-	if(synaptics_identify(fd, &id) == Success) {
-		return TRUE;
-	} else {
-		ErrorF("Query no Synaptics: %06X\n", id);
-		return FALSE;
-	}
+    unsigned long id;
+    int i;
+
+    for (i = 0; i < 3; i++) {
+	if (SynapticsDisableDevice(fd) == Success)
+	    break;
+    }
+
+    xf86WaitForInput(fd, 20000);
+    xf86FlushInput(fd);
+    if(synaptics_identify(fd, &id) == Success) {
+	return TRUE;
+    } else {
+	ErrorF("Query no Synaptics: %06X\n", id);
+	return FALSE;
+    }
 }
-
-/* Local Variables: */
-/* tab-width: 4 */
-/* End: */
-/*
- * vim: ts=4 sw=4 cindent
- */
diff --git a/synaptics.c b/synaptics.c
index 089da14..7f302c1 100644
--- a/synaptics.c
+++ b/synaptics.c
@@ -73,14 +73,14 @@
 #define MAX_UNSYNC_PACKETS 10				/* i.e. 10 to 60 bytes */
 
 typedef enum {
-	BOTTOM_EDGE = 1,
-	TOP_EDGE = 2,
-	LEFT_EDGE = 4,
-	RIGHT_EDGE = 8,
-	LEFT_BOTTOM_EDGE = BOTTOM_EDGE | LEFT_EDGE,
-	RIGHT_BOTTOM_EDGE = BOTTOM_EDGE | RIGHT_EDGE,
-	RIGHT_TOP_EDGE = TOP_EDGE | RIGHT_EDGE,
-	LEFT_TOP_EDGE = TOP_EDGE | LEFT_EDGE
+    BOTTOM_EDGE = 1,
+    TOP_EDGE = 2,
+    LEFT_EDGE = 4,
+    RIGHT_EDGE = 8,
+    LEFT_BOTTOM_EDGE = BOTTOM_EDGE | LEFT_EDGE,
+    RIGHT_BOTTOM_EDGE = BOTTOM_EDGE | RIGHT_EDGE,
+    RIGHT_TOP_EDGE = TOP_EDGE | RIGHT_EDGE,
+    LEFT_TOP_EDGE = TOP_EDGE | LEFT_EDGE
 } edge_type;
 
 #define MAX(a, b) (((a)>(b))?(a):(b))
@@ -104,38 +104,37 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags);
 
 
 InputDriverRec SYNAPTICS = {
-  1,
-  "synaptics",
-  NULL,
-  SynapticsPreInit,
-  /*SynapticsUnInit*/ NULL,
-  NULL,
-  0
+    1,
+    "synaptics",
+    NULL,
+    SynapticsPreInit,
+    /*SynapticsUnInit*/ NULL,
+    NULL,
+    0
 };
 
 #ifdef XFree86LOADER
 
-static XF86ModuleVersionInfo VersionRec =
-{
-	"synaptics",
-	MODULEVENDORSTRING,
-	MODINFOSTRING1,
-	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
-	1, 0, 0,
-	ABI_CLASS_XINPUT,
-	ABI_XINPUT_VERSION,
-	MOD_CLASS_XINPUT,
-	{0, 0, 0, 0}				/* signature, to be patched into the file by
-								 * a tool */
+static XF86ModuleVersionInfo VersionRec = {
+    "synaptics",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XF86_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_XINPUT,
+    ABI_XINPUT_VERSION,
+    MOD_CLASS_XINPUT,
+    {0, 0, 0, 0}				/* signature, to be patched into the file by
+						 * a tool */
 };
 
 
 static pointer
 SetupProc(pointer module, pointer options, int *errmaj, int *errmin)
 {
-	xf86AddInputDriver(&SYNAPTICS, module, 0);
-	return module;
+    xf86AddInputDriver(&SYNAPTICS, module, 0);
+    return module;
 }
 
 XF86ModuleData synapticsModuleData = {&VersionRec, &SetupProc, NULL };
@@ -157,122 +156,122 @@ static int
 GetlineBuffSys(char **line, size_t *len,int fd)
 {
 #define BLEN 100                     /* must hold the whole line, to get a match */
-	static char buffer[BLEN + 1];    /* buffer to hold the rest from last call */
-	static int brest = 0, old_i = 0; /* rest and its start in buffer[] */
-	static char first_char = 0;      /* As it made place for the term.-'\0'... */
-	int read_len, i;
-
-	/* In the buffer[] are still brest characters, starting at old_i.*/
-	if(old_i)
-		memmove(buffer, buffer + old_i, brest);
-	buffer[0] = first_char;	/* 1. char was stored separetely, to make place for
-							   the terminating '\0' */
-	/* We fill up the buffer to its limit, each time */
-	SYSCALL(read_len = read(fd, buffer + brest, BLEN - brest));
-	if(read_len < 0) {
-		ErrorF("auto-dev: Read error on " PROC_BUS_INPUT_DEV ".\n");
-		return -1; /* report EOF on behalf...  */
-	}
-	read_len += brest;
-	/* from now read_len is the count of valid characters in the buffer[] */
-	if(read_len == 0)
-		return -1; /* EOF */
-	/* find EOL */
-	for (i = 0; i < read_len && buffer[i] != '\n'; ++i)
-		;
-	/* If not EO-buffer, we include terminating '\n' */
-	if(i < read_len)
-		++i;
-	*line = buffer;
-	*len = i;
-
-	/* store the first char, of the next line, to make place for
-	   the termination '\0' */
-	first_char = buffer[i];
-	buffer[i] = 0;
-
-	brest = read_len-i;
-	old_i = i;
-	return 0;
+    static char buffer[BLEN + 1];    /* buffer to hold the rest from last call */
+    static int brest = 0, old_i = 0; /* rest and its start in buffer[] */
+    static char first_char = 0;      /* As it made place for the term.-'\0'... */
+    int read_len, i;
+
+    /* In the buffer[] are still brest characters, starting at old_i.*/
+    if(old_i)
+	memmove(buffer, buffer + old_i, brest);
+    buffer[0] = first_char;	/* 1. char was stored separetely, to make place for
+				   the terminating '\0' */
+    /* We fill up the buffer to its limit, each time */
+    SYSCALL(read_len = read(fd, buffer + brest, BLEN - brest));
+    if(read_len < 0) {
+	ErrorF("auto-dev: Read error on " PROC_BUS_INPUT_DEV ".\n");
+	return -1; /* report EOF on behalf...  */
+    }
+    read_len += brest;
+    /* from now read_len is the count of valid characters in the buffer[] */
+    if(read_len == 0)
+	return -1; /* EOF */
+    /* find EOL */
+    for (i = 0; i < read_len && buffer[i] != '\n'; ++i)
+	;
+    /* If not EO-buffer, we include terminating '\n' */
+    if(i < read_len)
+	++i;
+    *line = buffer;
+    *len = i;
+
+    /* store the first char, of the next line, to make place for
+       the termination '\0' */
+    first_char = buffer[i];
+    buffer[i] = 0;
+
+    brest = read_len-i;
+    old_i = i;
+    return 0;
 }
 
 static void
 SetDeviceAndProtocol(LocalDevicePtr local)
 {
-	char *str_par;
-	SynapticsPrivatePtr priv = local->private;
-
-	priv->proto = SYN_PROTO_PSAUX;
-	str_par = xf86FindOptionValue(local->options, "Protocol");
-	if (str_par && !strcmp(str_par, "event")) {
-		priv->proto = SYN_PROTO_EVENT;
-	} else if (str_par && !strcmp(str_par, "psaux")) {
-		/* Already set up */
-	} else { /* default to auto-dev */
-		/* We are trying to find the right eventX Device, or fall back to
-		   the psaux Protocol and the given Device from XF86Config */
-		int fd = -1;
-		int status = 0;  /* 0, start, 1=found "Synaptics", 2=found device */
-		SYSCALL(fd = open(PROC_BUS_INPUT_DEV, O_RDONLY));
-		if(fd < 0) {/* no luck, so fall back to "psaux" */
-			/* hopefully we have a valid device from XF86Config...*/
-			xf86Msg(X_PROBED, "%s Could not open " PROC_BUS_INPUT_DEV
-					" to auto-determine the synaptics touchpad device, "
-					"falling back to psaux protocol and the Device Option.\n",
-					local->name);
+    char *str_par;
+    SynapticsPrivatePtr priv = local->private;
+
+    priv->proto = SYN_PROTO_PSAUX;
+    str_par = xf86FindOptionValue(local->options, "Protocol");
+    if (str_par && !strcmp(str_par, "event")) {
+	priv->proto = SYN_PROTO_EVENT;
+    } else if (str_par && !strcmp(str_par, "psaux")) {
+	/* Already set up */
+    } else { /* default to auto-dev */
+	/* We are trying to find the right eventX Device, or fall back to
+	   the psaux Protocol and the given Device from XF86Config */
+	int fd = -1;
+	int status = 0;  /* 0, start, 1=found "Synaptics", 2=found device */
+	SYSCALL(fd = open(PROC_BUS_INPUT_DEV, O_RDONLY));
+	if(fd < 0) {/* no luck, so fall back to "psaux" */
+	    /* hopefully we have a valid device from XF86Config...*/
+	    xf86Msg(X_PROBED, "%s Could not open " PROC_BUS_INPUT_DEV
+		    " to auto-determine the synaptics touchpad device, "
+		    "falling back to psaux protocol and the Device Option.\n",
+		    local->name);
+	} else {
+	    char *line = NULL;
+	    size_t len = 0;
+	    while(GetlineBuffSys(&line, &len, fd) != -1) {
+		if(strncmp(line, INP_DEV_N, sizeof(INP_DEV_N) - 1) == 0) {
+		    DBG(7, ErrorF("auto-dev: Found Synaptics in " PROC_BUS_INPUT_DEV "\n"));
+		    status = 1;
+		}
+		else if(strncmp(line, INP_DEV_H, sizeof(INP_DEV_H) - 1) == 0 && status == 1) {
+		    status = 2;
+		    DBG(7, ErrorF("auto-dev: Found its handler entry\n"));
+		    break;
+		}
+	    }
+	    SYSCALL(close(fd));
+	    if(status != 2) { /* fall back... */
+		ErrorF("auto-dev: Could not find " INP_DEV_N " and its handler entry "
+		       INP_DEV_H " in " PROC_BUS_INPUT_DEV ". So we are unable to auto-determine "
+		       "the synaptics touchpad device, falling back to psaux protocol and "
+		       "the Device Option.\n");
+	    } else { /* Now update Device Option to found eventX */
+		static char *event_device;
+		char *s;
+
+		event_device=NULL;
+		s=strstr(line+sizeof(INP_DEV_H)-1, "event"); /* there might also be some other devices f.e. js0... */
+		if(s != NULL) {
+		    char *p = s + sizeof("event");
+		    while (*p && (*p >= '0') && (*p <= '9'))
+			p++;
+		    *p = 0; /* terminate the string after event2 */
+		    event_device = malloc(strlen(s) + sizeof(DEV_INPUT_EVENT) + 1);
+		}
+		if(s == NULL || event_device == NULL) {
+		    if(s == NULL)
+			ErrorF("auto-dev: cannot find the event-device in the handlers-entry for the "
+			       "Synaptics touchpad hardware. Falling back to psaux protocol and the "
+			       "Device Option from XF86Config.\n");
+		    else
+			ErrorF("auto-dev: cannot get memory for telling the right device name. "
+			       "Falling back to psaux protocol and the Device Option from XF86Config.\n");
 		} else {
-			char *line = NULL;
-			size_t len = 0;
-			while(GetlineBuffSys(&line, &len, fd) != -1) {
-				if(strncmp(line, INP_DEV_N, sizeof(INP_DEV_N) - 1) == 0) {
-					DBG(7, ErrorF("auto-dev: Found Synaptics in " PROC_BUS_INPUT_DEV "\n"));
-					status = 1;
-				}
-				else if(strncmp(line, INP_DEV_H, sizeof(INP_DEV_H) - 1) == 0 && status == 1) {
-					status = 2;
-					DBG(7, ErrorF("auto-dev: Found its handler entry\n"));
-					break;
-				}
-			}
-			SYSCALL(close(fd));
-			if(status != 2) { /* fall back... */
-				ErrorF("auto-dev: Could not find " INP_DEV_N " and its handler entry "
-					   INP_DEV_H " in " PROC_BUS_INPUT_DEV ". So we are unable to auto-determine "
-					   "the synaptics touchpad device, falling back to psaux protocol and "
-					   "the Device Option.\n");
-			} else { /* Now update Device Option to found eventX */
-				static char *event_device;
-				char *s;
-
-				event_device=NULL;
-				s=strstr(line+sizeof(INP_DEV_H)-1, "event"); /* there might also be some other devices f.e. js0... */
-				if(s != NULL) {
-					char *p = s + sizeof("event");
-					while (*p && (*p >= '0') && (*p <= '9'))
-						p++;
-					*p = 0; /* terminate the string after event2 */
-					event_device = malloc(strlen(s) + sizeof(DEV_INPUT_EVENT) + 1);
-				}
-				if(s == NULL || event_device == NULL) {
-					if(s == NULL)
-						ErrorF("auto-dev: cannot find the event-device in the handlers-entry for the "
-							   "Synaptics touchpad hardware. Falling back to psaux protocol and the "
-							   "Device Option from XF86Config.\n");
-					else
-						ErrorF("auto-dev: cannot get memory for telling the right device name. "
-						   "Falling back to psaux protocol and the Device Option from XF86Config.\n");
-				} else {
-					priv->proto = SYN_PROTO_EVENT;
-					strcpy(event_device, DEV_INPUT_EVENT);
-					strcat(event_device, s);
-					xf86Msg(X_PROBED, "%s auto-dev sets Synaptics Device to %s\n",
-							local->name, event_device);
-					xf86ReplaceStrOption(local->options, "Device", event_device);
-					free(event_device);
-				}
-			}
+		    priv->proto = SYN_PROTO_EVENT;
+		    strcpy(event_device, DEV_INPUT_EVENT);
+		    strcat(event_device, s);
+		    xf86Msg(X_PROBED, "%s auto-dev sets Synaptics Device to %s\n",
+			    local->name, event_device);
+		    xf86ReplaceStrOption(local->options, "Device", event_device);
+		    free(event_device);
 		}
+	    }
 	}
+    }
 }
 
 /*
@@ -281,206 +280,206 @@ SetDeviceAndProtocol(LocalDevicePtr local)
 static InputInfoPtr
 SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 {
-	LocalDevicePtr local;
-	SynapticsPrivatePtr priv;
+    LocalDevicePtr local;
+    SynapticsPrivatePtr priv;
 #ifdef XFREE_4_0_3
-	XF86OptionPtr optList;
+    XF86OptionPtr optList;
 #else
-	pointer optList;
+    pointer optList;
 #endif
-	char *str_par;
-	int shmid;
-	unsigned long now;
-
-	/* allocate memory for SynaticsPrivateRec */
-	priv = xcalloc (1, sizeof (SynapticsPrivateRec));
-	if (!priv)
-		return NULL;
-
-	/* Allocate a new InputInfoRec and add it to the head xf86InputDevs. */
-	local = xf86AllocateInput(drv, 0);
-	if (!local)
+    char *str_par;
+    int shmid;
+    unsigned long now;
+
+    /* allocate memory for SynaticsPrivateRec */
+    priv = xcalloc (1, sizeof (SynapticsPrivateRec));
+    if (!priv)
+	return NULL;
+
+    /* Allocate a new InputInfoRec and add it to the head xf86InputDevs. */
+    local = xf86AllocateInput(drv, 0);
+    if (!local)
 	{
-		xfree(priv);
-		return NULL;
+	    xfree(priv);
+	    return NULL;
 	}
 
-	/* initialize the InputInfoRec */
-	local->name                    = dev->identifier;
-	local->type_name               = XI_MOUSE; /* XI_TOUCHPAD and KDE killed the X-Server at startup ? */
-	local->device_control          = DeviceControl;
-	local->read_input              = ReadInput;
-	local->control_proc            = ControlProc;
-	local->close_proc              = CloseProc;
-	local->switch_mode             = SwitchMode;
-	local->conversion_proc         = ConvertProc;
-	local->reverse_conversion_proc = NULL;
-	local->dev                     = NULL;
-	local->private                 = priv;
-	local->private_flags           = 0;
-	local->flags                   = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
-	local->conf_idev               = dev;
-	local->motion_history_proc     = xf86GetMotionEvents;
-	local->history_size            = 0;
-	local->always_core_feedback    = 0;
-
-	xf86CollectInputOptions(local, NULL, NULL);
-
-	xf86OptionListReport(local->options);
-
-	SetDeviceAndProtocol(local);
-
-	/* open the touchpad device */
-	local->fd = xf86OpenSerial (local->options);
-	if (local->fd == -1)
+    /* initialize the InputInfoRec */
+    local->name                    = dev->identifier;
+    local->type_name               = XI_MOUSE; /* XI_TOUCHPAD and KDE killed the X-Server at startup ? */
+    local->device_control          = DeviceControl;
+    local->read_input              = ReadInput;
+    local->control_proc            = ControlProc;
+    local->close_proc              = CloseProc;
+    local->switch_mode             = SwitchMode;
+    local->conversion_proc         = ConvertProc;
+    local->reverse_conversion_proc = NULL;
+    local->dev                     = NULL;
+    local->private                 = priv;
+    local->private_flags           = 0;
+    local->flags                   = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
+    local->conf_idev               = dev;
+    local->motion_history_proc     = xf86GetMotionEvents;
+    local->history_size            = 0;
+    local->always_core_feedback    = 0;
+
+    xf86CollectInputOptions(local, NULL, NULL);
+
+    xf86OptionListReport(local->options);
+
+    SetDeviceAndProtocol(local);
+
+    /* open the touchpad device */
+    local->fd = xf86OpenSerial (local->options);
+    if (local->fd == -1)
 	{
-		ErrorF ("Synaptics driver unable to open device\n");
-		goto SetupProc_fail;
+	    ErrorF ("Synaptics driver unable to open device\n");
+	    goto SetupProc_fail;
 	}
-	xf86ErrorFVerb( 6, "port opened successfully\n" );
-
-	/* initialize variables */
-	priv->timer = NULL;
-	priv->repeatButtons = 0;
-	priv->nextRepeat = 0;
-	now = GetTimeInMillis();
-	priv->count_packet_finger = 0;
-	priv->tapping_millis = now;
-	priv->button_delay_millis = now;
-	priv->touch_on.millis = now;
-
-	/* install shared memory or normal memory for parameter */
-	priv->shm_config = FALSE;
-	if(xf86SetBoolOption(local->options, "SHMConfig", FALSE))
+    xf86ErrorFVerb( 6, "port opened successfully\n" );
+
+    /* initialize variables */
+    priv->timer = NULL;
+    priv->repeatButtons = 0;
+    priv->nextRepeat = 0;
+    now = GetTimeInMillis();
+    priv->count_packet_finger = 0;
+    priv->tapping_millis = now;
+    priv->button_delay_millis = now;
+    priv->touch_on.millis = now;
+
+    /* install shared memory or normal memory for parameter */
+    priv->shm_config = FALSE;
+    if(xf86SetBoolOption(local->options, "SHMConfig", FALSE))
 	{
-		if ((shmid = xf86shmget(SHM_SYNAPTICS, 0, 0)) != -1)
-			xf86shmctl(shmid, XF86IPC_RMID, NULL);
-		if((shmid = xf86shmget(SHM_SYNAPTICS, sizeof(SynapticsSHM), 0777 | XF86IPC_CREAT)) == -1)
+	    if ((shmid = xf86shmget(SHM_SYNAPTICS, 0, 0)) != -1)
+		xf86shmctl(shmid, XF86IPC_RMID, NULL);
+	    if((shmid = xf86shmget(SHM_SYNAPTICS, sizeof(SynapticsSHM), 0777 | XF86IPC_CREAT)) == -1)
 		{
-			xf86Msg(X_ERROR, "%s error shmget\n", local->name);
-			goto SetupProc_fail;
+		    xf86Msg(X_ERROR, "%s error shmget\n", local->name);
+		    goto SetupProc_fail;
 		}
-		else if((priv->synpara = (SynapticsSHM*) xf86shmat(shmid, NULL, 0)) == NULL)
+	    else if((priv->synpara = (SynapticsSHM*) xf86shmat(shmid, NULL, 0)) == NULL)
 		{
-			xf86Msg(X_ERROR, "%s error shmat\n", local->name);
-			goto SetupProc_fail;
+		    xf86Msg(X_ERROR, "%s error shmat\n", local->name);
+		    goto SetupProc_fail;
 		}
-		priv->shm_config = TRUE;
+	    priv->shm_config = TRUE;
 	}
-	else
+    else
 	{
-		priv->synpara = xcalloc (1, sizeof (SynapticsSHM));
-		if(!priv->synpara)
-			goto SetupProc_fail;
+	    priv->synpara = xcalloc (1, sizeof (SynapticsSHM));
+	    if(!priv->synpara)
+		goto SetupProc_fail;
 	}
 
-	/* read the parameter */
-	priv->synpara->left_edge = xf86SetIntOption(local->options, "LeftEdge", 1900);
-	priv->synpara->right_edge = xf86SetIntOption(local->options, "RightEdge", 5400);
-	priv->synpara->top_edge = xf86SetIntOption(local->options, "TopEdge", 3900);
-	priv->synpara->bottom_edge = xf86SetIntOption(local->options, "BottomEdge", 1800);
-	priv->synpara->finger_low = xf86SetIntOption(local->options, "FingerLow", 25);
-	priv->synpara->finger_high = xf86SetIntOption(local->options, "FingerHigh", 30);
-	priv->synpara->tap_time = xf86SetIntOption(local->options, "MaxTapTime", 180);
-	priv->synpara->tap_move = xf86SetIntOption(local->options, "MaxTapMove", 220);
-	priv->synpara->emulate_mid_button_time = xf86SetIntOption(local->options,
-															  "EmulateMidButtonTime", 75);
-	priv->synpara->scroll_dist_vert = xf86SetIntOption(local->options, "VertScrollDelta", 100);
-	priv->synpara->scroll_dist_horiz = xf86SetIntOption(local->options, "HorizScrollDelta", 100);
-	priv->synpara->edge_motion_speed = xf86SetIntOption(local->options, "EdgeMotionSpeed", 40);
-	priv->synpara->repeater = xf86SetStrOption(local->options, "Repeater", NULL);
-	priv->synpara->updown_button_scrolling = xf86SetBoolOption(local->options, "UpDownScrolling", TRUE);
-
-	str_par = xf86FindOptionValue(local->options, "MinSpeed");
-	if((!str_par) || (xf86sscanf(str_par, "%lf", &priv->synpara->min_speed) != 1))
-		priv->synpara->min_speed=0.02;
-	str_par = xf86FindOptionValue(local->options, "MaxSpeed");
-	if((!str_par) || (xf86sscanf(str_par, "%lf", &priv->synpara->max_speed) != 1))
-		priv->synpara->max_speed=0.18;
-	str_par = xf86FindOptionValue(local->options, "AccelFactor");
-	if((!str_par) || (xf86sscanf(str_par, "%lf", &priv->synpara->accl) != 1))
-		priv->synpara->accl=0.0015;
-
-	priv->buffer = XisbNew(local->fd, 200);
-	DBG(9, XisbTrace (priv->buffer, 1));
-
-	if(priv->synpara->repeater)
+    /* read the parameter */
+    priv->synpara->left_edge = xf86SetIntOption(local->options, "LeftEdge", 1900);
+    priv->synpara->right_edge = xf86SetIntOption(local->options, "RightEdge", 5400);
+    priv->synpara->top_edge = xf86SetIntOption(local->options, "TopEdge", 3900);
+    priv->synpara->bottom_edge = xf86SetIntOption(local->options, "BottomEdge", 1800);
+    priv->synpara->finger_low = xf86SetIntOption(local->options, "FingerLow", 25);
+    priv->synpara->finger_high = xf86SetIntOption(local->options, "FingerHigh", 30);
+    priv->synpara->tap_time = xf86SetIntOption(local->options, "MaxTapTime", 180);
+    priv->synpara->tap_move = xf86SetIntOption(local->options, "MaxTapMove", 220);
+    priv->synpara->emulate_mid_button_time = xf86SetIntOption(local->options,
+							      "EmulateMidButtonTime", 75);
+    priv->synpara->scroll_dist_vert = xf86SetIntOption(local->options, "VertScrollDelta", 100);
+    priv->synpara->scroll_dist_horiz = xf86SetIntOption(local->options, "HorizScrollDelta", 100);
+    priv->synpara->edge_motion_speed = xf86SetIntOption(local->options, "EdgeMotionSpeed", 40);
+    priv->synpara->repeater = xf86SetStrOption(local->options, "Repeater", NULL);
+    priv->synpara->updown_button_scrolling = xf86SetBoolOption(local->options, "UpDownScrolling", TRUE);
+
+    str_par = xf86FindOptionValue(local->options, "MinSpeed");
+    if((!str_par) || (xf86sscanf(str_par, "%lf", &priv->synpara->min_speed) != 1))
+	priv->synpara->min_speed=0.02;
+    str_par = xf86FindOptionValue(local->options, "MaxSpeed");
+    if((!str_par) || (xf86sscanf(str_par, "%lf", &priv->synpara->max_speed) != 1))
+	priv->synpara->max_speed=0.18;
+    str_par = xf86FindOptionValue(local->options, "AccelFactor");
+    if((!str_par) || (xf86sscanf(str_par, "%lf", &priv->synpara->accl) != 1))
+	priv->synpara->accl=0.0015;
+
+    priv->buffer = XisbNew(local->fd, 200);
+    DBG(9, XisbTrace (priv->buffer, 1));
+
+    if(priv->synpara->repeater)
 	{
-		/* create repeater fifo */
-		if((xf86mknod(priv->synpara->repeater, 666, XF86_S_IFIFO) != 0) &&
-		   (xf86errno != xf86_EEXIST))
+	    /* create repeater fifo */
+	    if((xf86mknod(priv->synpara->repeater, 666, XF86_S_IFIFO) != 0) &&
+	       (xf86errno != xf86_EEXIST))
 		{
-				xf86Msg(X_ERROR, "%s can't create repeater fifo\n", local->name);
-				xf86free(priv->synpara->repeater);
-				priv->synpara->repeater = NULL;
-				priv->fifofd = -1;
+		    xf86Msg(X_ERROR, "%s can't create repeater fifo\n", local->name);
+		    xf86free(priv->synpara->repeater);
+		    priv->synpara->repeater = NULL;
+		    priv->fifofd = -1;
 		}
-		else
+	    else
 		{
-			/* open the repeater fifo */
-			optList = xf86NewOption("Device", priv->synpara->repeater);
-			if((priv->fifofd = xf86OpenSerial(optList)) == -1)
+		    /* open the repeater fifo */
+		    optList = xf86NewOption("Device", priv->synpara->repeater);
+		    if((priv->fifofd = xf86OpenSerial(optList)) == -1)
 			{
-				xf86Msg(X_ERROR, "%s repeater device open failed\n", local->name);
-				xf86free(priv->synpara->repeater);
-				priv->synpara->repeater = NULL;
-				priv->fifofd = -1;
+			    xf86Msg(X_ERROR, "%s repeater device open failed\n", local->name);
+			    xf86free(priv->synpara->repeater);
+			    priv->synpara->repeater = NULL;
+			    priv->fifofd = -1;
 			}
 		}
 	}
 
-	if(QueryHardware(local) != Success)
+    if(QueryHardware(local) != Success)
 	{
-		xf86Msg(X_ERROR, "%s Unable to query/initialize Synaptics hardware.\n", local->name);
-		goto SetupProc_fail;
+	    xf86Msg(X_ERROR, "%s Unable to query/initialize Synaptics hardware.\n", local->name);
+	    goto SetupProc_fail;
 	}
 
-	local->history_size = xf86SetIntOption( local->options, "HistorySize", 0 );
+    local->history_size = xf86SetIntOption( local->options, "HistorySize", 0 );
 
-	/* this results in an xstrdup that must be freed later */
-	/*local->name = xf86SetStrOption( local->options, "DeviceName", "Synaptics-Touchpad" );*/
-	xf86ProcessCommonOptions(local, local->options);
-	local->flags |= XI86_CONFIGURED;
+    /* this results in an xstrdup that must be freed later */
+    /*local->name = xf86SetStrOption( local->options, "DeviceName", "Synaptics-Touchpad" );*/
+    xf86ProcessCommonOptions(local, local->options);
+    local->flags |= XI86_CONFIGURED;
 
-	if (local->fd != -1)
+    if (local->fd != -1)
 	{
-		xf86RemoveEnabledDevice (local);
-		if (priv->buffer)
+	    xf86RemoveEnabledDevice (local);
+	    if (priv->buffer)
 		{
-			XisbFree(priv->buffer);
-			priv->buffer = NULL;
+		    XisbFree(priv->buffer);
+		    priv->buffer = NULL;
 		}
-		xf86CloseSerial(local->fd);
-	}
-	local->fd = -1;
-	return (local);
-
-  SetupProc_fail:
-	if (local->fd >= 0) {
-		RemoveEnabledDevice (local->fd);
-		xf86CloseSerial (local->fd);
-		local->fd = -1;
+	    xf86CloseSerial(local->fd);
 	}
+    local->fd = -1;
+    return (local);
 
-	/* If it fails, the name will be printed
-	if (local->name)
-		xfree (local->name);
-	*/
-
-	if (priv->buffer)
-		XisbFree (priv->buffer);
-	if (priv->synpara) {
-		if (priv->shm_config) {
-			if ((shmid = xf86shmget(SHM_SYNAPTICS, 0, 0)) != -1)
-				xf86shmctl(shmid, XF86IPC_RMID, NULL);
-		} else {
-			xfree (priv->synpara);
-		}
+ SetupProc_fail:
+    if (local->fd >= 0) {
+	RemoveEnabledDevice (local->fd);
+	xf86CloseSerial (local->fd);
+	local->fd = -1;
+    }
+
+    /* If it fails, the name will be printed
+       if (local->name)
+       xfree (local->name);
+    */
+
+    if (priv->buffer)
+	XisbFree (priv->buffer);
+    if (priv->synpara) {
+	if (priv->shm_config) {
+	    if ((shmid = xf86shmget(SHM_SYNAPTICS, 0, 0)) != -1)
+		xf86shmctl(shmid, XF86IPC_RMID, NULL);
+	} else {
+	    xfree (priv->synpara);
 	}
-	/* Freeing priv makes the X server crash. Don't know why.
-	xfree (priv);
-	*/
-	return (local);
+    }
+    /* Freeing priv makes the X server crash. Don't know why.
+       xfree (priv);
+    */
+    return (local);
 }
 
 /*
@@ -490,184 +489,184 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 static void
 SynapticsCtrl(DeviceIntPtr device, PtrCtrl *ctrl)
 {
-	DBG(3, ErrorF("SynapticsCtrl called.\n"));
-/*
-    pInfo = device->public.devicePrivate;
-    pMse = pInfo->private;
-
-    pMse->num       = ctrl->num;
-    pMse->den       = ctrl->den;
-    pMse->threshold = ctrl->threshold;
-*/
+    DBG(3, ErrorF("SynapticsCtrl called.\n"));
+    /*
+      pInfo = device->public.devicePrivate;
+      pMse = pInfo->private;
+
+      pMse->num       = ctrl->num;
+      pMse->den       = ctrl->den;
+      pMse->threshold = ctrl->threshold;
+    */
 }
 
 static Bool
 DeviceControl (DeviceIntPtr dev, int mode)
 {
-	Bool	RetValue;
+    Bool	RetValue;
 
-	switch (mode)
+    switch (mode)
 	{
 	case DEVICE_INIT:
-		DeviceInit(dev);
-		RetValue = Success;
-		break;
+	    DeviceInit(dev);
+	    RetValue = Success;
+	    break;
 	case DEVICE_ON:
-		RetValue = DeviceOn( dev );
-		break;
+	    RetValue = DeviceOn( dev );
+	    break;
 	case DEVICE_OFF:
-		RetValue = DeviceOff( dev );
-		break;
+	    RetValue = DeviceOff( dev );
+	    break;
 	case DEVICE_CLOSE:
-		{
-			int shmid;
-			LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
-			SynapticsPrivatePtr priv = (SynapticsPrivatePtr) (local->private);
-			RetValue = DeviceOff( dev );
-			if (priv->shm_config)
-				if ((shmid = xf86shmget(SHM_SYNAPTICS, 0, 0)) != -1)
-					xf86shmctl(shmid, XF86IPC_RMID, NULL);
-		}
-		break;
+	    {
+		int shmid;
+		LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
+		SynapticsPrivatePtr priv = (SynapticsPrivatePtr) (local->private);
+		RetValue = DeviceOff( dev );
+		if (priv->shm_config)
+		    if ((shmid = xf86shmget(SHM_SYNAPTICS, 0, 0)) != -1)
+			xf86shmctl(shmid, XF86IPC_RMID, NULL);
+	    }
+	    break;
 	default:
-		RetValue = BadValue;
+	    RetValue = BadValue;
 	}
 
-	return( RetValue );
+    return( RetValue );
 }
 
 static Bool
 DeviceOn (DeviceIntPtr dev)
 {
-	LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
-	SynapticsPrivatePtr priv = (SynapticsPrivatePtr) (local->private);
+    LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
+    SynapticsPrivatePtr priv = (SynapticsPrivatePtr) (local->private);
 
-	DBG(3, ErrorF("Synaptics DeviceOn called\n"));
+    DBG(3, ErrorF("Synaptics DeviceOn called\n"));
 
-	local->fd = xf86OpenSerial(local->options);
-	if (local->fd == -1) {
-		xf86Msg(X_WARNING, "%s: cannot open input device\n", local->name);
-		return (!Success);
-	}
+    local->fd = xf86OpenSerial(local->options);
+    if (local->fd == -1) {
+	xf86Msg(X_WARNING, "%s: cannot open input device\n", local->name);
+	return (!Success);
+    }
 
-	priv->buffer = XisbNew(local->fd, 64);
-	if (!priv->buffer) {
-		xf86CloseSerial(local->fd);
-		local->fd = -1;
-		return (!Success);
-	}
+    priv->buffer = XisbNew(local->fd, 64);
+    if (!priv->buffer) {
+	xf86CloseSerial(local->fd);
+	local->fd = -1;
+	return (!Success);
+    }
 
-	xf86FlushInput(local->fd);
+    xf86FlushInput(local->fd);
 
-	/* reinit the pad */
-	QueryHardware(local);
-	xf86AddEnabledDevice (local);
-	dev->public.on = TRUE;
+    /* reinit the pad */
+    QueryHardware(local);
+    xf86AddEnabledDevice (local);
+    dev->public.on = TRUE;
 
-	return (Success);
+    return (Success);
 }
 
 static Bool
 DeviceOff(DeviceIntPtr dev)
 {
-	LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
-	SynapticsPrivatePtr priv = (SynapticsPrivatePtr) (local->private);
-
-	DBG(3, ErrorF("Synaptics DeviceOff called\n"));
-
-	if (local->fd != -1) {
-		xf86RemoveEnabledDevice (local);
-		if (priv->proto == SYN_PROTO_PSAUX)
-			synaptics_set_mode(local->fd, 0);
-		if (priv->buffer) {
-			XisbFree(priv->buffer);
-			priv->buffer = NULL;
-		}
-		xf86CloseSerial(local->fd);
+    LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
+    SynapticsPrivatePtr priv = (SynapticsPrivatePtr) (local->private);
+
+    DBG(3, ErrorF("Synaptics DeviceOff called\n"));
+
+    if (local->fd != -1) {
+	xf86RemoveEnabledDevice (local);
+	if (priv->proto == SYN_PROTO_PSAUX)
+	    synaptics_set_mode(local->fd, 0);
+	if (priv->buffer) {
+	    XisbFree(priv->buffer);
+	    priv->buffer = NULL;
 	}
-	dev->public.on = FALSE;
-	return (Success);
+	xf86CloseSerial(local->fd);
+    }
+    dev->public.on = FALSE;
+    return (Success);
 }
 
 static Bool
 DeviceInit(DeviceIntPtr dev)
 {
-	LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
-	unsigned char map[] = {0, 1, 2, 3, 4, 5, 6, 7};
+    LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
+    unsigned char map[] = {0, 1, 2, 3, 4, 5, 6, 7};
 
-	DBG(3, ErrorF("Synaptics DeviceInit called\n"));
+    DBG(3, ErrorF("Synaptics DeviceInit called\n"));
 
-	dev->public.on = FALSE;
+    dev->public.on = FALSE;
 
-	InitPointerDeviceStruct((DevicePtr)dev, map,
-			7,
-			miPointerGetMotionEvents, SynapticsCtrl,
-			miPointerGetMotionBufferSize());
+    InitPointerDeviceStruct((DevicePtr)dev, map,
+			    7,
+			    miPointerGetMotionEvents, SynapticsCtrl,
+			    miPointerGetMotionBufferSize());
 
-	/* X valuator */
-	xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1);
-	xf86InitValuatorDefaults(dev, 0);
-	/* Y valuator */
-	xf86InitValuatorAxisStruct(dev, 1, 0, -1, 1, 0, 1);
-	xf86InitValuatorDefaults(dev, 1);
+    /* X valuator */
+    xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1);
+    xf86InitValuatorDefaults(dev, 0);
+    /* Y valuator */
+    xf86InitValuatorAxisStruct(dev, 1, 0, -1, 1, 0, 1);
+    xf86InitValuatorDefaults(dev, 1);
 
-	xf86MotionHistoryAllocate(local);
+    xf86MotionHistoryAllocate(local);
 
-	return Success;
+    return Success;
 }
 
 static int
 move_distance(int dx, int dy)
 {
-	return(xf86sqrt((dx * dx) + (dy * dy)));
+    return(xf86sqrt((dx * dx) + (dy * dy)));
 }
 
 static edge_type
 edge_detection(SynapticsPrivatePtr priv, int x, int y)
 {
-	edge_type edge = 0;
+    edge_type edge = 0;
 
-	if(x > priv->synpara->right_edge)
-		edge |= RIGHT_EDGE;
-	else if(x < priv->synpara->left_edge)
-		edge |= LEFT_EDGE;
+    if(x > priv->synpara->right_edge)
+	edge |= RIGHT_EDGE;
+    else if(x < priv->synpara->left_edge)
+	edge |= LEFT_EDGE;
 
-	if(y > priv->synpara->top_edge)
-		edge |= TOP_EDGE;
-	else if(y < priv->synpara->bottom_edge)
-		edge |= BOTTOM_EDGE;
+    if(y > priv->synpara->top_edge)
+	edge |= TOP_EDGE;
+    else if(y < priv->synpara->bottom_edge)
+	edge |= BOTTOM_EDGE;
 
-	return( edge );
+    return( edge );
 }
 
 static CARD32
 timerFunc(OsTimerPtr timer, CARD32 now, pointer arg)
 {
     LocalDevicePtr local = (LocalDevicePtr) (arg);
-	SynapticsPrivatePtr priv = (SynapticsPrivatePtr) (local->private);
-	struct SynapticsHwState hw;
-	int delay;
-	int sigstate;
-	CARD32 wakeUpTime;
+    SynapticsPrivatePtr priv = (SynapticsPrivatePtr) (local->private);
+    struct SynapticsHwState hw;
+    int delay;
+    int sigstate;
+    CARD32 wakeUpTime;
 
     sigstate = xf86BlockSIGIO ();
 
-	hw = priv->hwState;
-	hw.millis = now;
-	delay = HandleState(local, &hw);
+    hw = priv->hwState;
+    hw.millis = now;
+    delay = HandleState(local, &hw);
 
-	/*
-	 * Workaround for wraparound bug in the TimerSet function. This bug is already
-	 * fixed in CVS, but this driver needs to work with XFree86 versions 4.2.x and
-	 * 4.3.x too.
-	 */
-	wakeUpTime = now + delay;
-	if (wakeUpTime <= now)
-		wakeUpTime = 0xffffffffL;
+    /*
+     * Workaround for wraparound bug in the TimerSet function. This bug is already
+     * fixed in CVS, but this driver needs to work with XFree86 versions 4.2.x and
+     * 4.3.x too.
+     */
+    wakeUpTime = now + delay;
+    if (wakeUpTime <= now)
+	wakeUpTime = 0xffffffffL;
 
-	priv->timer = TimerSet(priv->timer, TimerAbsolute, wakeUpTime, timerFunc, local);
+    priv->timer = TimerSet(priv->timer, TimerAbsolute, wakeUpTime, timerFunc, local);
 
-	xf86UnblockSIGIO (sigstate);
+    xf86UnblockSIGIO (sigstate);
 
     return 0;
 }
@@ -677,12 +676,12 @@ timerFunc(OsTimerPtr timer, CARD32 now, pointer arg)
 
 static int clamp(int val, int min, int max)
 {
-	if (val < min)
-		return min;
-	else if (val < max)
-		return val;
-	else
-		return max;
+    if (val < min)
+	return min;
+    else if (val < max)
+	return val;
+    else
+	return max;
 }
 
 
@@ -692,135 +691,135 @@ static int clamp(int val, int min, int max)
 static void
 ReadInput(LocalDevicePtr local)
 {
-	SynapticsPrivatePtr priv = (SynapticsPrivatePtr) (local->private);
-	struct SynapticsHwState hw;
-	int delay = 0;
-	Bool newDelay = FALSE;
+    SynapticsPrivatePtr priv = (SynapticsPrivatePtr) (local->private);
+    struct SynapticsHwState hw;
+    int delay = 0;
+    Bool newDelay = FALSE;
 
-	while(SynapticsGetHwState(local, priv, &hw) == Success)
+    while(SynapticsGetHwState(local, priv, &hw) == Success)
 	{
-		hw.millis = GetTimeInMillis();
-		delay = HandleState(local, &hw);
-		newDelay = TRUE;
+	    hw.millis = GetTimeInMillis();
+	    delay = HandleState(local, &hw);
+	    newDelay = TRUE;
 	}
 
-	if (newDelay)
-		priv->timer = TimerSet(priv->timer, 0, delay, timerFunc, local);
+    if (newDelay)
+	priv->timer = TimerSet(priv->timer, 0, delay, timerFunc, local);
 }
 
 static int
 HandleMidButtonEmulation(SynapticsPrivatePtr priv, struct SynapticsHwState* hw, long* delay)
 {
-	SynapticsSHMPtr para = priv->synpara;
-	Bool done = FALSE;
-	long timeleft;
-	int mid = 0;
-
-	while (!done) {
-		switch (priv->mid_emu_state) {
-		case MBE_OFF:
-			priv->button_delay_millis = hw->millis;
-			if (hw->left) {
-				priv->mid_emu_state = MBE_LEFT;
-			} else if (hw->right) {
-				priv->mid_emu_state = MBE_RIGHT;
-			} else {
-				done = TRUE;
-			}
-			break;
-		case MBE_LEFT:
-			timeleft = TIME_DIFF(priv->button_delay_millis + para->emulate_mid_button_time,
-								 hw->millis);
-			if (timeleft > 0)
-				*delay = MIN(*delay, timeleft);
-			if (!hw->left || (timeleft <= 0)) {
-				hw->left = TRUE;
-				priv->mid_emu_state = MBE_TIMEOUT;
-				done = TRUE;
-			} else if (hw->right) {
-				priv->mid_emu_state = MBE_MID;
-			} else {
-				hw->left = FALSE;
-				done = TRUE;
-			}
-			break;
-		case MBE_RIGHT:
-			timeleft = TIME_DIFF(priv->button_delay_millis + para->emulate_mid_button_time,
-								 hw->millis);
-			if (timeleft > 0)
-				*delay = MIN(*delay, timeleft);
-			if (!hw->right || (timeleft <= 0)) {
-				hw->right = TRUE;
-				priv->mid_emu_state = MBE_TIMEOUT;
-				done = TRUE;
-			} else if (hw->left) {
-				priv->mid_emu_state = MBE_MID;
-			} else {
-				hw->right = FALSE;
-				done = TRUE;
-			}
-			break;
-		case MBE_MID:
-			if (!hw->left && !hw->right) {
-				priv->mid_emu_state = MBE_OFF;
-			} else {
-				mid = TRUE;
-				hw->left = hw->right = FALSE;
-				done = TRUE;
-			}
-			break;
-		case MBE_TIMEOUT:
-			if (!hw->left && !hw->right) {
-				priv->mid_emu_state = MBE_OFF;
-			} else {
-				done = TRUE;
-			}
-		}
+    SynapticsSHMPtr para = priv->synpara;
+    Bool done = FALSE;
+    long timeleft;
+    int mid = 0;
+
+    while (!done) {
+	switch (priv->mid_emu_state) {
+	case MBE_OFF:
+	    priv->button_delay_millis = hw->millis;
+	    if (hw->left) {
+		priv->mid_emu_state = MBE_LEFT;
+	    } else if (hw->right) {
+		priv->mid_emu_state = MBE_RIGHT;
+	    } else {
+		done = TRUE;
+	    }
+	    break;
+	case MBE_LEFT:
+	    timeleft = TIME_DIFF(priv->button_delay_millis + para->emulate_mid_button_time,
+				 hw->millis);
+	    if (timeleft > 0)
+		*delay = MIN(*delay, timeleft);
+	    if (!hw->left || (timeleft <= 0)) {
+		hw->left = TRUE;
+		priv->mid_emu_state = MBE_TIMEOUT;
+		done = TRUE;
+	    } else if (hw->right) {
+		priv->mid_emu_state = MBE_MID;
+	    } else {
+		hw->left = FALSE;
+		done = TRUE;
+	    }
+	    break;
+	case MBE_RIGHT:
+	    timeleft = TIME_DIFF(priv->button_delay_millis + para->emulate_mid_button_time,
+				 hw->millis);
+	    if (timeleft > 0)
+		*delay = MIN(*delay, timeleft);
+	    if (!hw->right || (timeleft <= 0)) {
+		hw->right = TRUE;
+		priv->mid_emu_state = MBE_TIMEOUT;
+		done = TRUE;
+	    } else if (hw->left) {
+		priv->mid_emu_state = MBE_MID;
+	    } else {
+		hw->right = FALSE;
+		done = TRUE;
+	    }
+	    break;
+	case MBE_MID:
+	    if (!hw->left && !hw->right) {
+		priv->mid_emu_state = MBE_OFF;
+	    } else {
+		mid = TRUE;
+		hw->left = hw->right = FALSE;
+		done = TRUE;
+	    }
+	    break;
+	case MBE_TIMEOUT:
+	    if (!hw->left && !hw->right) {
+		priv->mid_emu_state = MBE_OFF;
+	    } else {
+		done = TRUE;
+	    }
 	}
-	return mid;
+    }
+    return mid;
 }
 
 static int
 SynapticsDetectFinger(SynapticsPrivatePtr priv, struct SynapticsHwState* hw)
 {
-	SynapticsSHMPtr para = priv->synpara;
-	int finger;
-
-	/* finger detection thru pressure and threshold */
-	finger = (((hw->z > para->finger_high) && !priv->finger_flag) ||
-			  ((hw->z > para->finger_low)  &&  priv->finger_flag));
-
-	/* palm detection */
-	if(finger) {
-		if((hw->z > 200) && (hw->w > 10))
-			priv->palm = TRUE;
-	} else {
-		priv->palm = FALSE;
-	}
-	if(hw->x == 0)
-		priv->avg_w = 0;
-	else
-		priv->avg_w += (hw->w - priv->avg_w + 1) / 2;
-	if(finger && !priv->finger_flag) {
-		int safe_w = MAX(hw->w, priv->avg_w);
-		if(hw->w < 2)
-			finger = TRUE;				/* more than one finger -> not a palm */
-		else if((safe_w < 6) && (priv->prev_z < para->finger_high))
-			finger = TRUE;				/* thin finger, distinct touch -> not a palm */
-		else if((safe_w < 7) && (priv->prev_z < para->finger_high / 2))
-			finger = TRUE;				/* thin finger, distinct touch -> not a palm */
-		else if(hw->z > priv->prev_z + 1) /* z not stable, may be a palm */
-			finger = FALSE;
-		else if(hw->z < priv->prev_z - 5) /* z not stable, may be a palm */
-			finger = FALSE;
-		else if(hw->z > 200)			/* z too large -> probably palm */
-			finger = FALSE;
-		else if(hw->w > 10)				/* w too large -> probably palm */
-			finger = FALSE;
-	}
-	priv->prev_z = hw->z;
-
-	return finger;
+    SynapticsSHMPtr para = priv->synpara;
+    int finger;
+
+    /* finger detection thru pressure and threshold */
+    finger = (((hw->z > para->finger_high) && !priv->finger_flag) ||
+	      ((hw->z > para->finger_low)  &&  priv->finger_flag));
+
+    /* palm detection */
+    if(finger) {
+	if((hw->z > 200) && (hw->w > 10))
+	    priv->palm = TRUE;
+    } else {
+	priv->palm = FALSE;
+    }
+    if(hw->x == 0)
+	priv->avg_w = 0;
+    else
+	priv->avg_w += (hw->w - priv->avg_w + 1) / 2;
+    if(finger && !priv->finger_flag) {
+	int safe_w = MAX(hw->w, priv->avg_w);
+	if(hw->w < 2)
+	    finger = TRUE;				/* more than one finger -> not a palm */
+	else if((safe_w < 6) && (priv->prev_z < para->finger_high))
+	    finger = TRUE;				/* thin finger, distinct touch -> not a palm */
+	else if((safe_w < 7) && (priv->prev_z < para->finger_high / 2))
+	    finger = TRUE;				/* thin finger, distinct touch -> not a palm */
+	else if(hw->z > priv->prev_z + 1) /* z not stable, may be a palm */
+	    finger = FALSE;
+	else if(hw->z < priv->prev_z - 5) /* z not stable, may be a palm */
+	    finger = FALSE;
+	else if(hw->z > 200)			/* z too large -> probably palm */
+	    finger = FALSE;
+	else if(hw->w > 10)				/* w too large -> probably palm */
+	    finger = FALSE;
+    }
+    priv->prev_z = hw->z;
+
+    return finger;
 }
 
 /*
@@ -832,416 +831,416 @@ SynapticsDetectFinger(SynapticsPrivatePtr priv, struct SynapticsHwState* hw)
 static int
 HandleState(LocalDevicePtr local, struct SynapticsHwState* hw)
 {
-	SynapticsPrivatePtr priv = (SynapticsPrivatePtr) (local->private);
-	SynapticsSHMPtr para = priv->synpara;
-	Bool finger;
-	int dist, dx, dy, buttons, id;
-	edge_type edge;
-	Bool mid;
-	double speed, integral;
-	int change;
-	int scroll_up, scroll_down, scroll_left, scroll_right;
-	int double_click;
-	long delay = 1000000000;
-	long timeleft;
-
-	edge = edge_detection(priv, hw->x, hw->y);
-
-	dx = dy = 0;
-
-	/* update finger position in shared memory */
-	para->x = hw->x;
-	para->y = hw->y;
-	para->z = hw->z;
-	para->w = hw->w;
-	para->left = hw->left;
-	para->right = hw->right;
-	para->up = hw->up;
-	para->down = hw->down;
-
-	/* 3rd button emulation */
-	mid = HandleMidButtonEmulation(priv, hw, &delay);
-
-	/* Up/Down-button scrolling or middle/double-click */
-	double_click = FALSE;
-	if (!para->updown_button_scrolling)
-		{
-			if (hw->down)
-				{ /* map down-button to middle-button */
-					mid = TRUE;
-				}
-
-			if (hw->up)
-				{ /* up-button generates double-click */
-					if (!priv->prev_up)
-						double_click = TRUE;
-				}
-			priv->prev_up = hw->up;
+    SynapticsPrivatePtr priv = (SynapticsPrivatePtr) (local->private);
+    SynapticsSHMPtr para = priv->synpara;
+    Bool finger;
+    int dist, dx, dy, buttons, id;
+    edge_type edge;
+    Bool mid;
+    double speed, integral;
+    int change;
+    int scroll_up, scroll_down, scroll_left, scroll_right;
+    int double_click;
+    long delay = 1000000000;
+    long timeleft;
+
+    edge = edge_detection(priv, hw->x, hw->y);
+
+    dx = dy = 0;
+
+    /* update finger position in shared memory */
+    para->x = hw->x;
+    para->y = hw->y;
+    para->z = hw->z;
+    para->w = hw->w;
+    para->left = hw->left;
+    para->right = hw->right;
+    para->up = hw->up;
+    para->down = hw->down;
+
+    /* 3rd button emulation */
+    mid = HandleMidButtonEmulation(priv, hw, &delay);
+
+    /* Up/Down-button scrolling or middle/double-click */
+    double_click = FALSE;
+    if (!para->updown_button_scrolling)
+	{
+	    if (hw->down)
+		{ /* map down-button to middle-button */
+		    mid = TRUE;
+		}
 
-			/* reset up/down button events */
-			hw->up = hw->down = FALSE;
+	    if (hw->up)
+		{ /* up-button generates double-click */
+		    if (!priv->prev_up)
+			double_click = TRUE;
 		}
+	    priv->prev_up = hw->up;
+
+	    /* reset up/down button events */
+	    hw->up = hw->down = FALSE;
+	}
 
-	finger = SynapticsDetectFinger(priv, hw);
+    finger = SynapticsDetectFinger(priv, hw);
 
-	/* tap and drag detection */
-	if(priv->palm) {
-		/* Palm detected, skip tap/drag processing */
-	} else if(finger && !priv->finger_flag)
-		{ /* touched */
-			DBG(7, ErrorF("touched - x:%d, y:%d millis:%lu\n", hw->x, hw->y, hw->millis));
-			if(priv->tap)
+    /* tap and drag detection */
+    if(priv->palm) {
+	/* Palm detected, skip tap/drag processing */
+    } else if(finger && !priv->finger_flag)
+	{ /* touched */
+	    DBG(7, ErrorF("touched - x:%d, y:%d millis:%lu\n", hw->x, hw->y, hw->millis));
+	    if(priv->tap)
+		{
+		    DBG(7, ErrorF("drag detected - tap time:%lu\n", priv->tapping_millis));
+		    priv->drag = TRUE; /* drag gesture */
+		}
+	    priv->touch_on.x = hw->x;
+	    priv->touch_on.y = hw->y;
+	    priv->touch_on.millis = hw->millis;
+	}
+    else if(!finger && priv->finger_flag)
+	{ /* untouched */
+	    DBG(7, ErrorF("untouched - x:%d, y:%d millis:%lu finger:%d\n",
+			  hw->x, hw->y, hw->millis, priv->finger_count));
+	    /* check if
+	       1. the tap is in tap_time
+	       2. the max movement is in tap_move or more than one finger are tapped */
+	    if((TIME_DIFF(hw->millis, priv->touch_on.millis + para->tap_time) < 0) &&
+	       (((abs(hw->x - priv->touch_on.x) < para->tap_move) &&
+		 (abs(hw->y - priv->touch_on.y) < para->tap_move)) ||
+		priv->finger_count))
+		{
+		    if(priv->drag)
+			{
+			    DBG(7, ErrorF("double tapping detected\n"));
+			    priv->doubletap = TRUE;
+			    priv->tap = FALSE;
+			}
+		    else
+			{
+			    DBG(7, ErrorF("tapping detected @ "));
+			    priv->tapping_millis = hw->millis;
+			    priv->tap = TRUE;
+			    if(priv->finger_count == 0)
 				{
-					DBG(7, ErrorF("drag detected - tap time:%lu\n", priv->tapping_millis));
-					priv->drag = TRUE; /* drag gesture */
+				    switch(edge)
+					{
+					case RIGHT_TOP_EDGE:
+					    DBG(7, ErrorF("right top edge\n"));
+					    priv->tap_mid = TRUE;
+					    break;
+					case RIGHT_BOTTOM_EDGE:
+					    DBG(7, ErrorF("right bottom edge\n"));
+					    priv->tap_right = TRUE;
+					    break;
+					case LEFT_TOP_EDGE:
+					    DBG(7, ErrorF("left top edge\n"));
+					    break;
+					case LEFT_BOTTOM_EDGE:
+					    DBG(7, ErrorF("left bottom edge\n"));
+					    break;
+					default:
+					    DBG(7, ErrorF("no edge\n"));
+					    priv->tap_left = TRUE;
+					}
 				}
-			priv->touch_on.x = hw->x;
-			priv->touch_on.y = hw->y;
-			priv->touch_on.millis = hw->millis;
-		}
-	else if(!finger && priv->finger_flag)
-		{ /* untouched */
-			DBG(7, ErrorF("untouched - x:%d, y:%d millis:%lu finger:%d\n",
-			              hw->x, hw->y, hw->millis, priv->finger_count));
-			/* check if
-			   1. the tap is in tap_time
-			   2. the max movement is in tap_move or more than one finger are tapped */
-			if((TIME_DIFF(hw->millis, priv->touch_on.millis + para->tap_time) < 0) &&
-			   (((abs(hw->x - priv->touch_on.x) < para->tap_move) &&
-				 (abs(hw->y - priv->touch_on.y) < para->tap_move)) ||
-				priv->finger_count))
+			    else
 				{
-					if(priv->drag)
-						{
-							DBG(7, ErrorF("double tapping detected\n"));
-							priv->doubletap = TRUE;
-							priv->tap = FALSE;
-						}
-					else
-						{
-							DBG(7, ErrorF("tapping detected @ "));
-							priv->tapping_millis = hw->millis;
-							priv->tap = TRUE;
-							if(priv->finger_count == 0)
-								{
-									switch(edge)
-										{
-										case RIGHT_TOP_EDGE:
-											DBG(7, ErrorF("right top edge\n"));
-											priv->tap_mid = TRUE;
-											break;
-										case RIGHT_BOTTOM_EDGE:
-											DBG(7, ErrorF("right bottom edge\n"));
-											priv->tap_right = TRUE;
-											break;
-										case LEFT_TOP_EDGE:
-											DBG(7, ErrorF("left top edge\n"));
-											break;
-										case LEFT_BOTTOM_EDGE:
-											DBG(7, ErrorF("left bottom edge\n"));
-											break;
-										default:
-											DBG(7, ErrorF("no edge\n"));
-											priv->tap_left = TRUE;
-										}
-								}
-							else
-								{
-									switch(priv->finger_count)
-										{
-										case 2:
-											DBG(7, ErrorF("two finger tap\n"));
-											priv->tap_mid = TRUE;
-											break;
-										case 3:
-											DBG(7, ErrorF("three finger tap\n"));
-											priv->tap_right = TRUE;
-											break;
-										default:
-											DBG(7, ErrorF("one finger\n"));
-											priv->tap_left = TRUE;
-										}
-								}
-						}
-				} /* tap detection */
-			priv->drag = FALSE;
-		} /* finger lost */
-
-	/* detecting 2 and 3 fingers */
-	timeleft = TIME_DIFF(priv->touch_on.millis + para->tap_time, hw->millis);
-	if (timeleft > 0)
-		delay = MIN(delay, timeleft);
-	if(finger && /* finger is on the surface */
-	   (timeleft > 0)) /* tap time is not succeeded */
-		{ /* count fingers when reported */
-			if((hw->w == 0) && (priv->finger_count == 0))
-				priv->finger_count = 2;
-			if(hw->w == 1)
-				priv->finger_count = 3;
-		}
-	else
-		{ /* reset finger counts */
-			priv->finger_count = 0;
-		}
+				    switch(priv->finger_count)
+					{
+					case 2:
+					    DBG(7, ErrorF("two finger tap\n"));
+					    priv->tap_mid = TRUE;
+					    break;
+					case 3:
+					    DBG(7, ErrorF("three finger tap\n"));
+					    priv->tap_right = TRUE;
+					    break;
+					default:
+					    DBG(7, ErrorF("one finger\n"));
+					    priv->tap_left = TRUE;
+					}
+				}
+			}
+		} /* tap detection */
+	    priv->drag = FALSE;
+	} /* finger lost */
+
+    /* detecting 2 and 3 fingers */
+    timeleft = TIME_DIFF(priv->touch_on.millis + para->tap_time, hw->millis);
+    if (timeleft > 0)
+	delay = MIN(delay, timeleft);
+    if(finger && /* finger is on the surface */
+       (timeleft > 0)) /* tap time is not succeeded */
+	{ /* count fingers when reported */
+	    if((hw->w == 0) && (priv->finger_count == 0))
+		priv->finger_count = 2;
+	    if(hw->w == 1)
+		priv->finger_count = 3;
+	}
+    else
+	{ /* reset finger counts */
+	    priv->finger_count = 0;
+	}
 
-	/* reset tapping button flags */
-	if(!priv->tap && !priv->drag && !priv->doubletap)
-		{
-			priv->tap_left = priv->tap_mid = priv->tap_right = FALSE;
-		}
+    /* reset tapping button flags */
+    if(!priv->tap && !priv->drag && !priv->doubletap)
+	{
+	    priv->tap_left = priv->tap_mid = priv->tap_right = FALSE;
+	}
 
-	/* tap processing */
-	timeleft = TIME_DIFF(priv->tapping_millis + para->tap_time, hw->millis);
-	if (timeleft > 0)
-		delay = MIN(delay, timeleft);
-	if (priv->tap && (timeleft > 0))
-		{
-			hw->left  |= priv->tap_left;
-			mid       |= priv->tap_mid;
-			hw->right |= priv->tap_right;
-		}
-	else
-		{
-			priv->tap = FALSE;
-		}
+    /* tap processing */
+    timeleft = TIME_DIFF(priv->tapping_millis + para->tap_time, hw->millis);
+    if (timeleft > 0)
+	delay = MIN(delay, timeleft);
+    if (priv->tap && (timeleft > 0))
+	{
+	    hw->left  |= priv->tap_left;
+	    mid       |= priv->tap_mid;
+	    hw->right |= priv->tap_right;
+	}
+    else
+	{
+	    priv->tap = FALSE;
+	}
 
-	/* drag processing */
-	if(priv->drag)
-		{
-			hw->left  |= priv->tap_left;
-			mid       |= priv->tap_mid;
-			hw->right |= priv->tap_right;
-		}
+    /* drag processing */
+    if(priv->drag)
+	{
+	    hw->left  |= priv->tap_left;
+	    mid       |= priv->tap_mid;
+	    hw->right |= priv->tap_right;
+	}
 
-	/* double tap processing */
-	if(priv->doubletap && !priv->finger_flag)
-		{
-			hw->left  |= priv->tap_left;
-			mid       |= priv->tap_mid;
-			hw->right |= priv->tap_right;
-			priv->doubletap = FALSE;
-		}
+    /* double tap processing */
+    if(priv->doubletap && !priv->finger_flag)
+	{
+	    hw->left  |= priv->tap_left;
+	    mid       |= priv->tap_mid;
+	    hw->right |= priv->tap_right;
+	    priv->doubletap = FALSE;
+	}
 
-	/* scroll detection */
-	if(finger && !priv->finger_flag)
-		{
-			if(edge & RIGHT_EDGE)
-				{
-					priv->vert_scroll_on = TRUE;
-					priv->scroll_y = hw->y;
-					DBG(7, ErrorF("vert edge scroll detected on right edge\n"));
-				}
- 			if(edge & BOTTOM_EDGE) {
- 				priv->horiz_scroll_on = TRUE;
- 				priv->scroll_x = hw->x;
- 				DBG(7, ErrorF("horiz edge scroll detected on bottom edge\n"));
- 			}
-		}
-	if(priv->vert_scroll_on && (!(edge & RIGHT_EDGE) || !finger || priv->palm))
-		{
-			DBG(7, ErrorF("vert edge scroll off\n"));
-			priv->vert_scroll_on = FALSE;
-		}
-	if(priv->horiz_scroll_on && (!(edge & BOTTOM_EDGE) || !finger || priv->palm))
-		{
- 			DBG(7, ErrorF("horiz edge scroll off\n"));
- 			priv->horiz_scroll_on = FALSE;
- 		}
-
-	/* scroll processing */
-	scroll_up = 0;
-	scroll_down = 0;
-	if(priv->vert_scroll_on)
+    /* scroll detection */
+    if(finger && !priv->finger_flag)
+	{
+	    if(edge & RIGHT_EDGE)
 		{
- 			/* + = up, - = down */
- 			while(hw->y - priv->scroll_y > para->scroll_dist_vert) {
- 				scroll_up++;
-				priv->scroll_y += para->scroll_dist_vert;
-			}
- 			while(hw->y - priv->scroll_y < -para->scroll_dist_vert) {
- 				scroll_down++;
-				priv->scroll_y -= para->scroll_dist_vert;
-			}
-		}
-	scroll_left = 0;
-	scroll_right = 0;
-	if(priv->horiz_scroll_on) {
-		/* + = right, - = left */
-		while(hw->x - priv->scroll_x > para->scroll_dist_horiz) {
-			scroll_right++;
-			priv->scroll_x += para->scroll_dist_horiz;
-		}
-		while(hw->x - priv->scroll_x < -para->scroll_dist_horiz) {
-			scroll_left++;
-			priv->scroll_x -= para->scroll_dist_horiz;
+		    priv->vert_scroll_on = TRUE;
+		    priv->scroll_y = hw->y;
+		    DBG(7, ErrorF("vert edge scroll detected on right edge\n"));
 		}
+	    if(edge & BOTTOM_EDGE) {
+		priv->horiz_scroll_on = TRUE;
+		priv->scroll_x = hw->x;
+		DBG(7, ErrorF("horiz edge scroll detected on bottom edge\n"));
+	    }
+	}
+    if(priv->vert_scroll_on && (!(edge & RIGHT_EDGE) || !finger || priv->palm))
+	{
+	    DBG(7, ErrorF("vert edge scroll off\n"));
+	    priv->vert_scroll_on = FALSE;
+	}
+    if(priv->horiz_scroll_on && (!(edge & BOTTOM_EDGE) || !finger || priv->palm))
+	{
+	    DBG(7, ErrorF("horiz edge scroll off\n"));
+	    priv->horiz_scroll_on = FALSE;
 	}
 
-	/* movement */
-	if(finger && !priv->vert_scroll_on && !priv->horiz_scroll_on &&
-	   !priv->finger_count && !priv->palm)
+    /* scroll processing */
+    scroll_up = 0;
+    scroll_down = 0;
+    if(priv->vert_scroll_on)
 	{
-		delay = MIN(delay, 13);
-		if (priv->count_packet_finger > 3)
+	    /* + = up, - = down */
+	    while(hw->y - priv->scroll_y > para->scroll_dist_vert) {
+		scroll_up++;
+		priv->scroll_y += para->scroll_dist_vert;
+	    }
+	    while(hw->y - priv->scroll_y < -para->scroll_dist_vert) {
+		scroll_down++;
+		priv->scroll_y -= para->scroll_dist_vert;
+	    }
+	}
+    scroll_left = 0;
+    scroll_right = 0;
+    if(priv->horiz_scroll_on) {
+	/* + = right, - = left */
+	while(hw->x - priv->scroll_x > para->scroll_dist_horiz) {
+	    scroll_right++;
+	    priv->scroll_x += para->scroll_dist_horiz;
+	}
+	while(hw->x - priv->scroll_x < -para->scroll_dist_horiz) {
+	    scroll_left++;
+	    priv->scroll_x -= para->scroll_dist_horiz;
+	}
+    }
+
+    /* movement */
+    if(finger && !priv->vert_scroll_on && !priv->horiz_scroll_on &&
+       !priv->finger_count && !priv->palm)
+	{
+	    delay = MIN(delay, 13);
+	    if (priv->count_packet_finger > 3)
 		{ /* min. 3 packets */
 
-			dy = (1 *
-				  (((MOVE_HIST(1).y + MOVE_HIST(2).y) / 2) -
-				   ((hw->y			+ MOVE_HIST(1).y) / 2)));
-			dx = (-1 *
-				  (((MOVE_HIST(1).x + MOVE_HIST(2).x) / 2) -
-				   ((hw->x			+ MOVE_HIST(1).x) / 2)));
-
-			if (priv->drag) {
-				if (edge & RIGHT_EDGE) {
-					dx += clamp(para->edge_motion_speed - dx, 0, para->edge_motion_speed);
-				} else if (edge & LEFT_EDGE) {
-					dx -= clamp(para->edge_motion_speed + dx, 0, para->edge_motion_speed);
-				}
-				if (edge & TOP_EDGE) {
-					dy -= clamp(para->edge_motion_speed + dy, 0, para->edge_motion_speed);
-				} else if (edge & BOTTOM_EDGE) {
-					dy += clamp(para->edge_motion_speed - dy, 0, para->edge_motion_speed);
-				}
+		    dy = (1 *
+			  (((MOVE_HIST(1).y + MOVE_HIST(2).y) / 2) -
+			   ((hw->y			+ MOVE_HIST(1).y) / 2)));
+		    dx = (-1 *
+			  (((MOVE_HIST(1).x + MOVE_HIST(2).x) / 2) -
+			   ((hw->x			+ MOVE_HIST(1).x) / 2)));
+
+		    if (priv->drag) {
+			if (edge & RIGHT_EDGE) {
+			    dx += clamp(para->edge_motion_speed - dx, 0, para->edge_motion_speed);
+			} else if (edge & LEFT_EDGE) {
+			    dx -= clamp(para->edge_motion_speed + dx, 0, para->edge_motion_speed);
 			}
+			if (edge & TOP_EDGE) {
+			    dy -= clamp(para->edge_motion_speed + dy, 0, para->edge_motion_speed);
+			} else if (edge & BOTTOM_EDGE) {
+			    dy += clamp(para->edge_motion_speed - dy, 0, para->edge_motion_speed);
+			}
+		    }
 
-			/* speed in depence of distance/packet */
-			dist = move_distance( dx, dy );
-			speed = dist * para->accl;
-			if(speed > para->max_speed)
+		    /* speed in depence of distance/packet */
+		    dist = move_distance( dx, dy );
+		    speed = dist * para->accl;
+		    if(speed > para->max_speed)
 			{ /* set max speed factor */
-				speed = para->max_speed;
+			    speed = para->max_speed;
 			}
-			else if(speed < para->min_speed)
+		    else if(speed < para->min_speed)
 			{ /* set min speed factor */
-				speed = para->min_speed;
+			    speed = para->min_speed;
 			}
 
-			/* save the fraction for adding to the next priv->count_packet */
-			priv->frac_x = xf86modf((dx * speed) + priv->frac_x, &integral);
-			dx = integral;
-			priv->frac_y = xf86modf((dy * speed) + priv->frac_y, &integral);
-			dy = integral;
+		    /* save the fraction for adding to the next priv->count_packet */
+		    priv->frac_x = xf86modf((dx * speed) + priv->frac_x, &integral);
+		    dx = integral;
+		    priv->frac_y = xf86modf((dy * speed) + priv->frac_y, &integral);
+		    dy = integral;
 		}
 
-		priv->count_packet_finger++;
+	    priv->count_packet_finger++;
 	}
-	else
+    else
 	{ /* reset packet counter */
-		priv->count_packet_finger = 0;
+	    priv->count_packet_finger = 0;
 	}
 
 
-	buttons = ((hw->left  ? 0x01 : 0) |
-			   (mid       ? 0x02 : 0) |
-			   (hw->right ? 0x04 : 0) |
-			   (hw->up    ? 0x08 : 0) |
-			   (hw->down  ? 0x10 : 0) |
-			   (hw->cbLeft  ? 0x20 : 0) |
-			   (hw->cbRight ? 0x40 : 0));
+    buttons = ((hw->left  ? 0x01 : 0) |
+	       (mid       ? 0x02 : 0) |
+	       (hw->right ? 0x04 : 0) |
+	       (hw->up    ? 0x08 : 0) |
+	       (hw->down  ? 0x10 : 0) |
+	       (hw->cbLeft  ? 0x20 : 0) |
+	       (hw->cbRight ? 0x40 : 0));
 
-	/* Flags */
-	priv->finger_flag = finger;
+    /* Flags */
+    priv->finger_flag = finger;
 
-	/* generate a history of the absolute positions */
-	MOVE_HIST(0).y = hw->y;
-	MOVE_HIST(0).x = hw->x;
+    /* generate a history of the absolute positions */
+    MOVE_HIST(0).y = hw->y;
+    MOVE_HIST(0).x = hw->x;
 
-	/* Post events */
-	if(dx || dy)
-		xf86PostMotionEvent(local->dev, 0, 0, 2, dx, dy);
+    /* Post events */
+    if(dx || dy)
+	xf86PostMotionEvent(local->dev, 0, 0, 2, dx, dy);
 
-	change = buttons ^ priv->lastButtons;
-	while(change)
-		{
-			id = ffs(change); /* number of first set bit 1..32 is returned */
-			change &= ~(1 << (id - 1));
-			xf86PostButtonEvent(local->dev, FALSE, id, (buttons & (1 << (id - 1))), 0, 0);
-		}
-	priv->lastButtons = buttons;
-
-	while(scroll_up-- > 0) {
-		xf86PostButtonEvent(local->dev, FALSE, 4, !hw->up, 0, 0);
-		xf86PostButtonEvent(local->dev, FALSE, 4, hw->up, 0, 0);
-	}
-	while(scroll_down-- > 0) {
-		xf86PostButtonEvent(local->dev, FALSE, 5, !hw->down, 0, 0);
-		xf86PostButtonEvent(local->dev, FALSE, 5, hw->down, 0, 0);
-	}
-	while(scroll_left-- > 0) {
-		xf86PostButtonEvent(local->dev, FALSE, 6, TRUE, 0, 0);
-		xf86PostButtonEvent(local->dev, FALSE, 6, FALSE, 0, 0);
-	}
-	while(scroll_right-- > 0) {
-		xf86PostButtonEvent(local->dev, FALSE, 7, TRUE, 0, 0);
-		xf86PostButtonEvent(local->dev, FALSE, 7, FALSE, 0, 0);
+    change = buttons ^ priv->lastButtons;
+    while(change)
+	{
+	    id = ffs(change); /* number of first set bit 1..32 is returned */
+	    change &= ~(1 << (id - 1));
+	    xf86PostButtonEvent(local->dev, FALSE, id, (buttons & (1 << (id - 1))), 0, 0);
 	}
-	if (double_click) {
-		int i;
-		for (i = 0; i < 2; i++) {
-			xf86PostButtonEvent(local->dev, FALSE, 1, !hw->left, 0, 0);
-			xf86PostButtonEvent(local->dev, FALSE, 1, hw->left, 0, 0);
-		}
+    priv->lastButtons = buttons;
+
+    while(scroll_up-- > 0) {
+	xf86PostButtonEvent(local->dev, FALSE, 4, !hw->up, 0, 0);
+	xf86PostButtonEvent(local->dev, FALSE, 4, hw->up, 0, 0);
+    }
+    while(scroll_down-- > 0) {
+	xf86PostButtonEvent(local->dev, FALSE, 5, !hw->down, 0, 0);
+	xf86PostButtonEvent(local->dev, FALSE, 5, hw->down, 0, 0);
+    }
+    while(scroll_left-- > 0) {
+	xf86PostButtonEvent(local->dev, FALSE, 6, TRUE, 0, 0);
+	xf86PostButtonEvent(local->dev, FALSE, 6, FALSE, 0, 0);
+    }
+    while(scroll_right-- > 0) {
+	xf86PostButtonEvent(local->dev, FALSE, 7, TRUE, 0, 0);
+	xf86PostButtonEvent(local->dev, FALSE, 7, FALSE, 0, 0);
+    }
+    if (double_click) {
+	int i;
+	for (i = 0; i < 2; i++) {
+	    xf86PostButtonEvent(local->dev, FALSE, 1, !hw->left, 0, 0);
+	    xf86PostButtonEvent(local->dev, FALSE, 1, hw->left, 0, 0);
 	}
+    }
 
 
-	/*
-	 * Handle auto repeat buttons
-	 */
-	if ((hw->up || hw->down || hw->cbLeft || hw->cbRight) &&
-		para->updown_button_scrolling) {
-		priv->repeatButtons = buttons & 0x78;
-		if (!priv->nextRepeat) {
-			priv->nextRepeat = hw->millis + 200;
-		}
-	} else {
-		priv->repeatButtons = 0;
-		priv->nextRepeat = 0;
+    /*
+     * Handle auto repeat buttons
+     */
+    if ((hw->up || hw->down || hw->cbLeft || hw->cbRight) &&
+	para->updown_button_scrolling) {
+	priv->repeatButtons = buttons & 0x78;
+	if (!priv->nextRepeat) {
+	    priv->nextRepeat = hw->millis + 200;
 	}
+    } else {
+	priv->repeatButtons = 0;
+	priv->nextRepeat = 0;
+    }
 
-	if (priv->repeatButtons)
+    if (priv->repeatButtons)
 	{
-		timeleft = TIME_DIFF(priv->nextRepeat, hw->millis);
-		if (timeleft > 0)
-			delay = MIN(delay, timeleft);
-		if (timeleft <= 0)
+	    timeleft = TIME_DIFF(priv->nextRepeat, hw->millis);
+	    if (timeleft > 0)
+		delay = MIN(delay, timeleft);
+	    if (timeleft <= 0)
 		{
-			int change, id;
-			change = priv->repeatButtons;
-			while(change) {
-				id = ffs(change);
-				change &= ~(1 << (id - 1));
-				xf86PostButtonEvent(local->dev, FALSE, id, FALSE, 0, 0);
-				xf86PostButtonEvent(local->dev, FALSE, id, TRUE, 0, 0);
-			}
+		    int change, id;
+		    change = priv->repeatButtons;
+		    while(change) {
+			id = ffs(change);
+			change &= ~(1 << (id - 1));
+			xf86PostButtonEvent(local->dev, FALSE, id, FALSE, 0, 0);
+			xf86PostButtonEvent(local->dev, FALSE, id, TRUE, 0, 0);
+		    }
 
-			priv->nextRepeat = hw->millis + 100;
-			delay = MIN(delay, 100);
+		    priv->nextRepeat = hw->millis + 100;
+		    delay = MIN(delay, 100);
 		}
 	}
 
-	return delay;
+    return delay;
 }
 
 static int
 ControlProc(LocalDevicePtr local, xDeviceCtl * control)
 {
-	DBG(3, ErrorF("Control Proc called\n"));
-	return (Success);
+    DBG(3, ErrorF("Control Proc called\n"));
+    return (Success);
 }
 
 
 static void
 CloseProc (LocalDevicePtr local)
 {
-	DBG(3, ErrorF("Close Proc called\n"));
+    DBG(3, ErrorF("Close Proc called\n"));
 }
 
 static int
 SwitchMode (ClientPtr client, DeviceIntPtr dev, int mode)
 {
-	ErrorF("SwitchMode called\n");
-	return (Success);
+    ErrorF("SwitchMode called\n");
+    return (Success);
 }
 
 static Bool
@@ -1257,276 +1256,276 @@ ConvertProc (LocalDevicePtr local,
 			 int *x,
 			 int *y)
 {
-	if(first != 0 || num != 2)
-		return FALSE;
+    if(first != 0 || num != 2)
+	return FALSE;
 
-	*x = v0;
-	*y = v1;
+    *x = v0;
+    *y = v1;
 
-	return TRUE;
+    return TRUE;
 }
 
 
 static Bool
 QueryHardware (LocalDevicePtr local)
 {
-	SynapticsPrivatePtr priv = (SynapticsPrivatePtr) local->private;
-	SynapticsSHMPtr para = priv->synpara;
-	int retries;
-	int mode;
-
-	xf86Msg(X_INFO, "xfree driver for the synaptics touchpad %s\n", VERSION);
+    SynapticsPrivatePtr priv = (SynapticsPrivatePtr) local->private;
+    SynapticsSHMPtr para = priv->synpara;
+    int retries;
+    int mode;
 
-	if (priv->proto == SYN_PROTO_EVENT)
-		return Success;
-
-	/* is the synaptics touchpad active? */
-	priv->isSynaptics = QueryIsSynaptics(local->fd);
+    xf86Msg(X_INFO, "xfree driver for the synaptics touchpad %s\n", VERSION);
 
-	if((!priv->isSynaptics) && (!para->repeater || (priv->fifofd == -1))) {
-		xf86Msg(X_ERROR, "%s no synaptics touchpad detected and no repeater device\n",
-		        local->name);
-		priv->isSynaptics = TRUE;
-		return(!Success);
-	}
-	para->isSynaptics = priv->isSynaptics;
-
-	priv->protoBufTail = 0;
-	if(!priv->isSynaptics) {
-		xf86Msg(X_PROBED, "%s no synaptics touchpad, data piped to repeater fifo\n", local->name);
-		synaptics_reset(local->fd);
-		SynapticsEnableDevice(local->fd);
-		return(Success);
-	}
+    if (priv->proto == SYN_PROTO_EVENT)
+	return Success;
 
-	xf86Msg(X_PROBED, "%s synaptics touchpad found\n", local->name);
+    /* is the synaptics touchpad active? */
+    priv->isSynaptics = QueryIsSynaptics(local->fd);
+
+    if((!priv->isSynaptics) && (!para->repeater || (priv->fifofd == -1))) {
+	xf86Msg(X_ERROR, "%s no synaptics touchpad detected and no repeater device\n",
+		local->name);
+	priv->isSynaptics = TRUE;
+	return(!Success);
+    }
+    para->isSynaptics = priv->isSynaptics;
+
+    priv->protoBufTail = 0;
+    if(!priv->isSynaptics) {
+	xf86Msg(X_PROBED, "%s no synaptics touchpad, data piped to repeater fifo\n", local->name);
+	synaptics_reset(local->fd);
+	SynapticsEnableDevice(local->fd);
+	return(Success);
+    }
 
-	retries = 3;
-	while((retries++ <= 3) && (synaptics_reset(local->fd) != Success))
-		xf86Msg(X_ERROR, "%s reset failed\n", local->name);
+    xf86Msg(X_PROBED, "%s synaptics touchpad found\n", local->name);
 
-	if(synaptics_identify(local->fd, &priv->identity) != Success)
-		return !Success;
-	para->identity = priv->identity;
+    retries = 3;
+    while((retries++ <= 3) && (synaptics_reset(local->fd) != Success))
+	xf86Msg(X_ERROR, "%s reset failed\n", local->name);
 
-	if(synaptics_model_id(local->fd, &priv->model_id) != Success)
-		return !Success;
-	para->model_id = priv->model_id;
+    if(synaptics_identify(local->fd, &priv->identity) != Success)
+	return !Success;
+    para->identity = priv->identity;
 
-	if(synaptics_capability(local->fd, &priv->capabilities, &priv->ext_cap) != Success)
-		return !Success;
-	para->capabilities = priv->capabilities;
-	para->ext_cap = priv->ext_cap;
+    if(synaptics_model_id(local->fd, &priv->model_id) != Success)
+	return !Success;
+    para->model_id = priv->model_id;
 
-	mode = SYN_BIT_ABSOLUTE_MODE | SYN_BIT_HIGH_RATE;
-	if (SYN_ID_MAJOR(priv->identity) >= 4)
-		mode |= SYN_BIT_DISABLE_GESTURE;
-	if (SYN_CAP_EXTENDED(priv->capabilities))
-		mode |= SYN_BIT_W_MODE;
-	if(synaptics_set_mode(local->fd, mode) != Success)
-		return !Success;
+    if(synaptics_capability(local->fd, &priv->capabilities, &priv->ext_cap) != Success)
+	return !Success;
+    para->capabilities = priv->capabilities;
+    para->ext_cap = priv->ext_cap;
+
+    mode = SYN_BIT_ABSOLUTE_MODE | SYN_BIT_HIGH_RATE;
+    if (SYN_ID_MAJOR(priv->identity) >= 4)
+	mode |= SYN_BIT_DISABLE_GESTURE;
+    if (SYN_CAP_EXTENDED(priv->capabilities))
+	mode |= SYN_BIT_W_MODE;
+    if(synaptics_set_mode(local->fd, mode) != Success)
+	return !Success;
 
-	SynapticsEnableDevice(local->fd);
+    SynapticsEnableDevice(local->fd);
 
-	PrintIdent(priv);
+    PrintIdent(priv);
 
-	return Success;
+    return Success;
 }
 
 static Bool
 SynapticsGetHwState(LocalDevicePtr local, SynapticsPrivatePtr priv,
 					struct SynapticsHwState *hw)
 {
-	if (priv->proto == SYN_PROTO_PSAUX) {
-		return SynapticsParseRawPacket(local, priv, hw);
-	} else if (priv->proto == SYN_PROTO_EVENT) {
-		return SynapticsParseEventData(local, priv, hw);
-	} else {
-		return !Success;
-	}
+    if (priv->proto == SYN_PROTO_PSAUX) {
+	return SynapticsParseRawPacket(local, priv, hw);
+    } else if (priv->proto == SYN_PROTO_EVENT) {
+	return SynapticsParseEventData(local, priv, hw);
+    } else {
+	return !Success;
+    }
 }
 
 static Bool
 SynapticsParseEventData(LocalDevicePtr local, SynapticsPrivatePtr priv,
 						struct SynapticsHwState *hw)
 {
-	struct input_event ev;
-
-	while (SynapticsReadEvent(priv, &ev) == Success) {
-		switch (ev.type) {
-		case EV_SYN:
-			switch (ev.code) {
-			case SYN_REPORT:
-				*hw = priv->hwState;
-				return Success;
-			}
-		case EV_KEY:
-			switch (ev.code) {
-			case BTN_LEFT:
-				priv->hwState.left = (ev.value ? TRUE : FALSE);
-				break;
-			case BTN_RIGHT:
-				priv->hwState.right = (ev.value ? TRUE : FALSE);
-				break;
-			case BTN_FORWARD:
-				priv->hwState.up = (ev.value ? TRUE : FALSE);
-				break;
-			case BTN_BACK:
-				priv->hwState.down = (ev.value ? TRUE : FALSE);
-				break;
-			case BTN_0:						/* multi-btn-0 */
-				priv->hwState.up = (ev.value ? TRUE : FALSE);
-				break;
-			case BTN_1:						/* multi-btn-1 */
-				priv->hwState.down = (ev.value ? TRUE : FALSE);
-				break;
-			case BTN_2:						/* multi-btn-2 */
-				priv->hwState.cbLeft = (ev.value ? TRUE : FALSE);
-				break;
-			case BTN_3:						/* multi-btn-3 */
-				priv->hwState.cbRight = (ev.value ? TRUE : FALSE);
-				break;
-			}
-			break;
-		case EV_ABS:
-			switch (ev.code) {
-			case ABS_X:
-				priv->hwState.x = ev.value;
-				break;
-			case ABS_Y:
-				priv->hwState.y = ev.value;
-				break;
-			case ABS_PRESSURE:
-				priv->hwState.z = ev.value;
-				break;
-			}
-			break;
-		case EV_MSC:
-			switch (ev.code) {
-			case MSC_GESTURE:
-				priv->hwState.w = ev.value;
-				break;
-			}
-			break;
-		}
+    struct input_event ev;
+
+    while (SynapticsReadEvent(priv, &ev) == Success) {
+	switch (ev.type) {
+	case EV_SYN:
+	    switch (ev.code) {
+	    case SYN_REPORT:
+		*hw = priv->hwState;
+		return Success;
+	    }
+	case EV_KEY:
+	    switch (ev.code) {
+	    case BTN_LEFT:
+		priv->hwState.left = (ev.value ? TRUE : FALSE);
+		break;
+	    case BTN_RIGHT:
+		priv->hwState.right = (ev.value ? TRUE : FALSE);
+		break;
+	    case BTN_FORWARD:
+		priv->hwState.up = (ev.value ? TRUE : FALSE);
+		break;
+	    case BTN_BACK:
+		priv->hwState.down = (ev.value ? TRUE : FALSE);
+		break;
+	    case BTN_0:						/* multi-btn-0 */
+		priv->hwState.up = (ev.value ? TRUE : FALSE);
+		break;
+	    case BTN_1:						/* multi-btn-1 */
+		priv->hwState.down = (ev.value ? TRUE : FALSE);
+		break;
+	    case BTN_2:						/* multi-btn-2 */
+		priv->hwState.cbLeft = (ev.value ? TRUE : FALSE);
+		break;
+	    case BTN_3:						/* multi-btn-3 */
+		priv->hwState.cbRight = (ev.value ? TRUE : FALSE);
+		break;
+	    }
+	    break;
+	case EV_ABS:
+	    switch (ev.code) {
+	    case ABS_X:
+		priv->hwState.x = ev.value;
+		break;
+	    case ABS_Y:
+		priv->hwState.y = ev.value;
+		break;
+	    case ABS_PRESSURE:
+		priv->hwState.z = ev.value;
+		break;
+	    }
+	    break;
+	case EV_MSC:
+	    switch (ev.code) {
+	    case MSC_GESTURE:
+		priv->hwState.w = ev.value;
+		break;
+	    }
+	    break;
 	}
-	return !Success;
+    }
+    return !Success;
 }
 
 static Bool
 SynapticsReadEvent(SynapticsPrivatePtr priv, struct input_event *ev)
 {
-	int i, c;
-	unsigned char *pBuf, u;
-
-	for (i = 0; i < sizeof(struct input_event); i++) {
-		if ((c = XisbRead(priv->buffer)) < 0)
-			return !Success;
-		u = (unsigned char)c;
-		pBuf = (unsigned char *)ev;
-		pBuf[i] = u;
-	}
-	return Success;
+    int i, c;
+    unsigned char *pBuf, u;
+
+    for (i = 0; i < sizeof(struct input_event); i++) {
+	if ((c = XisbRead(priv->buffer)) < 0)
+	    return !Success;
+	u = (unsigned char)c;
+	pBuf = (unsigned char *)ev;
+	pBuf[i] = u;
+    }
+    return Success;
 }
 
 static Bool
 SynapticsParseRawPacket(LocalDevicePtr local, SynapticsPrivatePtr priv,
 						struct SynapticsHwState *hw)
 {
-	Bool ret = SynapticsGetPacket(local, priv);
-	int newabs = SYN_MODEL_NEWABS(priv->model_id);
-	unsigned char *buf;
+    Bool ret = SynapticsGetPacket(local, priv);
+    int newabs = SYN_MODEL_NEWABS(priv->model_id);
+    unsigned char *buf;
 
-	if (ret != Success)
-		return ret;
+    if (ret != Success)
+	return ret;
 
-	buf = priv->protoBuf;
-	if (newabs)								/* newer protos...*/
+    buf = priv->protoBuf;
+    if (newabs)								/* newer protos...*/
 	{
-		DBG(7, ErrorF("using new protocols\n"));
-		hw->x = (((buf[3] & 0x10) << 8) |
-				 ((buf[1] & 0x0f) << 8) |
-				 buf[4]);
-		hw->y = (((buf[3] & 0x20) << 7) |
-				 ((buf[1] & 0xf0) << 4) |
-				 buf[5]);
-
-		hw->z = buf[2];
-		hw->w = (((buf[0] & 0x30) >> 2) |
-				 ((buf[0] & 0x04) >> 1) |
-				 ((buf[3] & 0x04) >> 2));
-
-		hw->left  = (buf[0] & 0x01) ? 1 : 0;
-		hw->right = (buf[0] & 0x02) ? 1 : 0;
-		hw->up    = 0;
-		hw->down  = 0;
-
-		if (SYN_CAP_EXTENDED(priv->capabilities)) {
-			if (SYN_CAP_FOUR_BUTTON(priv->capabilities)) {
-				hw->up = ((buf[3] & 0x01)) ? 1 : 0;
-				if (hw->left)
-					hw->up = !hw->up;
-				hw->down = ((buf[3] & 0x02)) ? 1 : 0;
-				if (hw->right)
-					hw->down = !hw->down;
-			}
-			if (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap)) {
-				/* aka. type with 6 buttons */
-				if ((buf[3]&2) ? !hw->right : hw->right) {
-					if (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) > 2) {
-						hw->cbLeft  = (buf[4] & 0x02) ? TRUE : FALSE;
-						hw->cbRight = (buf[5] & 0x02) ? TRUE : FALSE;
-					}
-					hw->up      = (buf[4] & 0x01) ? TRUE : FALSE;
-					hw->down    = (buf[5] & 0x01) ? TRUE : FALSE;
-				} else {
-					hw->cbLeft = hw->cbRight = hw->up = hw->down = FALSE;
-				}
+	    DBG(7, ErrorF("using new protocols\n"));
+	    hw->x = (((buf[3] & 0x10) << 8) |
+		     ((buf[1] & 0x0f) << 8) |
+		     buf[4]);
+	    hw->y = (((buf[3] & 0x20) << 7) |
+		     ((buf[1] & 0xf0) << 4) |
+		     buf[5]);
+
+	    hw->z = buf[2];
+	    hw->w = (((buf[0] & 0x30) >> 2) |
+		     ((buf[0] & 0x04) >> 1) |
+		     ((buf[3] & 0x04) >> 2));
+
+	    hw->left  = (buf[0] & 0x01) ? 1 : 0;
+	    hw->right = (buf[0] & 0x02) ? 1 : 0;
+	    hw->up    = 0;
+	    hw->down  = 0;
+
+	    if (SYN_CAP_EXTENDED(priv->capabilities)) {
+		if (SYN_CAP_FOUR_BUTTON(priv->capabilities)) {
+		    hw->up = ((buf[3] & 0x01)) ? 1 : 0;
+		    if (hw->left)
+			hw->up = !hw->up;
+		    hw->down = ((buf[3] & 0x02)) ? 1 : 0;
+		    if (hw->right)
+			hw->down = !hw->down;
+		}
+		if (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap)) {
+		    /* aka. type with 6 buttons */
+		    if ((buf[3]&2) ? !hw->right : hw->right) {
+			if (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) > 2) {
+			    hw->cbLeft  = (buf[4] & 0x02) ? TRUE : FALSE;
+			    hw->cbRight = (buf[5] & 0x02) ? TRUE : FALSE;
 			}
+			hw->up      = (buf[4] & 0x01) ? TRUE : FALSE;
+			hw->down    = (buf[5] & 0x01) ? TRUE : FALSE;
+		    } else {
+			hw->cbLeft = hw->cbRight = hw->up = hw->down = FALSE;
+		    }
 		}
+	    }
 	}
-	else									/* old proto...*/
+    else									/* old proto...*/
 	{
-		DBG(7, ErrorF("using old protocol\n"));
-		hw->x = (((buf[1] & 0x1F) << 8) |
-				 buf[2]);
-		hw->y = (((buf[4] & 0x1F) << 8) |
-				 buf[5]);
-
-		hw->z = (((buf[0] & 0x30) << 2) |
-				 (buf[3] & 0x3F));
-		hw->w = (((buf[1] & 0x80) >> 4) |
-				 ((buf[0] & 0x04) >> 1));
-
-		hw->left  = (buf[0] & 0x01) ? 1 : 0;
-		hw->right = (buf[0] & 0x02) ? 1 : 0;
-		hw->up    = 0;
-		hw->down  = 0;
-		hw->cbLeft = hw->cbRight = hw->up = hw->down = FALSE;
+	    DBG(7, ErrorF("using old protocol\n"));
+	    hw->x = (((buf[1] & 0x1F) << 8) |
+		     buf[2]);
+	    hw->y = (((buf[4] & 0x1F) << 8) |
+		     buf[5]);
+
+	    hw->z = (((buf[0] & 0x30) << 2) |
+		     (buf[3] & 0x3F));
+	    hw->w = (((buf[1] & 0x80) >> 4) |
+		     ((buf[0] & 0x04) >> 1));
+
+	    hw->left  = (buf[0] & 0x01) ? 1 : 0;
+	    hw->right = (buf[0] & 0x02) ? 1 : 0;
+	    hw->up    = 0;
+	    hw->down  = 0;
+	    hw->cbLeft = hw->cbRight = hw->up = hw->down = FALSE;
 	}
-	if (hw->z > 0) {
-		int w_ok = 0;
-		/*
-		 * Use capability bits to decide if the w value is valid.
-		 * If not, set it to 5, which corresponds to a finger of
-		 * normal width.
-		 */
-		if (SYN_CAP_EXTENDED(priv->capabilities)) {
-			if ((hw->w >= 0) && (hw->w <= 1)) {
-				w_ok = SYN_CAP_MULTIFINGER(priv->capabilities);
-			} else if (hw->w == 2) {
-				w_ok = SYN_MODEL_PEN(priv->model_id);
-			} else if ((hw->w >= 4) && (hw->w <= 15)) {
-				w_ok = SYN_CAP_PALMDETECT(priv->capabilities);
-			}
-		}
-		if (!w_ok)
-			hw->w = 5;
+    if (hw->z > 0) {
+	int w_ok = 0;
+	/*
+	 * Use capability bits to decide if the w value is valid.
+	 * If not, set it to 5, which corresponds to a finger of
+	 * normal width.
+	 */
+	if (SYN_CAP_EXTENDED(priv->capabilities)) {
+	    if ((hw->w >= 0) && (hw->w <= 1)) {
+		w_ok = SYN_CAP_MULTIFINGER(priv->capabilities);
+	    } else if (hw->w == 2) {
+		w_ok = SYN_MODEL_PEN(priv->model_id);
+	    } else if ((hw->w >= 4) && (hw->w <= 15)) {
+		w_ok = SYN_CAP_PALMDETECT(priv->capabilities);
+	    }
 	}
+	if (!w_ok)
+	    hw->w = 5;
+    }
 
-	priv->hwState = *hw;
+    priv->hwState = *hw;
 
-	return Success;
+    return Success;
 }
 
 /*
@@ -1535,136 +1534,130 @@ SynapticsParseRawPacket(LocalDevicePtr local, SynapticsPrivatePtr priv,
 static Bool
 PacketOk(SynapticsPrivatePtr priv)
 {
-	unsigned char *buf = priv->protoBuf;
-	int newabs = SYN_MODEL_NEWABS(priv->model_id);
-
-	if (newabs ? ((buf[0] & 0xC8) != 0x80) : ((buf[0] & 0xC0) != 0xC0)) {
-		DBG(4, ErrorF("Synaptics driver lost sync at 1st byte\n"));
-		return FALSE;
-	}
-
-	if (!newabs && ((buf[1] & 0x60) != 0x00)) {
-		DBG(4, ErrorF("Synaptics driver lost sync at 2nd byte\n"));
-		return FALSE;
-	}
-
-	if ((newabs ? ((buf[3] & 0xc8) != 0xc0) : ((buf[3] & 0xc0) != 0x80))) {
-		DBG(4, ErrorF("Synaptics driver lost sync at 4th byte\n"));
-		return FALSE;
-	}
-
-	if (!newabs && ((buf[4] & 0x60) != 0x00)) {
-		DBG(4, ErrorF("Synaptics driver lost sync at 5th byte\n"));
-		return FALSE;
-	}
-
-	return TRUE;
+    unsigned char *buf = priv->protoBuf;
+    int newabs = SYN_MODEL_NEWABS(priv->model_id);
+
+    if (newabs ? ((buf[0] & 0xC8) != 0x80) : ((buf[0] & 0xC0) != 0xC0)) {
+	DBG(4, ErrorF("Synaptics driver lost sync at 1st byte\n"));
+	return FALSE;
+    }
+
+    if (!newabs && ((buf[1] & 0x60) != 0x00)) {
+	DBG(4, ErrorF("Synaptics driver lost sync at 2nd byte\n"));
+	return FALSE;
+    }
+
+    if ((newabs ? ((buf[3] & 0xc8) != 0xc0) : ((buf[3] & 0xc0) != 0x80))) {
+	DBG(4, ErrorF("Synaptics driver lost sync at 4th byte\n"));
+	return FALSE;
+    }
+
+    if (!newabs && ((buf[4] & 0x60) != 0x00)) {
+	DBG(4, ErrorF("Synaptics driver lost sync at 5th byte\n"));
+	return FALSE;
+    }
+
+    return TRUE;
 }
 
 static Bool
 SynapticsGetPacket(LocalDevicePtr local, SynapticsPrivatePtr priv)
 {
-	int count = 0;
-	int c;
-	unsigned char u;
-
-	while((c = XisbRead(priv->buffer)) >= 0) {
-		u = (unsigned char)c;
+    int count = 0;
+    int c;
+    unsigned char u;
+
+    while((c = XisbRead(priv->buffer)) >= 0) {
+	u = (unsigned char)c;
+
+	/* test if there is a reset sequence received */
+	if((c == 0x00) && (priv->lastByte == 0xAA))
+	    {
+		if(xf86WaitForInput(local->fd, 50000) == 0)
+		    {
+			DBG(7, ErrorF("Reset received\n"));
+			QueryHardware(local);
+		    } else
+			DBG(3, ErrorF("faked reset received\n"));
+	    }
+	priv->lastByte = u;
+
+	/* when there is no synaptics touchpad pipe the data to the repeater fifo */
+	if(!priv->isSynaptics)
+	    {
+		xf86write(priv->fifofd, &u, 1);
+		if(++count >= 3)
+		    return(!Success);
+		continue;
+	    }
+
+	/* to avoid endless loops */
+	if(count++ > 30)
+	    {
+		ErrorF("Synaptics driver lost sync... got gigantic packet!\n");
+		return (!Success);
+	    }
 
-		/* test if there is a reset sequence received */
-		if((c == 0x00) && (priv->lastByte == 0xAA))
-		{
-			if(xf86WaitForInput(local->fd, 50000) == 0)
-			{
-				DBG(7, ErrorF("Reset received\n"));
-				QueryHardware(local);
-			} else
-				DBG(3, ErrorF("faked reset received\n"));
-		}
-		priv->lastByte = u;
+	priv->protoBuf[priv->protoBufTail++] = u;
 
-		/* when there is no synaptics touchpad pipe the data to the repeater fifo */
-		if(!priv->isSynaptics)
-		{
-			xf86write(priv->fifofd, &u, 1);
-			if(++count >= 3)
-				return(!Success);
+	/* Check that we have a valid packet. If not, we are out of sync,
+	   so we throw away the first byte in the packet.*/
+	if (priv->protoBufTail >= 6) {
+	    if (!PacketOk(priv)) {
+		int i;
+		for (i = 0; i < priv->protoBufTail - 1; i++)
+		    priv->protoBuf[i] = priv->protoBuf[i + 1];
+		priv->protoBufTail--;
+		priv->outOfSync++;
+		if(priv->outOfSync > MAX_UNSYNC_PACKETS)
+		    {
+			priv->outOfSync = 0;
+			DBG(3, ErrorF("Synaptics synchronization lost too long -> reset touchpad.\n"));
+			QueryHardware(local); /* including a reset */
 			continue;
-		}
-
-		/* to avoid endless loops */
-		if(count++ > 30)
-		{
-			ErrorF("Synaptics driver lost sync... got gigantic packet!\n");
-			return (!Success);
-		}
-
-		priv->protoBuf[priv->protoBufTail++] = u;
-
-		/* Check that we have a valid packet. If not, we are out of sync,
-		   so we throw away the first byte in the packet.*/
-		if (priv->protoBufTail >= 6) {
-			if (!PacketOk(priv)) {
-				int i;
-				for (i = 0; i < priv->protoBufTail - 1; i++)
-					priv->protoBuf[i] = priv->protoBuf[i + 1];
-				priv->protoBufTail--;
-				priv->outOfSync++;
-				if(priv->outOfSync > MAX_UNSYNC_PACKETS)
-				{
-					priv->outOfSync = 0;
-					DBG(3, ErrorF("Synaptics synchronization lost too long -> reset touchpad.\n"));
-					QueryHardware(local); /* including a reset */
-					continue;
-				}
-			}
-		}
+		    }
+	    }
+	}
 
-		if(priv->protoBufTail >= 6)
-		{ /* Full packet received */
-			if(priv->outOfSync > 0) {
-				priv->outOfSync = 0;
-				DBG(4, ErrorF("Synaptics driver resynced.\n"));
-			}
-			priv->protoBufTail = 0;
-			return Success;
+	if(priv->protoBufTail >= 6)
+	    { /* Full packet received */
+		if(priv->outOfSync > 0) {
+		    priv->outOfSync = 0;
+		    DBG(4, ErrorF("Synaptics driver resynced.\n"));
 		}
-	}
+		priv->protoBufTail = 0;
+		return Success;
+	    }
+    }
 
-	return !Success;
+    return !Success;
 }
 
 static void
 PrintIdent(SynapticsPrivatePtr priv)
 {
-	xf86Msg(X_PROBED, " Synaptics Touchpad, model: %d\n", SYN_ID_MODEL(priv->identity));
-	xf86Msg(X_PROBED, " Firmware: %d.%d\n", SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity));
-
-	if(SYN_MODEL_ROT180(priv->model_id))
-		xf86Msg(X_PROBED, " 180 degree mounted touchpad\n");
-	if(SYN_MODEL_PORTRAIT(priv->model_id))
-		xf86Msg(X_PROBED, " portrait touchpad\n");
-	xf86Msg(X_PROBED, " Sensor: %d\n", SYN_MODEL_SENSOR(priv->model_id));
-	if(SYN_MODEL_NEWABS(priv->model_id))
-		xf86Msg(X_PROBED, " new absolute packet format\n");
-	if(SYN_MODEL_PEN(priv->model_id))
-		xf86Msg(X_PROBED, " pen detection\n");
-
-	if(SYN_CAP_EXTENDED(priv->capabilities)) {
-		xf86Msg(X_PROBED, " Touchpad has extended capability bits\n");
-		if(SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap))
-			xf86Msg(X_PROBED, " -> %d mulit-buttons, i.e. besides standard buttons\n" ,(int)(SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap)));
-		else if(SYN_CAP_FOUR_BUTTON(priv->capabilities))
-			xf86Msg(X_PROBED, " -> four buttons\n");
-		if(SYN_CAP_MULTIFINGER(priv->capabilities))
-			xf86Msg(X_PROBED, " -> multifinger detection\n");
-		if(SYN_CAP_PALMDETECT(priv->capabilities))
-			xf86Msg(X_PROBED, " -> palm detection\n");
-	}
+    xf86Msg(X_PROBED, " Synaptics Touchpad, model: %d\n", SYN_ID_MODEL(priv->identity));
+    xf86Msg(X_PROBED, " Firmware: %d.%d\n", SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity));
+
+    if(SYN_MODEL_ROT180(priv->model_id))
+	xf86Msg(X_PROBED, " 180 degree mounted touchpad\n");
+    if(SYN_MODEL_PORTRAIT(priv->model_id))
+	xf86Msg(X_PROBED, " portrait touchpad\n");
+    xf86Msg(X_PROBED, " Sensor: %d\n", SYN_MODEL_SENSOR(priv->model_id));
+    if(SYN_MODEL_NEWABS(priv->model_id))
+	xf86Msg(X_PROBED, " new absolute packet format\n");
+    if(SYN_MODEL_PEN(priv->model_id))
+	xf86Msg(X_PROBED, " pen detection\n");
+
+    if(SYN_CAP_EXTENDED(priv->capabilities)) {
+	xf86Msg(X_PROBED, " Touchpad has extended capability bits\n");
+	if(SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap))
+	    xf86Msg(X_PROBED, " -> %d mulit-buttons, i.e. besides standard buttons\n" ,(int)(SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap)));
+	else if(SYN_CAP_FOUR_BUTTON(priv->capabilities))
+	    xf86Msg(X_PROBED, " -> four buttons\n");
+	if(SYN_CAP_MULTIFINGER(priv->capabilities))
+	    xf86Msg(X_PROBED, " -> multifinger detection\n");
+	if(SYN_CAP_PALMDETECT(priv->capabilities))
+	    xf86Msg(X_PROBED, " -> palm detection\n");
+    }
 }
-
-/* Local Variables: */
-/* tab-width: 4 */
-/* End: */
-/* vim:ts=2:sw=2:cindent:
-*/
diff --git a/synaptics.h b/synaptics.h
index 99ab9ef..5bbdb48 100644
--- a/synaptics.h
+++ b/synaptics.h
@@ -5,44 +5,44 @@
 
 /******************************************************************************
  *		Public definitions.
- *						Used by driver and the shared memory configurator
+ *			Used by driver and the shared memory configurator
  *****************************************************************************/
 #define SHM_SYNAPTICS 23947
 typedef struct _SynapticsSHM
 {
-	/* Current device state */
-	int x, y;							/* actual x, y Coordinates */
-	int z;								/* pressure value */
-	int w;								/* finger width value */
-	int left, right, up, down;			/* left/right/up/down buttons */
-
-	/* Probed hardware properties */
-	unsigned long int model_id;			/* Model-ID */
-	unsigned long int capabilities; 	/* Capabilities */
-	unsigned long int ext_cap;			/* Extended Capabilities */
-	unsigned long int identity;			/* Identification */
-	Bool isSynaptics;					/* Synaptics touchpad active */
-
-	/* Parameter data */
-	int	left_edge, right_edge, top_edge, bottom_edge;
-										/* edge coordinates absolute */
-	int	finger_low, finger_high;		/* finger detection values in Z-values */
-	unsigned long tap_time;
-	int tap_move;						/* max. tapping-time and movement in packets and coord. */
-	int emulate_mid_button_time;		/* Max time between left and right button presses to
-										   emulate a middle button press. */
-	int	scroll_dist_vert;				/* Scrolling distance in absolute coordinates */
-	int	scroll_dist_horiz;				/* Scrolling distance in absolute coordinates */
-	double min_speed, max_speed, accl;  /* movement parameters */
-	int edge_motion_speed;				/* Edge motion speed when dragging */
-	char* repeater;						/* Repeater on or off */
-	Bool updown_button_scrolling;		/* Up/Down-Button scrolling or middle/double-click */
+    /* Current device state */
+    int x, y;				    /* actual x, y Coordinates */
+    int z;				    /* pressure value */
+    int w;				    /* finger width value */
+    int left, right, up, down;		    /* left/right/up/down buttons */
+
+    /* Probed hardware properties */
+    unsigned long int model_id;		    /* Model-ID */
+    unsigned long int capabilities;	    /* Capabilities */
+    unsigned long int ext_cap;		    /* Extended Capabilities */
+    unsigned long int identity;		    /* Identification */
+    Bool isSynaptics;			    /* Synaptics touchpad active */
+
+    /* Parameter data */
+    int	left_edge, right_edge, top_edge, bottom_edge;
+    /* edge coordinates absolute */
+    int	finger_low, finger_high;	    /* finger detection values in Z-values */
+    unsigned long tap_time;
+    int tap_move;			    /* max. tapping-time and movement in packets and coord. */
+    int emulate_mid_button_time;	    /* Max time between left and right button presses to
+					       emulate a middle button press. */
+    int	scroll_dist_vert;		    /* Scrolling distance in absolute coordinates */
+    int	scroll_dist_horiz;		    /* Scrolling distance in absolute coordinates */
+    double min_speed, max_speed, accl;	    /* movement parameters */
+    int edge_motion_speed;		    /* Edge motion speed when dragging */
+    char* repeater;			    /* Repeater on or off */
+    Bool updown_button_scrolling;	    /* Up/Down-Button scrolling or middle/double-click */
 } SynapticsSHM, *SynapticsSHMPtr;
 
 #ifdef SYNAPTICS_PRIVATE
 /******************************************************************************
  *		Definitions
- *									structs, typedefs, #defines, enums
+ *					structs, typedefs, #defines, enums
  *****************************************************************************/
 #define SYNAPTICS_MOVE_HISTORY	5
 
@@ -50,94 +50,95 @@ typedef struct _SynapticsSHM
  * A structure to describe the state of the touchpad hardware (buttons and pad)
  */
 struct SynapticsHwState {
-	int millis;								/* Timestamp in milliseconds */
-	int x;									/* X position of finger */
-	int y;									/* Y position of finger */
-	int z;									/* Finger pressure */
-	int w;									/* Finger width/finger count */
-	Bool left;
-	Bool right;
-	Bool up;
-	Bool down;
-	Bool cbLeft;
-	Bool cbRight;
+    int millis;			/* Timestamp in milliseconds */
+    int x;			/* X position of finger */
+    int y;			/* Y position of finger */
+    int z;			/* Finger pressure */
+    int w;			/* Finger width/finger count */
+    Bool left;
+    Bool right;
+    Bool up;
+    Bool down;
+    Bool cbLeft;
+    Bool cbRight;
 };
 
 typedef struct _SynapticsTapRec
 {
-	int x, y;
-	unsigned int millis;
+    int x, y;
+    unsigned int millis;
 } SynapticsTapRec;
 
 typedef struct _SynapticsMoveHist
 {
-	int x, y;
+    int x, y;
 } SynapticsMoveHistRec;
 
 enum MidButtonEmulation {
-	MBE_OFF,							/* No button pressed */
-	MBE_LEFT,							/* Left button pressed, waiting for right button or timeout */
-	MBE_RIGHT,							/* Right button pressed, waiting for left button or timeout */
-	MBE_MID,							/* Left and right buttons pressed, waiting for both buttons
-										   to be released */
-	MBE_TIMEOUT							/* Waiting for both buttons to be released. */
+    MBE_OFF,			/* No button pressed */
+    MBE_LEFT,			/* Left button pressed, waiting for right button or timeout */
+    MBE_RIGHT,			/* Right button pressed, waiting for left button or timeout */
+    MBE_MID,			/* Left and right buttons pressed, waiting for both buttons
+				   to be released */
+    MBE_TIMEOUT			/* Waiting for both buttons to be released. */
 };
 
 enum SynapticsProtocol {
-	SYN_PROTO_PSAUX,					/* Raw psaux device */
-	SYN_PROTO_EVENT						/* Linux kernel event interface */
+    SYN_PROTO_PSAUX,		/* Raw psaux device */
+    SYN_PROTO_EVENT		/* Linux kernel event interface */
 };
 
 typedef struct _SynapticsPrivateRec
 {
-	/* shared memory pointer */
-	SynapticsSHMPtr synpara;
-
-	enum SynapticsProtocol proto;
-
-	struct SynapticsHwState hwState;
-
-	/* Data read from the touchpad */
-	unsigned long int model_id;			/* Model-ID */
-	unsigned long int capabilities; 	/* Capabilities */
-	unsigned long int ext_cap;			/* Extended Capabilities */
-	unsigned long int identity;			/* Identification */
-	Bool isSynaptics;					/* Synaptics touchpad active */
-	Bool shm_config;					/* True when shared memory area allocated */
-
-	OsTimerPtr timer;				   /* for up/down-button repeat, tap processing, etc */
-
-	/* Data for normal processing */
-	XISBuffer *buffer;
-	unsigned char protoBuf[6];			/* Buffer for Packet */
-	unsigned char lastByte;				/* letztes gelesene byte */
-	int outOfSync;						/* How many consecutive incorrect packets we have received */
-	int protoBufTail;
-	int fifofd;		 					/* fd for fifo */
-	SynapticsTapRec touch_on;			/* data when the touchpad is touched */
-	SynapticsMoveHistRec move_hist[SYNAPTICS_MOVE_HISTORY]; /* movement history */
-
-	int scroll_y;						/* last y-scroll position */
-	int scroll_x;						/* last x-scroll position */
-	unsigned long count_packet_finger;	/* packet counter with finger on the touchpad */
-	unsigned int tapping_millis;		/* packet counter for tapping */
-	unsigned int button_delay_millis;	/* button delay for 3rd button emulation */
-	unsigned int prev_up;				/* Previous up button value, for double click emulation */
-	Bool finger_flag;					/* previous finger */
-	Bool tap, drag, doubletap;			/* feature flags */
-	Bool tap_left, tap_mid, tap_right;	/* tapping buttons */
-	Bool vert_scroll_on;				/* scrolling flag */
-	Bool horiz_scroll_on;				/* scrolling flag */
-	double frac_x, frac_y;				/* absoulte -> relative fraction */
-	enum MidButtonEmulation mid_emu_state;	/* emulated 3rd button */
-	int repeatButtons;					/* buttons for repeat */
-	unsigned long nextRepeat;			/* Time when to trigger next auto repeat event */
-	int lastButtons;					/* last State of the buttons */
-	int finger_count;					/* tap counter for fingers */
-	int palm;							/* Set to true when palm detected, reset to false when
-										 * palm/finger contact disappears */
-	int prev_z;							/* previous z value, for palm detection */
-	int avg_w;							/* weighted average of previous w values */
+    /* shared memory pointer */
+    SynapticsSHMPtr synpara;
+
+    enum SynapticsProtocol proto;
+
+    struct SynapticsHwState hwState;
+
+    /* Data read from the touchpad */
+    unsigned long int model_id;		/* Model-ID */
+    unsigned long int capabilities; 	/* Capabilities */
+    unsigned long int ext_cap;		/* Extended Capabilities */
+    unsigned long int identity;		/* Identification */
+    Bool isSynaptics;			/* Synaptics touchpad active */
+    Bool shm_config;			/* True when shared memory area allocated */
+
+    OsTimerPtr timer;			/* for up/down-button repeat, tap processing, etc */
+
+    /* Data for normal processing */
+    XISBuffer *buffer;
+    unsigned char protoBuf[6];		/* Buffer for Packet */
+    unsigned char lastByte;		/* letztes gelesene byte */
+    int outOfSync;			/* How many consecutive incorrect packets we
+					   have received */
+    int protoBufTail;
+    int fifofd;		 		/* fd for fifo */
+    SynapticsTapRec touch_on;		/* data when the touchpad is touched */
+    SynapticsMoveHistRec move_hist[SYNAPTICS_MOVE_HISTORY]; /* movement history */
+
+    int scroll_y;			/* last y-scroll position */
+    int scroll_x;			/* last x-scroll position */
+    unsigned long count_packet_finger;	/* packet counter with finger on the touchpad */
+    unsigned int tapping_millis;	/* packet counter for tapping */
+    unsigned int button_delay_millis;	/* button delay for 3rd button emulation */
+    unsigned int prev_up;		/* Previous up button value, for double click emulation */
+    Bool finger_flag;			/* previous finger */
+    Bool tap, drag, doubletap;		/* feature flags */
+    Bool tap_left, tap_mid, tap_right;	/* tapping buttons */
+    Bool vert_scroll_on;		/* scrolling flag */
+    Bool horiz_scroll_on;		/* scrolling flag */
+    double frac_x, frac_y;		/* absoulte -> relative fraction */
+    enum MidButtonEmulation mid_emu_state;	/* emulated 3rd button */
+    int repeatButtons;			/* buttons for repeat */
+    unsigned long nextRepeat;		/* Time when to trigger next auto repeat event */
+    int lastButtons;			/* last State of the buttons */
+    int finger_count;			/* tap counter for fingers */
+    int palm;				/* Set to true when palm detected, reset to false when
+					   palm/finger contact disappears */
+    int prev_z;				/* previous z value, for palm detection */
+    int avg_w;				/* weighted average of previous w values */
 }
 SynapticsPrivateRec, *SynapticsPrivatePtr;
 
@@ -156,10 +157,10 @@ static Bool DeviceOff(DeviceIntPtr);
 static Bool DeviceInit(DeviceIntPtr);
 static Bool SynapticsGetHwState(LocalDevicePtr, SynapticsPrivatePtr, struct SynapticsHwState*);
 static Bool SynapticsParseEventData(LocalDevicePtr, SynapticsPrivatePtr,
-									struct SynapticsHwState*);
+				    struct SynapticsHwState*);
 static Bool SynapticsReadEvent(SynapticsPrivatePtr, struct input_event*);
 static Bool SynapticsParseRawPacket(LocalDevicePtr, SynapticsPrivatePtr,
-									struct SynapticsHwState*);
+				    struct SynapticsHwState*);
 static Bool SynapticsGetPacket(LocalDevicePtr, SynapticsPrivatePtr);
 static void PrintIdent(SynapticsPrivatePtr);
 
@@ -170,9 +171,3 @@ static void PrintIdent(SynapticsPrivatePtr);
  *    DO NOT PUT ANYTHING AFTER THIS ENDIF
  */
 #endif /* _SYNAPTICS_H_ */
-
-/* Local Variables: */
-/* tab-width: 4 */
-/* End: */
-/* vim:ts=4:sw=4:cindent:
-*/
diff --git a/synclient.c b/synclient.c
index 00a1eb4..a50d5a0 100644
--- a/synclient.c
+++ b/synclient.c
@@ -13,228 +13,224 @@
 
 static void show_hw_info(SynapticsSHM* synshm)
 {
-	printf("Hardware properties:\n");
-	if (synshm->isSynaptics) {
-		printf("    Model Id     = %08lx\n", synshm->model_id);
-		printf("    Capabilities = %08lx\n", synshm->capabilities);
-		printf("    Identity     = %08lx\n", synshm->identity);
-	} else {
-		printf("    No touchpad found\n");
-		printf("    Do you use a newer kernel than 2.4?\n");
-		printf("    Then browse the messages or boot.msg for the hardware info\n");
-	}
+    printf("Hardware properties:\n");
+    if (synshm->isSynaptics) {
+	printf("    Model Id     = %08lx\n", synshm->model_id);
+	printf("    Capabilities = %08lx\n", synshm->capabilities);
+	printf("    Identity     = %08lx\n", synshm->identity);
+    } else {
+	printf("    No touchpad found\n");
+	printf("    Do you use a newer kernel than 2.4?\n");
+	printf("    Then browse the messages or boot.msg for the hardware info\n");
+    }
 }
 
 /* ---------------------------------------------------------------------- */
 
 enum ParaType {
-	PT_INT,
-	PT_BOOL,
-	PT_DOUBLE
+    PT_INT,
+    PT_BOOL,
+    PT_DOUBLE
 };
 
 struct Parameter {
-	char* name;								/* Name of parameter */
-	int offset;								/* Offset in shared memory area */
-	enum ParaType type;						/* Type of parameter */
-	double min_val;							/* Minimum allowed value */
-	double max_val;							/* Maximum allowed value */
+    char* name;				    /* Name of parameter */
+    int offset;				    /* Offset in shared memory area */
+    enum ParaType type;			    /* Type of parameter */
+    double min_val;			    /* Minimum allowed value */
+    double max_val;			    /* Maximum allowed value */
 };
 
 #define DEFINE_PAR(name, memb, type, min_val, max_val) \
 { name, offsetof(SynapticsSHM, memb), (type), (min_val), (max_val) }
 
 static struct Parameter params[] = {
-	DEFINE_PAR("LeftEdge",             left_edge,               PT_INT,    0, 10000),
-	DEFINE_PAR("RightEdge",            right_edge,              PT_INT,    0, 10000),
-	DEFINE_PAR("TopEdge",              top_edge,                PT_INT,    0, 10000),
-	DEFINE_PAR("BottomEdge",           bottom_edge,             PT_INT,    0, 10000),
-	DEFINE_PAR("FingerLow",            finger_low,              PT_INT,    0, 255),
-	DEFINE_PAR("FingerHigh",           finger_high,             PT_INT,    0, 255),
-	DEFINE_PAR("MaxTapTime",           tap_time,                PT_INT,    0, 1000),
-	DEFINE_PAR("MaxTapMove",           tap_move,                PT_INT,    0, 2000),
-	DEFINE_PAR("EmulateMidButtonTime", emulate_mid_button_time, PT_INT,    0, 1000),
-	DEFINE_PAR("VertScrollDelta",      scroll_dist_vert,        PT_INT,    5, 1000),
-	DEFINE_PAR("HorizScrollDelta",     scroll_dist_horiz,       PT_INT,    5, 1000),
-	DEFINE_PAR("MinSpeed",             min_speed,               PT_DOUBLE, 0, 1.0),
-	DEFINE_PAR("MaxSpeed",             max_speed,               PT_DOUBLE, 0, 1.0),
-	DEFINE_PAR("AccelFactor",          accl,                    PT_DOUBLE, 0, 0.2),
-	DEFINE_PAR("EdgeMotionSpeed",      edge_motion_speed,       PT_INT,    0, 400),
-	DEFINE_PAR("UpDownScrolling",      updown_button_scrolling, PT_BOOL,   0, 1),
-	{ 0, 0, 0, 0, 0 }
+    DEFINE_PAR("LeftEdge",             left_edge,               PT_INT,    0, 10000),
+    DEFINE_PAR("RightEdge",            right_edge,              PT_INT,    0, 10000),
+    DEFINE_PAR("TopEdge",              top_edge,                PT_INT,    0, 10000),
+    DEFINE_PAR("BottomEdge",           bottom_edge,             PT_INT,    0, 10000),
+    DEFINE_PAR("FingerLow",            finger_low,              PT_INT,    0, 255),
+    DEFINE_PAR("FingerHigh",           finger_high,             PT_INT,    0, 255),
+    DEFINE_PAR("MaxTapTime",           tap_time,                PT_INT,    0, 1000),
+    DEFINE_PAR("MaxTapMove",           tap_move,                PT_INT,    0, 2000),
+    DEFINE_PAR("EmulateMidButtonTime", emulate_mid_button_time, PT_INT,    0, 1000),
+    DEFINE_PAR("VertScrollDelta",      scroll_dist_vert,        PT_INT,    5, 1000),
+    DEFINE_PAR("HorizScrollDelta",     scroll_dist_horiz,       PT_INT,    5, 1000),
+    DEFINE_PAR("MinSpeed",             min_speed,               PT_DOUBLE, 0, 1.0),
+    DEFINE_PAR("MaxSpeed",             max_speed,               PT_DOUBLE, 0, 1.0),
+    DEFINE_PAR("AccelFactor",          accl,                    PT_DOUBLE, 0, 0.2),
+    DEFINE_PAR("EdgeMotionSpeed",      edge_motion_speed,       PT_INT,    0, 400),
+    DEFINE_PAR("UpDownScrolling",      updown_button_scrolling, PT_BOOL,   0, 1),
+    { 0, 0, 0, 0, 0 }
 };
 
 static void show_settings(SynapticsSHM* synshm)
 {
-	int i;
-
-	printf("Parameter settings:\n");
-	for (i = 0; params[i].name; i++) {
-		struct Parameter* par = &params[i];
-		switch (par->type) {
-		case PT_INT:
-			printf("    %-20s = %d\n", par->name, *(int*)((char*)synshm + par->offset));
-			break;
-		case PT_BOOL:
-			printf("    %-20s = %d\n", par->name, *(Bool*)((char*)synshm + par->offset));
-			break;
-		case PT_DOUBLE:
-			printf("    %-20s = %g\n", par->name, *(double*)((char*)synshm + par->offset));
-			break;
-		}
+    int i;
+
+    printf("Parameter settings:\n");
+    for (i = 0; params[i].name; i++) {
+	struct Parameter* par = &params[i];
+	switch (par->type) {
+	case PT_INT:
+	    printf("    %-20s = %d\n", par->name, *(int*)((char*)synshm + par->offset));
+	    break;
+	case PT_BOOL:
+	    printf("    %-20s = %d\n", par->name, *(Bool*)((char*)synshm + par->offset));
+	    break;
+	case PT_DOUBLE:
+	    printf("    %-20s = %g\n", par->name, *(double*)((char*)synshm + par->offset));
+	    break;
 	}
+    }
 }
 
 static void set_variables(SynapticsSHM* synshm, int argc, char* argv[], int first_cmd)
 {
-	int i;
-	for (i = first_cmd; i < argc; i++) {
-		char* cmd = argv[i];
-		char* eqp = index(cmd, '=');
-		if (eqp) {
-			int j;
-			int found = 0;
-			*eqp = 0;
-			for (j = 0; params[j].name; j++) {
-				if (strcmp(cmd, params[j].name) == 0) {
-					found = 1;
-					break;
-				}
-			}
-			if (found) {
-				double val = atof(&eqp[1]);
-				struct Parameter* par = &params[j];
-
-				if (val < par->min_val)
-					val = par->min_val;
-				if (val > par->max_val)
-					val = par->max_val;
-
-				switch (par->type) {
-				case PT_INT:
-					*(int*)((char*)synshm + par->offset) = (int)rint(val);
-					break;
-				case PT_BOOL:
-					*(Bool*)((char*)synshm + par->offset) = (Bool)rint(val);
-					break;
-				case PT_DOUBLE:
-					*(double*)((char*)synshm + par->offset) = val;
-					break;
-				}
-			} else {
-				printf("Unknown parameter %s\n", cmd);
-			}
-		} else {
-			printf("Invalid command: %s\n", cmd);
+    int i;
+    for (i = first_cmd; i < argc; i++) {
+	char* cmd = argv[i];
+	char* eqp = index(cmd, '=');
+	if (eqp) {
+	    int j;
+	    int found = 0;
+	    *eqp = 0;
+	    for (j = 0; params[j].name; j++) {
+		if (strcmp(cmd, params[j].name) == 0) {
+		    found = 1;
+		    break;
+		}
+	    }
+	    if (found) {
+		double val = atof(&eqp[1]);
+		struct Parameter* par = &params[j];
+
+		if (val < par->min_val)
+		    val = par->min_val;
+		if (val > par->max_val)
+		    val = par->max_val;
+
+		switch (par->type) {
+		case PT_INT:
+		    *(int*)((char*)synshm + par->offset) = (int)rint(val);
+		    break;
+		case PT_BOOL:
+		    *(Bool*)((char*)synshm + par->offset) = (Bool)rint(val);
+		    break;
+		case PT_DOUBLE:
+		    *(double*)((char*)synshm + par->offset) = val;
+		    break;
 		}
+	    } else {
+		printf("Unknown parameter %s\n", cmd);
+	    }
+	} else {
+	    printf("Invalid command: %s\n", cmd);
 	}
+    }
 }
 
 static int is_equal(SynapticsSHM* s1, SynapticsSHM* s2)
 {
-	return ((s1->x     == s2->x) &&
-			(s1->y     == s2->y) &&
-			(s1->z     == s2->z) &&
-			(s1->w     == s2->w) &&
-			(s1->left  == s2->left) &&
-			(s1->right == s2->right) &&
-			(s1->up    == s2->up) &&
-			(s1->down  == s2->down));
+    return ((s1->x     == s2->x) &&
+	    (s1->y     == s2->y) &&
+	    (s1->z     == s2->z) &&
+	    (s1->w     == s2->w) &&
+	    (s1->left  == s2->left) &&
+	    (s1->right == s2->right) &&
+	    (s1->up    == s2->up) &&
+	    (s1->down  == s2->down));
 }
 
 static void monitor(SynapticsSHM* synshm, int delay)
 {
-	SynapticsSHM old;
-	memset(&old, 0, sizeof(SynapticsSHM));
-	old.x = -1;							/* Force first equality test to fail */
-
-	while(1) {
-		SynapticsSHM cur = *synshm;
-		if (!is_equal(&old, &cur)) {
-			printf("x:%4d y:%4d z:%3d w:%2d left:%d right:%d up:%d down:%d\n",
-				   cur.x, cur.y, cur.z, cur.w, cur.left, cur.right, cur.up, cur.down);
-			old = cur;
-		}
-		usleep(delay * 1000);
+    SynapticsSHM old;
+    memset(&old, 0, sizeof(SynapticsSHM));
+    old.x = -1;				    /* Force first equality test to fail */
+
+    while(1) {
+	SynapticsSHM cur = *synshm;
+	if (!is_equal(&old, &cur)) {
+	    printf("x:%4d y:%4d z:%3d w:%2d left:%d right:%d up:%d down:%d\n",
+		   cur.x, cur.y, cur.z, cur.w, cur.left, cur.right, cur.up, cur.down);
+	    old = cur;
 	}
+	usleep(delay * 1000);
+    }
 }
 
 static void usage()
 {
-	fprintf(stderr, "Usage: synclient [-m interval] [-h] [-l] [-?] [var1=value1 [var2=value2] ...]\n");
-	fprintf(stderr, "  -m monitor changes to the touchpad state.\n"
-					"     interval specifies how often (in ms) to poll the touchpad state\n");
-	fprintf(stderr, "  -h Show detected hardware properties\n");
-	fprintf(stderr, "  -l List current user settings\n");
-	fprintf(stderr, "  -? Show this help message\n");
-	fprintf(stderr, "  var=value  Set user parameter 'var' to 'value'.\n");
-	exit(1);
+    fprintf(stderr, "Usage: synclient [-m interval] [-h] [-l] [-?] [var1=value1 [var2=value2] ...]\n");
+    fprintf(stderr, "  -m monitor changes to the touchpad state.\n"
+	    "     interval specifies how often (in ms) to poll the touchpad state\n");
+    fprintf(stderr, "  -h Show detected hardware properties\n");
+    fprintf(stderr, "  -l List current user settings\n");
+    fprintf(stderr, "  -? Show this help message\n");
+    fprintf(stderr, "  var=value  Set user parameter 'var' to 'value'.\n");
+    exit(1);
 }
 
 int main(int argc, char* argv[])
 {
-	SynapticsSHM *synshm;
-	int shmid;
-
-	int c;
-	int delay = -1;
-	int do_monitor = 0;
-	int dump_hw = 0;
-	int dump_settings = 0;
-	int first_cmd;
-
-	/* Parse command line parameters */
-	while ((c = getopt(argc, argv, "m:hl")) != -1) {
-		switch (c) {
-		case 'm':
-			do_monitor = 1;
-			if ((delay = atoi(optarg)) < 0)
-				usage();
-			break;
-		case 'h':
-			dump_hw = 1;
-			break;
-		case 'l':
-			dump_settings = 1;
-			break;
-		default:
-			usage();
-		}
-	}
-	first_cmd = optind;
-	if (!do_monitor && !dump_hw && !dump_settings && first_cmd == argc)
+    SynapticsSHM *synshm;
+    int shmid;
+
+    int c;
+    int delay = -1;
+    int do_monitor = 0;
+    int dump_hw = 0;
+    int dump_settings = 0;
+    int first_cmd;
+
+    /* Parse command line parameters */
+    while ((c = getopt(argc, argv, "m:hl")) != -1) {
+	switch (c) {
+	case 'm':
+	    do_monitor = 1;
+	    if ((delay = atoi(optarg)) < 0)
 		usage();
-
-	/* Connect to the shared memory area */
-	if((shmid = shmget(SHM_SYNAPTICS, sizeof(SynapticsSHM), 0)) == -1) {
-		if ((shmid = shmget(SHM_SYNAPTICS, 0, 0)) == -1) {
-			fprintf(stderr, "Can't access shared memory area. SHMConfig disabled?\n");
-			exit(1);
-		} else {
-			fprintf(stderr, "Incorrect size of shared memory area. Incompatible driver version?\n");
-			exit(1);
-		}
-	}
-	if((synshm = (SynapticsSHM*) shmat(shmid, NULL, 0)) == NULL) {
-		perror("shmat");
-		exit(1);
+	    break;
+	case 'h':
+	    dump_hw = 1;
+	    break;
+	case 'l':
+	    dump_settings = 1;
+	    break;
+	default:
+	    usage();
 	}
-
-	/* Perform requested actions */
-	if (dump_hw) {
-		show_hw_info(synshm);
-	}
-	set_variables(synshm, argc, argv, first_cmd);
-	if (dump_settings) {
-		show_settings(synshm);
-	}
-	if (do_monitor) {
-		monitor(synshm, delay);
+    }
+    first_cmd = optind;
+    if (!do_monitor && !dump_hw && !dump_settings && first_cmd == argc)
+	usage();
+
+    /* Connect to the shared memory area */
+    if((shmid = shmget(SHM_SYNAPTICS, sizeof(SynapticsSHM), 0)) == -1) {
+	if ((shmid = shmget(SHM_SYNAPTICS, 0, 0)) == -1) {
+	    fprintf(stderr, "Can't access shared memory area. SHMConfig disabled?\n");
+	    exit(1);
+	} else {
+	    fprintf(stderr, "Incorrect size of shared memory area. Incompatible driver version?\n");
+	    exit(1);
 	}
-
-	exit(0);
+    }
+    if((synshm = (SynapticsSHM*) shmat(shmid, NULL, 0)) == NULL) {
+	perror("shmat");
+	exit(1);
+    }
+
+    /* Perform requested actions */
+    if (dump_hw) {
+	show_hw_info(synshm);
+    }
+    set_variables(synshm, argc, argv, first_cmd);
+    if (dump_settings) {
+	show_settings(synshm);
+    }
+    if (do_monitor) {
+	monitor(synshm, delay);
+    }
+
+    exit(0);
 }
-
-/* Local Variables: */
-/* tab-width: 4 */
-/* End: */