[PATCH] added missing param in call to gsm48_rx_bcch. added 'extern' to declarations of rsl_rlm_cause_strs and target_board. added several 'const' for strings. removed useless 'bufptr,' from hexdump.

itsme itsme at xs4all.nl
Sun Mar 21 21:28:13 UTC 2010


---
 src/host/gsm48-andreas/gsm48_rr.c                  |    2 +-
 src/host/layer23/include/osmocom/layer3.h          |    1 +
 src/host/layer23/src/rslms.c                       |    2 +-
 src/host/osmocon/osmocon.c                         |    6 +++---
 src/host/osmocon/osmoload.c                        |    2 +-
 .../libosmocore/include/osmocore/gsm_utils.h       |    2 +-
 src/shared/libosmocore/include/osmocore/rsl.h      |    2 +-
 src/shared/libosmocore/src/gsm_utils.c             |    2 +-
 src/target/firmware/include/board.h                |    2 +-
 9 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/host/gsm48-andreas/gsm48_rr.c b/src/host/gsm48-andreas/gsm48_rr.c
index c3227bf..f1dfc18 100644
--- a/src/host/gsm48-andreas/gsm48_rr.c
+++ b/src/host/gsm48-andreas/gsm48_rr.c
@@ -23,7 +23,7 @@
  * state transition
  */
 
-char *rr_state_names[] = {
+const char *rr_state_names[] = {
 	"IDLE",
 	"CONN PEND",
 	"DEDICATED",
diff --git a/src/host/layer23/include/osmocom/layer3.h b/src/host/layer23/include/osmocom/layer3.h
index 1b4af07..415b909 100644
--- a/src/host/layer23/include/osmocom/layer3.h
+++ b/src/host/layer23/include/osmocom/layer3.h
@@ -6,5 +6,6 @@
 
 int gsm48_rx_ccch(struct msgb *msg, struct osmocom_ms *ms);
 int gsm48_rx_dcch(struct msgb *msg, struct osmocom_ms *ms);
+int gsm48_rx_bcch(struct msgb *msg, struct osmocom_ms *ms);
 
 #endif
diff --git a/src/host/layer23/src/rslms.c b/src/host/layer23/src/rslms.c
index 509bb71..86079ac 100644
--- a/src/host/layer23/src/rslms.c
+++ b/src/host/layer23/src/rslms.c
@@ -76,7 +76,7 @@ static int rslms_rx_udata_ind(struct msgb *msg, struct osmocom_ms *ms)
 	if (rllh->chan_nr == RSL_CHAN_PCH_AGCH)
 		rc = gsm48_rx_ccch(msg, ms);
 	else if (rllh->chan_nr == RSL_CHAN_BCCH) {
-		rc = gsm48_rx_bcch(msg);
+		rc = gsm48_rx_bcch(msg, ms);
 		if (rach_count < 2) {
 			tx_ph_rach_req(ms);
 			rach_count++;
diff --git a/src/host/osmocon/osmocon.c b/src/host/osmocon/osmocon.c
index 82ff0e0..f934dd7 100644
--- a/src/host/osmocon/osmocon.c
+++ b/src/host/osmocon/osmocon.c
@@ -665,9 +665,9 @@ extern void hdlc_tpudbg_cb(uint8_t dlci, struct msgb *msg);
 int main(int argc, char **argv)
 {
 	int opt, flags;
-	char *serial_dev = "/dev/ttyUSB1";
-	char *layer2_un_path = "/tmp/osmocom_l2";
-	char *loader_un_path = "/tmp/osmocom_loader";
+	const char *serial_dev = "/dev/ttyUSB1";
+	const char *layer2_un_path = "/tmp/osmocom_l2";
+	const char *loader_un_path = "/tmp/osmocom_loader";
 
 	dnload.mode = MODE_C123;
 
diff --git a/src/host/osmocon/osmoload.c b/src/host/osmocon/osmoload.c
index 2ee0124..ecee8b3 100644
--- a/src/host/osmocon/osmoload.c
+++ b/src/host/osmocon/osmoload.c
@@ -39,7 +39,7 @@ static void hexdump(const uint8_t *data, unsigned int len)
 	const uint8_t *bufptr = data;
 	int n;
 
-	for (n=0; bufptr, n < len; n++, bufptr++)
+	for (n=0; n < len; n++, bufptr++)
 		printf("%02x ", *bufptr);
 	printf("\n");
 }
diff --git a/src/shared/libosmocore/include/osmocore/gsm_utils.h b/src/shared/libosmocore/include/osmocore/gsm_utils.h
index 2536045..c87e967 100644
--- a/src/shared/libosmocore/include/osmocore/gsm_utils.h
+++ b/src/shared/libosmocore/include/osmocore/gsm_utils.h
@@ -46,7 +46,7 @@ enum gsm_band {
 	GSM_BAND_810	= 0x80,
 };
 
-char *gsm_band_name(enum gsm_band band);
+const char *gsm_band_name(enum gsm_band band);
 enum gsm_band gsm_band_parse(const char *mhz);
 
 int gsm_7bit_decode(char *decoded, const uint8_t *user_data, uint8_t length);
diff --git a/src/shared/libosmocore/include/osmocore/rsl.h b/src/shared/libosmocore/include/osmocore/rsl.h
index 4c5f75b..c108081 100644
--- a/src/shared/libosmocore/include/osmocore/rsl.h
+++ b/src/shared/libosmocore/include/osmocore/rsl.h
@@ -16,7 +16,7 @@ uint8_t rsl_enc_chan_nr(uint8_t type, uint8_t subch, uint8_t timeslot);
 /* decode channel number as per Section 9.3.1 */
 int rsl_dec_chan_nr(uint8_t chan_nr, uint8_t *type, uint8_t *subch, uint8_t *timeslot);
 
-const struct value_string rsl_rlm_cause_strs[];
+extern const struct value_string rsl_rlm_cause_strs[];
 
 const char *rsl_err_name(uint8_t err);
 
diff --git a/src/shared/libosmocore/src/gsm_utils.c b/src/shared/libosmocore/src/gsm_utils.c
index 97497c8..593dd5c 100644
--- a/src/shared/libosmocore/src/gsm_utils.c
+++ b/src/shared/libosmocore/src/gsm_utils.c
@@ -193,7 +193,7 @@ uint8_t dbm2rxlev(int dbm)
 	return rxlev;
 }
 
-char *gsm_band_name(enum gsm_band band)
+const char *gsm_band_name(enum gsm_band band)
 {
 	switch (band) {
 	case GSM_BAND_450:
diff --git a/src/target/firmware/include/board.h b/src/target/firmware/include/board.h
index f6f073d..3635621 100644
--- a/src/target/firmware/include/board.h
+++ b/src/target/firmware/include/board.h
@@ -3,6 +3,6 @@
 
 void board_init(void);
 
-const char *target_board;
+extern const char *target_board;
 
 #endif /* _BOARD_H */
-- 
1.7.0


--------------090903020606000903000404--




More information about the baseband-devel mailing list