From 2be72230897deb65c92771d49f4b1beb55b2f8e6 Mon Sep 17 00:00:00 2001 From: Gerry Stellenberg Date: Sat, 10 Apr 2010 20:33:11 -0500 Subject: [PATCH] Removed enableExtraData from Aux commits. That bit is now a global bit in the FPGA's Manager logic. --- include/pinproc.h | 3 +-- src/PRHardware.cpp | 5 ++--- src/PRHardware.h | 1 - src/pinproc.cpp | 15 +++++++++++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/include/pinproc.h b/include/pinproc.h index 381b626..0ce1a12 100644 --- a/include/pinproc.h +++ b/include/pinproc.h @@ -182,7 +182,6 @@ typedef struct PRDriverState { typedef struct PRDriverAuxCommand { bool_t active; - bool_t useExtraData; bool_t muxEnables; uint8_t command; uint8_t enables; @@ -243,7 +242,7 @@ PR_EXPORT PRResult PRDriverPulsedPatter(PRHandle handle, uint16_t driverNum, uin * Prepares an Aux Command to drive the Aux bus. * This function is provided for convenience. */ -PR_EXPORT void PRDriverAuxPrepareOutput(PRDriverAuxCommand *auxCommand, uint8_t data, uint8_t extraData, bool_t useExtraData, uint8_t enables, bool_t muxEnables); +PR_EXPORT void PRDriverAuxPrepareOutput(PRDriverAuxCommand *auxCommand, uint8_t data, uint8_t extraData, uint8_t enables, bool_t muxEnables); /** * Prepares an Aux Command to delay the Aux logic. * This function is provided for convenience. diff --git a/src/PRHardware.cpp b/src/PRHardware.cpp index fede420..b4d696f 100644 --- a/src/PRHardware.cpp +++ b/src/PRHardware.cpp @@ -136,9 +136,8 @@ int32_t CreateDriverUpdateBurst ( uint32_t * burst, PRDriverState *driver) { uint32_t CreateDriverAuxCommand ( PRDriverAuxCommand command) { switch (command.command) { case (kPRDriverAuxCmdOutput) : { - return (command.active << P_ROC_DRIVER_AUX_ENTRY_ACTIVE_SHIFT) | - (command.useExtraData << P_ROC_DRIVER_AUX_USE_EXTRA_DATA_SHIFT) | - (command.muxEnables << P_ROC_DRIVER_AUX_MUX_ENABLES_SHIFT) | + return ((command.active & 1) << P_ROC_DRIVER_AUX_ENTRY_ACTIVE_SHIFT) | + ((command.muxEnables & 1) << P_ROC_DRIVER_AUX_MUX_ENABLES_SHIFT) | ((command.command & P_ROC_DRIVER_AUX_COMMAND_MASK) << P_ROC_DRIVER_AUX_COMMAND_SHIFT) | ((command.enables & P_ROC_DRIVER_AUX_ENABLES_MASK) << diff --git a/src/PRHardware.h b/src/PRHardware.h index 28ea5ba..12ed2de 100644 --- a/src/PRHardware.h +++ b/src/PRHardware.h @@ -172,7 +172,6 @@ const uint32_t P_ROC_DRIVER_CONFIG_PATTER_ENABLE_SHIFT = 30; const uint32_t P_ROC_DRIVER_CONFIG_TABLE_DRIVER_NUM_SHIFT = 1; const uint32_t P_ROC_DRIVER_AUX_ENTRY_ACTIVE_SHIFT = 31; -const uint32_t P_ROC_DRIVER_AUX_USE_EXTRA_DATA_SHIFT = 20; const uint32_t P_ROC_DRIVER_AUX_MUX_ENABLES_SHIFT = 19; const uint32_t P_ROC_DRIVER_AUX_COMMAND_SHIFT = 16; const uint32_t P_ROC_DRIVER_AUX_COMMAND_MASK = 0x67; diff --git a/src/pinproc.cpp b/src/pinproc.cpp index 9eb70dd..860d7db 100644 --- a/src/pinproc.cpp +++ b/src/pinproc.cpp @@ -191,14 +191,13 @@ PR_EXPORT PRResult PRDriverAuxSendCommands(PRHandle handle, PRDriverAuxCommand * return handleAsDevice->DriverAuxSendCommands(commands, numCommands, startingAddr); } -PR_EXPORT void PRDriverAuxPrepareOutput(PRDriverAuxCommand *auxCommand, uint8_t data, uint8_t extraData, bool_t useExtraData, uint8_t enables, bool_t muxEnables) +PR_EXPORT void PRDriverAuxPrepareOutput(PRDriverAuxCommand *auxCommand, uint8_t data, uint8_t extraData, uint8_t enables, bool_t muxEnables) { auxCommand->active = true; auxCommand->data = data; auxCommand->extraData = extraData; auxCommand->enables = enables; auxCommand->muxEnables = muxEnables; - auxCommand->useExtraData = useExtraData; auxCommand->command = kPRDriverAuxCmdOutput; } @@ -207,6 +206,10 @@ PR_EXPORT void PRDriverAuxPrepareDelay(PRDriverAuxCommand *auxCommand, uint16_t auxCommand->active = true; auxCommand->delayTime = delayTime; auxCommand->command = kPRDriverAuxCmdDelay; + auxCommand->data = 0; + auxCommand->extraData = 0; + auxCommand->enables = 0; + auxCommand->muxEnables = false; } PR_EXPORT void PRDriverAuxPrepareJump(PRDriverAuxCommand *auxCommand, uint8_t jumpAddr) @@ -214,11 +217,19 @@ PR_EXPORT void PRDriverAuxPrepareJump(PRDriverAuxCommand *auxCommand, uint8_t ju auxCommand->active = true; auxCommand->jumpAddr = jumpAddr; auxCommand->command = kPRDriverAuxCmdJump; + auxCommand->data = 0; + auxCommand->extraData = 0; + auxCommand->enables = 0; + auxCommand->muxEnables = false; } PR_EXPORT void PRDriverAuxPrepareDisable(PRDriverAuxCommand *auxCommand) { auxCommand->active = false; + auxCommand->data = 0; + auxCommand->extraData = 0; + auxCommand->enables = 0; + auxCommand->muxEnables = false; } PR_EXPORT PRResult PRDriverWatchdogTickle(PRHandle handle)