diff options
author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-05-15 14:23:17 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-05-15 17:33:26 +0200 |
commit | a1d16802457164ce9d90ae023aba06a4c38d05fd (patch) | |
tree | b98f0f947deedf0d94bfc62b7c0026600a089199 /src/host/osmocon | |
parent | 0e6cea9b5172e61c934128ee7179cc04d0aa613f (diff) |
src: use namespace prefix osmo_* for utils
Summary of changes:
s/bcd2char/osmo_bcd2char/g
s/char2bcd/osmo_char2bcd/g
s/hexparse/osmo_hexparse/g
s/hexdump/osmo_hexdump/g
s/hexdump_nospc/osmo_hexdump_nospc/g
s/ubit_dump/osmo_ubit_dump/g
s/static_assert/osmo_static_assert/g
Diffstat (limited to 'src/host/osmocon')
-rw-r--r-- | src/host/osmocon/osmocon.c | 8 | ||||
-rw-r--r-- | src/host/osmocon/osmoload.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/host/osmocon/osmocon.c b/src/host/osmocon/osmocon.c index ab977c13..7f8d3ac7 100644 --- a/src/host/osmocon/osmocon.c +++ b/src/host/osmocon/osmocon.c @@ -447,7 +447,7 @@ int read_file(const char *filename) return 0; } -static void osmocon_hexdump(const uint8_t *data, unsigned int len) +static void osmocon_osmo_hexdump(const uint8_t *data, unsigned int len) { int n; @@ -754,7 +754,7 @@ static void hdlc_send_to_phone(uint8_t dlci, uint8_t *data, int len) if(dnload.dump_tx) { printf("hdlc_send(dlci=%u): ", dlci); - osmocon_hexdump(data, len); + osmocon_osmo_hexdump(data, len); } if (len > 512) { @@ -792,7 +792,7 @@ static void hdlc_tool_cb(uint8_t dlci, struct msgb *msg) if(dnload.dump_rx) { printf("hdlc_recv(dlci=%u): ", dlci); - osmocon_hexdump(msg->data, msg->len); + osmocon_osmo_hexdump(msg->data, msg->len); } if(srv) { @@ -832,7 +832,7 @@ static int handle_buffer(int buf_used_len) if (!dnload.expect_hdlc) { printf("got %i bytes from modem, ", nbytes); printf("data looks like: "); - osmocon_hexdump(bufptr, nbytes); + osmocon_osmo_hexdump(bufptr, nbytes); } else { for (i = 0; i < nbytes; ++i) if (sercomm_drv_rx_char(bufptr[i]) == 0) diff --git a/src/host/osmocon/osmoload.c b/src/host/osmocon/osmoload.c index 1471a2e6..5848e560 100644 --- a/src/host/osmocon/osmoload.c +++ b/src/host/osmocon/osmoload.c @@ -146,7 +146,7 @@ static int version(const char *name) exit(2); } -static void osmoload_hexdump(const uint8_t *data, unsigned int len) +static void osmoload_osmo_hexdump(const uint8_t *data, unsigned int len) { const uint8_t *bufptr = data; const uint8_t const *endptr = bufptr + len; @@ -190,7 +190,7 @@ loader_send_request(struct msgb *msg) { if(osmoload.print_requests) { printf("Sending %d bytes:\n", msg->len); - osmoload_hexdump(msg->data, msg->len); + osmoload_osmo_hexdump(msg->data, msg->len); } rc = write(connection.fd, &len, sizeof(len)); @@ -277,7 +277,7 @@ static void loader_handle_reply(struct msgb *msg) { if(osmoload.print_replies) { printf("Received %d bytes:\n", msg->len); - osmoload_hexdump(msg->data, msg->len); + osmoload_osmo_hexdump(msg->data, msg->len); } uint8_t cmd = msgb_get_u8(msg); @@ -338,7 +338,7 @@ loader_handle_reply(struct msgb *msg) { break; default: printf("Received unknown reply %d:\n", cmd); - osmoload_hexdump(msg->data, msg->len); + osmoload_osmo_hexdump(msg->data, msg->len); osmoload.quit = 1; return; } @@ -364,7 +364,7 @@ loader_handle_reply(struct msgb *msg) { break; case LOADER_MEM_READ: printf("Received memory dump of %d bytes at 0x%x:\n", length, address); - osmoload_hexdump(data, length); + osmoload_osmo_hexdump(data, length); break; case LOADER_MEM_WRITE: printf("Confirmed memory write of %d bytes at 0x%x.\n", length, address); |