diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-03-22 22:23:04 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-03-23 04:14:27 -0400 |
| commit | 3649cb065699316bc8cd64b06f273c72f1806323 (patch) | |
| tree | cf56f50cedc1a0d897cc271556c067a033d20d67 /sim/common | |
| parent | 80fc77e6c14835462fca0b7adc15655ce2e4bb99 (diff) | |
| download | binutils-gdb-3649cb065699316bc8cd64b06f273c72f1806323.tar.gz | |
sim: dv-sockser: add stub funcs when not available
This lets ports assume that the dv-sockser API is always available if
they want to. This way we don't have to do an abort at configure time
and it makes the resulting code a bit simpler.
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 8 | ||||
| -rw-r--r-- | sim/common/dv-sockser.c | 1 | ||||
| -rw-r--r-- | sim/common/dv-sockser.h | 37 |
3 files changed, 46 insertions, 0 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index d3b86421c0a..c82f105a423 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,11 @@ +2015-03-23 Mike Frysinger <vapier@gentoo.org> + + * dv-sockser.c: Include config.h. + * dv-sockser.h: Include sim-inline.h. + [HAVE_DV_SOCKSER]: Move all prototypes here. + [!HAVE_DV_SOCKSER] (dv_sockser_status, dv_sockser_write, + dv_sockser_write_buffer, dv_sockser_read): New stub functions. + 2015-03-16 Mike Frysinger <vapier@gentoo.org> * gentmap.c, run.c: Convert old style prototypes. diff --git a/sim/common/dv-sockser.c b/sim/common/dv-sockser.c index ac6fb5032db..313fa4f60a6 100644 --- a/sim/common/dv-sockser.c +++ b/sim/common/dv-sockser.c @@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* FIXME: will obviously need to evolve. - connectionless sockets might be more appropriate. */ +#include "config.h" #include "sim-main.h" #ifdef HAVE_STRING_H diff --git a/sim/common/dv-sockser.h b/sim/common/dv-sockser.h index cc4fd741ac5..1fd1c12383e 100644 --- a/sim/common/dv-sockser.h +++ b/sim/common/dv-sockser.h @@ -19,11 +19,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef DV_SOCKSER_H #define DV_SOCKSER_H +#include "sim-inline.h" + /* bits in result of dev_sockser_status */ #define DV_SOCKSER_INPUT_EMPTY 0x1 #define DV_SOCKSER_OUTPUT_EMPTY 0x2 #define DV_SOCKSER_DISCONNECTED 0x4 +#ifdef HAVE_DV_SOCKSER + /* FIXME: later add a device ptr arg */ extern int dv_sockser_status (SIM_DESC); int dv_sockser_write (SIM_DESC, unsigned char); @@ -32,4 +36,37 @@ int dv_sockser_read (SIM_DESC); SIM_RC dv_sockser_install (SIM_DESC); +#else + +/* If dv-sockser isn't available, provide stub functions. */ + +STATIC_INLINE int +dv_sockser_status (SIM_DESC sd) +{ + return (DV_SOCKSER_INPUT_EMPTY | + DV_SOCKSER_OUTPUT_EMPTY | + DV_SOCKSER_DISCONNECTED); +} + +STATIC_INLINE int +dv_sockser_write (SIM_DESC sd, unsigned char c) +{ + return -1; +} + +STATIC_INLINE int +dv_sockser_write_buffer (SIM_DESC sd, const unsigned char *buffer, + unsigned nr_bytes) +{ + return -1; +} + +STATIC_INLINE int +dv_sockser_read (SIM_DESC sd) +{ + return -1; +} + +#endif /* HAVE_DV_SOCKSER */ + #endif /* DV_SOCKSER_H */ |