andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed potential name conflicts. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10079 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2017-02-02 11:28:34 +00:00
parent 07fc57b2c8
commit fed649d56c
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
os/hal/lib/streams/memstreams.c
View File

@ -43,7 +43,7 @@
/* Driver local functions. */
/*===========================================================================*/
static size_t writes(void *ip, const uint8_t *bp, size_t n) {
static size_t _writes(void *ip, const uint8_t *bp, size_t n) {
MemoryStream *msp = ip;
if (msp->size - msp->eos < n)
@ -53,7 +53,7 @@ static size_t writes(void *ip, const uint8_t *bp, size_t n) {
return n;
}
static size_t reads(void *ip, uint8_t *bp, size_t n) {
static size_t _reads(void *ip, uint8_t *bp, size_t n) {
MemoryStream *msp = ip;
if (msp->eos - msp->offset < n)
@ -63,7 +63,7 @@ static size_t reads(void *ip, uint8_t *bp, size_t n) {
return n;
}
static msg_t put(void *ip, uint8_t b) {
static msg_t _put(void *ip, uint8_t b) {
MemoryStream *msp = ip;
if (msp->size - msp->eos <= 0)
@ -73,7 +73,7 @@ static msg_t put(void *ip, uint8_t b) {
return MSG_OK;
}
static msg_t get(void *ip) {
static msg_t _get(void *ip) {
uint8_t b;
MemoryStream *msp = ip;
@ -84,7 +84,7 @@ static msg_t get(void *ip) {
return b;
}
static const struct MemStreamVMT vmt = {writes, reads, put, get};
static const struct MemStreamVMT vmt = {_writes, _reads, _put, _get};
/*===========================================================================*/
/* Driver exported functions. */

20
os/hal/src/hal_serial.c
View File

@ -47,51 +47,51 @@
* queue-level function or macro.
*/
static size_t write(void *ip, const uint8_t *bp, size_t n) {
static size_t _write(void *ip, const uint8_t *bp, size_t n) {
return oqWriteTimeout(&((SerialDriver *)ip)->oqueue, bp,
n, TIME_INFINITE);
}
static size_t read(void *ip, uint8_t *bp, size_t n) {
static size_t _read(void *ip, uint8_t *bp, size_t n) {
return iqReadTimeout(&((SerialDriver *)ip)->iqueue, bp,
n, TIME_INFINITE);
}
static msg_t put(void *ip, uint8_t b) {
static msg_t _put(void *ip, uint8_t b) {
return oqPutTimeout(&((SerialDriver *)ip)->oqueue, b, TIME_INFINITE);
}
static msg_t get(void *ip) {
static msg_t _get(void *ip) {
return iqGetTimeout(&((SerialDriver *)ip)->iqueue, TIME_INFINITE);
}
static msg_t putt(void *ip, uint8_t b, systime_t timeout) {
static msg_t _putt(void *ip, uint8_t b, systime_t timeout) {
return oqPutTimeout(&((SerialDriver *)ip)->oqueue, b, timeout);
}
static msg_t gett(void *ip, systime_t timeout) {
static msg_t _gett(void *ip, systime_t timeout) {
return iqGetTimeout(&((SerialDriver *)ip)->iqueue, timeout);
}
static size_t writet(void *ip, const uint8_t *bp, size_t n, systime_t timeout) {
static size_t _writet(void *ip, const uint8_t *bp, size_t n, systime_t timeout) {
return oqWriteTimeout(&((SerialDriver *)ip)->oqueue, bp, n, timeout);
}
static size_t readt(void *ip, uint8_t *bp, size_t n, systime_t timeout) {
static size_t _readt(void *ip, uint8_t *bp, size_t n, systime_t timeout) {
return iqReadTimeout(&((SerialDriver *)ip)->iqueue, bp, n, timeout);
}
static const struct SerialDriverVMT vmt = {
write, read, put, get,
putt, gett, writet, readt
_write, _read, _put, _get,
_putt, _gett, _writet, _readt
};
/*===========================================================================*/

20
os/hal/src/hal_serial_usb.c
View File

@ -82,51 +82,51 @@ static bool sdu_start_receive(SerialUSBDriver *sdup) {
* Interface implementation.
*/
static size_t write(void *ip, const uint8_t *bp, size_t n) {
static size_t _write(void *ip, const uint8_t *bp, size_t n) {
return obqWriteTimeout(&((SerialUSBDriver *)ip)->obqueue, bp,
n, TIME_INFINITE);
}
static size_t read(void *ip, uint8_t *bp, size_t n) {
static size_t _read(void *ip, uint8_t *bp, size_t n) {
return ibqReadTimeout(&((SerialUSBDriver *)ip)->ibqueue, bp,
n, TIME_INFINITE);
}
static msg_t put(void *ip, uint8_t b) {
static msg_t _put(void *ip, uint8_t b) {
return obqPutTimeout(&((SerialUSBDriver *)ip)->obqueue, b, TIME_INFINITE);
}
static msg_t get(void *ip) {
static msg_t _get(void *ip) {
return ibqGetTimeout(&((SerialUSBDriver *)ip)->ibqueue, TIME_INFINITE);
}
static msg_t putt(void *ip, uint8_t b, systime_t timeout) {
static msg_t _putt(void *ip, uint8_t b, systime_t timeout) {
return obqPutTimeout(&((SerialUSBDriver *)ip)->obqueue, b, timeout);
}
static msg_t gett(void *ip, systime_t timeout) {
static msg_t _gett(void *ip, systime_t timeout) {
return ibqGetTimeout(&((SerialUSBDriver *)ip)->ibqueue, timeout);
}
static size_t writet(void *ip, const uint8_t *bp, size_t n, systime_t timeout) {
static size_t _writet(void *ip, const uint8_t *bp, size_t n, systime_t timeout) {
return obqWriteTimeout(&((SerialUSBDriver *)ip)->obqueue, bp, n, timeout);
}
static size_t readt(void *ip, uint8_t *bp, size_t n, systime_t timeout) {
static size_t _readt(void *ip, uint8_t *bp, size_t n, systime_t timeout) {
return ibqReadTimeout(&((SerialUSBDriver *)ip)->ibqueue, bp, n, timeout);
}
static const struct SerialUSBDriverVMT vmt = {
write, read, put, get,
putt, gett, writet, readt
_write, _read, _put, _get,
_putt, _gett, _writet, _readt
};
/**