Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337459
b: refs/heads/master
c: 24f7846
h: refs/heads/master
i:
  337457: fcf782f
  337455: 18b1b3d
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 30, 2012
1 parent 0791aa7 commit 7a4e246
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 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: 9e7bdd9e683fd2a3535aca375ce0440fba53a94c
refs/heads/master: 24f78463d58993764faba60ac22a9a637b40e746
18 changes: 9 additions & 9 deletions trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@

#define NVRAM_USER_DATA_START 0x100

#define NVCMD_BEGIN_READ (0x7 << 5) /* nvRam begin read command */
#define NVCMD_LOAD_LOW (0x4 << 5) /* nvRam load low command */
#define NVCMD_LOAD_HIGH (0x5 << 5) /* nvRam load high command */
#define NVCMD_BEGIN_READ (0x7 << 5) /* nvRam begin read command */
#define NVCMD_LOAD_LOW (0x4 << 5) /* nvRam load low command */
#define NVCMD_LOAD_HIGH (0x5 << 5) /* nvRam load high command */

#define EE93C76_CLK_BIT (1 << 0)
#define EE93C76_CS_BIT (1 << 1)
Expand All @@ -42,12 +42,12 @@
#define EE93C76_READ_CMD (0x0180 << 4)
#define EE93C76_CMD_LEN 13

#define EEPROM_DIGITALINPUT 0
#define EEPROM_DIGITALOUTPUT 1
#define EEPROM_ANALOGINPUT 2
#define EEPROM_ANALOGOUTPUT 3
#define EEPROM_TIMER 4
#define EEPROM_WATCHDOG 5
#define EEPROM_DIGITALINPUT 0
#define EEPROM_DIGITALOUTPUT 1
#define EEPROM_ANALOGINPUT 2
#define EEPROM_ANALOGOUTPUT 3
#define EEPROM_TIMER 4
#define EEPROM_WATCHDOG 5
#define EEPROM_TIMER_WATCHDOG_COUNTER 10

static void addi_eeprom_clk_93c76(unsigned long iobase, unsigned int val)
Expand Down

0 comments on commit 7a4e246

Please sign in to comment.