Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262768AbUDLILV (ORCPT ); Mon, 12 Apr 2004 04:11:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262709AbUDLILV (ORCPT ); Mon, 12 Apr 2004 04:11:21 -0400 Received: from pD9E57A79.dip.t-dialin.net ([217.229.122.121]:46090 "EHLO Marvin.DL8BCU.ampr.org") by vger.kernel.org with ESMTP id S262768AbUDLILH (ORCPT ); Mon, 12 Apr 2004 04:11:07 -0400 Date: Mon, 12 Apr 2004 07:58:00 +0000 From: Thorsten Kranzkowski To: linux-kernel@vger.kernel.org, rth@twiddle.net, spyro@f2s.com, rmk@arm.linux.org.uk, davidm@hpl.hp.com, paulus@au.ibm.com, benh@kernel.crashing.org, jes@trained-monkey.org, ralf@gnu.org, matthew@wil.cx, davem@redhat.com, wesolows@foobazco.org, jdike@karaya.com, ak@suse.de Subject: Re: [PATCH][RFC] sort out CLOCK_TICK_RATE usage [3/3] Message-ID: <20040412075800.D5198@Marvin.DL8BCU.ampr.org> Reply-To: dl8bcu@dl8bcu.de Mail-Followup-To: linux-kernel@vger.kernel.org, rth@twiddle.net, spyro@f2s.com, rmk@arm.linux.org.uk, davidm@hpl.hp.com, paulus@au.ibm.com, benh@kernel.crashing.org, jes@trained-monkey.org, ralf@gnu.org, matthew@wil.cx, davem@redhat.com, wesolows@foobazco.org, jdike@karaya.com, ak@suse.de References: <20040412075519.A5198@Marvin.DL8BCU.ampr.org> <20040412075704.B5198@Marvin.DL8BCU.ampr.org> <20040412075729.C5198@Marvin.DL8BCU.ampr.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0.1i In-Reply-To: <20040412075729.C5198@Marvin.DL8BCU.ampr.org>; from dl8bcu@dl8bcu.de on Mon, Apr 12, 2004 at 07:57:29AM +0000 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1906 Lines: 51 diff -ur linux-2.6.5-2/drivers/input/joystick/analog.c linux-2.6.5-3/drivers/input/joystick/analog.c --- linux-2.6.5-2/drivers/input/joystick/analog.c Sat Apr 10 11:11:01 2004 +++ linux-2.6.5-3/drivers/input/joystick/analog.c Sun Apr 11 15:19:11 2004 @@ -142,7 +142,7 @@ #ifdef __i386__ #define GET_TIME(x) do { if (cpu_has_tsc) rdtscl(x); else x = get_time_pit(); } while (0) -#define DELTA(x,y) (cpu_has_tsc?((y)-(x)):((x)-(y)+((x)<(y)?1193182L/HZ:0))) +#define DELTA(x,y) (cpu_has_tsc?((y)-(x)):((x)-(y)+((x)<(y)?CLOCK_TICK_RATE/HZ:0))) #define TIME_NAME (cpu_has_tsc?"TSC":"PIT") static unsigned int get_time_pit(void) { diff -ur linux-2.6.5-2/sound/oss/pas2_pcm.c linux-2.6.5-3/sound/oss/pas2_pcm.c --- linux-2.6.5-2/sound/oss/pas2_pcm.c Thu Dec 18 02:58:28 2003 +++ linux-2.6.5-3/sound/oss/pas2_pcm.c Sun Apr 11 15:18:27 2004 @@ -17,6 +17,7 @@ #include #include +#include #include "sound_config.h" #include "pas2.h" @@ -62,13 +63,13 @@ if (pcm_channels & 2) { - foo = (596590 + (arg / 2)) / arg; - arg = (596590 + (foo / 2)) / foo; + foo = ((CLOCK_TICK_RATE/2) + (arg / 2)) / arg; + arg = ((CLOCK_TICK_RATE/2) + (foo / 2)) / foo; } else { - foo = (1193180 + (arg / 2)) / arg; - arg = (1193180 + (foo / 2)) / foo; + foo = (CLOCK_TICK_RATE + (arg / 2)) / arg; + arg = (CLOCK_TICK_RATE + (foo / 2)) / foo; } pcm_speed = arg; -- | Thorsten Kranzkowski Internet: dl8bcu@dl8bcu.de | | Mobile: ++49 170 1876134 Snail: Kiebitzstr. 14, 49324 Melle, Germany | | Ampr: dl8bcu@db0lj.#rpl.deu.eu, dl8bcu@marvin.dl8bcu.ampr.org [44.130.8.19] | - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/