Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337492
b: refs/heads/master
c: 89bfdc0
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 31, 2012
1 parent ef0eeec commit a648f14
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 42 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 89c6d640205f8acd2c0bc0ab27629de6779a7300
refs/heads/master: 89bfdc0f5c6099d058da20919220fdd5936a24b4
24 changes: 18 additions & 6 deletions trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,24 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+----------+-----------+------------------------------------------------+
*/

/*
+----------------------------------------------------------------------------+
| Included files |
+----------------------------------------------------------------------------+
*/
#include "hwdrv_apci1516.h"
/********* Definitions for APCI-1516 card *****/

/* Card Specific information */
#define APCI1516_ADDRESS_RANGE 8

/* DIGITAL INPUT-OUTPUT DEFINE */

#define APCI1516_DIGITAL_OP 4
#define APCI1516_DIGITAL_OP_RW 4
#define APCI1516_DIGITAL_IP 0

/* TIMER COUNTER WATCHDOG DEFINES */

#define ADDIDATA_WATCHDOG 2
#define APCI1516_DIGITAL_OP_WATCHDOG 0
#define APCI1516_WATCHDOG_ENABLEDISABLE 12
#define APCI1516_WATCHDOG_RELOAD_VALUE 4
#define APCI1516_WATCHDOG_STATUS 16

/*
+----------------------------------------------------------------------------+
Expand Down
35 changes: 0 additions & 35 deletions trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h

This file was deleted.

0 comments on commit a648f14

Please sign in to comment.