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

Removed enableExtraData from Aux commits. That bit is now a global bit in the FPGA's Manager logic.

Browse Source
This commit is contained in:
Gerry Stellenberg
2010-04-10 20:33:11 -05:00
parent f5754d961b
commit 2be7223089
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/pinproc.h
View File

@@ -182,7 +182,6 @@ typedef struct PRDriverState {
typedef struct PRDriverAuxCommand { typedef struct PRDriverAuxCommand {
bool_t active; bool_t active;
bool_t useExtraData;
bool_t muxEnables; bool_t muxEnables;
uint8_t command; uint8_t command;
uint8_t enables; 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. * Prepares an Aux Command to drive the Aux bus.
* This function is provided for convenience. * 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. * Prepares an Aux Command to delay the Aux logic.
* This function is provided for convenience. * This function is provided for convenience.

5
src/PRHardware.cpp
View File

@@ -136,9 +136,8 @@ int32_t CreateDriverUpdateBurst ( uint32_t * burst, PRDriverState *driver) {
uint32_t CreateDriverAuxCommand ( PRDriverAuxCommand command) { uint32_t CreateDriverAuxCommand ( PRDriverAuxCommand command) {
switch (command.command) { switch (command.command) {
case (kPRDriverAuxCmdOutput) : { case (kPRDriverAuxCmdOutput) : {
return (command.active << P_ROC_DRIVER_AUX_ENTRY_ACTIVE_SHIFT) | return ((command.active & 1) << P_ROC_DRIVER_AUX_ENTRY_ACTIVE_SHIFT) |
(command.useExtraData << P_ROC_DRIVER_AUX_USE_EXTRA_DATA_SHIFT) | ((command.muxEnables & 1) << P_ROC_DRIVER_AUX_MUX_ENABLES_SHIFT) |
(command.muxEnables << P_ROC_DRIVER_AUX_MUX_ENABLES_SHIFT) |
((command.command & P_ROC_DRIVER_AUX_COMMAND_MASK) << ((command.command & P_ROC_DRIVER_AUX_COMMAND_MASK) <<
P_ROC_DRIVER_AUX_COMMAND_SHIFT) | P_ROC_DRIVER_AUX_COMMAND_SHIFT) |
((command.enables & P_ROC_DRIVER_AUX_ENABLES_MASK) << ((command.enables & P_ROC_DRIVER_AUX_ENABLES_MASK) <<

1
src/PRHardware.h
View File

@@ -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_CONFIG_TABLE_DRIVER_NUM_SHIFT = 1;
const uint32_t P_ROC_DRIVER_AUX_ENTRY_ACTIVE_SHIFT = 31; 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_MUX_ENABLES_SHIFT = 19;
const uint32_t P_ROC_DRIVER_AUX_COMMAND_SHIFT = 16; const uint32_t P_ROC_DRIVER_AUX_COMMAND_SHIFT = 16;
const uint32_t P_ROC_DRIVER_AUX_COMMAND_MASK = 0x67; const uint32_t P_ROC_DRIVER_AUX_COMMAND_MASK = 0x67;

15
src/pinproc.cpp
View File

@@ -191,14 +191,13 @@ PR_EXPORT PRResult PRDriverAuxSendCommands(PRHandle handle, PRDriverAuxCommand *
return handleAsDevice->DriverAuxSendCommands(commands, numCommands, startingAddr); 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->active = true;
auxCommand->data = data; auxCommand->data = data;
auxCommand->extraData = extraData; auxCommand->extraData = extraData;
auxCommand->enables = enables; auxCommand->enables = enables;
auxCommand->muxEnables = muxEnables; auxCommand->muxEnables = muxEnables;
auxCommand->useExtraData = useExtraData;
auxCommand->command = kPRDriverAuxCmdOutput; auxCommand->command = kPRDriverAuxCmdOutput;
} }
@@ -207,6 +206,10 @@ PR_EXPORT void PRDriverAuxPrepareDelay(PRDriverAuxCommand *auxCommand, uint16_t
auxCommand->active = true; auxCommand->active = true;
auxCommand->delayTime = delayTime; auxCommand->delayTime = delayTime;
auxCommand->command = kPRDriverAuxCmdDelay; auxCommand->command = kPRDriverAuxCmdDelay;
auxCommand->data = 0;
auxCommand->extraData = 0;
auxCommand->enables = 0;
auxCommand->muxEnables = false;
} }
PR_EXPORT void PRDriverAuxPrepareJump(PRDriverAuxCommand *auxCommand, uint8_t jumpAddr) 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->active = true;
auxCommand->jumpAddr = jumpAddr; auxCommand->jumpAddr = jumpAddr;
auxCommand->command = kPRDriverAuxCmdJump; auxCommand->command = kPRDriverAuxCmdJump;
auxCommand->data = 0;
auxCommand->extraData = 0;
auxCommand->enables = 0;
auxCommand->muxEnables = false;
} }
PR_EXPORT void PRDriverAuxPrepareDisable(PRDriverAuxCommand *auxCommand) PR_EXPORT void PRDriverAuxPrepareDisable(PRDriverAuxCommand *auxCommand)
{ {
auxCommand->active = false; auxCommand->active = false;
auxCommand->data = 0;
auxCommand->extraData = 0;
auxCommand->enables = 0;
auxCommand->muxEnables = false;
} }
PR_EXPORT PRResult PRDriverWatchdogTickle(PRHandle handle) PR_EXPORT PRResult PRDriverWatchdogTickle(PRHandle handle)