diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-08-02 14:22:30 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-08-02 14:22:30 +0200 |
| commit | e581516b26da54f8d73fca6640ab1a5df16bc6e8 (patch) | |
| tree | 94922706248617630d825b071e6aa3c00db85b30 | |
| parent | eeb78dde9b037d6b26325e6e5b9154a91952ced9 (diff) | |
| parent | 1a99df84e12315c63f2e96a2972864e4c311712d (diff) | |
Merge branch 'master' of git.osmocom.org:libosmocore
| -rw-r--r-- | include/osmocom/core/logging.h | 2 | ||||
| -rw-r--r-- | src/gsm/gsm48_ie.c | 2 | ||||
| -rw-r--r-- | src/logging.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 06d90e52..154ee198 100644 --- a/include/osmocom/core/logging.h +++ b/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/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c index efcf2816..863e6365 100644 --- a/src/gsm/gsm48_ie.c +++ b/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/logging.c b/src/logging.c index 44fea98f..11d63ac9 100644 --- a/src/logging.c +++ b/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, }, |