diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-16 00:50:44 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-16 06:45:46 +0100 |
commit | c4c8cd6a55f4ce378f4a5d371cc95b42dc09704b (patch) | |
tree | f0b5f820f60fcee0dbd31fb9170ca09590809c7e | |
parent | 132a94c545fa77cf7eb3a794dfe9b91a1232cfbc (diff) |
proto/freetrack: typedefs are volatile, cleanup
-rw-r--r-- | proto-ft/ftnoir_protocol_ft.cpp | 6 | ||||
-rw-r--r-- | proto-ft/ftnoir_protocol_ft.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/proto-ft/ftnoir_protocol_ft.cpp b/proto-ft/ftnoir_protocol_ft.cpp index e1850748..7fa34a84 100644 --- a/proto-ft/ftnoir_protocol_ft.cpp +++ b/proto-ft/ftnoir_protocol_ft.cpp @@ -85,8 +85,8 @@ void freetrack::pose(const double* headpose) const bool is_crossing_90 = std::fabs(headpose[Pitch] - 90) < 1e-4; const float pitch = -degrees_to_rads(is_crossing_90 ? 89.85 : headpose[Pitch]); - FTHeap volatile* ft = pMemData; - FTData volatile* data = &ft->data; + FTHeap* ft = pMemData; + FTData* data = &ft->data; store(data->X, tx); store(data->Y, ty); @@ -206,7 +206,7 @@ module_status freetrack::initialize() store(pMemData->data.DataID, 0); for (unsigned k = 0; k < 2; k++) - store(*(std::int32_t volatile*)&pMemData->table_ints[k], 0); + store(pMemData->table_ints[k], 0); // more games need the dummy executable than previously thought if (use_npclient) diff --git a/proto-ft/ftnoir_protocol_ft.h b/proto-ft/ftnoir_protocol_ft.h index 56ad1b0b..ac82bbd9 100644 --- a/proto-ft/ftnoir_protocol_ft.h +++ b/proto-ft/ftnoir_protocol_ft.h @@ -47,7 +47,7 @@ public: private: settings s; shm_wrapper shm { FREETRACK_HEAP, FREETRACK_MUTEX, sizeof(FTHeap) }; - FTHeap volatile *pMemData { (FTHeap*) shm.ptr() }; + FTHeap *pMemData { (FTHeap*) shm.ptr() }; QProcess dummyTrackIR; |