Commit 6a770eca authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

Staging: comedi: Remove boardtype typedef in addi-data

typedef for boardtype removed and struct renamed to
addi_board
Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1c09a82c
...@@ -73,7 +73,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc ...@@ -73,7 +73,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
//Update-0.7.57->0.7.68MODULE_LICENSE("GPL"); //Update-0.7.57->0.7.68MODULE_LICENSE("GPL");
#define devpriv ((addi_private *)dev->private) #define devpriv ((addi_private *)dev->private)
#define this_board ((boardtype *)dev->board_ptr) #define this_board ((struct addi_board *)dev->board_ptr)
#if defined(CONFIG_APCI_1710) || defined(CONFIG_APCI_3200) || defined(CONFIG_APCI_3300) #if defined(CONFIG_APCI_1710) || defined(CONFIG_APCI_3200) || defined(CONFIG_APCI_3300)
//BYTE b_SaveFPUReg [94]; //BYTE b_SaveFPUReg [94];
...@@ -219,7 +219,7 @@ static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = { ...@@ -219,7 +219,7 @@ static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {
MODULE_DEVICE_TABLE(pci, addi_apci_tbl); MODULE_DEVICE_TABLE(pci, addi_apci_tbl);
static const boardtype boardtypes[] = { static const struct addi_board boardtypes[] = {
#ifdef CONFIG_APCI_3120 #ifdef CONFIG_APCI_3120
{"apci3120", {"apci3120",
APCI3120_BOARD_VENDOR_ID, APCI3120_BOARD_VENDOR_ID,
...@@ -2525,7 +2525,7 @@ static const boardtype boardtypes[] = { ...@@ -2525,7 +2525,7 @@ static const boardtype boardtypes[] = {
#endif #endif
}; };
#define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype)) #define n_boardtypes (sizeof(boardtypes)/sizeof(struct addi_board))
struct comedi_driver driver_addi = { struct comedi_driver driver_addi = {
driver_name:"addi_common", driver_name:"addi_common",
...@@ -2534,7 +2534,7 @@ struct comedi_driver driver_addi = { ...@@ -2534,7 +2534,7 @@ struct comedi_driver driver_addi = {
detach:i_ADDI_Detach, detach:i_ADDI_Detach,
num_names:n_boardtypes, num_names:n_boardtypes,
board_name:&boardtypes[0].pc_DriverName, board_name:&boardtypes[0].pc_DriverName,
offset:sizeof(boardtype), offset:sizeof(struct addi_board),
}; };
COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl); COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl);
...@@ -2662,7 +2662,7 @@ static int i_ADDI_Attach(struct comedi_device * dev, struct comedi_devconfig * i ...@@ -2662,7 +2662,7 @@ static int i_ADDI_Attach(struct comedi_device * dev, struct comedi_devconfig * i
it->options[2]); it->options[2]);
dev->irq = irq; dev->irq = irq;
// Read eepeom and fill boardtype Structure // Read eepeom and fill addi_board Structure
if (this_board->i_PCIEeprom) { if (this_board->i_PCIEeprom) {
printk("\nPCI Eeprom used"); printk("\nPCI Eeprom used");
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
/* Structures */ /* Structures */
/* structure for the boardtype */ /* structure for the boardtype */
typedef struct { struct addi_board {
const char *pc_DriverName; // driver name const char *pc_DriverName; // driver name
int i_VendorId; //PCI vendor a device ID of card int i_VendorId; //PCI vendor a device ID of card
int i_DeviceId; int i_DeviceId;
...@@ -199,7 +199,7 @@ typedef struct { ...@@ -199,7 +199,7 @@ typedef struct {
int (*i_hwdr_WriteTTLIOChlOnOff)(struct comedi_device *dev, int (*i_hwdr_WriteTTLIOChlOnOff)(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data); struct comedi_insn *insn, unsigned int *data);
} boardtype; };
//MODULE INFO STRUCTURE //MODULE INFO STRUCTURE
...@@ -406,7 +406,7 @@ typedef struct { ...@@ -406,7 +406,7 @@ typedef struct {
/* Pointer to the current process */ /* Pointer to the current process */
struct task_struct *tsk_Current; struct task_struct *tsk_Current;
boardtype *ps_BoardInfo; struct addi_board *ps_BoardInfo;
/* Hardware board infos for 1710 */ /* Hardware board infos for 1710 */
struct { struct {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment