rebellion/libpinproc
1
0
Fork 0
mirror of https://github.com/preble/libpinproc synced 2026-02-24 18:25:23 +01:00
Code Releases Activity

Resolved watchdog change conflicts.

Browse Source
This commit is contained in:
Adam Preble
2009-05-20 23:20:25 -04:00
parent 9716e222a7 ec47b8fac1
commit 77fe39aec5
7 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/PRDevice.cpp
View File

@@ -123,10 +123,9 @@ int PRDevice::GetEvents(PREvent *events, int maxEvents)
return i;
}
PRResult PRDevice::DriverUpdateGlobalConfig(PRDriverGlobalConfig *driverGlobalConfig)
{
const int burstWords = 2;
const int burstWords = 4;
uint32_t burst[burstWords];
int32_t rc;
@@ -134,8 +133,12 @@ PRResult PRDevice::DriverUpdateGlobalConfig(PRDriverGlobalConfig *driverGlobalCo
this->driverGlobalConfig = *driverGlobalConfig;
rc = CreateDriverUpdateGlobalConfigBurst(burst, driverGlobalConfig);
rc = CreateWatchdogConfigBurst(burst+2, driverGlobalConfig->watchdogExpired,
driverGlobalConfig->watchdogEnable,
driverGlobalConfig->watchdogResetTime);
DEBUG(PRLog("Words: %x %x\n", burst[0], burst[1]));
DEBUG(PRLog("Driver Global words: %x %x\n", burst[0], burst[1]));
DEBUG(PRLog("Watchdog words: %x %x\n", burst[2], burst[3]));
return WriteData(burst, burstWords);
}
@@ -188,6 +191,19 @@ PRResult PRDevice::DriverUpdateState(PRDriverState *driverState)
}
PRResult PRDevice::DriverWatchdogTickle()
{
const int burstWords = 2;
uint32_t burst[burstWords];
int32_t rc;
rc = CreateWatchdogConfigBurst(burst, driverGlobalConfig.watchdogExpired,
driverGlobalConfig.watchdogEnable,
driverGlobalConfig.watchdogResetTime);
return WriteData(burst, burstWords);
}
PRSwitchRuleInternal *PRDevice::GetSwitchRuleByAddress(uint32_t addr)