Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337439
b: refs/heads/master
c: 67ae9a4
h: refs/heads/master
i:
  337437: 46f7be9
  337435: 36d3e45
  337431: 4e456c4
  337423: a94670b
  337407: 3a0a194
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 30, 2012
1 parent 231df11 commit 3d8d18f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 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: aa36c7720aa65417a992c9722a2ee34c74572d50
refs/heads/master: 67ae9a429152a98adbc023c3ce56d85a38c388e2
16 changes: 6 additions & 10 deletions trunk/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,6 @@ struct str_AnalogInputHeader {
unsigned char b_Resolution;
};

int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress,
char *pc_PCIChipInformation, struct comedi_device *dev);

unsigned short w_EepromReadWord(unsigned short w_PCIBoardEepromAddress, char *pc_PCIChipInformation,
unsigned short w_EepromStartAddress);

static void v_EepromClock76(unsigned int dw_Address,
unsigned int dw_RegisterValue)
{
Expand Down Expand Up @@ -213,8 +207,9 @@ static void v_EepromWaitBusy(unsigned short w_PCIBoardEepromAddress)
} while (b_EepromBusy == 0x80);
}

unsigned short w_EepromReadWord(unsigned short w_PCIBoardEepromAddress, char *pc_PCIChipInformation,
unsigned short w_EepromStartAddress)
static unsigned short w_EepromReadWord(unsigned short w_PCIBoardEepromAddress,
char *pc_PCIChipInformation,
unsigned short w_EepromStartAddress)
{
unsigned char b_Counter = 0;
unsigned char b_ReadByte = 0;
Expand Down Expand Up @@ -437,8 +432,9 @@ static int i_EepromReadAnlogInputHeader(unsigned short w_PCIBoardEepromAddress,
return 0;
}

int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress,
char *pc_PCIChipInformation, struct comedi_device *dev)
static int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress,
char *pc_PCIChipInformation,
struct comedi_device *dev)
{
const struct addi_board *this_board = comedi_board(dev);
struct addi_private *devpriv = dev->private;
Expand Down

0 comments on commit 3d8d18f

Please sign in to comment.