Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-23 09:08:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

replace space() with txspace()

Browse Source 
space() was actually intended to be tx buffer space, it just had a
bug. The name txspace() is clearer however, and should prevent
confusion as to which buffer its for

git-svn-id: https://arducopter.googlecode.com/svn/trunk@3247 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
tridge60@gmail.com 2011-09-04 22:52:11 +00:00
parent 7774ac534e
commit 2e989fd101
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/FastSerial/BetterStream.cpp
View File

@ -54,8 +54,8 @@ BetterStream::_printf_P(const prog_char *fmt, ...)
} }
int int
BetterStream::space(void) BetterStream::txspace(void)
{ {
// by default claim that there is always space // by default claim that there is always space in transmit buffer
return(INT_MAX); return(INT_MAX);
} }

2
libraries/FastSerial/BetterStream.h
View File

@ -28,7 +28,7 @@ public:
void _printf_P(const prog_char *, ...); void _printf_P(const prog_char *, ...);
__attribute__ ((format(__printf__, 2, 3))); __attribute__ ((format(__printf__, 2, 3)));
virtual int space(void); virtual int txspace(void);
#define printf_P(fmt, ...) _printf_P((const prog_char *)fmt, ## __VA_ARGS__) #define printf_P(fmt, ...) _printf_P((const prog_char *)fmt, ## __VA_ARGS__)

7
libraries/FastSerial/FastSerial.cpp
View File

@ -142,13 +142,6 @@ int FastSerial::available(void)
return ((_rxBuffer->head - _rxBuffer->tail) & _rxBuffer->mask); return ((_rxBuffer->head - _rxBuffer->tail) & _rxBuffer->mask);
} }
int FastSerial::space(void)
{
if (!_open)
return (-1);
return (((_rxBuffer->tail - _rxBuffer->head) & _rxBuffer->mask) - 1);
}
int FastSerial::txspace(void) int FastSerial::txspace(void)
{ {
if (!_open) if (!_open)

1
libraries/FastSerial/FastSerial.h
View File

@ -110,7 +110,6 @@ public:
virtual void begin(long baud); virtual void begin(long baud);
virtual void end(void); virtual void end(void);
virtual int available(void); virtual int available(void);
virtual int space(void);
virtual int txspace(void); virtual int txspace(void);
virtual int read(void); virtual int read(void);
virtual int peek(void); virtual int peek(void);