summaryrefslogtreecommitdiffstats
path: root/src/shared/libosmocore
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2011-07-30 21:35:37 +0200
committerSylvain Munaut <tnt@246tNt.com>2011-07-30 21:35:37 +0200
commit589200a663a5143fc6de3bb1cde0049c0d22522f (patch)
tree984edef1fe60675047aa5473c2afbf773d99d9b4 /src/shared/libosmocore
parent1a5461fb2beb96bfa004245a102cd4c1422baa2a (diff)
parent1a99df84e12315c63f2e96a2972864e4c311712d (diff)
Merge commit '1a99df84e12315c63f2e96a2972864e4c311712d'
Diffstat (limited to 'src/shared/libosmocore')
-rw-r--r--src/shared/libosmocore/include/osmocom/core/logging.h2
-rw-r--r--src/shared/libosmocore/src/gsm/gsm48_ie.c2
-rw-r--r--src/shared/libosmocore/src/logging.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/src/shared/libosmocore/include/osmocom/core/logging.h b/src/shared/libosmocore/include/osmocom/core/logging.h
index 06d90e52..154ee198 100644
--- a/src/shared/libosmocore/include/osmocom/core/logging.h
+++ b/src/shared/libosmocore/include/osmocom/core/logging.h
@@ -43,7 +43,7 @@ void logp(int subsys, char *file, int line, int cont, const char *format, ...) _
#define DLMUX -4
#define DLMI -5
#define DLMIB -6
-#define OSMO_NUM_DLIB 7
+#define OSMO_NUM_DLIB 6
struct log_category {
uint8_t loglevel;
diff --git a/src/shared/libosmocore/src/gsm/gsm48_ie.c b/src/shared/libosmocore/src/gsm/gsm48_ie.c
index efcf2816..863e6365 100644
--- a/src/shared/libosmocore/src/gsm/gsm48_ie.c
+++ b/src/shared/libosmocore/src/gsm/gsm48_ie.c
@@ -745,7 +745,7 @@ int gsm48_decode_freq_list(struct gsm_sysinfo_freq *f, uint8_t *cd,
if (w[4])
f[((w[1] - 512 + ((w[2] - 256 + w[4] - 1) % 511)) % 1023) + 1].mask |= frqt;
if (w[5])
- f[((w[1] + ((w[3] - 256 - w[5] - 1) % 511)) % 1023) + 1].mask |= frqt;
+ f[((w[1] + ((w[3] - 256 + w[5] - 1) % 511)) % 1023) + 1].mask |= frqt;
if (w[6])
f[((w[1] - 512 + ((w[2] + w[6] - 1) % 511)) % 1023) + 1].mask |= frqt;
if (w[7])
diff --git a/src/shared/libosmocore/src/logging.c b/src/shared/libosmocore/src/logging.c
index 44fea98f..11d63ac9 100644
--- a/src/shared/libosmocore/src/logging.c
+++ b/src/shared/libosmocore/src/logging.c
@@ -73,24 +73,24 @@ static const struct log_info_cat internal_cat[OSMO_NUM_DLIB] = {
.enabled = 1,
},
[INT2IDX(DLINP)] = {
- .name = "DINP",
+ .name = "DLINP",
.description = "A-bis Intput Subsystem",
.loglevel = LOGL_NOTICE,
.enabled = 1,
},
[INT2IDX(DLMUX)] = {
- .name = "DMUX",
+ .name = "DLMUX",
.description = "A-bis B-Subchannel TRAU Frame Multiplex",
.loglevel = LOGL_NOTICE,
.enabled = 1,
},
[INT2IDX(DLMI)] = {
- .name = "DMI",
+ .name = "DLMI",
.description = "A-bis Input Driver for Signalling",
.enabled = 0, .loglevel = LOGL_NOTICE,
},
[INT2IDX(DLMIB)] = {
- .name = "DMIB",
+ .name = "DLMIB",
.description = "A-bis Input Driver for B-Channels (voice)",
.enabled = 0, .loglevel = LOGL_NOTICE,
},