Skip to content

L
linux
Commit a9fce7c9 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files
Options

Staging: comedi: Remove USHORT and *PUSHORT typedefs in addi-data 

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 66673a7c
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 27 deletions
drivers/staging/comedi/drivers/addi-data/addi_common.h
View file @ a9fce7c9
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#define SUCCESS 1 #define SUCCESS 1
/* variable type definition */ /* variable type definition */
typedef unsigned short USHORT, *PUSHORT;
typedef unsigned short WORD, *PWORD; typedef unsigned short WORD, *PWORD;
typedef int INT, *PINT;; typedef int INT, *PINT;;
typedef unsigned int UINT, *PUINT; typedef unsigned int UINT, *PUINT;
...@@ -50,9 +49,9 @@ typedef const struct comedi_lrange *PCRANGE; ...@@ -50,9 +49,9 @@ typedef const struct comedi_lrange *PCRANGE;
#define LOBYTE(W) (unsigned char)((W) & 0xFF) #define LOBYTE(W) (unsigned char)((W) & 0xFF)
#define HIBYTE(W) (unsigned char)(((W) >> 8) & 0xFF) #define HIBYTE(W) (unsigned char)(((W) >> 8) & 0xFF)
#define MAKEWORD(H, L) (USHORT)((L) | ((H) << 8)) #define MAKEWORD(H, L) (unsigned short)((L) | ((H) << 8))
#define LOWORD(W) (USHORT)((W) & 0xFFFF) #define LOWORD(W) (unsigned short)((W) & 0xFFFF)
#define HIWORD(W) (USHORT)(((W) >> 16) & 0xFFFF) #define HIWORD(W) (unsigned short)(((W) >> 16) & 0xFFFF)
#define MAKEDWORD(H, L) (UINT)((L) | ((H) << 16)) #define MAKEDWORD(H, L) (UINT)((L) | ((H) << 16))
#define ADDI_ENABLE 1 #define ADDI_ENABLE 1
...@@ -385,7 +384,7 @@ typedef struct { ...@@ -385,7 +384,7 @@ typedef struct {
UINT ui_AiDataLength; UINT ui_AiDataLength;
short *AiData; // Pointer to sample data short *AiData; // Pointer to sample data
UINT ui_AiNbrofScans; // number of scans to do UINT ui_AiNbrofScans; // number of scans to do
USHORT us_UseDma; // To use Dma or not unsigned short us_UseDma; // To use Dma or not
unsigned char b_DmaDoubleBuffer; // we can use double buffering unsigned char b_DmaDoubleBuffer; // we can use double buffering
UINT ui_DmaActualBuffer; // which buffer is used now UINT ui_DmaActualBuffer; // which buffer is used now
//*UPDATE-0.7.57->0.7.68 //*UPDATE-0.7.57->0.7.68
...@@ -402,7 +401,7 @@ typedef struct { ...@@ -402,7 +401,7 @@ typedef struct {
unsigned char b_AnalogOutputChannelNbr; // Analog input Output Nbr unsigned char b_AnalogOutputChannelNbr; // Analog input Output Nbr
unsigned char b_TimerSelectMode; // Contain data written at iobase + 0C unsigned char b_TimerSelectMode; // Contain data written at iobase + 0C
unsigned char b_ModeSelectRegister; // Contain data written at iobase + 0E unsigned char b_ModeSelectRegister; // Contain data written at iobase + 0E
USHORT us_OutputRegister; // Contain data written at iobase + 0 unsigned short us_OutputRegister; // Contain data written at iobase + 0
unsigned char b_InterruptState; unsigned char b_InterruptState;
unsigned char b_TimerInit; // Specify if InitTimerWatchdog was load unsigned char b_TimerInit; // Specify if InitTimerWatchdog was load
unsigned char b_TimerStarted; // Specify if timer 2 is running or not unsigned char b_TimerStarted; // Specify if timer 2 is running or not
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View file @ a9fce7c9
...@@ -148,7 +148,7 @@ int i_APCI3120_InsnConfigAnalogInput(struct comedi_device * dev, struct comedi_s ...@@ -148,7 +148,7 @@ int i_APCI3120_InsnConfigAnalogInput(struct comedi_device * dev, struct comedi_s
int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s,
struct comedi_insn * insn, unsigned int * data) struct comedi_insn * insn, unsigned int * data)
{ {
USHORT us_ConvertTiming, us_TmpValue, i; unsigned short us_ConvertTiming, us_TmpValue, i;
unsigned char b_Tmp; unsigned char b_Tmp;
// fix convertion time to 10 us // fix convertion time to 10 us
...@@ -156,7 +156,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, struct comedi_sub ...@@ -156,7 +156,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, struct comedi_sub
printk("No timer0 Value using 10 us\n"); printk("No timer0 Value using 10 us\n");
us_ConvertTiming = 10; us_ConvertTiming = 10;
} else } else
us_ConvertTiming = (USHORT) (devpriv->ui_EocEosConversionTime / 1000); // nano to useconds us_ConvertTiming = (unsigned short) (devpriv->ui_EocEosConversionTime / 1000); // nano to useconds
// this_board->i_hwdrv_InsnReadAnalogInput(dev,us_ConvertTiming,insn->n,&insn->chanspec,data,insn->unused[0]); // this_board->i_hwdrv_InsnReadAnalogInput(dev,us_ConvertTiming,insn->n,&insn->chanspec,data,insn->unused[0]);
...@@ -179,7 +179,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, struct comedi_sub ...@@ -179,7 +179,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, struct comedi_sub
//to set in the timer //to set in the timer
us_TmpValue = us_TmpValue =
(USHORT) inw(devpriv->iobase + APCI3120_RD_STATUS); (unsigned short) inw(devpriv->iobase + APCI3120_RD_STATUS);
//EL250804: Testing if board APCI3120 have the new Quartz or if it is an APCI3001 //EL250804: Testing if board APCI3120 have the new Quartz or if it is an APCI3001
if ((us_TmpValue & 0x00B0) == 0x00B0 if ((us_TmpValue & 0x00B0) == 0x00B0
...@@ -190,7 +190,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, struct comedi_sub ...@@ -190,7 +190,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, struct comedi_sub
((us_ConvertTiming * 12926) / 10000) - 1; ((us_ConvertTiming * 12926) / 10000) - 1;
} }
us_TmpValue = (USHORT) devpriv->b_InterruptMode; us_TmpValue = (unsigned short) devpriv->b_InterruptMode;
switch (us_TmpValue) { switch (us_TmpValue) {
...@@ -260,7 +260,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, struct comedi_sub ...@@ -260,7 +260,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, struct comedi_sub
devpriv->iobase + APCI3120_TIMER_VALUE); devpriv->iobase + APCI3120_TIMER_VALUE);
us_TmpValue = us_TmpValue =
(USHORT) inw(dev->iobase + APCI3120_RD_STATUS); (unsigned short) inw(dev->iobase + APCI3120_RD_STATUS);
if (devpriv->b_EocEosInterrupt == APCI3120_DISABLE) { if (devpriv->b_EocEosInterrupt == APCI3120_DISABLE) {
...@@ -714,7 +714,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev, ...@@ -714,7 +714,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev,
UINT ui_Tmp, ui_DelayTiming = 0, ui_TimerValue1 = 0, dmalen0 = UINT ui_Tmp, ui_DelayTiming = 0, ui_TimerValue1 = 0, dmalen0 =
0, dmalen1 = 0, ui_TimerValue2 = 0, dmalen1 = 0, ui_TimerValue2 =
0, ui_TimerValue0, ui_ConvertTiming; 0, ui_TimerValue0, ui_ConvertTiming;
USHORT us_TmpValue; unsigned short us_TmpValue;
//BEGIN JK 07.05.04: Comparison between WIN32 and Linux driver //BEGIN JK 07.05.04: Comparison between WIN32 and Linux driver
//devpriv->b_AiCyclicAcquisition=APCI3120_ENABLE; //devpriv->b_AiCyclicAcquisition=APCI3120_ENABLE;
...@@ -795,7 +795,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev, ...@@ -795,7 +795,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev,
devpriv->pui_AiChannelList, 0)) devpriv->pui_AiChannelList, 0))
return -EINVAL; return -EINVAL;
us_TmpValue = (USHORT) inw(dev->iobase + APCI3120_RD_STATUS); us_TmpValue = (unsigned short) inw(dev->iobase + APCI3120_RD_STATUS);
/*** EL241003 : add this section in comment because floats must not be used /*** EL241003 : add this section in comment because floats must not be used
if((us_TmpValue & 0x00B0)==0x00B0) if((us_TmpValue & 0x00B0)==0x00B0)
{ {
...@@ -861,7 +861,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev, ...@@ -861,7 +861,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev,
APCI3120_SELECT_TIMER_0_WORD; APCI3120_SELECT_TIMER_0_WORD;
outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0); outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0);
//Set the convertion time //Set the convertion time
outw(((USHORT) ui_TimerValue0), outw(((unsigned short) ui_TimerValue0),
dev->iobase + APCI3120_TIMER_VALUE); dev->iobase + APCI3120_TIMER_VALUE);
break; break;
...@@ -879,7 +879,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev, ...@@ -879,7 +879,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev,
APCI3120_SELECT_TIMER_1_WORD; APCI3120_SELECT_TIMER_1_WORD;
outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0); outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0);
//Set the convertion time //Set the convertion time
outw(((USHORT) ui_TimerValue1), outw(((unsigned short) ui_TimerValue1),
dev->iobase + APCI3120_TIMER_VALUE); dev->iobase + APCI3120_TIMER_VALUE);
// init timer0 in mode 2 // init timer0 in mode 2
...@@ -896,7 +896,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev, ...@@ -896,7 +896,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev,
outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0); outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0);
//Set the convertion time //Set the convertion time
outw(((USHORT) ui_TimerValue0), outw(((unsigned short) ui_TimerValue0),
dev->iobase + APCI3120_TIMER_VALUE); dev->iobase + APCI3120_TIMER_VALUE);
break; break;
...@@ -1422,10 +1422,10 @@ int i_APCI3120_ExttrigDisable(struct comedi_device * dev) ...@@ -1422,10 +1422,10 @@ int i_APCI3120_ExttrigDisable(struct comedi_device * dev)
void v_APCI3120_Interrupt(int irq, void *d) void v_APCI3120_Interrupt(int irq, void *d)
{ {
struct comedi_device *dev = d; struct comedi_device *dev = d;
USHORT int_daq; unsigned short int_daq;
unsigned int int_amcc, ui_Check, i; unsigned int int_amcc, ui_Check, i;
USHORT us_TmpValue; unsigned short us_TmpValue;
unsigned char b_DummyRead; unsigned char b_DummyRead;
struct comedi_subdevice *s = dev->subdevices + 0; struct comedi_subdevice *s = dev->subdevices + 0;
...@@ -1973,7 +1973,7 @@ int i_APCI3120_InsnConfigTimer(struct comedi_device * dev, struct comedi_subdevi ...@@ -1973,7 +1973,7 @@ int i_APCI3120_InsnConfigTimer(struct comedi_device * dev, struct comedi_subdevi
{ {
UINT ui_Timervalue2; UINT ui_Timervalue2;
USHORT us_TmpValue; unsigned short us_TmpValue;
unsigned char b_Tmp; unsigned char b_Tmp;
if (!data[1]) if (!data[1])
...@@ -1984,7 +1984,7 @@ int i_APCI3120_InsnConfigTimer(struct comedi_device * dev, struct comedi_subdevi ...@@ -1984,7 +1984,7 @@ int i_APCI3120_InsnConfigTimer(struct comedi_device * dev, struct comedi_subdevi
ui_Timervalue2 = data[1] / 1000; // convert nano seconds to u seconds ui_Timervalue2 = data[1] / 1000; // convert nano seconds to u seconds
//this_board->i_hwdrv_InsnConfigTimer(dev, ui_Timervalue2,(unsigned char)data[0]); //this_board->i_hwdrv_InsnConfigTimer(dev, ui_Timervalue2,(unsigned char)data[0]);
us_TmpValue = (USHORT) inw(devpriv->iobase + APCI3120_RD_STATUS); us_TmpValue = (unsigned short) inw(devpriv->iobase + APCI3120_RD_STATUS);
//EL250804: Testing if board APCI3120 have the new Quartz or if it is an APCI3001 //EL250804: Testing if board APCI3120 have the new Quartz or if it is an APCI3001
// and calculate the time value to set in the timer // and calculate the time value to set in the timer
...@@ -2124,7 +2124,7 @@ int i_APCI3120_InsnWriteTimer(struct comedi_device * dev, struct comedi_subdevic ...@@ -2124,7 +2124,7 @@ int i_APCI3120_InsnWriteTimer(struct comedi_device * dev, struct comedi_subdevic
{ {
UINT ui_Timervalue2 = 0; UINT ui_Timervalue2 = 0;
USHORT us_TmpValue; unsigned short us_TmpValue;
unsigned char b_Tmp; unsigned char b_Tmp;
if ((devpriv->b_Timer2Mode != APCI3120_WATCHDOG) if ((devpriv->b_Timer2Mode != APCI3120_WATCHDOG)
...@@ -2244,7 +2244,7 @@ int i_APCI3120_InsnWriteTimer(struct comedi_device * dev, struct comedi_subdevic ...@@ -2244,7 +2244,7 @@ int i_APCI3120_InsnWriteTimer(struct comedi_device * dev, struct comedi_subdevic
} }
// ui_Timervalue2=data[1]; // passed as argument // ui_Timervalue2=data[1]; // passed as argument
us_TmpValue = us_TmpValue =
(USHORT) inw(devpriv->iobase + APCI3120_RD_STATUS); (unsigned short) inw(devpriv->iobase + APCI3120_RD_STATUS);
//EL250804: Testing if board APCI3120 have the new Quartz or if it is an APCI3001 //EL250804: Testing if board APCI3120 have the new Quartz or if it is an APCI3001
// and calculate the time value to set in the timer // and calculate the time value to set in the timer
...@@ -2309,7 +2309,7 @@ int i_APCI3120_InsnReadTimer(struct comedi_device * dev, struct comedi_subdevice ...@@ -2309,7 +2309,7 @@ int i_APCI3120_InsnReadTimer(struct comedi_device * dev, struct comedi_subdevice
struct comedi_insn * insn, unsigned int * data) struct comedi_insn * insn, unsigned int * data)
{ {
unsigned char b_Tmp; unsigned char b_Tmp;
USHORT us_TmpValue, us_TmpValue_2, us_StatusValue; unsigned short us_TmpValue, us_TmpValue_2, us_StatusValue;
if ((devpriv->b_Timer2Mode != APCI3120_WATCHDOG) if ((devpriv->b_Timer2Mode != APCI3120_WATCHDOG)
&& (devpriv->b_Timer2Mode != APCI3120_TIMER)) { && (devpriv->b_Timer2Mode != APCI3120_TIMER)) {
...@@ -2647,7 +2647,7 @@ int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev, ...@@ -2647,7 +2647,7 @@ int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev,
unsigned int *data) unsigned int *data)
{ {
UINT ui_Range, ui_Channel; UINT ui_Range, ui_Channel;
USHORT us_TmpValue; unsigned short us_TmpValue;
ui_Range = CR_RANGE(insn->chanspec); ui_Range = CR_RANGE(insn->chanspec);
ui_Channel = CR_CHAN(insn->chanspec); ui_Channel = CR_CHAN(insn->chanspec);
...@@ -2678,19 +2678,19 @@ int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev, ...@@ -2678,19 +2678,19 @@ int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev,
do //Waiting of DA_READY BIT do //Waiting of DA_READY BIT
{ {
us_TmpValue = us_TmpValue =
((USHORT) inw(devpriv->iobase + ((unsigned short) inw(devpriv->iobase +
APCI3120_RD_STATUS)) & 0x0001; APCI3120_RD_STATUS)) & 0x0001;
} while (us_TmpValue != 0x0001); } while (us_TmpValue != 0x0001);
if (ui_Channel <= 3) if (ui_Channel <= 3)
// for channel 0-3 out at the register 1 (wrDac1-8) // for channel 0-3 out at the register 1 (wrDac1-8)
// data[i] typecasted to ushort since word write is to be done // data[i] typecasted to ushort since word write is to be done
outw((USHORT) data[0], outw((unsigned short) data[0],
devpriv->iobase + APCI3120_ANALOG_OUTPUT_1); devpriv->iobase + APCI3120_ANALOG_OUTPUT_1);
else else
// for channel 4-7 out at the register 2 (wrDac5-8) // for channel 4-7 out at the register 2 (wrDac5-8)
//data[i] typecasted to ushort since word write is to be done //data[i] typecasted to ushort since word write is to be done
outw((USHORT) data[0], outw((unsigned short) data[0],
devpriv->iobase + APCI3120_ANALOG_OUTPUT_2); devpriv->iobase + APCI3120_ANALOG_OUTPUT_2);
return insn->n; return insn->n;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7