From 3ac3d2fd287b3a68366d927aceb7b2491cf1716a Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 30 Oct 2012 17:00:21 -0700 Subject: [PATCH] --- yaml --- r: 337504 b: refs/heads/master c: e595e926fa892902eff3e189caa6fe5a21e5c69d h: refs/heads/master v: v3 --- [refs] | 2 +- .../comedi/drivers/addi-data/APCI1710_Ssi.c | 19 ++++++++---- .../comedi/drivers/addi-data/APCI1710_Ssi.h | 31 ------------------- 3 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h diff --git a/[refs] b/[refs] index 6ef795aae739..b856f24b137a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b629be25caba04c6ec57ee79dca99ba23ffd9a61 +refs/heads/master: e595e926fa892902eff3e189caa6fe5a21e5c69d diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c index 00f8dc38186e..1e05732e9f3d 100644 --- a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c +++ b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c @@ -40,13 +40,20 @@ You should also find the complete GPL in the COPYING file accompanying this sour +-----------------------------------------------------------------------+ */ -/* -+----------------------------------------------------------------------------+ -| Included files | -+----------------------------------------------------------------------------+ -*/ +#define APCI1710_30MHZ 30 +#define APCI1710_33MHZ 33 +#define APCI1710_40MHZ 40 + +#define APCI1710_BINARY_MODE 0x1 +#define APCI1710_GRAY_MODE 0x0 + +#define APCI1710_SSI_READ1VALUE 1 +#define APCI1710_SSI_READALLVALUE 2 -#include "APCI1710_Ssi.h" +#define APCI1710_SSI_SET_CHANNELON 0 +#define APCI1710_SSI_SET_CHANNELOFF 1 +#define APCI1710_SSI_READ_1CHANNEL 2 +#define APCI1710_SSI_READ_ALLCHANNEL 3 /* +----------------------------------------------------------------------------+ diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h b/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h deleted file mode 100644 index c4f6565aa315..000000000000 --- a/trunk/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h +++ /dev/null @@ -1,31 +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_30MHZ 30 -#define APCI1710_33MHZ 33 -#define APCI1710_40MHZ 40 - -#define APCI1710_BINARY_MODE 0x1 -#define APCI1710_GRAY_MODE 0x0 - -#define APCI1710_SSI_READ1VALUE 1 -#define APCI1710_SSI_READALLVALUE 2 - -#define APCI1710_SSI_SET_CHANNELON 0 -#define APCI1710_SSI_SET_CHANNELOFF 1 -#define APCI1710_SSI_READ_1CHANNEL 2 -#define APCI1710_SSI_READ_ALLCHANNEL 3