svn merge -r588:HEAD ^/branches/released .

1 files changed, 183 insertions, 183 deletions

diff --git a/xorg-server/hw/xfree86/i2c/uda1380.c b/xorg-server/hw/xfree86/i2c/uda1380.c
index defda3cdc..eebe127ed 100644
--- a/xorg-server/hw/xfree86/i2c/uda1380.c
+++ b/xorg-server/hw/xfree86/i2c/uda1380.c
@@ -1,183 +1,183 @@
-/*************************************************************************************
- * Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this 
- * software and associated documentation files (the "Software"), to deal in the Software 
- * without restriction, including without limitation the rights to use, copy, modify, 
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, 
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or 
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE 
- * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, 
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the author shall not be used in advertising or 
- * otherwise to promote the sale, use or other dealings in this Software without prior written 
- * authorization from the author.
- *
- ************************************************************************************/
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86.h"
-#include "xf86i2c.h"
-#include "uda1380.h"
-#include "i2c_def.h"
-
-UDA1380Ptr Detect_uda1380(I2CBusPtr b, I2CSlaveAddr addr)
-{
-	UDA1380Ptr t;
-	I2CByte a;
-  
-	t = xcalloc(1, sizeof(UDA1380Rec));
-	if(t == NULL) return NULL;
-	switch(addr)
-	{
-		case UDA1380_ADDR_1:
-		case UDA1380_ADDR_2:
-			t->d.DevName = "UDA1380 Stereo audion coder-decoder";
-			break;
-		default:
-			t->d.DevName = "Generic UDAxxxx";
-		break;
-	}
-	t->d.SlaveAddr = addr;
-	t->d.pI2CBus = b;
-	t->d.NextDev = NULL;
-	t->d.StartTimeout = b->StartTimeout;
-	t->d.BitTimeout = b->BitTimeout;
-	t->d.AcknTimeout = b->AcknTimeout;
-	t->d.ByteTimeout = b->ByteTimeout;
-  
-	if(!I2C_WriteRead(&(t->d), NULL, 0, &a, 1))
-	{
-		xfree(t);
-		return NULL;
-	}
-  
-	/* set default parameters */
-	if(!I2CDevInit(&(t->d)))
-	{
-		xfree(t);
-		return NULL;
-	}
-  
-	xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 stereo coder-decoder detected\n");
-
-	return t;  
-}
-
-Bool uda1380_init(UDA1380Ptr t)
-{
-	CARD8 data[3];
-	CARD16 tmp;
-	Bool ret;
-
-	/* Power control */
-	data[0] = 0x02;
-	tmp = (1 << 13) | (1 << 10) | ( 1 << 8) | (1 << 7) | (1 << 6) | (1 << 3) | (1 << 1);
-	data[1] = (CARD8)((tmp >> 8) & 0xff);
-	data[2] = (CARD8)(tmp & 0xff);
-	ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);
-	if (ret == FALSE)
-	{
-		xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to initialize\n");
-		return FALSE;
-	}
-
-	/* Analog mixer  (AVC) */
-	data[0] = 0x03;
-	/* the analog mixer is muted initially */
-	data[1] = 0x3f;
-	data[2] = 0x3f;
-	ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);
-	if (ret == FALSE)
-	{
-		xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to initialize\n");
-		return FALSE;
-	}
-		  
-	xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 initialized\n");
-
-	return TRUE;
-}
-
-void uda1380_shutdown(UDA1380Ptr t)
-{
-	CARD8 data[3];
-	Bool ret;
-
-	/* Power control */
-	data[0] = 0x02;
-	data[1] = 0;
-	data[2] = 0;
-	ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);
-	if (ret == FALSE)
-		xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to shutdown\n");
-}
-
-void uda1380_setvolume(UDA1380Ptr t, INT32 value)
-{
-	CARD8 data[3];
-	/*
-	 * We have to scale the value ranging from -1000 to 1000 to 0x2c to 0
-	 */
-	CARD8 volume = 47 - (CARD8)((value + 1000) * 47 / 2000);
-	Bool ret;
-		  
-	t->analog_mixer_settings = ((volume << 8) & 0x3f00) | (volume & 0x3f);
-					 
-	/* Analog mixer  (AVC) */
-	data[0] = 0x03;
-	data[1] = volume & 0x3f;
-	data[2] = volume & 0x3f;
-	ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);
-	if (ret == FALSE)
-		xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to set volume\n");
-}
-
-void uda1380_mute(UDA1380Ptr t, Bool mute)
-{
-	CARD8 data[3];
-	Bool ret;
-		  
-	if (mute == TRUE)
-	{
-		/* Analog mixer  (AVC) */
-		data[0] = 0x03;
-		data[1] = 0xff;
-		data[2] = 0xff;
-		ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);
-		if (ret == FALSE)
-			xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to mute\n");
-	}
-	else
-	{
-		/* Analog mixer  (AVC) */
-		data[0] = 0x03;
-		data[1] = (CARD8)((t->analog_mixer_settings >> 8) & 0x3f);
-		data[2] = (CARD8)(t->analog_mixer_settings & 0x3f);
-		ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);
-		if (ret == FALSE)
-			xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to unmute\n");
-	}
-}
-
-void uda1380_getstatus(UDA1380Ptr t)
-{
-}
-
-void uda1380_setparameters(UDA1380Ptr t)
-{
-}
-
-void uda1380_dumpstatus(UDA1380Ptr t)
-{
-}
+/*************************************************************************************

+ * Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this 

+ * software and associated documentation files (the "Software"), to deal in the Software 

+ * without restriction, including without limitation the rights to use, copy, modify, 

+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, 

+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in all copies or 

+ * substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 

+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE 

+ * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, 

+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 

+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ *

+ * Except as contained in this notice, the name of the author shall not be used in advertising or 

+ * otherwise to promote the sale, use or other dealings in this Software without prior written 

+ * authorization from the author.

+ *

+ ************************************************************************************/

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#include "xf86.h"

