diff options
author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-04-26 02:55:30 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-04-26 02:55:30 +0200 |
commit | ade79a00838801dbcd95efd026d18b15eb1e1e3c (patch) | |
tree | 6b08d76dcee3abe022770fee6fd52b16d322c79e /src/target/firmware/comm | |
parent | f0059596a20bfa406a500ca5d6b34bf88d333ed3 (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
Makefile.am 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 <pablo@gnumonks.org>
Diffstat (limited to 'src/target/firmware/comm')
-rw-r--r-- | src/target/firmware/comm/msgb.c | 2 | ||||
-rw-r--r-- | src/target/firmware/comm/sercomm.c | 4 | ||||
-rw-r--r-- | src/target/firmware/comm/sercomm_cons.c | 2 | ||||
-rw-r--r-- | src/target/firmware/comm/timer.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/target/firmware/comm/msgb.c b/src/target/firmware/comm/msgb.c index d412844c..ff18e65b 100644 --- a/src/target/firmware/comm/msgb.c +++ b/src/target/firmware/comm/msgb.c @@ -26,7 +26,7 @@ #include <debug.h> #include <delay.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <calypso/backlight.h> diff --git a/src/target/firmware/comm/sercomm.c b/src/target/firmware/comm/sercomm.c index 0263f7d6..d7f60366 100644 --- a/src/target/firmware/comm/sercomm.c +++ b/src/target/firmware/comm/sercomm.c @@ -24,7 +24,7 @@ #include <stdio.h> #include <errno.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #ifdef HOST_BUILD #define SERCOMM_RX_MSG_SIZE 2048 @@ -39,7 +39,7 @@ #else #define SERCOMM_RX_MSG_SIZE 256 #include <debug.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <asm/system.h> #include <comm/sercomm.h> diff --git a/src/target/firmware/comm/sercomm_cons.c b/src/target/firmware/comm/sercomm_cons.c index 5d7842fb..987c9920 100644 --- a/src/target/firmware/comm/sercomm_cons.c +++ b/src/target/firmware/comm/sercomm_cons.c @@ -29,7 +29,7 @@ #include <calypso/uart.h> #include <console.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <comm/sercomm.h> #include <comm/sercomm_cons.h> diff --git a/src/target/firmware/comm/timer.c b/src/target/firmware/comm/timer.c index 9799cfc5..54abc793 100644 --- a/src/target/firmware/comm/timer.c +++ b/src/target/firmware/comm/timer.c @@ -20,7 +20,7 @@ #include <stdint.h> #include <debug.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <comm/timer.h> |