--- np2/io/pit.c 2007/11/03 00:00:20 1.26 +++ np2/io/pit.c 2011/01/15 18:04:43 1.27 @@ -145,11 +145,11 @@ void rs232ctimer(NEVENTITEM item) { static UINT getcount(const _PITCH *pitch) { - SINT32 clock; + SINT32 clk; switch(pitch->ch) { case 0: - clock = nevent_getremain(NEVENT_ITIMER); + clk = nevent_getremain(NEVENT_ITIMER); break; case 1: @@ -164,24 +164,24 @@ static UINT getcount(const _PITCH *pitch return(pitch->value & (~1)); #endif } - clock = nevent_getremain(NEVENT_BEEP); + clk = nevent_getremain(NEVENT_BEEP); #if defined(BEEPCOUNTEREX) - if (clock >= 0) { - clock /= pccore.multiple; + if (clk >= 0) { + clk /= pccore.multiple; if (pitch->value > 2) { - clock %= pitch->value; + clk %= pitch->value; } else { - clock = LOW16(clock); + clk = LOW16(clk); } - return(clock); + return(clk); } #else break; #endif case 2: - clock = nevent_getremain(NEVENT_RS232C); + clk = nevent_getremain(NEVENT_RS232C); break; #if !defined(DISABLE_SOUND) @@ -190,11 +190,11 @@ static UINT getcount(const _PITCH *pitch #endif default: - clock = 0; + clk = 0; break; } - if (clock > 0) { - return(clock / pccore.multiple); + if (clk > 0) { + return(clk / pccore.multiple); } return(0); }