From 7af6d22a4e15ea7dde5869ca6784e06dbff87a28 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 14 May 2017 21:48:41 +0200 Subject: [PATCH] sercomm: Include in libosmocore Makefile Change-Id: If9d50d634381f43b2c67b97fea36a462a66e4559 --- include/Makefile.am | 1 + include/osmocom/core/sercomm.h | 2 +- src/Makefile.am | 2 +- src/sercomm.c | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/Makefile.am b/include/Makefile.am index 6981c379a..161bbcaf1 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -36,6 +36,7 @@ nobase_include_HEADERS = \ osmocom/core/rate_ctr.h \ osmocom/core/stat_item.h \ osmocom/core/select.h \ + osmocom/core/sercomm.h \ osmocom/core/signal.h \ osmocom/core/socket.h \ osmocom/core/statistics.h \ diff --git a/include/osmocom/core/sercomm.h b/include/osmocom/core/sercomm.h index cc1a833b0..32b96c538 100644 --- a/include/osmocom/core/sercomm.h +++ b/include/osmocom/core/sercomm.h @@ -58,7 +58,7 @@ struct osmo_sercomm_inst { }; -#ifndef HOST_BUILD +#ifdef EMBEDDED #include /* helper functions for target */ void osmo_sercomm_change_speed(struct osmo_sercomm_inst *sercomm, enum uart_baudrate bdrt); diff --git a/src/Makefile.am b/src/Makefile.am index 6948e1a84..c083936ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,7 +17,7 @@ libosmocore_la_SOURCES = timer.c timer_gettimeofday.c select.c signal.c msgb.c b conv.c application.c rbtree.c strrb.c \ loggingrb.c crc8gen.c crc16gen.c crc32gen.c crc64gen.c \ macaddr.c stat_item.c stats.c stats_statsd.c prim.c \ - viterbi.c viterbi_gen.c + viterbi.c viterbi_gen.c sercomm.c BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c diff --git a/src/sercomm.c b/src/sercomm.c index ff6a5a360..f3241c4e2 100644 --- a/src/sercomm.c +++ b/src/sercomm.c @@ -29,7 +29,7 @@ #include #include -#ifdef HOST_BUILD +#ifndef EMBEDDED # define DEFAULT_RX_MSG_SIZE 2048 static inline void sercomm_drv_lock(unsigned long __attribute__((unused)) *flags) {} @@ -107,7 +107,7 @@ void osmo_sercomm_sendmsg(struct osmo_sercomm_inst *sercomm, uint8_t dlci, struc msgb_enqueue(&sercomm->tx.dlci_queues[dlci], msg); sercomm_drv_unlock(&flags); -#ifndef HOST_BUILD +#ifdef EMBEDDED /* tell UART that we have something to send */ uart_irq_enable(sercomm->uart_id, UART_IRQ_TX_EMPTY, 1); #endif @@ -126,7 +126,7 @@ unsigned int osmo_sercomm_tx_queue_depth(struct osmo_sercomm_inst *sercomm, uint return num; } -#ifndef HOST_BUILD +#ifdef EMBEDDED /* wait until everything has been transmitted, then grab the lock and * change the baud rate as requested */ void osmo_sercomm_change_speed(struct osmo_sercomm_inst *sercomm, enum uart_baudrate bdrt)