Prepends all HAL functions with HAL_ (#146)

This commit is contained in:
Thad House
2016-07-09 00:24:26 -07:00
committed by Peter Johnson
parent 5ad28d58ec
commit b637b9ee4c
162 changed files with 2855 additions and 2747 deletions

View File

@@ -14,7 +14,7 @@ static uint32_t m_portHandle[2];
extern "C" {
void serialInitializePort(uint8_t port, int32_t* status) {
void HAL_SerialInitializePort(uint8_t port, int32_t* status) {
char const* portName;
if (m_resourceManagerHandle == 0)
@@ -32,44 +32,45 @@ void serialInitializePort(uint8_t port, int32_t* status) {
if (*status > 0) *status = 0;
}
void serialSetBaudRate(uint8_t port, uint32_t baud, int32_t* status) {
void HAL_SerialSetBaudRate(uint8_t port, uint32_t baud, int32_t* status) {
*status = viSetAttribute(m_portHandle[port], VI_ATTR_ASRL_BAUD, baud);
if (*status > 0) *status = 0;
}
void serialSetDataBits(uint8_t port, uint8_t bits, int32_t* status) {
void HAL_SerialSetDataBits(uint8_t port, uint8_t bits, int32_t* status) {
*status = viSetAttribute(m_portHandle[port], VI_ATTR_ASRL_DATA_BITS, bits);
if (*status > 0) *status = 0;
}
void serialSetParity(uint8_t port, uint8_t parity, int32_t* status) {
void HAL_SerialSetParity(uint8_t port, uint8_t parity, int32_t* status) {
*status = viSetAttribute(m_portHandle[port], VI_ATTR_ASRL_PARITY, parity);
if (*status > 0) *status = 0;
}
void serialSetStopBits(uint8_t port, uint8_t stopBits, int32_t* status) {
void HAL_SerialSetStopBits(uint8_t port, uint8_t stopBits, int32_t* status) {
*status =
viSetAttribute(m_portHandle[port], VI_ATTR_ASRL_STOP_BITS, stopBits);
if (*status > 0) *status = 0;
}
void serialSetWriteMode(uint8_t port, uint8_t mode, int32_t* status) {
void HAL_SerialSetWriteMode(uint8_t port, uint8_t mode, int32_t* status) {
*status = viSetAttribute(m_portHandle[port], VI_ATTR_WR_BUF_OPER_MODE, mode);
if (*status > 0) *status = 0;
}
void serialSetFlowControl(uint8_t port, uint8_t flow, int32_t* status) {
void HAL_SerialSetFlowControl(uint8_t port, uint8_t flow, int32_t* status) {
*status = viSetAttribute(m_portHandle[port], VI_ATTR_ASRL_FLOW_CNTRL, flow);
if (*status > 0) *status = 0;
}
void serialSetTimeout(uint8_t port, float timeout, int32_t* status) {
void HAL_SerialSetTimeout(uint8_t port, float timeout, int32_t* status) {
*status = viSetAttribute(m_portHandle[port], VI_ATTR_TMO_VALUE,
(uint32_t)(timeout * 1e3));
if (*status > 0) *status = 0;
}
void serialEnableTermination(uint8_t port, char terminator, int32_t* status) {
void HAL_SerialEnableTermination(uint8_t port, char terminator,
int32_t* status) {
viSetAttribute(m_portHandle[port], VI_ATTR_TERMCHAR_EN, VI_TRUE);
viSetAttribute(m_portHandle[port], VI_ATTR_TERMCHAR, terminator);
*status = viSetAttribute(m_portHandle[port], VI_ATTR_ASRL_END_IN,
@@ -77,24 +78,25 @@ void serialEnableTermination(uint8_t port, char terminator, int32_t* status) {
if (*status > 0) *status = 0;
}
void serialDisableTermination(uint8_t port, int32_t* status) {
void HAL_SerialDisableTermination(uint8_t port, int32_t* status) {
viSetAttribute(m_portHandle[port], VI_ATTR_TERMCHAR_EN, VI_FALSE);
*status =
viSetAttribute(m_portHandle[port], VI_ATTR_ASRL_END_IN, VI_ASRL_END_NONE);
if (*status > 0) *status = 0;
}
void serialSetReadBufferSize(uint8_t port, uint32_t size, int32_t* status) {
void HAL_SerialSetReadBufferSize(uint8_t port, uint32_t size, int32_t* status) {
*status = viSetBuf(m_portHandle[port], VI_READ_BUF, size);
if (*status > 0) *status = 0;
}
void serialSetWriteBufferSize(uint8_t port, uint32_t size, int32_t* status) {
void HAL_SerialSetWriteBufferSize(uint8_t port, uint32_t size,
int32_t* status) {
*status = viSetBuf(m_portHandle[port], VI_WRITE_BUF, size);
if (*status > 0) *status = 0;
}
int32_t serialGetBytesReceived(uint8_t port, int32_t* status) {
int32_t HAL_SerialGetBytesReceived(uint8_t port, int32_t* status) {
int32_t bytes = 0;
*status = viGetAttribute(m_portHandle[port], VI_ATTR_ASRL_AVAIL_NUM, &bytes);
@@ -102,8 +104,8 @@ int32_t serialGetBytesReceived(uint8_t port, int32_t* status) {
return bytes;
}
uint32_t serialRead(uint8_t port, char* buffer, int32_t count,
int32_t* status) {
uint32_t HAL_SerialRead(uint8_t port, char* buffer, int32_t count,
int32_t* status) {
uint32_t retCount = 0;
*status =
@@ -112,15 +114,15 @@ uint32_t serialRead(uint8_t port, char* buffer, int32_t count,
if (*status == VI_ERROR_IO || *status == VI_ERROR_ASRL_OVERRUN ||
*status == VI_ERROR_ASRL_FRAMING || *status == VI_ERROR_ASRL_PARITY) {
int32_t localStatus = 0;
serialClear(port, &localStatus);
HAL_SerialClear(port, &localStatus);
}
if (*status == VI_ERROR_TMO || *status > 0) *status = 0;
return retCount;
}
uint32_t serialWrite(uint8_t port, const char* buffer, int32_t count,
int32_t* status) {
uint32_t HAL_SerialWrite(uint8_t port, const char* buffer, int32_t count,
int32_t* status) {
uint32_t retCount = 0;
*status =
@@ -130,17 +132,17 @@ uint32_t serialWrite(uint8_t port, const char* buffer, int32_t count,
return retCount;
}
void serialFlush(uint8_t port, int32_t* status) {
void HAL_SerialFlush(uint8_t port, int32_t* status) {
*status = viFlush(m_portHandle[port], VI_WRITE_BUF);
if (*status > 0) *status = 0;
}
void serialClear(uint8_t port, int32_t* status) {
void HAL_SerialClear(uint8_t port, int32_t* status) {
*status = viClear(m_portHandle[port]);
if (*status > 0) *status = 0;
}
void serialClose(uint8_t port, int32_t* status) {
void HAL_SerialClose(uint8_t port, int32_t* status) {
*status = viClose(m_portHandle[port]);
if (*status > 0) *status = 0;
}