mirror of https://gerrit.osmocom.org/libosmocore
Merge branch 'master' of git.osmocom.org:libosmocore
This commit is contained in:
commit
e581516b26
|
@ -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;
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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,
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue