This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
dexter gerrit-no-reply at lists.osmocom.orgHello Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/644 to look at the new patch set (#10). V42BIS integration The previously committed SPANDSP v42bis implementation has been edited to function outside the SPANDSP library. Debug printf statements were changed into DEBUGP statements. Als removed the assembely code in top_bit(). Change-Id: I689413f2541b6def0625ce6bd96f1f488f05f99d --- M openbsc/include/openbsc/Makefile.am M openbsc/include/openbsc/debug.h M openbsc/include/openbsc/v42bis.h R openbsc/include/openbsc/v42bis_private.h M openbsc/src/gprs/Makefile.am M openbsc/src/gprs/v42bis.c 6 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/44/644/10 diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am index e159db5..e404b17 100644 --- a/openbsc/include/openbsc/Makefile.am +++ b/openbsc/include/openbsc/Makefile.am @@ -19,7 +19,8 @@ gprs_gsup_client.h bsc_msg_filter.h \ oap.h oap_messages.h \ gtphub.h gprs_sndcp.h slhc.h gprs_llc_xid.h gprs_sndcp_xid.h \ - gprs_sndcp_comp_entity.h gprs_sndcp_hdrcomp.h + gprs_sndcp_comp_entity.h gprs_sndcp_hdrcomp.h v42bis.h \ + v42bis_private.h openbsc_HEADERS = gsm_04_08.h meas_rep.h bsc_api.h openbscdir = $(includedir)/openbsc diff --git a/openbsc/include/openbsc/debug.h b/openbsc/include/openbsc/debug.h index 90ddca5..ca3d4ad 100644 --- a/openbsc/include/openbsc/debug.h +++ b/openbsc/include/openbsc/debug.h @@ -37,6 +37,7 @@ DGTPHUB, DRANAP, DSUA, + DV42BIS, Debug_LastEntry, }; diff --git a/openbsc/include/openbsc/v42bis.h b/openbsc/include/openbsc/v42bis.h index f13e5c5..e7592e8 100644 --- a/openbsc/include/openbsc/v42bis.h +++ b/openbsc/include/openbsc/v42bis.h @@ -36,6 +36,8 @@ #if !defined(_SPANDSP_V42BIS_H_) #define _SPANDSP_V42BIS_H_ +#define SPAN_DECLARE(x) x + #define V42BIS_MAX_BITS 12 #define V42BIS_MAX_CODEWORDS 4096 /* 2^V42BIS_MAX_BITS */ #define V42BIS_TABLE_SIZE 5021 /* This should be a prime >(2^V42BIS_MAX_BITS) */ diff --git a/openbsc/include/openbsc/private_v42bis.h b/openbsc/include/openbsc/v42bis_private.h similarity index 100% rename from openbsc/include/openbsc/private_v42bis.h rename to openbsc/include/openbsc/v42bis_private.h diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am index 3d6c82a..2c03a45 100644 --- a/openbsc/src/gprs/Makefile.am +++ b/openbsc/src/gprs/Makefile.am @@ -22,7 +22,7 @@ osmo_sgsn_SOURCES = gprs_gmm.c gprs_sgsn.c gprs_sndcp.c gprs_sndcp_vty.c \ slhc.c gprs_sndcp_xid.c gprs_sndcp_comp_entity.c \ - gprs_sndcp_hdrcomp.c \ + gprs_sndcp_hdrcomp.c v42bis.c \ sgsn_main.c sgsn_vty.c sgsn_libgtp.c \ gprs_llc.c gprs_llc_parse.c gprs_llc_vty.c \ gprs_llc_xid.c crc24.c \ diff --git a/openbsc/src/gprs/v42bis.c b/openbsc/src/gprs/v42bis.c index 6d38916..a306107 100644 --- a/openbsc/src/gprs/v42bis.c +++ b/openbsc/src/gprs/v42bis.c @@ -31,9 +31,8 @@ /*! \file */ -#if defined(HAVE_CONFIG_H) -#include "config.h" -#endif +#define FALSE 0 +#define TRUE 1 #include <stdio.h> #include <stdlib.h> @@ -44,13 +43,9 @@ #include <ctype.h> #include <assert.h> -#include "spandsp/telephony.h" -#include "spandsp/logging.h" -#include "spandsp/bit_operations.h" -#include "spandsp/v42bis.h" +#include <openbsc/v42bis.h> +#include <openbsc/v42bis_private.h> -#include "spandsp/private/logging.h" -#include "spandsp/private/v42bis.h" /* Fixed parameters from the spec. */ #define V42BIS_N3 8 /* Character size (bits) */ @@ -79,6 +74,7 @@ \return The bit number of the highest set bit, or -1 if the word is zero. */ static __inline__ int top_bit(unsigned int bits) { + /* Note: This function was taken from spandsp/bit_operations.h */ int res; -- To view, visit https://gerrit.osmocom.org/644 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I689413f2541b6def0625ce6bd96f1f488f05f99d Gerrit-PatchSet: 10 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: dexter <pmaier at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>