diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-04 02:22:38 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-04 02:22:38 +0000 |
| commit | 98a12d05a48814bec3870b9a6d5865475cfa1c95 (patch) | |
| tree | a711801e47696fb0cf162abd7330e0b5b480ba39 /kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp | |
| parent | 421a1845137c7c396b5d03bce53237fcb149d602 (diff) | |
| download | tdeedu-98a12d05a48814bec3870b9a6d5865475cfa1c95.tar.gz tdeedu-98a12d05a48814bec3870b9a6d5865475cfa1c95.zip | |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1211429 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp')
| -rw-r--r-- | kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp b/kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp index 4cbb77b2..cae78e59 100644 --- a/kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp +++ b/kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp @@ -213,7 +213,7 @@ APN_USB_TYPE ApnUsbWriteRegMultiMRMD( unsigned short FpgaReg[], } -APN_USB_TYPE ApnUsbReadStatusRegs( unsigned short *StatusReg, +APN_USB_TYPE ApnUsbReadtqStatusRegs( unsigned short *tqStatusReg, unsigned short *HeatsinkTempReg, unsigned short *CcdTempReg, unsigned short *CoolerDriveReg, @@ -226,15 +226,15 @@ APN_USB_TYPE ApnUsbReadStatusRegs( unsigned short *StatusReg, unsigned short RegNumber; struct apIOparam request; unsigned short *Data; - unsigned char StatusData[21]; + unsigned char tqStatusData[21]; request.reg = 0; //check this ******************* - request.param1=(unsigned long)&StatusData; + request.param1=(unsigned long)&tqStatusData; Success=ioctl(g_hSysDriver,APUSB_READ_STATUS,(unsigned long)&request); // if ( !Success ) // return APN_USB_ERR_STATUS; - Data = (unsigned short *)StatusData; + Data = (unsigned short *)tqStatusData; *HeatsinkTempReg = Data[0]; *CcdTempReg = Data[1]; @@ -242,11 +242,11 @@ APN_USB_TYPE ApnUsbReadStatusRegs( unsigned short *StatusReg, *VoltageReg = Data[3]; *TdiCounter = Data[4]; *SequenceCounter = Data[5]; - *StatusReg = Data[6]; + *tqStatusReg = Data[6]; - if ( (StatusData[20] & 0x01) != 0 ) + if ( (tqStatusData[20] & 0x01) != 0 ) { - *StatusReg |= 0x8; + *tqStatusReg |= 0x8; } return APN_USB_SUCCESS; |