sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Legacy: Use new layout for SDeviceSettings 

This fixes issues where the settings values would be shifted.
pull/49/head
Paul Hollinsky 2021-08-20 10:36:55 -04:00
parent c7e7222140
commit 27184a203f
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
api/icsneolegacy/icsneolegacy.cpp
View File

@ -870,27 +870,33 @@ int LegacyDLLExport icsneoGetDeviceSettingsType(void *hObject, EPlasmaIonVnetCha
return 1; return 1;
} }
int LegacyDLLExport icsneoSetDeviceSettings(void *hObject, SDeviceSettings *pSettings, int iNumBytes, int bSaveToEEPROM, EPlasmaIonVnetChannel_t vnetSlot) int LegacyDLLExport icsneoSetDeviceSettings(void* hObject, SDeviceSettings* pSettings, int iNumBytes, int bSaveToEEPROM, EPlasmaIonVnetChannel_t vnetSlot)
{ {
if (!icsneoValidateHObject(hObject)) if (!icsneoValidateHObject(hObject))
return false; return false;
neodevice_t *device = (neodevice_t *)hObject; neodevice_t* device = (neodevice_t*)hObject;
const size_t offset = size_t(&pSettings->Settings) - size_t(pSettings);
if (bSaveToEEPROM) if (bSaveToEEPROM)
return icsneo_settingsApplyStructure(device, pSettings, iNumBytes); return icsneo_settingsApplyStructure(device, &pSettings->Settings, iNumBytes - offset);
else
return icsneo_settingsApplyStructureTemporary(device, pSettings, iNumBytes); return icsneo_settingsApplyStructureTemporary(device, &pSettings->Settings, iNumBytes - offset);
} }
int LegacyDLLExport icsneoGetDeviceSettings(void *hObject, SDeviceSettings *pSettings, int iNumBytes, EPlasmaIonVnetChannel_t vnetSlot) int LegacyDLLExport icsneoGetDeviceSettings(void* hObject, SDeviceSettings* pSettings, int iNumBytes, EPlasmaIonVnetChannel_t vnetSlot)
{ {
if (!icsneoValidateHObject(hObject)) if (!icsneoValidateHObject(hObject))
return false; return false;
neodevice_t *device = (neodevice_t *)hObject; neodevice_t* device = (neodevice_t*)hObject;
return !!icsneo_settingsReadStructure(device, pSettings, iNumBytes); if (icsneoGetDeviceSettingsType(hObject, vnetSlot, &pSettings->DeviceSettingType) == 0)
return false;
const size_t offset = size_t(&pSettings->Settings) - size_t(pSettings);
return !!icsneo_settingsReadStructure(device, &pSettings->Settings, iNumBytes - offset);
} }
int LegacyDLLExport icsneoSetBitRateEx(void *hObject, unsigned long BitRate, int NetworkID, int iOptions) int LegacyDLLExport icsneoSetBitRateEx(void *hObject, unsigned long BitRate, int NetworkID, int iOptions)