+#include "xf86i2c.h"

+#include "uda1380.h"

+#include "i2c_def.h"

+

+UDA1380Ptr Detect_uda1380(I2CBusPtr b, I2CSlaveAddr addr)

+{

+	UDA1380Ptr t;

+	I2CByte a;

+  

+	t = calloc(1, sizeof(UDA1380Rec));

+	if(t == NULL) return NULL;

+	switch(addr)

+	{

+		case UDA1380_ADDR_1:

+		case UDA1380_ADDR_2:

+			t->d.DevName = "UDA1380 Stereo audion coder-decoder";

+			break;

+		default:

+			t->d.DevName = "Generic UDAxxxx";

+		break;

+	}

+	t->d.SlaveAddr = addr;

+	t->d.pI2CBus = b;

+	t->d.NextDev = NULL;

+	t->d.StartTimeout = b->StartTimeout;

+	t->d.BitTimeout = b->BitTimeout;

+	t->d.AcknTimeout = b->AcknTimeout;

+	t->d.ByteTimeout = b->ByteTimeout;

+  

+	if(!I2C_WriteRead(&(t->d), NULL, 0, &a, 1))

+	{

+		free(t);

+		return NULL;

+	}

+  

+	/* set default parameters */

+	if(!I2CDevInit(&(t->d)))

+	{

+		free(t);

+		return NULL;

+	}

+  

+	xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 stereo coder-decoder detected\n");

+

+	return t;  

+}

+

+Bool uda1380_init(UDA1380Ptr t)

+{

+	CARD8 data[3];

+	CARD16 tmp;

+	Bool ret;

+

+	/* Power control */

+	data[0] = 0x02;

+	tmp = (1 << 13) | (1 << 10) | ( 1 << 8) | (1 << 7) | (1 << 6) | (1 << 3) | (1 << 1);

+	data[1] = (CARD8)((tmp >> 8) & 0xff);

+	data[2] = (CARD8)(tmp & 0xff);

+	ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);

+	if (ret == FALSE)

+	{

+		xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to initialize\n");

+		return FALSE;

+	}

+

+	/* Analog mixer  (AVC) */

+	data[0] = 0x03;

+	/* the analog mixer is muted initially */

+	data[1] = 0x3f;

+	data[2] = 0x3f;

+	ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);

+	if (ret == FALSE)

+	{

+		xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to initialize\n");

+		return FALSE;

+	}

+		  

+	xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 initialized\n");

+

+	return TRUE;

+}

+

+void uda1380_shutdown(UDA1380Ptr t)

+{

+	CARD8 data[3];

+	Bool ret;

+

+	/* Power control */

+	data[0] = 0x02;

+	data[1] = 0;

+	data[2] = 0;

+	ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);

+	if (ret == FALSE)

+		xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to shutdown\n");

+}

+

+void uda1380_setvolume(UDA1380Ptr t, INT32 value)

+{

+	CARD8 data[3];

+	/*

+	 * We have to scale the value ranging from -1000 to 1000 to 0x2c to 0

+	 */

+	CARD8 volume = 47 - (CARD8)((value + 1000) * 47 / 2000);

+	Bool ret;

+		  

+	t->analog_mixer_settings = ((volume << 8) & 0x3f00) | (volume & 0x3f);

+					 

+	/* Analog mixer  (AVC) */

+	data[0] = 0x03;

+	data[1] = volume & 0x3f;

+	data[2] = volume & 0x3f;

+	ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);

+	if (ret == FALSE)

+		xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to set volume\n");

+}

+

+void uda1380_mute(UDA1380Ptr t, Bool mute)

+{

+	CARD8 data[3];

+	Bool ret;

+		  

+	if (mute == TRUE)

+	{

+		/* Analog mixer  (AVC) */

+		data[0] = 0x03;

+		data[1] = 0xff;

+		data[2] = 0xff;

+		ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);

+		if (ret == FALSE)

+			xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to mute\n");

+	}

+	else

+	{

+		/* Analog mixer  (AVC) */

+		data[0] = 0x03;

+		data[1] = (CARD8)((t->analog_mixer_settings >> 8) & 0x3f);

+		data[2] = (CARD8)(t->analog_mixer_settings & 0x3f);

+		ret = I2C_WriteRead(&(t->d), data, 3, NULL, 0);

+		if (ret == FALSE)

+			xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to unmute\n");

+	}

+}

+

+void uda1380_getstatus(UDA1380Ptr t)

+{

+}

+

+void uda1380_setparameters(UDA1380Ptr t)

+{

+}

+

+void uda1380_dumpstatus(UDA1380Ptr t)

+{

+}