change some scanf %u back to %i to allow using both hex and dec numbers
This commit is contained in:
@@ -52,7 +52,7 @@
|
||||
*/
|
||||
FX_EXPORT FxBool FX_CSTYLE sst1InitSli(FxU32 *sstbase0, FxU32 *sstbase1)
|
||||
{
|
||||
FxU32 j, n, u, MasterPhysAddr, cntr;
|
||||
FxU32 j, n, MasterPhysAddr, cntr;
|
||||
SstRegs *sstMaster = (SstRegs *) sstbase0;
|
||||
SstRegs *sstSlave = (SstRegs *) sstbase1;
|
||||
FxU32 masterVInClkDel, masterVOutClkDel;
|
||||
@@ -68,6 +68,7 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitSli(FxU32 *sstbase0, FxU32 *sstbase1)
|
||||
FxU32 videoWindowActive = 0x1;
|
||||
FxU32 videoWindowActiveDrag = 0xf;
|
||||
sst1DeviceInfoStruct *sst1M, *sst1S;
|
||||
int i;
|
||||
|
||||
if(sst1InitCheckBoard(sstbase1) == FXFALSE)
|
||||
return(FXFALSE);
|
||||
@@ -242,14 +243,14 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitSli(FxU32 *sstbase0, FxU32 *sstbase1)
|
||||
slavePVOutClkDel = 0;
|
||||
|
||||
if(GETENV(("SSTV2_SLIS_VOUT_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_SLIS_VOUT_CLKDEL")), "%u", &u) == 1))
|
||||
slaveVOutClkDel = u;
|
||||
(SSCANF(GETENV(("SSTV2_SLIS_VOUT_CLKDEL")), "%i", &i) == 1))
|
||||
slaveVOutClkDel = i;
|
||||
if(GETENV(("SSTV2_SLIS_PVOUT_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_SLIS_PVOUT_CLKDEL")), "%u", &u) == 1))
|
||||
slavePVOutClkDel = u;
|
||||
(SSCANF(GETENV(("SSTV2_SLIS_PVOUT_CLKDEL")), "%i", &i) == 1))
|
||||
slavePVOutClkDel = i;
|
||||
if(GETENV(("SSTV2_SLIS_VIN_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_SLIS_VIN_CLKDEL")), "%u", &u) == 1))
|
||||
slaveVInClkDel = u;
|
||||
(SSCANF(GETENV(("SSTV2_SLIS_VIN_CLKDEL")), "%i", &i) == 1))
|
||||
slaveVInClkDel = i;
|
||||
INIT_PRINTF(("sst1InitSli(): slaveVinClkdel=0x%x, slaveVOutClkDel=0x%x, slavePVOutClkDel=0x%x\n",
|
||||
slaveVInClkDel, slaveVOutClkDel, slavePVOutClkDel));
|
||||
if(sst1CurrentBoard->fbiVideo16BPP)
|
||||
@@ -394,14 +395,14 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitSli(FxU32 *sstbase0, FxU32 *sstbase1)
|
||||
masterVOutClkDel = 2;
|
||||
masterPVOutClkDel = 0;
|
||||
if(GETENV(("SSTV2_SLIM_VOUT_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_SLIM_VOUT_CLKDEL")), "%u", &u) == 1))
|
||||
masterVOutClkDel = u;
|
||||
(SSCANF(GETENV(("SSTV2_SLIM_VOUT_CLKDEL")), "%i", &i) == 1))
|
||||
masterVOutClkDel = i;
|
||||
if(GETENV(("SSTV2_SLIM_PVOUT_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_SLIM_PVOUT_CLKDEL")), "%u", &u) == 1))
|
||||
masterPVOutClkDel = u;
|
||||
(SSCANF(GETENV(("SSTV2_SLIM_PVOUT_CLKDEL")), "%i", &i) == 1))
|
||||
masterPVOutClkDel = i;
|
||||
if(GETENV(("SSTV2_SLIM_VIN_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_SLIM_VIN_CLKDEL")), "%u", &u) == 1))
|
||||
masterVInClkDel = u;
|
||||
(SSCANF(GETENV(("SSTV2_SLIM_VIN_CLKDEL")), "%i", &i) == 1))
|
||||
masterVInClkDel = i;
|
||||
INIT_PRINTF(("sst1InitSli(): masterVinClkdel=0x%x, masterVOutClkDel=0x%x, masterPVOutClkDel=0x%x\n",
|
||||
masterVInClkDel, masterVOutClkDel, masterPVOutClkDel));
|
||||
if(sst1CurrentBoard->fbiVideo16BPP)
|
||||
|
||||
@@ -201,12 +201,13 @@ FX_EXPORT FxU32 * FX_CSTYLE sst1InitMapBoardDirect(FxU32 BoardNumber,
|
||||
FxU32 deviceID; // 0x0002 - Look for a Voodoo2 board (0xFFFF - Find any 3Dfx board)
|
||||
FxU32 sizeOfCard = 0x1000000; // 16 MBytes of addr space for SST-1
|
||||
FxU32 *sstbase;
|
||||
FxU32 j, n, u;
|
||||
FxU32 j, n;
|
||||
FxU32 sstv2_noremap = 0;
|
||||
int i;
|
||||
|
||||
if( GETENV( ("SSTV2_DEVICEID") ) &&
|
||||
(SSCANF(GETENV(("SSTV2_DEVICEID")), "%u", &u) == 1) )
|
||||
deviceID = u;
|
||||
(SSCANF(GETENV(("SSTV2_DEVICEID")), "%i", &i) == 1) )
|
||||
deviceID = i;
|
||||
else
|
||||
deviceID = 0x0002;
|
||||
|
||||
@@ -237,8 +238,8 @@ FX_EXPORT FxU32 * FX_CSTYLE sst1InitMapBoardDirect(FxU32 BoardNumber,
|
||||
sst1InitUseVoodooFile = sst1InitVoodooFile();
|
||||
|
||||
if( GETENV( ("SSTV2_NOREMAP") ) &&
|
||||
(SSCANF(GETENV(("SSTV2_NOREMAP")), "%u", &u) == 1) )
|
||||
sstv2_noremap = u;
|
||||
(SSCANF(GETENV(("SSTV2_NOREMAP")), "%i", &i) == 1) )
|
||||
sstv2_noremap = i;
|
||||
else
|
||||
sstv2_noremap = 0;
|
||||
#if !macintosh && !__linux__
|
||||
@@ -432,10 +433,11 @@ FX_EXPORT FxU32 * FX_CSTYLE sst1InitMapBoardDirect(FxU32 BoardNumber,
|
||||
*/
|
||||
FX_EXPORT FxBool FX_CSTYLE sst1InitRegisters(FxU32 *sstbase)
|
||||
{
|
||||
FxU32 n, u, tf_fifo_thresh;
|
||||
FxU32 n, tf_fifo_thresh;
|
||||
FxU32 ft_clkdel, tf0_clkdel, tf1_clkdel, tf2_clkdel;
|
||||
sst1ClkTimingStruct sstGrxClk;
|
||||
SstRegs *sst = (SstRegs *) sstbase;
|
||||
int i;
|
||||
|
||||
if(!sst)
|
||||
return(FXFALSE);
|
||||
@@ -471,16 +473,16 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitRegisters(FxU32 *sstbase)
|
||||
|
||||
// Adjust Trex-to-Fbi FIFO
|
||||
if(GETENV(("SSTV2_TF_FIFO_THRESH")) &&
|
||||
(SSCANF(GETENV(("SSTV2_TF_FIFO_THRESH")), "%u", &u) == 1) )
|
||||
tf_fifo_thresh = u;
|
||||
(SSCANF(GETENV(("SSTV2_TF_FIFO_THRESH")), "%i", &i) == 1) )
|
||||
tf_fifo_thresh = i;
|
||||
else
|
||||
tf_fifo_thresh = 0x8;
|
||||
INIT_PRINTF(("sst1InitRegisters(): Setting TREX-to-FBI FIFO THRESHOLD to 0x%x...\n",
|
||||
tf_fifo_thresh));
|
||||
|
||||
if(GETENV(("SSTV2_PFT_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_PFT_CLKDEL")), "%u", &u) == 1) )
|
||||
ft_clkdel = u;
|
||||
(SSCANF(GETENV(("SSTV2_PFT_CLKDEL")), "%i", &i) == 1) )
|
||||
ft_clkdel = i;
|
||||
else
|
||||
ft_clkdel = 0x8; // Okay for 16 MHz startup...
|
||||
INIT_PRINTF(("sst1InitRegisters(): Setting PRELIM FT-CLK delay to 0x%x...\n", ft_clkdel));
|
||||
@@ -546,23 +548,23 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitRegisters(FxU32 *sstbase)
|
||||
|
||||
// set TREX0 init values
|
||||
if(GETENV(("SSTV2_TREX0INIT0")) &&
|
||||
(SSCANF(GETENV(("SSTV2_TREX0INIT0")), "%u", &u) == 1) ) {
|
||||
(SSCANF(GETENV(("SSTV2_TREX0INIT0")), "%i", &i) == 1) ) {
|
||||
INIT_PRINTF(("sst1InitRegisters(): Using SST_TREX0INIT0 environment variable\n"));
|
||||
sst1CurrentBoard->tmuInit0[0] = u;
|
||||
sst1CurrentBoard->tmuInit0[0] = i;
|
||||
} else
|
||||
sst1CurrentBoard->tmuInit0[0] = SST_TREX0INIT0_DEFAULT;
|
||||
|
||||
INIT_PRINTF(("sst1InitRegisters(): Storing TREX0INIT0=0x%x\n",
|
||||
sst1CurrentBoard->tmuInit0[0]));
|
||||
if(GETENV(("SSTV2_TREX0INIT1")) &&
|
||||
(SSCANF(GETENV(("SSTV2_TREX0INIT1")), "%u", &u) == 1) ) {
|
||||
(SSCANF(GETENV(("SSTV2_TREX0INIT1")), "%i", &i) == 1) ) {
|
||||
INIT_PRINTF(("sst1InitRegisters(): Using SST_TREX0INIT1 environment variable\n"));
|
||||
sst1CurrentBoard->tmuInit1[0] = u;
|
||||
sst1CurrentBoard->tmuInit1[0] = i;
|
||||
} else
|
||||
sst1CurrentBoard->tmuInit1[0] = SST_TREX0INIT1_DEFAULT;
|
||||
|
||||
if(GETENV(("SSTV2_PTF0_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_PTF0_CLKDEL")), "%u", &tf0_clkdel) == 1)) {
|
||||
(SSCANF(GETENV(("SSTV2_PTF0_CLKDEL")), "%i", &tf0_clkdel) == 1)) {
|
||||
sst1CurrentBoard->tmuInit1[0] = (sst1CurrentBoard->tmuInit1[0] &
|
||||
~SST_TEX_TF_CLK_DEL_ADJ) |
|
||||
(tf0_clkdel<<SST_TEX_TF_CLK_DEL_ADJ_SHIFT);
|
||||
@@ -572,21 +574,21 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitRegisters(FxU32 *sstbase)
|
||||
|
||||
// set TREX1 init values
|
||||
if(GETENV(("SSTV2_TREX1INIT0")) &&
|
||||
(SSCANF(GETENV(("SSTV2_TREX1INIT0")), "%u", &u) == 1) ) {
|
||||
(SSCANF(GETENV(("SSTV2_TREX1INIT0")), "%i", &i) == 1) ) {
|
||||
INIT_PRINTF(("sst1InitRegisters(): Using SST_TREX1INIT0 environment variable\n"));
|
||||
sst1CurrentBoard->tmuInit0[1] = u;
|
||||
sst1CurrentBoard->tmuInit0[1] = i;
|
||||
} else
|
||||
sst1CurrentBoard->tmuInit0[1] = SST_TREX1INIT0_DEFAULT;
|
||||
INIT_PRINTF(("sst1InitRegisters(): Storing TREX1INIT0=0x%x\n",
|
||||
sst1CurrentBoard->tmuInit0[1]));
|
||||
if(GETENV(("SSTV2_TREX1INIT1")) &&
|
||||
(SSCANF(GETENV(("SSTV2_TREX1INIT1")), "%u", &u) == 1) ) {
|
||||
(SSCANF(GETENV(("SSTV2_TREX1INIT1")), "%i", &i) == 1) ) {
|
||||
INIT_PRINTF(("sst1InitRegisters(): Using SST_TREX1INIT1 environment variable\n"));
|
||||
sst1CurrentBoard->tmuInit1[1] = u;
|
||||
sst1CurrentBoard->tmuInit1[1] = i;
|
||||
} else
|
||||
sst1CurrentBoard->tmuInit1[1] = SST_TREX1INIT1_DEFAULT;
|
||||
if(GETENV(("SSTV2_PTF1_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_PTF1_CLKDEL")), "%u", &tf1_clkdel) == 1) ) {
|
||||
(SSCANF(GETENV(("SSTV2_PTF1_CLKDEL")), "%i", &tf1_clkdel) == 1) ) {
|
||||
sst1CurrentBoard->tmuInit1[1] = (sst1CurrentBoard->tmuInit1[1] &
|
||||
~SST_TEX_TF_CLK_DEL_ADJ) |
|
||||
(tf1_clkdel<<SST_TEX_TF_CLK_DEL_ADJ_SHIFT);
|
||||
@@ -597,21 +599,21 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitRegisters(FxU32 *sstbase)
|
||||
|
||||
// set TREX2 init values
|
||||
if(GETENV(("SSTV2_TREX2INIT0")) &&
|
||||
(SSCANF(GETENV(("SSTV2_TREX2INIT0")), "%u", &u) == 1) ) {
|
||||
(SSCANF(GETENV(("SSTV2_TREX2INIT0")), "%i", &i) == 1) ) {
|
||||
INIT_PRINTF(("sst1InitRegisters(): Using SST_TREX2INIT0 environment variable\n"));
|
||||
sst1CurrentBoard->tmuInit0[2] = u;
|
||||
sst1CurrentBoard->tmuInit0[2] = i;
|
||||
} else
|
||||
sst1CurrentBoard->tmuInit0[2] = SST_TREX2INIT0_DEFAULT;
|
||||
INIT_PRINTF(("sst1InitRegisters(): Storing TREX2INIT0=0x%x\n",
|
||||
sst1CurrentBoard->tmuInit0[2]));
|
||||
if(GETENV(("SSTV2_TREX2INIT1")) &&
|
||||
(SSCANF(GETENV(("SSTV2_TREX2INIT1")), "%u", &u) == 1) ) {
|
||||
(SSCANF(GETENV(("SSTV2_TREX2INIT1")), "%i", &i) == 1) ) {
|
||||
INIT_PRINTF(("sst1InitRegisters(): Using SST_TREX2INIT1 environment variable\n"));
|
||||
sst1CurrentBoard->tmuInit1[2] = u;
|
||||
sst1CurrentBoard->tmuInit1[2] = i;
|
||||
} else
|
||||
sst1CurrentBoard->tmuInit1[2] = SST_TREX2INIT1_DEFAULT;
|
||||
if(GETENV(("SSTV2_PTF2_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_PTF2_CLKDEL")), "%u", &tf2_clkdel) == 1) ) {
|
||||
(SSCANF(GETENV(("SSTV2_PTF2_CLKDEL")), "%i", &tf2_clkdel) == 1) ) {
|
||||
sst1CurrentBoard->tmuInit1[2] = (sst1CurrentBoard->tmuInit1[2] &
|
||||
~SST_TEX_TF_CLK_DEL_ADJ) |
|
||||
(tf2_clkdel<<SST_TEX_TF_CLK_DEL_ADJ_SHIFT);
|
||||
|
||||
@@ -971,16 +971,17 @@ FX_EXPORT void FX_CSTYLE sst1InitPrintInitRegs(FxU32 *sstbase)
|
||||
*/
|
||||
FX_EXPORT FxU32 FX_CSTYLE sst1InitMeasureSiProcess(FxU32 *sstbase, FxU32 which)
|
||||
{
|
||||
FxU32 n, u, siProcess, nandOsc, norOsc;
|
||||
FxU32 n, siProcess, nandOsc, norOsc;
|
||||
FxU32 pciCntrLoad = 0xfff;
|
||||
FxU32 cntr;
|
||||
int i;
|
||||
|
||||
if(sst1InitCheckBoard(sstbase) == FXFALSE)
|
||||
return(FXFALSE);
|
||||
|
||||
if(GETENV(("SSTV2_SIPROCESS_CNTR")) &&
|
||||
(SSCANF(GETENV(("SSTV2_SIPROCESS_CNTR")), "%u", &u) == 1) ) {
|
||||
pciCntrLoad = u;
|
||||
(SSCANF(GETENV(("SSTV2_SIPROCESS_CNTR")), "%i", &i) == 1) ) {
|
||||
pciCntrLoad = i;
|
||||
INIT_PRINTF(("sst1InitMeasureSiProcess(): Using PCI Counter preload value of 0x%x...\n", pciCntrLoad));
|
||||
}
|
||||
|
||||
|
||||
@@ -121,7 +121,7 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitVideoBuffers(FxU32 *sstbase,
|
||||
FxU32 nColorBuffs, FxU32 nAuxBuffs, sst1VideoTimingStruct *altVideoTiming,
|
||||
FxBool switchPassThru)
|
||||
{
|
||||
FxU32 n, u, vtmp;
|
||||
FxU32 n, vtmp;
|
||||
SstRegs *sst = (SstRegs *) sstbase;
|
||||
sst1VideoTimingStruct *sstVideoRez;
|
||||
FxU32 video16BPP;
|
||||
@@ -223,21 +223,21 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitVideoBuffers(FxU32 *sstbase,
|
||||
|
||||
// Setup SST video timing registers
|
||||
if(GETENV(("SSTV2_HSYNC")) &&
|
||||
(SSCANF(GETENV(("SSTV2_HSYNC")), "%u", &vtmp) == 1) ) {
|
||||
(SSCANF(GETENV(("SSTV2_HSYNC")), "%i", &vtmp) == 1) ) {
|
||||
INIT_PRINTF(("sst1InitVideo(): Using SST_HSYNC=0x%x\n", vtmp));
|
||||
ISET(sst->hSync, vtmp);
|
||||
} else
|
||||
ISET(sst->hSync, ((sstVideoRez->hSyncOff << SST_VIDEO_HSYNC_OFF_SHIFT) |
|
||||
(sstVideoRez->hSyncOn << SST_VIDEO_HSYNC_ON_SHIFT)));
|
||||
if(GETENV(("SSTV2_VSYNC")) &&
|
||||
(SSCANF(GETENV(("SSTV2_VSYNC")), "%u", &vtmp) == 1) ) {
|
||||
(SSCANF(GETENV(("SSTV2_VSYNC")), "%i", &vtmp) == 1) ) {
|
||||
INIT_PRINTF(("sst1InitVideo(): Using SST_VSYNC=0x%x\n", vtmp));
|
||||
ISET(sst->vSync, vtmp);
|
||||
} else
|
||||
ISET(sst->vSync, ((sstVideoRez->vSyncOff << SST_VIDEO_VSYNC_OFF_SHIFT) |
|
||||
(sstVideoRez->vSyncOn << SST_VIDEO_VSYNC_ON_SHIFT)));
|
||||
if(GETENV(("SSTV2_BACKPORCH")) &&
|
||||
(SSCANF(GETENV(("SSTV2_BACKPORCH")), "%u", &vtmp) == 1) ) {
|
||||
(SSCANF(GETENV(("SSTV2_BACKPORCH")), "%i", &vtmp) == 1) ) {
|
||||
INIT_PRINTF(("sst1InitVideo(): Using SST_BACKPORCH=0x%x\n", vtmp));
|
||||
ISET(sst->backPorch, vtmp);
|
||||
} else
|
||||
@@ -245,7 +245,7 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitVideoBuffers(FxU32 *sstbase,
|
||||
((sstVideoRez->vBackPorch << SST_VIDEO_VBACKPORCH_SHIFT) |
|
||||
(sstVideoRez->hBackPorch << SST_VIDEO_HBACKPORCH_SHIFT)));
|
||||
if(GETENV(("SSTV2_DIMENSIONS")) &&
|
||||
(SSCANF(GETENV(("SSTV2_DIMENSIONS")), "%u", &vtmp) == 1) ) {
|
||||
(SSCANF(GETENV(("SSTV2_DIMENSIONS")), "%i", &vtmp) == 1) ) {
|
||||
INIT_PRINTF(("sst1InitVideo(): Using SST_DIMENSIONS=0x%x\n", vtmp));
|
||||
sstVideoRez->yDimension = (vtmp >> SST_VIDEO_YDIM_SHIFT) & 0x3ff;
|
||||
sstVideoRez->xDimension = vtmp & 0x3ff;
|
||||
@@ -254,12 +254,12 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitVideoBuffers(FxU32 *sstbase,
|
||||
((sstVideoRez->yDimension << SST_VIDEO_YDIM_SHIFT) |
|
||||
((sstVideoRez->xDimension-1) << SST_VIDEO_XDIM_SHIFT)));
|
||||
if(GETENV(("SSTV2_MEMOFFSET")) &&
|
||||
(SSCANF(GETENV(("SSTV2_MEMOFFSET")), "%u", &vtmp) == 1) ) {
|
||||
(SSCANF(GETENV(("SSTV2_MEMOFFSET")), "%i", &vtmp) == 1) ) {
|
||||
INIT_PRINTF(("sst1InitVideo(): Using video memOffset=0x%x\n", vtmp));
|
||||
sstVideoRez->memOffset = vtmp;
|
||||
}
|
||||
if(GETENV(("SSTV2_TILESINX")) &&
|
||||
(SSCANF(GETENV(("SSTV2_TILESINX")), "%u", &vtmp) == 1) ) {
|
||||
(SSCANF(GETENV(("SSTV2_TILESINX")), "%i", &vtmp) == 1) ) {
|
||||
INIT_PRINTF(("sst1InitVideo(): Using video tilesInX=0x%x\n", vtmp));
|
||||
sstVideoRez->tilesInX = vtmp;
|
||||
}
|
||||
@@ -321,16 +321,16 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitVideoBuffers(FxU32 *sstbase,
|
||||
|
||||
memFifoLwm = 23;
|
||||
if(GETENV(("SSTV2_MEMFIFO_LWM")) &&
|
||||
(SSCANF(GETENV(("SSTV2_MEMFIFO_LWM")), "%u", &u) == 1))
|
||||
memFifoLwm = u;
|
||||
(SSCANF(GETENV(("SSTV2_MEMFIFO_LWM")), "%i", &vtmp) == 1))
|
||||
memFifoLwm = vtmp;
|
||||
memFifoHwm = 54;
|
||||
if(GETENV(("SSTV2_MEMFIFO_HWM")) &&
|
||||
(SSCANF(GETENV(("SSTV2_MEMFIFO_HWM")), "%u", &u) == 1))
|
||||
memFifoHwm = u;
|
||||
(SSCANF(GETENV(("SSTV2_MEMFIFO_HWM")), "%i", &vtmp) == 1))
|
||||
memFifoHwm = vtmp;
|
||||
pciFifoLwm = 13;
|
||||
if(GETENV(("SSTV2_PCIFIFO_LWM")) &&
|
||||
(SSCANF(GETENV(("SSTV2_PCIFIFO_LWM")), "%u", &u) == 1))
|
||||
pciFifoLwm = u;
|
||||
(SSCANF(GETENV(("SSTV2_PCIFIFO_LWM")), "%i", &vtmp) == 1))
|
||||
pciFifoLwm = vtmp;
|
||||
INIT_PRINTF(("sst1InitVideo(): pciFifoLwm:%d memFifoLwm:%d memFifoHwm:%d\n",
|
||||
pciFifoLwm, memFifoLwm, memFifoHwm));
|
||||
|
||||
@@ -376,7 +376,6 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitVideoBuffers(FxU32 *sstbase,
|
||||
n = 1;
|
||||
|
||||
if(n) {
|
||||
int i;
|
||||
sst1CurrentBoard->fbiMemoryFifoEn = 1;
|
||||
memFifoEntries = (65536 - (int)
|
||||
(((int) (memSizeInPages - 1) -
|
||||
@@ -389,8 +388,8 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitVideoBuffers(FxU32 *sstbase,
|
||||
return(FXFALSE);
|
||||
}
|
||||
if(GETENV(("SSTV2_MEMFIFO_ENTRIES")) &&
|
||||
(SSCANF(GETENV(("SSTV2_MEMFIFO_ENTRIES")), "%d", &i) == 1))
|
||||
memFifoEntries = i;
|
||||
(SSCANF(GETENV(("SSTV2_MEMFIFO_ENTRIES")), "%i", &vtmp) == 1))
|
||||
memFifoEntries = vtmp;
|
||||
INIT_PRINTF(("sst1InitVideo(): Enabling Memory FIFO (Entries=%d)...\n",
|
||||
65536 - (memFifoEntries << 5)));
|
||||
|
||||
@@ -408,13 +407,13 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitVideoBuffers(FxU32 *sstbase,
|
||||
|
||||
vInClkDel = 1;
|
||||
if(GETENV(("SSTV2_VIN_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_VIN_CLKDEL")), "%u", &u) == 1))
|
||||
vInClkDel = u;
|
||||
(SSCANF(GETENV(("SSTV2_VIN_CLKDEL")), "%i", &vtmp) == 1))
|
||||
vInClkDel = vtmp;
|
||||
|
||||
vOutClkDel = 0;
|
||||
if(GETENV(("SSTV2_VOUT_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_VOUT_CLKDEL")), "%u", &u) == 1))
|
||||
vOutClkDel = u;
|
||||
(SSCANF(GETENV(("SSTV2_VOUT_CLKDEL")), "%i", &vtmp) == 1))
|
||||
vOutClkDel = vtmp;
|
||||
|
||||
INIT_PRINTF(("sst1InitVideo(): vInClkDel=0x%x vOutClkDel=0x%x\n",
|
||||
|
||||
@@ -479,9 +478,9 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitVideoBuffers(FxU32 *sstbase,
|
||||
if(!GETENV(("SSTV2_VIDEO_FILTER_DISABLE"))) {
|
||||
ISET(sst->fbiInit1, IGET(sst->fbiInit1) | SST_VIDEO_FILTER_EN);
|
||||
if(GETENV(("SSTV2_VIDEO_FILTER_THRESHOLD")) &&
|
||||
(SSCANF(GETENV(("SSTV2_VIDEO_FILTER_THRESHOLD")), "%u", &u) == 1)) {
|
||||
INIT_PRINTF(("sst1InitVideo(): Setting Video Filtering Treshold to 0x%x...\n", u));
|
||||
ISET(sst->videoFilterRgbThreshold, u);
|
||||
(SSCANF(GETENV(("SSTV2_VIDEO_FILTER_THRESHOLD")), "%i", &vtmp) == 1)) {
|
||||
INIT_PRINTF(("sst1InitVideo(): Setting Video Filtering Treshold to 0x%x...\n", vtmp));
|
||||
ISET(sst->videoFilterRgbThreshold, vtmp);
|
||||
} else
|
||||
// ISET(sst->videoFilterRgbThreshold, 0x180c18);
|
||||
ISET(sst->videoFilterRgbThreshold, 0x080408);
|
||||
@@ -607,11 +606,11 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitVideoBuffers(FxU32 *sstbase,
|
||||
// Clear memory...
|
||||
if(!GETENV(("SSTV2_VIDEO_NOCLEAR"))) {
|
||||
FxU32 clearColor = 0x0;
|
||||
FxU32 u, pagesToFill;
|
||||
FxU32 pagesToFill;
|
||||
|
||||
if(GETENV(("SSTV2_VIDEO_CLEARCOLOR")) &&
|
||||
(SSCANF(GETENV(("SSTV2_VIDEO_CLEARCOLOR")), "%u", &u) == 1))
|
||||
clearColor = u;
|
||||
(SSCANF(GETENV(("SSTV2_VIDEO_CLEARCOLOR")), "%i", &vtmp) == 1))
|
||||
clearColor = vtmp;
|
||||
|
||||
if(sst1CurrentBoard->fbiMemSize == 1)
|
||||
pagesToFill = 256;
|
||||
@@ -1268,7 +1267,7 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitMonitorDetect(FxU32 *sstbase)
|
||||
// }
|
||||
|
||||
if(GETENV(("SSTV2_MDETECT_CONST")) &&
|
||||
(SSCANF(GETENV(("SSTV2_MDETECT_CONST")), "%u", &j) == 1)) {
|
||||
(SSCANF(GETENV(("SSTV2_MDETECT_CONST")), "%i", &j) == 1)) {
|
||||
gammaCorrectConstant = j;
|
||||
INIT_PRINTF(("sst1InitMonitorDetect(): Using value 0x%x for constant gamma value...\n", gammaCorrectConstant));
|
||||
}
|
||||
@@ -1336,8 +1335,9 @@ FX_EXPORT FxBool FX_CSTYLE sst1InitMonitorDetect(FxU32 *sstbase)
|
||||
*/
|
||||
FX_EXPORT FxBool FX_CSTYLE sst1InitSetClkDelays(FxU32 *sstbase)
|
||||
{
|
||||
FxU32 tf0_clkdel, tf1_clkdel, tf2_clkdel, ft_clkdel, u;
|
||||
FxU32 tf0_clkdel, tf1_clkdel, tf2_clkdel, ft_clkdel;
|
||||
SstRegs *sst = (SstRegs *) sstbase;
|
||||
int i;
|
||||
|
||||
if(sst1CurrentBoard->fbiBoardID == 0x3) {
|
||||
// Early 4-layer 4220 board -- Runs at 83 MHz by default...
|
||||
@@ -1433,17 +1433,17 @@ setDelays:
|
||||
|
||||
// Override with environment variables
|
||||
if(GETENV(("SSTV2_FT_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_FT_CLKDEL")), "%u", &u) == 1))
|
||||
ft_clkdel = u;
|
||||
(SSCANF(GETENV(("SSTV2_FT_CLKDEL")), "%i", &i) == 1))
|
||||
ft_clkdel = i;
|
||||
if(GETENV(("SSTV2_TF0_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_TF0_CLKDEL")), "%u", &u) == 1))
|
||||
tf0_clkdel = u;
|
||||
(SSCANF(GETENV(("SSTV2_TF0_CLKDEL")), "%i", &i) == 1))
|
||||
tf0_clkdel = i;
|
||||
if(GETENV(("SSTV2_TF1_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_TF1_CLKDEL")), "%u", &u) == 1))
|
||||
tf1_clkdel = u;
|
||||
(SSCANF(GETENV(("SSTV2_TF1_CLKDEL")), "%i", &i) == 1))
|
||||
tf1_clkdel = i;
|
||||
if(GETENV(("SSTV2_TF2_CLKDEL")) &&
|
||||
(SSCANF(GETENV(("SSTV2_TF2_CLKDEL")), "%u", &u) == 1))
|
||||
tf2_clkdel = u;
|
||||
(SSCANF(GETENV(("SSTV2_TF2_CLKDEL")), "%i", &i) == 1))
|
||||
tf2_clkdel = i;
|
||||
|
||||
INIT_PRINTF(("sst1InitSetClkDelays(): Setting FBI-to-TREX clock delay to 0x%x...\n", ft_clkdel));
|
||||
INIT_PRINTF(("sst1InitSetClkDelays(): Setting TREX#0 TREX-to-FBI clock delay to 0x%x\n",
|
||||
|
||||
Reference in New Issue
Block a user