Skip to content

Commit

Permalink
staging: comedi: addi_eeprom: use AMCC_OP_REG_* defines
Browse files Browse the repository at this point in the history
Use the AMCC_OP_REG_* register offset defines for the magic numbers
used to read the nvram data.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 30, 2012
1 parent fc272e0 commit ed4d2b2
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ static void addi_eeprom_nvram_wait(unsigned long iobase)
unsigned char val;

do {
val = inb(iobase + 0x3F);
val = inb(iobase + AMCC_OP_REG_MCSR_NVCMD);
} while (val & 0x80);
}

Expand All @@ -197,21 +197,21 @@ static unsigned short addi_eeprom_readw_nvram(unsigned long iobase,

for (i = 0; i < 2; i++) {
/* Load the low 8 bit address */
outb(NVCMD_LOAD_LOW, iobase + 0x3F);
outb(NVCMD_LOAD_LOW, iobase + AMCC_OP_REG_MCSR_NVCMD);
addi_eeprom_nvram_wait(iobase);
outb((addr + i) & 0xff, iobase + 0x3E);
outb((addr + i) & 0xff, iobase + AMCC_OP_REG_MCSR_NVDATA);
addi_eeprom_nvram_wait(iobase);

/* Load the high 8 bit address */
outb(NVCMD_LOAD_HIGH, iobase + 0x3F);
outb(NVCMD_LOAD_HIGH, iobase + AMCC_OP_REG_MCSR_NVCMD);
addi_eeprom_nvram_wait(iobase);
outb(((addr + i) >> 8) & 0xff, iobase + 0x3E);
outb(((addr + i) >> 8) & 0xff, iobase + AMCC_OP_REG_MCSR_NVDATA);
addi_eeprom_nvram_wait(iobase);

/* Read the eeprom data byte */
outb(NVCMD_BEGIN_READ, iobase + 0x3F);
outb(NVCMD_BEGIN_READ, iobase + AMCC_OP_REG_MCSR_NVCMD);
addi_eeprom_nvram_wait(iobase);
tmp = inb(iobase + 0x3E);
tmp = inb(iobase + AMCC_OP_REG_MCSR_NVDATA);
addi_eeprom_nvram_wait(iobase);

if (i == 0)
Expand Down

0 comments on commit ed4d2b2

Please sign in to comment.