diff options
| author | Harald Welte <laforge@gnumonks.org> | 2010-04-09 07:58:44 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2010-04-09 07:58:44 +0200 |
| commit | b7be8af6266a76660e52313bb676a9c876d5c6e9 (patch) | |
| tree | 12b2913e23bca656d1dd80d34122292c47f285c9 /src/shared/libosmocore | |
| parent | 2bb14aa3bbd7ddfe18ccee0b0e0a5ce608213936 (diff) | |
| parent | 163d0ea85b99a2c581b1f861bf9445a9a14bfc6f (diff) | |
Merge commit '163d0ea85b99a2c581b1f861bf9445a9a14bfc6f'
Diffstat (limited to 'src/shared/libosmocore')
| -rw-r--r-- | src/shared/libosmocore/include/osmocore/gsm48.h | 2 | ||||
| -rw-r--r-- | src/shared/libosmocore/src/gsm48.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/shared/libosmocore/include/osmocore/gsm48.h b/src/shared/libosmocore/include/osmocore/gsm48.h index b752ee00..e3a1defa 100644 --- a/src/shared/libosmocore/include/osmocore/gsm48.h +++ b/src/shared/libosmocore/include/osmocore/gsm48.h @@ -16,6 +16,6 @@ int gsm48_generate_mid_from_imsi(uint8_t *buf, const char *imsi); /* Convert Mobile Identity (10.5.1.4) to string */ int gsm48_mi_to_string(char *string, const int str_len, - const u_int8_t *mi, const int mi_len); + const uint8_t *mi, const int mi_len); #endif diff --git a/src/shared/libosmocore/src/gsm48.c b/src/shared/libosmocore/src/gsm48.c index e0cba15e..783ff6a5 100644 --- a/src/shared/libosmocore/src/gsm48.c +++ b/src/shared/libosmocore/src/gsm48.c @@ -263,12 +263,13 @@ int gsm48_generate_mid_from_imsi(uint8_t *buf, const char *imsi) } /* Convert Mobile Identity (10.5.1.4) to string */ -int gsm48_mi_to_string(char *string, const int str_len, const u_int8_t *mi, const int mi_len) +int gsm48_mi_to_string(char *string, const int str_len, const uint8_t *mi, + const int mi_len) { int i; - u_int8_t mi_type; + uint8_t mi_type; char *str_cur = string; - u_int32_t tmsi; + uint32_t tmsi; mi_type = mi[0] & GSM_MI_TYPE_MASK; |