path: root/src/host/osmocon/osmocon.c
diff options
authorPablo Neira Ayuso <>2011-04-26 02:55:30 +0200
committerPablo Neira Ayuso <>2011-04-26 02:55:30 +0200
commitade79a00838801dbcd95efd026d18b15eb1e1e3c (patch)
tree6b08d76dcee3abe022770fee6fd52b16d322c79e /src/host/osmocon/osmocon.c
parentf0059596a20bfa406a500ca5d6b34bf88d333ed3 (diff)
src: use new libosmogsm and include/osmocom/[gsm|core] path to headers
This patch changes include paths to get osmocom-bb working with the current libosmocore tree. Among all these renames, you can notice several tweaks that I added on purpose, and that require some explanation, they are: * hexdump() in osmocon.c and osmoload.c has been renamed to avoid clashing with hexdump() defined in libosmocore. * gsmmap now depends on libosmogsm. Actually I had to cleanup because I was experiencing weird linking problems, probably due to a bug in the autotools. With the change included in this patch, I got it compiled and linked here correctly. This patch has been tested with the phone Motorola C123 and the following images files: * firmware/board/compal_e88/hello_world.compalram.bin * firmware/board/compal_e88/layer1.compalram.bin Using the osmocon, bcch_scan and mobile tools. Signed-off-by: Pablo Neira Ayuso <>
Diffstat (limited to 'src/host/osmocon/osmocon.c')
1 files changed, 8 insertions, 8 deletions
diff --git a/src/host/osmocon/osmocon.c b/src/host/osmocon/osmocon.c
index 6f6f5669..2c42799c 100644
--- a/src/host/osmocon/osmocon.c
+++ b/src/host/osmocon/osmocon.c
@@ -39,10 +39,10 @@
#include <sercomm.h>
-#include <osmocore/linuxlist.h>
-#include <osmocore/select.h>
-#include <osmocore/talloc.h>
-#include <osmocore/timer.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/select.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/timer.h>
#include <arpa/inet.h>
@@ -447,7 +447,7 @@ int read_file(const char *filename)
return 0;
-static void hexdump(const uint8_t *data, unsigned int len)
+static void osmocon_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);
- hexdump(data, len);
+ osmocon_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);
- hexdump(msg->data, msg->len);
+ osmocon_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: ");
- hexdump(bufptr, nbytes);
+ osmocon_hexdump(bufptr, nbytes);
} else {
for (i = 0; i < nbytes; ++i)
if (sercomm_drv_rx_char(bufptr[i]) == 0)