From 8adf57ac1708df174d75e26c08cdae9485ab621d Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 30 Oct 2012 17:01:28 -0700 Subject: [PATCH] --- yaml --- r: 337508 b: refs/heads/master c: f1975596f50d6b35ce2de41b04bd971117241519 h: refs/heads/master v: v3 --- [refs] | 2 +- .../comedi/drivers/addi-data/APCI1710_82x54.c | 14 +++++++- .../comedi/drivers/addi-data/APCI1710_82x54.h | 32 ------------------- 3 files changed, 14 insertions(+), 34 deletions(-) delete mode 100644 trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h diff --git a/[refs] b/[refs] index e44b67ceb3c3..7eb28c2cb250 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3e7f885c93266c34b60550eb9f14797fb44ab43 +refs/heads/master: f1975596f50d6b35ce2de41b04bd971117241519 diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c index 64d286d3cd91..d0702084caa2 100644 --- a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c +++ b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c @@ -18,7 +18,19 @@ | Description : APCI-1710 82X54 timer module | */ -#include "APCI1710_82x54.h" +#define APCI1710_PCI_BUS_CLOCK 0 +#define APCI1710_FRONT_CONNECTOR_INPUT 1 +#define APCI1710_TIMER_READVALUE 0 +#define APCI1710_TIMER_GETOUTPUTLEVEL 1 +#define APCI1710_TIMER_GETPROGRESSSTATUS 2 +#define APCI1710_TIMER_WRITEVALUE 3 + +#define APCI1710_TIMER_READINTERRUPT 1 +#define APCI1710_TIMER_READALLTIMER 2 + +#ifndef APCI1710_10MHZ +#define APCI1710_10MHZ 10 +#endif /* +----------------------------------------------------------------------------+ diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h deleted file mode 100644 index 85a70f32362d..000000000000 --- a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2004,2005 ADDI-DATA GmbH for the source code of this module. - * - * ADDI-DATA GmbH - * Dieselstrasse 3 - * D-77833 Ottersweier - * Tel: +19(0)7223/9493-0 - * Fax: +49(0)7223/9493-92 - * http://www.addi-data.com - * info@addi-data.com - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - */ - -#define APCI1710_PCI_BUS_CLOCK 0 -#define APCI1710_FRONT_CONNECTOR_INPUT 1 -#define APCI1710_TIMER_READVALUE 0 -#define APCI1710_TIMER_GETOUTPUTLEVEL 1 -#define APCI1710_TIMER_GETPROGRESSSTATUS 2 -#define APCI1710_TIMER_WRITEVALUE 3 - -#define APCI1710_TIMER_READINTERRUPT 1 -#define APCI1710_TIMER_READALLTIMER 2 - -/* BEGIN JK 27.10.03 : Add the possibility to use a 40 Mhz quartz */ -#ifndef APCI1710_10MHZ -#define APCI1710_10MHZ 10 -#endif -/* END JK 27.10.03 : Add the possibility to use a 40 Mhz quartz */