Re: [hatari-devel] Videl Emu and TimerB

[Laurent Sallafranque <laurent.sallafranque@xxxxxxx>]

Sorry for the empty mail.

Maybe I could just change the last else

    /* Is it event count mode or not? */
    if (MFP_TBCR != 8)
    {
        /* Not event count mode, so handle as normal timer
         * and store result in 'MFP_TB_MAINCOUNTER' */
        MFP_ReadTimerB(false);
    }
    else if (bUseVDIRes)
    {
        /* HBLs are disabled in VDI mode, but TOS expects to read a 1. */
        MFP_TB_MAINCOUNTER = 1;
    }
    /* Special case when reading $fffa21, we need to test if the 
current read instruction */
    /* overlaps the horizontal video position where $fffa21 is changed */
    else <------------------- HERE
    {
        int FrameCycles, HblCounterVideo;
        int pos_start , pos_read;


by else if (ConfigureParams.System.nMachineType != MACHINE_FALCON ) {


Do you agree ?
Regards

Laurent



Le 08/03/2012 00:05, Laurent Sallafranque a écrit :
> I've added the following :
>
> void MFP_TimerBData_ReadByte(void)
> {
>     Uint8 TB_count;
>
>     M68000_WaitState(4);
>
> +    if ( ConfigureParams.System.nMachineType == MACHINE_FALCON ) {
> +       IoMem[0xfffa21] = MFP_TB_MAINCOUNTER;
> +        return;
> +   }
>
>     /* Is it event count mode or not? */
>     if (MFP_TBCR != 8)
>     {
>         /* Not event count mode, so handle as normal timer
> [...]
>
> Do you agree with this ?
> Do you think I should upload this immediatly (as Falcon doesn't need 
> the next lines of specific ST code) ?
>
> Regards
>
> Laurent
>
>
> Le 07/03/2012 23:48, Nicolas Pomarède a écrit :
> > In MFP_TimerBData_ReadByte, you should just do 1 line for falcon case 
> > in mfp.c :
> >
> >         IoMem[0xfffa21] = MFP_TB_MAINCOUNTER;