gatos-cvs Mailing List for GATOS (Page 3)
Status: Beta
Brought to you by:
volodya
Menu
▾
▴
gatos-cvs
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(35) |
Feb
(67) |
Mar
(41) |
Apr
(4) |
May
(7) |
Jun
(9) |
Jul
(7) |
Aug
(2) |
Sep
(9) |
Oct
(3) |
Nov
(5) |
Dec
(30) |
| 2004 |
Jan
(11) |
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
(6) |
Jul
(8) |
Aug
(3) |
Sep
(5) |
Oct
(15) |
Nov
(25) |
Dec
(14) |
| 2005 |
Jan
(11) |
Feb
(5) |
Mar
(8) |
Apr
(5) |
May
(1) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
(1) |
Nov
(3) |
Dec
|
| 2006 |
Jan
(2) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(3) |
Nov
(1) |
Dec
(2) |
| 2007 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <gat...@li...> - 2005-01-14 18:26:15
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4009 Modified Files: Tag: r200_branch theatre200.c Log Message: Added commands to drive the analog mux used for sound (4052) Index: theatre200.c =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/Attic/theatre200.c,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -d -r1.1.2.5 -r1.1.2.6 --- theatre200.c 4 Dec 2004 11:22:59 -0000 1.1.2.5 +++ theatre200.c 14 Jan 2005 18:26:06 -0000 1.1.2.6 @@ -5,6 +5,9 @@ * License: GPL * * $Log$ + * Revision 1.1.2.6 2005/01/14 18:26:06 bogdand + * Added commands to drive the analog mux used for sound (4052) + * * Revision 1.1.2.5 2004/12/04 11:22:59 bogdand * RT_SetStandard with PAL/NTSC/SECAM standards known by RT200 * @@ -1579,11 +1582,20 @@ ****************************************************************************/ void RT_SetStandard (TheatrePtr t, CARD16 wStandard) { + CARD32 data; + xf86DrvMsg(t->VIP->scrnIndex,X_INFO,"Rage Theatre setting standard 0x%04x\n", wStandard); t->wStandard = wStandard; + theatre_read(t, 0x30, &data); + xf86DrvMsg(t->VIP->scrnIndex,X_INFO,"REGISTER 0x30: %x\n", data); + + theatre_read(t, 0x34, &data); + xf86DrvMsg(t->VIP->scrnIndex,X_INFO,"REGISTER 0x34: %x\n", data); + + /* Program the new standards: */ switch (wStandard & 0x00FF) { @@ -1718,6 +1730,8 @@ ****************************************************************************/ void RT_SetConnector (TheatrePtr t, CARD16 wConnector, int tunerFlag) { + CARD32 data; + t->wConnector = wConnector; switch (wConnector) @@ -1725,12 +1739,42 @@ case (DEC_TUNER): /* Tuner*/ /* RT200 does not have any input connector 0 */ dsp_set_video_input_connector(t, t->wTunerConnector + 1); + + /* this is to set the analog mux used for sond */ + theatre_read(t, VIP_GPIO_CNTL, &data); + data &= ~0x10; + theatre_write(t, VIP_GPIO_CNTL, data); + + theatre_read(t, VIP_GPIO_INOUT, &data); + data &= ~0x10; + theatre_write(t, VIP_GPIO_INOUT, data); + break; case (DEC_COMPOSITE): /* Comp*/ dsp_set_video_input_connector(t, t->wComp0Connector); + + /* this is to set the analog mux used for sond */ + theatre_read(t, VIP_GPIO_CNTL, &data); + data |= 0x10; + theatre_write(t, VIP_GPIO_CNTL, data); + + theatre_read(t, VIP_GPIO_INOUT, &data); + data |= 0x10; + theatre_write(t, VIP_GPIO_INOUT, data); + break; case (DEC_SVIDEO): /* Svideo*/ dsp_set_video_input_connector(t, t->wSVideo0Connector); + + /* this is to set the analog mux used for sond */ + theatre_read(t, VIP_GPIO_CNTL, &data); + data |= 0x10; + theatre_write(t, VIP_GPIO_CNTL, data); + + theatre_read(t, VIP_GPIO_INOUT, &data); + data |= 0x10; + theatre_write(t, VIP_GPIO_INOUT, data); + break; default: dsp_set_video_input_connector(t, t->wComp0Connector); |
|
From: <gat...@li...> - 2005-01-14 18:23:58
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3523 Modified Files: Tag: r200_branch theatre_reg.h Log Message: Added macros for GPIO registers Index: theatre_reg.h =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/theatre_reg.h,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- theatre_reg.h 4 Dec 2004 11:26:02 -0000 1.1.2.2 +++ theatre_reg.h 14 Jan 2005 18:23:46 -0000 1.1.2.3 @@ -47,6 +47,8 @@ #define VIP_RIPINTF_PORT_CNTL 0x003c /* RT200 */ +#define VIP_GPIO_INOUT 0x0030 +#define VIP_GPIO_CNTL 0x0034 #define VIP_HOSTINTF_PORT_CNTL 0x003c #define VIP_HOSTINTF_PORT_CNTL__HAD_HCTL_SDA_SN 0x00000008 #define VIP_HOSTINTF_PORT_CNTL__HAD_HCTL_SDA_SP 0x00000080 |
|
From: <gat...@li...> - 2005-01-13 14:13:54
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4924 Added Files: Tag: r200_branch uda1380.c uda1380.h uda1380_module.c Log Message: This adds support for UDA1380 sound coder-decoder used for ATI AIW cards featuring RT200 --- NEW FILE: uda1380.c --- /************************************************************************************* * $Id: uda1380.c,v 1.1.2.1 2005/01/13 14:13:45 bogdand Exp $ * * Created by Bogdan D. bo...@us... * License: GPL * * $Log: uda1380.c,v $ * Revision 1.1.2.1 2005/01/13 14:13:45 bogdand * This adds support for UDA1380 sound coder-decoder used for ATI AIW cards featuring RT200 * * ************************************************************************************/ #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) { } --- NEW FILE: uda1380_module.c --- #include "xf86Module.h" static MODULESETUPPROTO(uda1380Setup); static XF86ModuleVersionInfo uda1380VersRec = { "uda1380", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, XF86_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_VIDEODRV, /* This needs the video driver ABI */ ABI_VIDEODRV_VERSION, MOD_CLASS_NONE, {0,0,0,0} }; XF86ModuleData uda1380ModuleData = { &uda1380VersRec, uda1380Setup, NULL }; static pointer uda1380Setup(pointer module, pointer opts, int *errmaj, int *errmin) { return (pointer)1; } --- NEW FILE: uda1380.h --- /************************************************************************************* * $Id: uda1380.h,v 1.1.2.1 2005/01/13 14:13:45 bogdand Exp $ * * Created by Bogdan D. bo...@us... * License: GPL * * $Log: uda1380.h,v $ * Revision 1.1.2.1 2005/01/13 14:13:45 bogdand * This adds support for UDA1380 sound coder-decoder used for ATI AIW cards featuring RT200 * * ************************************************************************************/ #ifndef __UDA1380_H__ #define __UDA1380_H__ #include "xf86i2c.h" typedef struct { I2CDevRec d; CARD16 analog_mixer_settings; /* register 0x03 */ } UDA1380Rec, *UDA1380Ptr; #define UDA1380_ADDR_1 0x30 #define UDA1380_ADDR_2 0x34 UDA1380Ptr Detect_uda1380(I2CBusPtr b, I2CSlaveAddr addr); Bool uda1380_init(UDA1380Ptr t); void uda1380_shutdown(UDA1380Ptr t); void uda1380_setvolume(UDA1380Ptr t, INT32); void uda1380_mute(UDA1380Ptr t, Bool); void uda1380_setparameters(UDA1380Ptr t); void uda1380_getstatus(UDA1380Ptr t); void uda1380_dumpstatus(UDA1380Ptr t); #define UDA1380SymbolsList \ "Detect_uda1380", \ "uda1380_init", \ "uda1380_shutdown", \ "uda1380_setvolume", \ "uda1380_mute", \ "uda1380_setparameters", \ "uda1380_getstatus", \ "uda1380_dumpstatus" #ifdef XFree86LOADER #define xf86_Detect_uda1380 ((TDA9885Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_uda1380")) #define xf86_uda1380_init ((Bool (*)(TDA9885Ptr))LoaderSymbol("uda1380_init")) #define xf86_uda1380_shutdown ((void (*)(TDA9885Ptr))LoaderSymbol("uda1380_shutdown")) #define xf86_uda1380_setvolume ((void (*)(TDA9885Ptr, CARD16))LoaderSymbol("uda1380_setvolume")) #define xf86_uda1380_mute ((void (*)(TDA9885Ptr, Bool))LoaderSymbol("uda1380_mute")) #define xf86_uda1380_setparameters ((void (*)(TDA9885Ptr))LoaderSymbol("uda1380_setparameters")) #define xf86_uda1380_getstatus ((void (*)(TDA9885Ptr))LoaderSymbol("uda1380_getstatus")) #define xf86_uda1380_dumpstatus ((void (*)(TDA9885Ptr))LoaderSymbol("uda1380_dumpstatus")) #else #define xf86_Detect_uda1380 Detect_uda1380 #define xf86_uda1380_init uda1380_init #define xf86_uda1380_shutdown uda1380_shutdown #define xf86_uda1380_setvolume uda1380_setvolume #define xf86_uda1380_mute uda1380_mute #define xf86_uda1380_setparameters uda1380_setparameters #define xf86_uda1380_getstatus uda1380_getstatus #define xf86_uda1380_dumpstatus uda1380_dumpstatus #endif #endif |
|
From: <gat...@li...> - 2005-01-13 13:58:22
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2388 Modified Files: Tag: r200_branch Imakefile Log Message: Added the uda1380 to be built as a module Index: Imakefile =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/Imakefile,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -d -r1.2.2.2 -r1.2.2.3 --- Imakefile 6 Nov 2004 13:58:46 -0000 1.2.2.2 +++ Imakefile 13 Jan 2005 13:58:06 -0000 1.2.2.3 @@ -44,6 +44,7 @@ MODSRC_TDA9850 = tda9850_module.c MODSRC_TDA8425 = tda8425_module.c MODSRC_TDA9885 = tda9885_module.c +MODSRC_UDA1380 = uda1380_module.c MODOBJS1 = atimodule.o MODOBJS2 = atiload.o atimisc.o @@ -59,6 +60,7 @@ MODOBJ_TDA9850 = tda9850_module.o MODOBJ_TDA8425 = tda8425_module.o MODOBJ_TDA9885 = tda9885_module.o +MODOBJ_UDA1380 = uda1380_module.o #endif @@ -191,6 +193,7 @@ SRCS_TDA9850 = tda9850.c $(MODSRC_TDA9850) SRCS_TDA8425 = tda8425.c $(MODSRC_TDA8425) SRCS_TDA9885 = tda9885.c $(MODSRC_TDA9885) +SRCS_UDA1380 = uda1380.c $(MODSRC_UDA1380) OBJS1 = ati.o atiadapter.o atibus.o atichip.o atiident.o atioption.o \ atiprobe.o atividmem.o $(CPIOOBJS1) $(MODOBJS1) \ @@ -217,13 +220,14 @@ OBJS_TDA9850 = tda9850.o $(MODOBJ_TDA9850) OBJS_TDA8425 = tda8425.o $(MODOBJ_TDA8425) OBJS_TDA9885 = tda9885.o $(MODOBJ_TDA9885) +OBJS_UDA1380 = uda1380.o $(MODOBJ_UDA1380) SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS4) $(SRCS_FI1236) \ $(SRCS_MSP3430) $(SRCS_THEATRE_DETECT) $(SRCS_THEATRE) $(SRCS_THEATRE200) $(SRCS_BT829) \ - $(SRCS_TDA9850) $(SRCS_TDA8425) $(SRCS_TDA9885) $(SRCS_SAA7114) + $(SRCS_TDA9850) $(SRCS_TDA8425) $(SRCS_TDA9885) $(SRCS_UDA1380) $(SRCS_SAA7114) OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS_FI1236) \ $(OBJS_MSP3430) $(OBJS_THEATRE_DETECT) $(OBJS_THEATRE) $(OBJS_THEATRE200) $(OBJS_BT829) \ - $(OBJS_TDA9850) $(OBJS_TDA8425) $(OBJS_TDA9885) $(OBJS_SAA7114) + $(OBJS_TDA9850) $(OBJS_TDA8425) $(OBJS_TDA9885) $(OBJS_UDA1380) $(OBJS_SAA7114) #if defined(XF86DriverSDK) INCLUDES = -I. -I../../include @@ -261,6 +265,7 @@ ObjectModuleTarget(tda9850, $(OBJS_TDA9850)) ObjectModuleTarget(tda8425, $(OBJS_TDA8425)) ObjectModuleTarget(tda9885, $(OBJS_TDA9885)) +ObjectModuleTarget(uda1380, $(OBJS_UDA1380)) InstallObjectModule(ati,$(MODULEDIR),drivers) @@ -277,6 +282,7 @@ InstallObjectModule(tda9850,$(MODULEDIR),multimedia) InstallObjectModule(tda8425,$(MODULEDIR),multimedia) InstallObjectModule(tda9885,$(MODULEDIR),multimedia) +InstallObjectModule(uda1380,$(MODULEDIR),multimedia) #if !defined(XF86DriverSDK) #if 0 @@ -447,6 +453,11 @@ InstallDriverSDKNonExecFile(tda9885_module.c,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(tda9885.h,$(DRIVERSDKDIR)/drivers/ati) +InstallDriverSDKNonExecFile(uda1380.c,$(DRIVERSDKDIR)/drivers/ati) +InstallDriverSDKNonExecFile(uda1380_module.c,$(DRIVERSDKDIR)/drivers/ati) +InstallDriverSDKNonExecFile(uda1380.h,$(DRIVERSDKDIR)/drivers/ati) + + InstallDriverSDKNonExecFile(radeon.h,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(radeon_accel.c,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(radeon_cursor.c,$(DRIVERSDKDIR)/drivers/ati) |
|
From: <gat...@li...> - 2005-01-13 13:57:10
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2084 Modified Files: Tag: r200_branch radeon_video.c Log Message: Added the uda1380 module to me loaded at init. Also made calls for volume and mute when needed. Index: radeon_video.c =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/radeon_video.c,v retrieving revision 1.6.2.11 retrieving revision 1.6.2.12 diff -u -d -r1.6.2.11 -r1.6.2.12 --- radeon_video.c 30 Dec 2004 16:37:22 -0000 1.6.2.11 +++ radeon_video.c 13 Jan 2005 13:56:57 -0000 1.6.2.12 @@ -25,6 +25,7 @@ #include "i2c_def.h" #include "tda9885.h" #include "saa7114.h" +#include "uda1380.h" #define OFF_DELAY 250 /* milliseconds */ #define FREE_DELAY 15000 @@ -133,6 +134,7 @@ MSP3430Ptr msp3430; TDA9885Ptr tda9885; SAA7114Ptr saa7114; + UDA1380Ptr uda1380; GENERIC_BUS_Ptr VIP; TheatrePtr theatre; @@ -744,6 +746,12 @@ xfree(pPriv->fi1236); pPriv->fi1236=NULL; } + if(pPriv->uda1380!=NULL){ + xf86_uda1380_shutdown(pPriv->uda1380); + xfree(pPriv->uda1380); + pPriv->uda1380=NULL; + } + DestroyI2CBusRec(pPriv->i2c, TRUE, TRUE); pPriv->i2c=NULL; } @@ -1232,6 +1240,7 @@ pPriv->msp3430 = NULL; pPriv->tda9885 = NULL; pPriv->saa7114 = NULL; + pPriv->uda1380 = NULL; if(pPriv->i2c!=NULL) return; if(!xf86LoadSubModule(pScrn,"i2c")) @@ -1393,6 +1402,27 @@ } } } + + if(!xf86LoadSubModule(pScrn,"uda1380")) + { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to initialize uda1380 driver\n"); + } + else + { + xf86LoaderReqSymbols(UDA1380SymbolsList, NULL); + if(pPriv->uda1380 == NULL) + { + pPriv->uda1380 = xf86_Detect_uda1380(pPriv->i2c, UDA1380_ADDR_1); + } + if(pPriv->uda1380 == NULL) + { + pPriv->uda1380 = xf86_Detect_uda1380(pPriv->i2c, UDA1380_ADDR_2); + } + if(pPriv->uda1380 != NULL) + { + xf86_uda1380_init(pPriv->uda1380); + } + } if(!xf86LoadSubModule(pScrn,"msp3430")) { @@ -2375,6 +2405,7 @@ RADEONResetVideo(pScrn); pPriv->video_stream_active = FALSE; if(pPriv->msp3430 != NULL) xf86_MSP3430SetVolume(pPriv->msp3430, MSP3430_FAST_MUTE); + if(pPriv->uda1380 != NULL) xf86_uda1380_mute(pPriv->uda1380, TRUE); if(pPriv->i2c != NULL) RADEON_board_setmisc(pPriv); } if(info->videoLinear) { @@ -2546,6 +2577,7 @@ pPriv->mute = value; if(pPriv->msp3430 != NULL) xf86_MSP3430SetVolume(pPriv->msp3430, pPriv->mute ? MSP3430_FAST_MUTE : MSP3430_VOLUME(pPriv->volume)); if(pPriv->i2c != NULL) RADEON_board_setmisc(pPriv); + if(pPriv->uda1380 != NULL) xf86_uda1380_mute(pPriv->uda1380, pPriv->mute); } else if(attribute == xvSAP) { pPriv->sap_channel = value; @@ -2558,6 +2590,7 @@ pPriv->mute = FALSE; if(pPriv->msp3430 != NULL) xf86_MSP3430SetVolume(pPriv->msp3430, MSP3430_VOLUME(value)); if(pPriv->i2c != NULL) RADEON_board_setmisc(pPriv); + if(pPriv->uda1380 != NULL) xf86_uda1380_setvolume(pPriv->uda1380, value); } else if(attribute == xvOverlayDeinterlacingMethod) { if(value<0)value = 0; @@ -3685,7 +3718,7 @@ case 2: case 3: t->standard_video_if=2; - t->standard_sound_carrier=3; + t->standard_sound_carrier=1; /* t->modulation=0; */ /* positive AM */ t->modulation=2; /* negative FM */ break; @@ -3987,6 +4020,7 @@ } if(pPriv->msp3430 != NULL) RADEON_MSP_SetEncoding(pPriv); if(pPriv->tda9885 != NULL) RADEON_TDA9885_SetEncoding(pPriv); + if(pPriv->uda1380 != NULL) xf86_uda1380_setvolume(pPriv->uda1380, pPriv->volume); if(pPriv->fi1236 != NULL) RADEON_FI1236_SetEncoding(pPriv); if(pPriv->i2c != NULL)RADEON_board_setmisc(pPriv); } |
|
From: <gat...@li...> - 2005-01-13 13:54:45
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1614 Modified Files: Tag: r200_branch tda9885.c Log Message: Changed a print message Index: tda9885.c =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/tda9885.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- tda9885.c 6 Nov 2004 13:48:05 -0000 1.1.2.1 +++ tda9885.c 13 Jan 2005 13:54:36 -0000 1.1.2.2 @@ -88,7 +88,7 @@ I2C_WriteRead(&(t->d), data, 4, NULL, 0); -xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"TDA9885 setparam: B data: %x, C data: %x, D data: %x\n", data[1], data[2], data[3]); +xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"TDA9885 setparam: B data: %x, C data: %x, E data: %x\n", data[1], data[2], data[3]); } void tda9885_dumpstatus(TDA9885Ptr t) |
|
From: <gat...@li...> - 2005-01-11 09:12:54
|
Update of /cvsroot/gatos/km In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6665 Modified Files: Makefile-2.4 km.c Log Message: Fixes compilation on 2.4 kernels Index: km.c =================================================================== RCS file: /cvsroot/gatos/km/km.c,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- km.c 18 Dec 2004 10:31:35 -0000 1.101 +++ km.c 11 Jan 2005 09:12:42 -0000 1.102 @@ -585,11 +585,15 @@ /* too many */ if(num_devices>=MAX_DEVICES)return -1; +#ifdef LINUX_2_6 #ifdef CONFIG_PCI_NAMES printk(KERN_INFO "km: probing %s\n",dev->pretty_name); #else printk(KERN_INFO "km: probing %s\n",dev->slot_name); #endif +#else + printk(KERN_INFO "km: probing %s\n",dev->name); +#endif switch(pci_id->driver_data){ case HARDWARE_RADEON: @@ -1006,8 +1010,10 @@ PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RAGE128}, {PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_LF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RAGE128}, +#ifdef PCI_DEVICE_ID_ATI_RAGE128_TF {PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_TF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RAGE128}, +#endif #ifdef PCI_DEVICE_ID_ATI_RAGE128_U1 {PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_U1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RAGE128}, Index: Makefile-2.4 =================================================================== RCS file: /cvsroot/gatos/km/Makefile-2.4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile-2.4 29 Jun 2004 04:54:05 -0000 1.2 +++ Makefile-2.4 11 Jan 2005 09:12:42 -0000 1.3 @@ -29,7 +29,7 @@ ld -r $(KM_API_OBJS) -o km_api_drv.o km_v4l.o: km_v4l_24.c - $(CC) $(CFLAGS) -DMODULE -D__KERNEL__ -DLINUX -I$(LINUXINCLUDES) -c km_v4l_24.c + $(CC) $(CFLAGS) -DMODULE -D__KERNEL__ -DLINUX -I$(LINUXINCLUDES) -c km_v4l_24.c -o km_v4l.o km_memory.o: km_memory.c $(CC) $(CFLAGS) -DMODULE -D__KERNEL__ -DLINUX -I$(LINUXINCLUDES) -c km_memory.c |
|
From: <gat...@li...> - 2005-01-11 09:02:55
|
Update of /cvsroot/gatos/km In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4994 Modified Files: km_v4l_24.c Log Message: A patch by Petrov M.I.: kernel 2.4 build fix Index: km_v4l_24.c =================================================================== RCS file: /cvsroot/gatos/km/km_v4l_24.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- km_v4l_24.c 14 Dec 2004 09:58:44 -0000 1.3 +++ km_v4l_24.c 11 Jan 2005 09:02:35 -0000 1.4 @@ -491,12 +491,12 @@ int init_km_v4l(KM_STRUCT *kms) { -kms->vd = kmalloc(sizeof(km_v4l_template)); +kms->vd = kmalloc(sizeof(km_v4l_template), GFP_KERNEL); if (NULL == kms->vd) return -ENOMEM; memcpy(kms->vd, &km_v4l_template, sizeof(km_v4l_template)); kms->vd->priv=kms; -kms->vbi_vd = kvmalloc(sizeof(km_v4l_vbi_template)); +kms->vbi_vd = kmalloc(sizeof(km_v4l_vbi_template), GFP_KERNEL); if (NULL == kms->vbi_vd) { kfree(kms->vd); return -ENOMEM; |
|
From: <gat...@li...> - 2004-12-30 16:37:31
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22329 Modified Files: Tag: r200_branch radeon_video.c Log Message: In RADEONVIP_reset() added a case for R300 according to a user that have AIW 9700. Index: radeon_video.c =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/radeon_video.c,v retrieving revision 1.6.2.10 retrieving revision 1.6.2.11 diff -u -d -r1.6.2.10 -r1.6.2.11 --- radeon_video.c 30 Dec 2004 11:56:48 -0000 1.6.2.10 +++ radeon_video.c 30 Dec 2004 16:37:22 -0000 1.6.2.11 @@ -1763,6 +1763,7 @@ case CHIP_FAMILY_RV250: case CHIP_FAMILY_RV350: case CHIP_FAMILY_R350: + case CHIP_FAMILY_R300: OUTREG(VIPH_CONTROL, 0x003F0009); /* slowest, timeout in 16 phases */ OUTREG(VIPH_TIMEOUT_STAT, (INREG(VIPH_TIMEOUT_STAT) & 0xFFFFFF00) | VIPH_TIMEOUT_STAT__VIPH_REGR_DIS); OUTREG(VIPH_DV_LAT, 0x444400FF); /* set timeslice */ |
|
From: <gat...@li...> - 2004-12-30 11:56:59
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31104 Modified Files: Tag: r200_branch radeon_video.c Log Message: Change the I2C bus init for R350. Added a case for RV250 as reported by Terry Shipclark (AIW 9000 Pro) Index: radeon_video.c =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/radeon_video.c,v retrieving revision 1.6.2.9 retrieving revision 1.6.2.10 diff -u -d -r1.6.2.9 -r1.6.2.10 --- radeon_video.c 26 Dec 2004 09:55:17 -0000 1.6.2.9 +++ radeon_video.c 30 Dec 2004 11:56:48 -0000 1.6.2.10 @@ -1254,6 +1254,7 @@ pPriv->i2c->DriverPrivate.ptr=(pointer)pPriv; switch(info->ChipFamily){ case CHIP_FAMILY_RV350: + case CHIP_FAMILY_R350: case CHIP_FAMILY_R300: case CHIP_FAMILY_RV250: case CHIP_FAMILY_R200: @@ -1274,7 +1275,8 @@ #if 1 switch(info->ChipFamily){ - case CHIP_FAMILY_RV200: + case CHIP_FAMILY_RV200: + case CHIP_FAMILY_RV250: nm=(pll->reference_freq * 40000.0)/(1.0*I2C_CLOCK_FREQ); break; case CHIP_FAMILY_R300: @@ -1283,7 +1285,7 @@ nm=(pll->reference_freq * 40000.0)/(4.0*I2C_CLOCK_FREQ); break; } - default: + default: nm=(pll->reference_freq * 10000.0)/(4.0*I2C_CLOCK_FREQ); } #else |
|
From: <gat...@li...> - 2004-12-26 09:55:26
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24013 Modified Files: Tag: r200_branch radeon_video.c Log Message: Added back the case for R350 in RADEONVIP_reset(). Seems this is working for 9800 cards Index: radeon_video.c =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/radeon_video.c,v retrieving revision 1.6.2.8 retrieving revision 1.6.2.9 diff -u -d -r1.6.2.8 -r1.6.2.9 --- radeon_video.c 20 Dec 2004 13:45:46 -0000 1.6.2.8 +++ radeon_video.c 26 Dec 2004 09:55:17 -0000 1.6.2.9 @@ -1760,10 +1760,11 @@ switch(info->ChipFamily){ case CHIP_FAMILY_RV250: case CHIP_FAMILY_RV350: + case CHIP_FAMILY_R350: OUTREG(VIPH_CONTROL, 0x003F0009); /* slowest, timeout in 16 phases */ OUTREG(VIPH_TIMEOUT_STAT, (INREG(VIPH_TIMEOUT_STAT) & 0xFFFFFF00) | VIPH_TIMEOUT_STAT__VIPH_REGR_DIS); OUTREG(VIPH_DV_LAT, 0x444400FF); /* set timeslice */ - OUTREG(VIPH_BM_CHUNK, 0x0); + OUTREG(VIPH_BM_CHUNK, 0x151); OUTREG(RADEON_TEST_DEBUG_CNTL, INREG(RADEON_TEST_DEBUG_CNTL) & (~TEST_DEBUG_CNTL__TEST_DEBUG_OUT_EN)); break; default: |
|
From: <gat...@li...> - 2004-12-20 13:46:03
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17226 Modified Files: Tag: r200_branch radeon_video.c Log Message: Modified the tuners table according to what Daniel Fouilleul reports. The card is 3D prophet 9000 AIW Index: radeon_video.c =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/radeon_video.c,v retrieving revision 1.6.2.7 retrieving revision 1.6.2.8 diff -u -d -r1.6.2.7 -r1.6.2.8 --- radeon_video.c 19 Dec 2004 11:20:18 -0000 1.6.2.7 +++ radeon_video.c 20 Dec 2004 13:45:46 -0000 1.6.2.8 @@ -1193,7 +1193,7 @@ {"TEMIC-FN5AL" , TUNER_TYPE_TEMIC_FN5AL}, {"FQ1216ME/P" , TUNER_TYPE_FI1216}, {"FI1236W" , TUNER_TYPE_FI1236W}, - {"Alps TSBH5" , -1}, + {"Philips FI1216ME (or compatible)" , TUNER_TYPE_FM1216ME}, {"Alps TSCxx" , -1}, {"Philips FI1216ME (or compatible)" , TUNER_TYPE_FM1216ME}, {"UNKNOWN-19" , -1}, |
|
From: <gat...@li...> - 2004-12-19 11:20:31
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23549 Modified Files: Tag: r200_branch radeon_video.c Log Message: Reverted to the previous values in RADEONVIP+Reset() Index: radeon_video.c =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/radeon_video.c,v retrieving revision 1.6.2.6 retrieving revision 1.6.2.7 diff -u -d -r1.6.2.6 -r1.6.2.7 --- radeon_video.c 29 Nov 2004 23:30:35 -0000 1.6.2.6 +++ radeon_video.c 19 Dec 2004 11:20:18 -0000 1.6.2.7 @@ -1760,7 +1760,6 @@ switch(info->ChipFamily){ case CHIP_FAMILY_RV250: case CHIP_FAMILY_RV350: - case CHIP_FAMILY_R350: OUTREG(VIPH_CONTROL, 0x003F0009); /* slowest, timeout in 16 phases */ OUTREG(VIPH_TIMEOUT_STAT, (INREG(VIPH_TIMEOUT_STAT) & 0xFFFFFF00) | VIPH_TIMEOUT_STAT__VIPH_REGR_DIS); OUTREG(VIPH_DV_LAT, 0x444400FF); /* set timeslice */ |
|
From: <gat...@li...> - 2004-12-18 10:31:51
|
Update of /cvsroot/gatos/km In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28147 Modified Files: km.c Log Message: More tinkering with spin locks Index: km.c =================================================================== RCS file: /cvsroot/gatos/km/km.c,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- km.c 16 Dec 2004 14:30:56 -0000 1.100 +++ km.c 18 Dec 2004 10:31:35 -0000 1.101 @@ -323,6 +323,10 @@ printk("Capture buf size=%d\n", buf_size); spin_unlock(&(kms->kms_lock)); + /* Spin lock has to be released before calling allocate_dvb + * which may sleep! + */ + if(kms->allocate_dvb(&(kms->capture), km_buffers, buf_size)<0){ spin_lock(&(kms->kms_lock)); result=-ENOMEM; @@ -335,12 +339,13 @@ goto fail; } kmd_signal_state_change(kms->kmd); + spin_lock(&(kms->kms_lock)); if(kms->start_transfer!=NULL){ kms->start_transfer(kms); + spin_unlock(&(kms->kms_lock)); return 0; } result=0; - spin_lock(&(kms->kms_lock)); fail: kms->gdq_usage--; @@ -397,12 +402,14 @@ result=-ENOTSUPP; goto fail; } + kmd_signal_state_change(kms->kmd); + spin_lock(&(kms->kms_lock)); if(kms->start_vbi_transfer!=NULL){ kms->start_vbi_transfer(kms); + spin_unlock(&(kms->kms_lock)); return 0; } - spin_lock(&(kms->kms_lock)); result=0; fail: |
|
From: <gat...@li...> - 2004-12-17 12:40:47
|
Update of /cvsroot/gatos/avview In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26181 Modified Files: configure.in Log Message: Bump version number Index: configure.in =================================================================== RCS file: /cvsroot/gatos/avview/configure.in,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- configure.in 26 Aug 2004 00:24:33 -0000 1.60 +++ configure.in 17 Dec 2004 12:40:31 -0000 1.61 @@ -4,7 +4,7 @@ # Note to self: always bump version number when there are changes # in setup window or avview_shell # -AC_INIT([AVview], [0.80.5], [gat...@li...]) +AC_INIT([AVview], [0.80.6], [gat...@li...]) # # For now I'll be happier without NEWS and Changelog files. # |
|
From: <gat...@li...> - 2004-12-17 12:39:32
|
Update of /cvsroot/gatos/km In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25471 Modified Files: Makefile-2.6 README Log Message: Add some Makefile magic from LWN Index: README =================================================================== RCS file: /cvsroot/gatos/km/README,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- README 11 Jan 2004 16:51:12 -0000 1.13 +++ README 17 Dec 2004 12:39:08 -0000 1.14 @@ -5,7 +5,8 @@ hints: - * edit Makefile + * rename either Makefile-2.4 or Makefile-2.6 to Makefile depending + on your kernel version * compile * become root and issue "make test" * start X Index: Makefile-2.6 =================================================================== RCS file: /cvsroot/gatos/km/Makefile-2.6,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile-2.6 11 Jan 2004 21:14:11 -0000 1.1 +++ Makefile-2.6 17 Dec 2004 12:39:08 -0000 1.2 @@ -1,6 +1,5 @@ -# to compile for linux kernel>2.6.0 rename this file to Makefile and then -# compile with: make -C /usr/src/linux-2.6.X SUBDIRS=$PWD modules -CFLAGS += -DLINUX_2_6 +ifneq ($(KERNELRELEASE),) + KM_OBJS=km.o km_v4l.o km_memory.o radeon.o mach64.o rage128.o KM_API_OBJS=km_api.o km_api_data.o km_memory.o @@ -9,3 +8,40 @@ obj-m += km_drv.o obj-m += km_api_drv.o + +EXTRA_CFLAGS += -DLINUX_2_6 + +else + +KDIR := /lib/modules/$(shell uname -r)/build +PWD := $(shell pwd) + +all: + $(MAKE) -C $(KDIR) M=$(PWD) modules + +clean: + $(MAKE) -C $(KDIR) M=$(PWD) clean + +install: + $(MAKE) -C $(KDIR) M=$(PWD) modules_install + +test: all + @echo "** Syncing disks" + sync + @echo "** Trying to make sure v4l module is loaded" + modprobe videodev || true + @echo "** Now loading km modules" + insmod ./km_api_drv.ko + insmod ./km_drv.ko km_debug=0 km_buffers=5 + +test2: test2.c + $(CC) $(CFLAGS) test2.c -o test2 + +tarball: + (cd .. ; tar cvf - km/*.[c,h] km/Makefile-* km/README km/km.*.txt km/test*.tcl | gzip - ) > km.tgz + +remove: + rmmod km_drv || true + rmmod km_api_drv || true + +endif |
|
From: <gat...@li...> - 2004-12-17 10:01:32
|
Update of /cvsroot/gatos/km In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26816 Modified Files: km_v4l.c Log Message: an undefined function Index: km_v4l.c =================================================================== RCS file: /cvsroot/gatos/km/km_v4l.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- km_v4l.c 14 Dec 2004 09:58:44 -0000 1.53 +++ km_v4l.c 17 Dec 2004 10:01:14 -0000 1.54 @@ -431,10 +431,10 @@ if(kms->is_capture_active!=NULL) video_unregister_device(kms->vd); else - km_vd_release(kms->vd); + video_device_release(kms->vd); if(kms->is_vbi_active!=NULL) video_unregister_device(kms->vbi_vd); else - km_vd_release(kms->vbi_vd); + video_device_release(kms->vbi_vd); } |
|
From: <gat...@li...> - 2004-12-16 14:31:07
|
Update of /cvsroot/gatos/km In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11200 Modified Files: km.c km.h km_api.c km_api.h km_api_data.c Log Message: Avoid calling functions which might sleeps while holding a spin lock Bump version number Index: km_api_data.c =================================================================== RCS file: /cvsroot/gatos/km/km_api_data.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- km_api_data.c 14 Dec 2004 09:58:44 -0000 1.22 +++ km_api_data.c 16 Dec 2004 14:30:56 -0000 1.23 @@ -66,11 +66,14 @@ return NULL; } kdu->use_count++; +spin_unlock(&(kdu->lock)); + kdufpd=kmalloc(sizeof(KDU_FILE_PRIVATE_DATA), GFP_KERNEL); if(kdufpd==NULL){ + spin_lock(&(kdu->lock)); kdu->use_count--; #ifndef LINUX_2_6 - MOD_DEC_USE_COUNT; + MOD_DEC_USE_COUNT; #endif spin_unlock(&(kdu->lock)); return NULL; @@ -82,7 +85,6 @@ kdufpd->bytes_read=0; kdufpd->age=0; -spin_unlock(&(kdu->lock)); return kdufpd; } Index: km.c =================================================================== RCS file: /cvsroot/gatos/km/km.c,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- km.c 14 Dec 2004 09:58:34 -0000 1.99 +++ km.c 16 Dec 2004 14:30:56 -0000 1.100 @@ -319,27 +319,28 @@ } kms->get_window_parameters(kms, &(kms->vwin)); - - buf_size=kms->vwin.width*kms->vwin.height*2; printk("Capture buf size=%d\n", buf_size); + spin_unlock(&(kms->kms_lock)); if(kms->allocate_dvb(&(kms->capture), km_buffers, buf_size)<0){ + spin_lock(&(kms->kms_lock)); result=-ENOMEM; goto fail; } if(!verify_dvb(kms, &(kms->capture))){ if(kms->deallocate_dvb!=NULL)kms->deallocate_dvb(&(kms->capture)); + spin_lock(&(kms->kms_lock)); result=-ENOTSUPP; goto fail; } kmd_signal_state_change(kms->kmd); if(kms->start_transfer!=NULL){ kms->start_transfer(kms); - spin_unlock(&(kms->kms_lock)); return 0; } result=0; + spin_lock(&(kms->kms_lock)); fail: kms->gdq_usage--; @@ -382,24 +383,26 @@ } buf_size=kms->get_vbi_buf_size(kms); - printk("vbi_buf_size=%ld\n", buf_size); + spin_unlock(&(kms->kms_lock)); if(kms->allocate_dvb(&(kms->vbi), km_buffers, buf_size)<0){ + spin_lock(&(kms->kms_lock)); result=-ENOMEM; goto fail; } if(!verify_dvb(kms, &(kms->vbi))){ if(kms->deallocate_dvb!=NULL)kms->deallocate_dvb(&(kms->vbi)); + spin_lock(&(kms->kms_lock)); result=-ENOTSUPP; goto fail; } kmd_signal_state_change(kms->kmd); if(kms->start_vbi_transfer!=NULL){ kms->start_vbi_transfer(kms); - spin_unlock(&(kms->kms_lock)); return 0; } + spin_lock(&(kms->kms_lock)); result=0; fail: Index: km.h =================================================================== RCS file: /cvsroot/gatos/km/km.h,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- km.h 22 Nov 2004 18:50:05 -0000 1.54 +++ km.h 16 Dec 2004 14:30:56 -0000 1.55 @@ -15,7 +15,7 @@ #include "km_api.h" #include "km_api_data.h" -#define KM_VERSION "alpha-4.0" +#define KM_VERSION "alpha-6.0" /* already in >= 2.4.22 */ #ifndef LINUX_2_6 Index: km_api.c =================================================================== RCS file: /cvsroot/gatos/km/km_api.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- km_api.c 14 Dec 2004 09:58:44 -0000 1.42 +++ km_api.c 16 Dec 2004 14:30:56 -0000 1.43 @@ -194,7 +194,6 @@ MOD_INC_USE_COUNT; #endif - spin_lock(&(kmd->lock)); kmfpd=kmalloc(sizeof(KM_FILE_PRIVATE_DATA), GFP_KERNEL); memset(kmfpd, 0, sizeof(KM_FILE_PRIVATE_DATA)); @@ -203,11 +202,12 @@ kmfpd->br_read=0; kmfpd->buffer_read=kmalloc(kmfpd->br_size, GFP_KERNEL); + spin_lock(&(kmd->lock)); kmfpd->kmd=kmd; - kmfpd->field_flags=kmalloc(sizeof(*(kmfpd->field_flags))*kmd->num_fields, GFP_KERNEL); + kmfpd->field_flags=kmalloc(sizeof(*(kmfpd->field_flags))*kmd->num_fields, GFP_ATOMIC); memset(kmfpd->field_flags, 0, sizeof(*(kmfpd->field_flags))*kmd->num_fields); - kmfpd->kfd=kmalloc(sizeof(*(kmfpd->kfd))*kmd->num_fields, GFP_KERNEL); + kmfpd->kfd=kmalloc(sizeof(*(kmfpd->kfd))*kmd->num_fields, GFP_ATOMIC); memset(kmfpd->kfd, 0, sizeof(*(kmfpd->kfd))*kmd->num_fields); /* initialize field values */ @@ -362,8 +362,8 @@ u32 int_value; int result=0; - spin_lock(&(kmd->lock)); hash=km_command_hash(command, count); + spin_lock(&(kmd->lock)); if((hash==kmd->status_hash) && !strncmp("STATUS\n", command, count)){ spin_lock(&(kmfpd->lock)); kmfpd->request_flags|=KM_STATUS_REQUESTED; @@ -391,6 +391,7 @@ kf=&(kmd->fields[i]); kfd=&(kmfpd->kfd[i]); + spin_unlock(&(kmd->lock)); value=&(command[kf->length]); j=count-kf->length; @@ -406,28 +407,29 @@ printk("Processing \"%s\"=\"%s\" int_value=%d\n", kf->name, value, int_value); switch(kf->type){ case KM_FIELD_TYPE_PROGRAMMABLE: - printk("Performing KM_FIELD_PROGRAMMABLE action \"%s\" is not implemented [yet]\n", kmd->fields[i].name); + printk("Performing KM_FIELD_PROGRAMMABLE action \"%s\" is not implemented [yet]\n", kf->name); break; case KM_FIELD_TYPE_LEVEL_TRIGGER: if(!j || (int_value==0)){ /* trigger lowered */ - if(!kfd->t.requested){ goto exit; /* redundant */ } + if(!kfd->t.requested){ return result; /* redundant */ } kfd->t.requested=0; kf->data.t.count--; if(!kf->data.t.count)kf->data.t.one2zero(kf->data.t.priv); } else { /* trigger raised */ - if(kfd->t.requested){ goto exit; /* redundant */ } + if(kfd->t.requested){ return result; /* redundant */ } /* the zero2one transition checks for success before increasing count first */ if(!kf->data.t.count && (result=kf->data.t.zero2one(kf->data.t.priv))){ - goto exit; - } + return result; + } kfd->t.requested=1; kf->data.t.count++; } break; } + return result; } exit: Index: km_api.h =================================================================== RCS file: /cvsroot/gatos/km/km_api.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- km_api.h 11 Jan 2004 16:51:12 -0000 1.26 +++ km_api.h 16 Dec 2004 14:30:56 -0000 1.27 @@ -11,7 +11,7 @@ #include <linux/spinlock.h> -#define KM_API_VERSION "alpha-5.0" +#define KM_API_VERSION "alpha-6.0" #define KM_FIELD_TYPE_EOL 0 /* end of list marker */ #define KM_FIELD_TYPE_STATIC 1 /* static string */ |
|
From: <gat...@li...> - 2004-12-14 09:58:58
|
Update of /cvsroot/gatos/km In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22825 Modified Files: km.c km_api.c km_api_data.c km_v4l.c km_v4l_24.c Log Message: Prevent deadlocks on errors Index: km_api_data.c =================================================================== RCS file: /cvsroot/gatos/km/km_api_data.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- km_api_data.c 27 Oct 2004 13:47:43 -0000 1.21 +++ km_api_data.c 14 Dec 2004 09:58:44 -0000 1.22 @@ -44,8 +44,14 @@ KM_DATA_UNIT *kdu; KDU_FILE_PRIVATE_DATA *kdufpd=NULL; spin_lock(&data_units_lock); -if(data_unit<0)return NULL; -if(data_unit>=du_free)return NULL; +if(data_unit<0) { + spin_unlock(&data_units_lock); + return NULL; +} +if(data_unit>=du_free) { + spin_unlock(&data_units_lock); + return NULL; +} kdu=&(data_units[data_unit]); #ifndef LINUX_2_6 MOD_INC_USE_COUNT; @@ -330,18 +336,21 @@ if(data_units[i].use_count<=0){k=i; break;} } if(k<0){ + spin_lock(&(data_units_lock)); k=du_free; if(du_free>=du_size){ - du_size+=du_size+10; - p=kmalloc(du_size*sizeof(KM_DATA_UNIT), GFP_KERNEL); + p=kmalloc((du_size+10)*sizeof(KM_DATA_UNIT), GFP_ATOMIC); if(p==NULL){ + spin_unlock(&(data_units_lock)); return -ENOMEM; } + du_size+=10; if(du_free>0)memcpy(p, data_units, du_free*sizeof(KM_DATA_UNIT)); kfree(data_units); data_units=p; } du_free++; + spin_unlock(&(data_units_lock)); } #ifndef LINUX_2_6 MOD_INC_USE_COUNT; @@ -410,7 +419,10 @@ KM_DATA_UNIT *kdu; if(data_unit<0)return; spin_lock(&data_units_lock); -if(data_unit>=du_free)return; +if(data_unit>=du_free) { + spin_unlock(&data_units_lock); + return; +} kdu=&(data_units[data_unit]); spin_lock(&(kdu->lock)); spin_unlock(&data_units_lock); Index: km.c =================================================================== RCS file: /cvsroot/gatos/km/km.c,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- km.c 22 Nov 2004 18:50:05 -0000 1.98 +++ km.c 14 Dec 2004 09:58:34 -0000 1.99 @@ -354,7 +354,6 @@ if(kms->deallocate_dvb!=NULL){ kms->deallocate_dvb(&(kms->capture)); kmd_signal_state_change(kms->kmd); - } else { } kms->gdq_usage--; if(kms->gdq_usage==0){ @@ -416,7 +415,6 @@ if(kms->deallocate_dvb!=NULL){ kms->deallocate_dvb(&(kms->vbi)); kmd_signal_state_change(kms->kmd); - } else { } kms->gdq_usage--; if(kms->gdq_usage==0){ @@ -1059,7 +1057,7 @@ #ifdef MODULE -static int km_init_module(void) +static int __init km_init_module(void) { /* this does not do anything useful at the moment */ @@ -1074,7 +1072,7 @@ return 0; } -void km_cleanup_module(void) +void __exit km_cleanup_module(void) { pci_unregister_driver( &km_pci_driver ); return; Index: km_v4l_24.c =================================================================== RCS file: /cvsroot/gatos/km/km_v4l_24.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- km_v4l_24.c 20 Sep 2004 17:42:32 -0000 1.2 +++ km_v4l_24.c 14 Dec 2004 09:58:44 -0000 1.3 @@ -134,7 +134,10 @@ struct video_window vwin; strcpy(b.name,kms->vd->name); b.type = VID_TYPE_CAPTURE; - if(kms->get_window_parameters==NULL)return -EINVAL; + if(kms->get_window_parameters==NULL) { + spin_unlock(&(kms->kms_lock)); + return -EINVAL; + } kms->get_window_parameters(kms, &(vwin)); spin_unlock(&(kms->kms_lock)); @@ -150,13 +153,14 @@ } case VIDIOCGPICT:{ struct video_picture p; + spin_unlock(&(kms->kms_lock)); + p.palette=VIDEO_PALETTE_YUV422; p.brightness=32768; p.hue=32768; p.colour=32768; p.whiteness=32768; p.depth=16; - spin_unlock(&(kms->kms_lock)); if(copy_to_user(arg, &p, sizeof(p))) return -EFAULT; @@ -173,7 +177,10 @@ } case VIDIOCGWIN:{ struct video_window vwin; - if(kms->get_window_parameters==NULL)return -EINVAL; + if(kms->get_window_parameters==NULL) { + spin_unlock(&(kms->kms_lock)); + return -EINVAL; + } kms->get_window_parameters(kms, &(vwin)); spin_unlock(&(kms->kms_lock)); @@ -183,7 +190,10 @@ } case VIDIOCSWIN: { struct video_window vwin, vwin1; - if(kms->get_window_parameters==NULL)return -EINVAL; + if(kms->get_window_parameters==NULL) { + spin_unlock(&(kms->kms_lock)); + return -EINVAL; + } kms->get_window_parameters(kms, &(vwin1)); spin_unlock(&(kms->kms_lock)); @@ -364,7 +374,10 @@ } case BTTV_VBISIZE: spin_lock(&(kms->kms_lock)); - if(kms->get_vbi_buf_size==NULL)return -ENOTSUPP; + if(kms->get_vbi_buf_size==NULL) { + spin_unlock(&(kms->kms_lock)); + return -ENOTSUPP; + } size=kms->get_vbi_buf_size(kms); spin_unlock(&(kms->kms_lock)); return size; @@ -478,15 +491,15 @@ int init_km_v4l(KM_STRUCT *kms) { -kms->vd = rvmalloc(sizeof(km_v4l_template)); -if (NULL == kms->vd) return -1; +kms->vd = kmalloc(sizeof(km_v4l_template)); +if (NULL == kms->vd) return -ENOMEM; memcpy(kms->vd, &km_v4l_template, sizeof(km_v4l_template)); kms->vd->priv=kms; -kms->vbi_vd = rvmalloc(sizeof(km_v4l_vbi_template)); +kms->vbi_vd = kvmalloc(sizeof(km_v4l_vbi_template)); if (NULL == kms->vbi_vd) { - rvfree(kms->vd, sizeof(km_v4l_template)); - return -1; + kfree(kms->vd); + return -ENOMEM; } memcpy(kms->vbi_vd, &km_v4l_vbi_template, sizeof(km_v4l_vbi_template)); kms->vbi_vd->priv=kms; @@ -504,6 +517,6 @@ video_unregister_device(kms->vd); if(kms->is_vbi_active!=NULL) video_unregister_device(kms->vbi_vd); -rvfree(kms->vbi_vd, sizeof(km_v4l_vbi_template)); -rvfree(kms->vd, sizeof(km_v4l_template)); +kfree(kms->vbi_vd); +kfree(kms->vd); } Index: km_api.c =================================================================== RCS file: /cvsroot/gatos/km/km_api.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- km_api.c 27 Oct 2004 13:47:43 -0000 1.41 +++ km_api.c 14 Dec 2004 09:58:44 -0000 1.42 @@ -580,7 +580,7 @@ void km_api_cleanup_module(void); -static int km_api_init_module(void) +static int __init km_api_init_module(void) { int result; @@ -608,7 +608,7 @@ return 0; } -void km_api_cleanup_module(void) +void __exit km_api_cleanup_module(void) { if(devices!=NULL)kfree(devices); if(km_root!=NULL)remove_proc_entry("km", &proc_root); Index: km_v4l.c =================================================================== RCS file: /cvsroot/gatos/km/km_v4l.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- km_v4l.c 22 Nov 2004 18:50:05 -0000 1.52 +++ km_v4l.c 14 Dec 2004 09:58:44 -0000 1.53 @@ -105,7 +105,10 @@ struct video_window vwin; strcpy(b.name,kms->vd->name); b.type = VID_TYPE_CAPTURE; - if(kms->get_window_parameters==NULL)return -EINVAL; + if(kms->get_window_parameters==NULL) { + spin_unlock(&(kms->kms_lock)); + return -EINVAL; + } kms->get_window_parameters(kms, &(vwin)); spin_unlock(&(kms->kms_lock)); @@ -121,13 +124,14 @@ } case VIDIOCGPICT:{ struct video_picture p; + spin_unlock(&(kms->kms_lock)); + p.palette=VIDEO_PALETTE_YUV422; p.brightness=32768; p.hue=32768; p.colour=32768; p.whiteness=32768; p.depth=16; - spin_unlock(&(kms->kms_lock)); if(copy_to_user(arg, &p, sizeof(p))) return -EFAULT; @@ -144,7 +148,10 @@ } case VIDIOCGWIN:{ struct video_window vwin; - if(kms->get_window_parameters==NULL)return -EINVAL; + if(kms->get_window_parameters==NULL) { + spin_unlock(&(kms->kms_lock)); + return -EINVAL; + } kms->get_window_parameters(kms, &(vwin)); spin_unlock(&(kms->kms_lock)); @@ -154,7 +161,10 @@ } case VIDIOCSWIN: { struct video_window vwin, vwin1; - if(kms->get_window_parameters==NULL)return -EINVAL; + if(kms->get_window_parameters==NULL) { + spin_unlock(&(kms->kms_lock)); + return -EINVAL; + } kms->get_window_parameters(kms, &(vwin1)); spin_unlock(&(kms->kms_lock)); @@ -304,7 +314,10 @@ } case BTTV_VBISIZE: spin_lock(&(kms->kms_lock)); - if(kms->get_vbi_buf_size==NULL)return -ENOTSUPP; + if(kms->get_vbi_buf_size==NULL) { + spin_unlock(&(kms->kms_lock)); + return -ENOTSUPP; + } size=kms->get_vbi_buf_size(kms); spin_unlock(&(kms->kms_lock)); return size; @@ -394,14 +407,14 @@ int init_km_v4l(KM_STRUCT *kms) { kms->vd = video_device_alloc(); - if (NULL == kms->vd) return -1; + if (NULL == kms->vd) return -ENOMEM; memcpy(kms->vd, &km_v4l_template, sizeof(km_v4l_template)); video_set_drvdata(kms->vd, kms); kms->vbi_vd = video_device_alloc(); if (NULL == kms->vbi_vd) { video_device_release(kms->vd); - return -1; + return -ENOMEM; } memcpy(kms->vbi_vd, &km_v4l_vbi_template, sizeof(km_v4l_vbi_template)); video_set_drvdata(kms->vbi_vd, kms); @@ -417,6 +430,11 @@ { if(kms->is_capture_active!=NULL) video_unregister_device(kms->vd); + else + km_vd_release(kms->vd); + if(kms->is_vbi_active!=NULL) video_unregister_device(kms->vbi_vd); + else + km_vd_release(kms->vbi_vd); } |
|
From: <gat...@li...> - 2004-12-04 11:26:11
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25991 Modified Files: Tag: r200_branch theatre_reg.h Log Message: Added macro definitions for RT200 Index: theatre_reg.h =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/theatre_reg.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- theatre_reg.h 21 Oct 2004 20:29:18 -0000 1.1.2.1 +++ theatre_reg.h 4 Dec 2004 11:26:02 -0000 1.1.2.2 @@ -320,6 +320,20 @@ /* these are used in MSP3430 */ #define extPAL_DK1 0x0C00 #define extPAL_AUTO 0x0D00 + /* these are used in RT200. Some are defined above */ +#define extPAL_B 0x0E00 +#define extPAL_D 0x0F00 +#define extPAL_G 0x1000 +#define extPAL_H 0x1100 +#define extPAL_I 0x1200 +#define extSECAM_B 0x1300 +#define extSECAM_D 0x1400 +#define extSECAM_G 0x1500 +#define extSECAM_H 0x1600 +#define extSECAM_K 0x1700 +#define extSECAM_K1 0x1800 +#define extSECAM_L 0x1900 +#define extSECAM_L1 0x1A00 #define RT_FREF_2700 6 #define RT_FREF_2950 5 |
|
From: <gat...@li...> - 2004-12-04 11:23:25
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25519 Modified Files: Tag: r200_branch theatre200.c Log Message: RT_SetStandard with PAL/NTSC/SECAM standards known by RT200 Index: theatre200.c =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/Attic/theatre200.c,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -d -r1.1.2.4 -r1.1.2.5 --- theatre200.c 26 Nov 2004 15:40:35 -0000 1.1.2.4 +++ theatre200.c 4 Dec 2004 11:22:59 -0000 1.1.2.5 @@ -5,6 +5,9 @@ * License: GPL * * $Log$ + * Revision 1.1.2.5 2004/12/04 11:22:59 bogdand + * RT_SetStandard with PAL/NTSC/SECAM standards known by RT200 + * * Revision 1.1.2.4 2004/11/26 15:40:35 bogdand * This is the RT200 support. It adds microcode download and implements most of the commands * @@ -1585,27 +1588,97 @@ switch (wStandard & 0x00FF) { case (DEC_NTSC): /*NTSC GROUP - 480 lines */ - dsp_set_video_standard(t, 1); switch (wStandard & 0xFF00) { - case (extPAL_M): case (extNONE): case (extNTSC): - dsp_set_video_standard(t, 3); + dsp_set_video_standard(t, 2); break; case (extNTSC_J): - dsp_set_video_standard(t, 4); + dsp_set_video_standard(t, RT200_NTSC_J); + break; + case (extNTSC_443): + dsp_set_video_standard(t, RT200_NTSC_433); break; default: + dsp_video_standard_detection(t); break; } break; case (DEC_PAL): /*PAL GROUP - 625 lines */ - dsp_set_video_standard(t, 5); - break; + switch (wStandard & 0xFF00) + { + case (extNONE): + case (extPAL): + case (extPAL_B): + case (extPAL_BGHI): + dsp_set_video_standard(t, RT200_PAL_B); + break; + case (extPAL_D): + dsp_set_video_standard(t, RT200_PAL_D); + break; + case (extPAL_G): + dsp_set_video_standard(t, RT200_PAL_G); + break; + case (extPAL_H): + dsp_set_video_standard(t, RT200_PAL_H); + break; + case (extPAL_I): + dsp_set_video_standard(t, RT200_PAL_D); + break; + case (extPAL_N): + dsp_set_video_standard(t, RT200_PAL_N); + break; + case (extPAL_NCOMB): + dsp_set_video_standard(t, RT200_PAL_Ncomb); + break; + case (extPAL_M): + dsp_set_video_standard(t, RT200_PAL_M); + break; + case (extPAL_60): + dsp_set_video_standard(t, RT200_PAL_60); + break; + default: + dsp_video_standard_detection(t); + break; + } + break; case (DEC_SECAM): /*SECAM GROUP*/ - dsp_set_video_standard(t, 14); - break; + switch (wStandard & 0xFF00) + { + case (extNONE): + case (extSECAM): + dsp_set_video_standard(t, RT200_SECAM); + break; + case (extSECAM_B): + dsp_set_video_standard(t, RT200_SECAM_B); + break; + case (extSECAM_D): + dsp_set_video_standard(t, RT200_SECAM_D); + break; + case (extSECAM_G): + dsp_set_video_standard(t, RT200_SECAM_G); + break; + case (extSECAM_H): + dsp_set_video_standard(t, RT200_SECAM_H); + break; + case (extSECAM_K): + dsp_set_video_standard(t, RT200_SECAM_K); + break; + case (extSECAM_K1): + dsp_set_video_standard(t, RT200_SECAM_K1); + break; + case (extSECAM_L): + dsp_set_video_standard(t, RT200_SECAM_L); + break; + case (extSECAM_L1): + dsp_set_video_standard(t, RT200_SECAM_L1); + break; + default: + dsp_video_standard_detection(t); + break; + } + break; default: dsp_video_standard_detection(t); } |
|
From: <gat...@li...> - 2004-12-04 11:21:24
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25249 Modified Files: Tag: r200_branch theatre200.h Log Message: Added macro difinitions for various video standards known by RT200 Index: theatre200.h =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/Attic/theatre200.h,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -d -r1.1.2.4 -r1.1.2.5 --- theatre200.h 26 Nov 2004 15:40:35 -0000 1.1.2.4 +++ theatre200.h 4 Dec 2004 11:21:15 -0000 1.1.2.5 @@ -5,6 +5,9 @@ * License: GPL * * $Log$ + * Revision 1.1.2.5 2004/12/04 11:21:15 bogdand + * Added macro difinitions for various video standards known by RT200 + * * Revision 1.1.2.4 2004/11/26 15:40:35 bogdand * This is the RT200 support. It adds microcode download and implements most of the commands * @@ -43,6 +46,33 @@ #define DSP_WARNING 0x2c #define DSP_POWERDOWN_MODE 0x2d +#define RT200_NTSC_M 0x01 +#define RT200_NTSC_433 0x03 +#define RT200_NTSC_J 0x04 +#define RT200_PAL_B 0x05 +#define RT200_PAL_D 0x06 +#define RT200_PAL_G 0x07 +#define RT200_PAL_H 0x08 +#define RT200_PAL_I 0x09 +#define RT200_PAL_N 0x0a +#define RT200_PAL_Ncomb 0x0b +#define RT200_PAL_M 0x0c +#define RT200_PAL_60 0x0d +#define RT200_SECAM 0x0e +#define RT200_SECAM_B 0x0f +#define RT200_SECAM_D 0x10 +#define RT200_SECAM_G 0x11 +#define RT200_SECAM_H 0x12 +#define RT200_SECAM_K 0x13 +#define RT200_SECAM_K1 0x14 +#define RT200_SECAM_L 0x15 +#define RT200_SECAM_L1 0x16 +#define RT200_480i 0x17 +#define RT200_480p 0x18 +#define RT200_576i 0x19 +#define RT200_720p 0x1a +#define RT200_1080i 0x1b + struct rt200_microc_head { unsigned int device_id; |
|
From: <gat...@li...> - 2004-11-29 23:30:49
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28093 Modified Files: Tag: r200_branch radeon_video.c Log Message: Added R350 case in RADEONVIP_reset() Index: radeon_video.c =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/radeon_video.c,v retrieving revision 1.6.2.5 retrieving revision 1.6.2.6 diff -u -d -r1.6.2.5 -r1.6.2.6 --- radeon_video.c 28 Nov 2004 19:34:49 -0000 1.6.2.5 +++ radeon_video.c 29 Nov 2004 23:30:35 -0000 1.6.2.6 @@ -1760,6 +1760,7 @@ switch(info->ChipFamily){ case CHIP_FAMILY_RV250: case CHIP_FAMILY_RV350: + case CHIP_FAMILY_R350: OUTREG(VIPH_CONTROL, 0x003F0009); /* slowest, timeout in 16 phases */ OUTREG(VIPH_TIMEOUT_STAT, (INREG(VIPH_TIMEOUT_STAT) & 0xFFFFFF00) | VIPH_TIMEOUT_STAT__VIPH_REGR_DIS); OUTREG(VIPH_DV_LAT, 0x444400FF); /* set timeslice */ |
|
From: <gat...@li...> - 2004-11-29 09:52:34
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26861 Modified Files: Tag: r200_branch fi1236.c Log Message: Small changes in tuner table for both PAL and NTSC 12xx versions Index: fi1236.c =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/fi1236.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -d -r1.4.2.2 -r1.4.2.3 --- fi1236.c 6 Nov 2004 13:42:16 -0000 1.4.2.2 +++ fi1236.c 29 Nov 2004 09:52:15 -0000 1.4.2.3 @@ -24,9 +24,9 @@ /* 5 - FI1256 */ { 623 ,16*49.75 ,16*863.25 ,16*170 ,16*450 ,0xA0 ,0x90, 0x30, 0x8e }, /* 6 - FI1236W */ - { 733 ,884 ,12820 ,2516 ,7220 ,0x1 ,0x2, 0x4, 0x8e }, + { 733 ,16*55.25 ,16*801.25 ,16*160.00 ,16*442.00 ,0x1 ,0x2, 0x4, 0x8e }, /* 7 - FM1216ME */ - { 733 ,16*48.25 ,16*863.25 ,16*158.00 ,16*442.00 ,0x1 ,0x2, 0x4, 0x8e } + { 623 ,16*48.25 ,16*863.25 ,16*158.00 ,16*442.00 ,0x1 ,0x2, 0x4, 0x8e } }; |
|
From: <gat...@li...> - 2004-11-28 19:35:13
|
Update of /cvsroot/gatos/ati.4.4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7708 Modified Files: Tag: r200_branch radeon_video.c Log Message: Added a RV250 case in RADEONInitI2C() Index: radeon_video.c =================================================================== RCS file: /cvsroot/gatos/ati.4.4.0/radeon_video.c,v retrieving revision 1.6.2.4 retrieving revision 1.6.2.5 diff -u -d -r1.6.2.4 -r1.6.2.5 --- radeon_video.c 18 Nov 2004 14:22:09 -0000 1.6.2.4 +++ radeon_video.c 28 Nov 2004 19:34:49 -0000 1.6.2.5 @@ -1255,8 +1255,9 @@ switch(info->ChipFamily){ case CHIP_FAMILY_RV350: case CHIP_FAMILY_R300: + case CHIP_FAMILY_RV250: case CHIP_FAMILY_R200: - case CHIP_FAMILY_RV200: + case CHIP_FAMILY_RV200: pPriv->i2c->I2CWriteRead=R200_I2CWriteRead; xf86DrvMsg(pScrn->scrnIndex,X_INFO,"Using R200 i2c bus access method\n"); break; |