January 2011 - baseband-devel - lists.osmocom.org

Engagetted !

by Sébastien Lorquet

http://www.engadget.com/2010/12/29/researchers-eavesdrop-on-encrypted-gsm-c… Congrats!

6 months, 3 weeks

5
5
0 0

Receiving on TS=1 ?

by Sylvain Munaut

Hi, I've hacked something together to quickly test non-combined CCCH. However, I've hit a problem when trying to receive anything on another timeslot than 0. The TX side seems to work fine as the BTS can see my location update request and answers with a reject, but on the MS side, I never see the reject and wireshark only shows invalid incohrent data on the RX. The frames for SDCCH/8 show really nothing valid (looks like random bytes), things like 09 80 7f 47 49 06 1d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 09 00 47 d5 2d 06 1e 00 00 69 7c a0 91 3d 22 ff ab fe 6c 4f 56 4f 36 ... while the frames for the associated SAACH show at least something gsm-like : 03 03 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b but that's not quite a SI5/6 ... To RX/TX on TS=1, I just delayed the RX/TX window by 625 bits (4 * 156.25) when I'm in dedicated channel mode by chaning the 'start' in l1s_tx_win_ctrl / l1s_rx_win_ctrl Is there something else that should be done ? Cheers, Sylvain

11 years, 9 months

2
5
0 0

Use OsmocomBB as OpenBTS / airprobe clock generator

by Harald Welte

Hi! Recently we've had the idea of using OsmocomBB with a simple firmware that synchronizes to an existing GSM networks FCCH and use the resulting 13MHz clock to drive the USRP for airprobe or OpenBTS. Ideally, we would even use the Calypso-internal PLL (for ARM or DSP) to multiply it up to the required 52 MHz. However, neither the Openmoko nor the Compal/Motorola phones expose any of the 3 clock output pads :( So the only choice is to use something along the lines of the http://focus.ti.com/docs/prod/folders/print/cdcvf25084.html as a quad clock multiplier and attach it to the CLK13OUT signal of the phone. The chip is available for 9 USD in single quantities at digikey, and possibly cheaper at other sources. Combined with a sub-20EUR phone it might be a very cheap but still accurate frequency source for OpenBTS - at least as long as there are any commercial gsm networks available. Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

12 years, 1 month

8
17
0 0

Linux + u-boot port to MT6235

by Marcin Mielczarczyk

Hi All! That's true, I managed to run U-Boot on MT6235, but linux kernel is not fully functional yet (it's fresh stuff as I managed to ran it on Tuesday and then I was off to conference). For MT6235 development I chose Sciphone G2, which is pretty cheap. After some time I managed to download code to SRAM (just 64KB) using MTK's FlashTool. MTK FlashTool communicates over UART directly with MT6235 bootloader and sends its own chunk of code (about 58KB) which is executed in SRAM and communicates with FlashTool. I found on pudn.com some pack to customize code loaded by FlashTool, thanks to which I could download my own code to SRAM (without JTAG). The problem was that it had to be linked with some security libraries which occupied about 56KB and not much memory left for my own code. Then I decided to try find JTAG pins to get all control on MT6235. That took me sometime, but finally I succeeded. The other bigger issue was initializing DRAM controller to be able to download bigger code (linux kernel + uboot) to external RAM. In sciphone there is problem that all interesting chips are under metal shield which is pretty havily soldered. In this case I couldn't read what kind of RAM memory is mounted without destroying the board (I don't have such soldering machine which could unsolder so big metal shield). Thanks to JTAG I could attach to target and then dump DRAM controller registers from processor running MTK's software, but setting these values after processor start and configuration of PLL didn't work. I decided to disassemble bootloader which could show me how DRAM controller is initialized and how code fron NAND is loaded (to be able to flash U-Boot and kernel to NAND so MT6235 will start my code automatically and I will not have to use JTAG). Currently I have knowledge how internal MT6235 bootloader is loading code from memory during startup and I also extracted procedure of DRAM controller initialization. Thanks to that I'm able to run U-Boot from the very begining of processor startup. The problem is that I have just one piece of Sciphone G2 and I don't want to flash it yet to not break existing code in it. Thanks to running device I'm able to attach with JTAG and check how peripherals are configured (i.e. LCD, MMC, etc.). I have backup of flash, but I'm not 100% sure if I will flash it back, phone will startup. That's why I bought second piece of Sciphone G2 and should receive it today or on Tuesday (this Monday is holiday in Poland). In this case I'll flash U-Boot to NAND and try to make it working. Then we could load the rest of code from U-Boot (to RAM or NAND over serial). You can see how my setup looks on attached picture. The good thing about it is that the same bootloader is used in MT622x, so it should be fairly easy to do the same on phones based on that SoCs (but unfortuantely it's just ARM7). If it comes to code, of course I can share it on "git.osmocom.org". Currently it's just basic port of U-Boot and not much for linux kernel, but I'm working on this now so I'll push it when it'll be ready. Currently I'm working on driver for NAND memory for U-Boot, so we could flash linux kernel. When that will be ready I'll push the code. Then I'll switch to linux kernel and when it'll be functional I also push the code. At this stage you will not need to have JTAG and you could load the code over serial in U-Boot. If it comes to GSM I didn't work with it before. I actualy worked 6 months in L2/3 team for LTE (on RRC) but it's different story. That could be really outstanding thing if we could run first phone ever with whole code open (from BB up to APP). BR, Marcin

12 years, 4 months

13
37
0 0

Problems while building osmocomBB

by Begerad Stefan

Hi guys, I dunno if that is the right place for my concern about building the osmocomBB source. Here is what I already have done: - downloading the sources for osmocomBB and GNU toolchain for ARM, - setting the PATH for the arm-elf-* executables, - calling make in the src directory. Now, this appears as response of the make command in the terminal: cd shared/libosmocore/build-host && ../configure configure: error: cannot find install-sh, install.sh, or shtool in ".." "../.." "../../.." make: *** [shared/libosmocore/build-host/Makefile] Error 1. If you need details about my system, you can look at the following snippet from the config.log file: This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by libosmocore configure UNKNOWN, which was generated by GNU Autoconf 2.65. Invocation command line was $ ../configure ## --------- ## ## Platform. ## ## --------- ## hostname = ubuntu-stefan uname -m = x86_64 uname -r = 2.6.32-24-generic uname -s = Linux uname -v = #41-Ubuntu SMP Thu Aug 19 01:38:40 UTC 2010 /usr/bin/uname -p = unknown /bin/uname -X = unknown /bin/arch = unknown /usr/bin/arch -k = unknown /usr/convex/getsysinfo = unknown /usr/bin/hostinfo = unknown /bin/machine = unknown /usr/bin/oslevel = unknown /bin/universe = unknown PATH: /usr/local/sbin PATH: /usr/local/bin PATH: /usr/sbin PATH: /usr/bin PATH: /sbin PATH: /bin PATH: /usr/games PATH: /home/stefan/osmocomBB/gnuarm-4.0.2/bin ## ----------- ## ## Core tests. ## ## ----------- ## configure:2032: error: cannot find install-sh, install.sh, or shtool in ".." "../.." "../../..". So, I would be very glad, if someone could give me a hint to solve the problem. Thank you in advance. Regards, begy

12 years, 6 months

2
2
0 0

buzzer driver

by José Luis Pereira

Hi all, my name is Jose Pereira, and i'm very interested in helping you with some code! I've wrote the buzzer driver for calypso, not so sure if will help you of anything, but was just for experimenting :) Anyway, i send the patch in attachement. The interface can be simply #include <calypso/buzzer.h> buzzer_mode_pwt(1); buzzer_volume(40); buzzer_note(NOTE(NOTE_E,OCTAVE_5)); Please let me know what do you think of the code, and in what way i can further help. Best regards, -- José Pereira http://onaips.blogspot.com

13 years

2
1
0 0

Linux + u-boot port to MT6235

by Harald Welte

Hi All! At my OpenBSC / OsmocomBB talk here at the Embedded Linux Conference Europe, one of the attendees (Marcin, see Cc) came to me after the talk and told me he had recently done a u-boot and Linux kernel port to the MT6235 (that's the ARM926 based chipsets found in the touchscreen MTK phones). He said he has no understanding of GSM or the existing MTK firmware, but is interested in working together with us to try to make the GSM part work. I think that chipset is very intesting, as we could implement the layer1 inside the Linux kernel (and submit that mainline, yay!) and run our layer2 and layer3 implementations as userspace processes on the Linux system, together with the user interface. The performance of those devices should be somewhere between the Openmoko GTA01 and GTA02, and the GSM stack is certainly not going to eat away a lot of the CPU either. I have asked Marcin to write mail to the OsmocomBB mailing list on where we can find the code. He has so far downloaded the code using JTAG. Combining his code with our ramloader might remove that JTAG dependency... Marcin: if you want to push your u-boot / kernel to git.osmocom.org, or want a separate trac installation for your mtk-linux work, pleaes let me know, I'd be happy to host that. Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

13 years, 1 month

2
1
0 0

mobile: config file in /etc/osmocom/osmocom.cfg

by Harald Welte

Hi all, I would like to propose moving the config file into something like ~/.osmocom/ and not put it in a system wide directory. The path in /etc/ is the only part of OsmocomBB that requires root privileges, and I don't really think that in a case of multiple users you would want to e.g. share stuff like the IMSI / Ki anyway. What do you think? -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

13 years, 2 months

3
4
0 0

FCCH and SCH

by list_mailing

Hello, I'm newbie to osmocomm and GSM too....I'm studying the protocol and the source code...but I have many doubts...the first one is the following: 1. Which are the routines handling FCCH and SCH in osmocom source code? 2. When I load layer1 firmware and load mobile app, FCCH and SCH are automatically handled by this application? Sorry if my questions are stupid for you, but it's a litlle bit complicate moving in the code, above all for a newbie. Thanks in advance. -- View this message in context: http://baseband-devel.722152.n3.nabble.com/FCCH-and-SCH-tp2363201p2363201.h… Sent from the baseband-devel mailing list archive at Nabble.com.

13 years, 2 months

2
2
0 0

thinking about the sim

by Sébastien Lorquet

Hello, I was walking through trac while I came across this file: http://bb.osmocom.org/trac/browser/src/host/layer23/src/common/sim.c I see here: 183 /* send APDU to card reader */ 184 static int sim_apdu_send(struct osmocom_ms *ms, uint8_t *data, uint16_t length) 185 { 186 LOGP(DSIM, LOGL_INFO, "sending APDU (class 0x%02x, ins 0x%02x)\n", 187 data[0], data[1]); 188 l1ctl_tx_sim_req(ms, data, length); 189 return 0; 190 } ohoh, that's hardcoded. If we would like to have a software SIM, a SIM in a card reader on the PC, or a real sim in the MS, I think this would this be the correct place to plug a modular sim implementation. I mean something that looks like: struct osmocom_sim_ops { int (*sim_apdu_init)(.....); int (*sim_apdu_fini)(.....); void (*sim_op_reset)(.....); void (*sim_apdu_send)(.....); void (*sim_response_callback)(.....); }; void ms_register_sim_driver(struct osmocom_ms *ms, struct osmocom_sim_ops *ops); this could be a part of struct osmocom_ms. I would be easy to have 3 implementations: -sim in the mobile, using the current calls 'l1ctl_tx_sim_req' 'l1ctl_tx_sim_conf' -sim in PCSC using pcsclite or winscard, and a command-line option to select the reader (by index, by name, or first reader with a card inside for simple setups) -virtual sim using pure software What do you think about this? Regards Sebastien

13 years, 3 months

4
6
0 0

[PATCH] Two minor patches for the firmware

by Holger Freyther

Hi laf0rge, I was building the firmware with a GCC 4.5.2 created by Steve-m's script and had to include limits.h for UINT_MAX. While reading the code I stumbled across a typo... I think the patches can be picked to master as well. holger

13 years, 3 months

2
3
0 0

SIMtrace issues

by tsaitgaist

hi, I'll be listing some issues I found in SIMtrace. This is to warn future users. I don't have time now, but I intend to work on this project in 1 or 2 weeks and correct these bugs. 1. when starting host program simtrace, the firmware will first return ATR. This is an error if simtrace is started after the card has been reseted. The program should use the state of the reset and vcc lines to know the state. 2. when using a usb hub, having a lot of USB traffic, or poor USB signal quality (I don't know exactly), bulk read timeouts can occur in host program simtrace/at91sam7/host/main.c line 230: rc = usb_bulk_read(udev, SIMTRACE_IN_EP, buf, sizeof(buf), 100000); rc is -110 (REQUEST_TIMEOUT). I increased the timeout (100000) so to have less errors (but they still occur), and I ignore this error instead of exiting (tracing still works). 3. it seems simtrace can loose track of the I/O stream after some traffic. see pcsc_apdu.log to see the original, and simtrace_apdu.log for the captured traffic. in the end, simtrace misses: APDU: A0 C0 00 00 0F and does a wrong following APDU parsing The problem occurs when using a OmniKey CardMan 5321 and Alcor Micro AU9520. Thus the reader should not be the origin. Also, if only the command where the error occurs is sent, no bytes are skipped. But another error occurs (see next bug) 4. when executing only the last commands, then it is wrongly interpreted (as ATR), but no bytes are skipped ATR (12): 3b 0a 41 00 3f 43 00 01 50 29 01 02 ATR (66): a0 a4 00 00 02 a4 7f 20 9f 17 a0 a4 00 00 02 a4 6f ad 9f 0f a0 c0 00 00 0f c0 00 00 00 03 6f ad 04 00 04 f0 44 01 02 00 00 90 00 a0 b0 00 00 03 b0 00 00 00 90 00 3b 0a 41 00 3f 43 00 01 50 29 01 02 I already wrote a SIM traffic parser for the PC before simtrace appeared. I used a logic analyzer to record the traffic. I will integrate the ATR and APDU parsing/checking into the simtrace firmware. Wrong recorded traffic will be discarded instead of affecting the rest of the parsing. thanks, kevin

13 years, 3 months

3
3
0 0

osmocomSIM

by tsaitgaist

Hi, how about opening the sub-project osmocomSIM ? This could include: - SIMtrace from Harald - SAP server from Andreas - SIM on javacard from Sébastien - future software/virtual SIM which could use SAP server - speaking about A38, Ki, SIM features, ... kevin

13 years, 3 months

2
2
0 0

What I am doing wrong? G2

by Панфилов Дмитрий

Hi! So, I decide to play with my G2 SciPhone (My phone has configuration as follows: 512Mb (64MB) NAND + 32MB RAM) But I could not run U-Boot... The first step seems to be good. I run Osmocon and download "loader" to the phone. I got "Running on mt62xx in environment mtkram HW_CODE = 0x6235" message. After executing $ ./osmoload memload 0x500000 u-boot.bin I can see progress and successfull download of u-boot.bin First of all I tried to use u-boot from here http://downloads.qi-hardware.com/people/marcin/g2_uboot.bin (http://downloads.qi-hardware.com/people/marcin/g2_uboot.bin) Executing $ ./osmoload jump 0x500000 leads to... nothing. I can see black screen. That's all. Also I compilled u-boot from git using toolchain kindly given by Andrew :-) $ ./osmoload jump 0x500000 leads to gray screen after flashing white for a moment. It looks like wrong LCD controller or driver. So... The simple question. What I am doing wrong? :)

13 years, 3 months

1
0
0 0

[PATCH 2/2] typo: Fix typo, transform reqyests to requests.

by Holger Hans Peter Freyther

--- firmware/src/pcd/main_dumbreader.c | 2 +- firmware/src/pcd/main_hid.c | 2 +- firmware/src/pcd/main_presence.c | 2 +- firmware/src/pcd/main_pwm.c | 2 +- firmware/src/pcd/main_usb.c | 2 +- firmware/src/picc/main_openpicc.c | 2 +- firmware/src/simtrace/main_simtrace.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/firmware/src/pcd/main_dumbreader.c b/firmware/src/pcd/main_dumbreader.c index 62695f0..9c8dd13 100644 --- a/firmware/src/pcd/main_dumbreader.c +++ b/firmware/src/pcd/main_dumbreader.c @@ -88,7 +88,7 @@ void _main_func(void) /* first we try to get rid of pending to-be-sent stuff */ usb_out_process(); - /* next we deal with incoming reqyests from USB EP1 (OUT) */ + /* next we deal with incoming requests from USB EP1 (OUT) */ usb_in_process(); rc632_unthrottle(); diff --git a/firmware/src/pcd/main_hid.c b/firmware/src/pcd/main_hid.c index 9735c3d..c9d8fd1 100644 --- a/firmware/src/pcd/main_hid.c +++ b/firmware/src/pcd/main_hid.c @@ -50,7 +50,7 @@ void _main_func(void) /* first we try to get rid of pending to-be-sent stuff */ usb_out_process(); - /* next we deal with incoming reqyests from USB EP1 (OUT) */ + /* next we deal with incoming requests from USB EP1 (OUT) */ usb_in_process(); /* try unthrottling sources since we now are [more] likely to diff --git a/firmware/src/pcd/main_presence.c b/firmware/src/pcd/main_presence.c index f61878f..4ead264 100644 --- a/firmware/src/pcd/main_presence.c +++ b/firmware/src/pcd/main_presence.c @@ -157,7 +157,7 @@ void _main_func(void) /* first we try to get rid of pending to-be-sent stuff */ usb_out_process(); - /* next we deal with incoming reqyests from USB EP1 (OUT) */ + /* next we deal with incoming requests from USB EP1 (OUT) */ usb_in_process(); rc632_unthrottle(); } diff --git a/firmware/src/pcd/main_pwm.c b/firmware/src/pcd/main_pwm.c index 7db6b72..50fd363 100644 --- a/firmware/src/pcd/main_pwm.c +++ b/firmware/src/pcd/main_pwm.c @@ -262,7 +262,7 @@ void _main_func(void) /* first we try to get rid of pending to-be-sent stuff */ usb_out_process(); - /* next we deal with incoming reqyests from USB EP1 (OUT) */ + /* next we deal with incoming requests from USB EP1 (OUT) */ usb_in_process(); /* try unthrottling sources since we now are [more] likely to diff --git a/firmware/src/pcd/main_usb.c b/firmware/src/pcd/main_usb.c index fcd3306..7892e77 100644 --- a/firmware/src/pcd/main_usb.c +++ b/firmware/src/pcd/main_usb.c @@ -35,7 +35,7 @@ void _main_func(void) /* first we try to get rid of pending to-be-sent stuff */ usb_out_process(); - /* next we deal with incoming reqyests from USB EP1 (OUT) */ + /* next we deal with incoming requests from USB EP1 (OUT) */ usb_in_process(); /* try unthrottling sources since we now are [more] likely to diff --git a/firmware/src/picc/main_openpicc.c b/firmware/src/picc/main_openpicc.c index 74700f8..93ca4b6 100644 --- a/firmware/src/picc/main_openpicc.c +++ b/firmware/src/picc/main_openpicc.c @@ -251,7 +251,7 @@ void _main_func(void) /* first we try to get rid of pending to-be-sent stuff */ usb_out_process(); - /* next we deal with incoming reqyests from USB EP1 (OUT) */ + /* next we deal with incoming requests from USB EP1 (OUT) */ usb_in_process(); udp_unthrottle(); diff --git a/firmware/src/simtrace/main_simtrace.c b/firmware/src/simtrace/main_simtrace.c index 5e4302e..740d35d 100644 --- a/firmware/src/simtrace/main_simtrace.c +++ b/firmware/src/simtrace/main_simtrace.c @@ -95,7 +95,7 @@ void _main_func(void) /* first we try to get rid of pending to-be-sent stuff */ usb_out_process(); - /* next we deal with incoming reqyests from USB EP1 (OUT) */ + /* next we deal with incoming requests from USB EP1 (OUT) */ usb_in_process(); udp_unthrottle(); -- 1.7.3.5 --------------090305060903020708070409--

13 years, 3 months

1
0
0 0

[PATCH 1/2] vsprintf.c: Fix compilation by including limits.h

by Holger Hans Peter Freyther

The INT_MAX define was not known to this code with a GCC 4.5.2/binutils 2.21/newlib 1.19.0 toolchain as build for osmocomBB. Include limits.h to fix that. --- firmware/lib/vsprintf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/firmware/lib/vsprintf.c b/firmware/lib/vsprintf.c index 5da7c02..799eb78 100644 --- a/firmware/lib/vsprintf.c +++ b/firmware/lib/vsprintf.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <limits.h> #include <sys/types.h> #include <string.h> #include <asm/ctype.h> -- 1.7.3.5 --------------090305060903020708070409 Content-Type: text/x-patch; name="0002-typo-Fix-typo-transform-reqyests-to-requests.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0002-typo-Fix-typo-transform-reqyests-to-requests.patch"

13 years, 3 months

1
0
0 0

Reading / sending SMS

by Bogdan Alecu

Hello, Has anyone managed to read (receive) or to send an SMS to Osmocom phone? I haven't found any vty command that would allow this. Also if I send an SMS to Osmocom the phone starts a location update every 1 minute or so and on the phone that sent the message I get the non-delivery report. Could someone give me some tips on how to send/receive SMS?

13 years, 3 months

2
1
0 0

track ticket

by tsaitgaist

Hi, Could it be possible to enable the ticket system in trac ? It could be used to add suggestions/bugs/todo/..., avoid overloading the mailing list, and keep trac of them. For example, how about changing the mobile welcome message from: Welcome to the OpenBSC Control interface to: Welcome to the osmocom Control interface it makes more sense when using osmocomBB. thanks, kevin

13 years, 3 months

4
4
0 0

Re: Channel info

by Bogdan Alecu

When I look in the output of the mobile app I see that IMSI paging goes almos up to 50%. It's almost like for every TMSI I get below a IMSI paging. That's why I asked from the beginning because I get a lot of IMSI there.

13 years, 3 months

1
0
0 0

Re: Channel info

by Bogdan Alecu

When I look in the output of the mobile app I see that IMSI paging goes almos up to 50%. It's almost like for every TMSI I get below a IMSI paging. That's why I asked from the beginning because I get a lot of IMSI there.

13 years, 3 months

2
2
0 0

[RFC] simplify intra-mobile event passing

by Harald Welte

Hi! I've been playing with some code earlier today, trying to reuse the RR implementation of 'mobile' but without 'MM' and '03.22' code. Next step was to play with RR+MM but without 03.22. Both were not that easy to do, given the various different function calls between those modules. While trying to resolve it, I discovered that we have many sequences like gsm322_msgb_alloc() followed by some error checking and a final gsm322_plmn_senmsg(). Similar pattersn could be seen for gsm48_mmevent. I've tried to simplify/unify this code a bit, as you can see from the attached patches (also in laforge/mobile_event branch). It's not tested yet, but I would like to get some comments on it. Initially I thought to use libosmocore signal code, but then signals are _emitted_, and they don't fit the picture where we have some incoming events into e.g. 03.22 code - as all the events are already labelled GSM322 and thus by the recipient, not its originator. So now there is one gsm322_event_input() and a gsm48_mmevent_input() function each. Somebody who wants to reuse partial 'mobile' code can simply provide stub functions for either one of those (or both)... The goal of this exercise is to have a tool that can open a dedicated channel to a user-specified cell and then send user-specified messages while optionally taking care of loc upd / auth / ciphering in order to make the network happy. Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

13 years, 3 months

1
0
0 0

[PATCH 3/3] [mobile] introduce and use gsm48_mmevevent_input()

by Harald Welte

... instead of using sequences of gsm48_mmevent_msgb_alloc() followed by gsm48_mmevent_msg() --- .../layer23/include/osmocom/bb/mobile/gsm48_mm.h | 4 +- src/host/layer23/src/mobile/app_mobile.c | 5 +-- src/host/layer23/src/mobile/gsm322.c | 41 +++----------------- src/host/layer23/src/mobile/gsm48_mm.c | 41 ++++++++++++-------- src/host/layer23/src/mobile/gsm48_rr.c | 6 +-- src/host/layer23/src/mobile/subscriber.c | 31 +++------------ 6 files changed, 41 insertions(+), 87 deletions(-) diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h index 447dc95..c141d5c 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h @@ -210,8 +210,8 @@ struct gsm48_mm_conn { int gsm48_mm_init(struct osmocom_ms *ms); int gsm48_mm_exit(struct osmocom_ms *ms); struct msgb *gsm48_mmr_msgb_alloc(int msg_type); -struct msgb *gsm48_mmevent_msgb_alloc(int msg_type); -int gsm48_mmevent_msg(struct osmocom_ms *ms, struct msgb *msg); +int gsm48_mmevent_input(struct osmocom_ms *ms, int msg_type, + const uint8_t *data, unsigned int len); int gsm48_mmr_downmsg(struct osmocom_ms *ms, struct msgb *msg); int gsm48_rr_dequeue(struct osmocom_ms *ms); int gsm48_mmxx_dequeue(struct osmocom_ms *ms); diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index b3c3284..4e6a803 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -124,10 +124,7 @@ int mobile_exit(struct osmocom_ms *ms, int force) struct msgb *nmsg; ms->shutdown = 1; /* going down */ - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_IMSI_DETACH); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(mm->ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_IMSI_DETACH, NULL, 0); return -EBUSY; } diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 3243afc..60b24cb 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -1174,17 +1174,12 @@ static int gsm322_a_hplmn_search_start(struct osmocom_ms *ms, struct msgb *msg) /* manual mode selected */ static int gsm322_a_sel_manual(struct osmocom_ms *ms, struct msgb *msg) { - struct msgb *nmsg; - /* restart state machine */ gsm322_a_switch_off(ms, msg); ms->settings.plmn_mode = PLMN_MODE_MANUAL; gsm322_m_switch_on(ms, msg); - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_USER_PLMN_SEL); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_USER_PLMN_SEL, NULL, 0); return 0; } @@ -1461,17 +1456,12 @@ static int gsm322_m_choose_plmn(struct osmocom_ms *ms, struct msgb *msg) /* auto mode selected */ static int gsm322_m_sel_auto(struct osmocom_ms *ms, struct msgb *msg) { - struct msgb *nmsg; - /* restart state machine */ gsm322_m_switch_off(ms, msg); ms->settings.plmn_mode = PLMN_MODE_AUTO; gsm322_a_switch_on(ms, msg); - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_USER_PLMN_SEL); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_USER_PLMN_SEL, NULL, 0); return 0; } @@ -2684,14 +2674,8 @@ static int gsm322_c_any_cell_sel(struct osmocom_ms *ms, struct msgb *msg) /* after re-selection, indicate no cell found */ if (cs->state == GSM322_C6_ANY_CELL_SEL || cs->state == GSM322_C8_ANY_CELL_RESEL) { - struct msgb *nmsg; - /* tell that we have no cell found */ - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_NO_CELL_FOUND); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(ms, nmsg); - + gsm48_mmevent_input(ms, GSM48_MM_EVENT_NO_CELL_FOUND, NULL, 0); } else { new_c_state(cs, GSM322_C6_ANY_CELL_SEL); } @@ -2737,7 +2721,6 @@ static int gsm322_c_any_cell_resel(struct osmocom_ms *ms, struct msgb *msg) static int gsm322_c_camp_normally(struct osmocom_ms *ms, struct msgb *msg) { struct gsm322_cellsel *cs = &ms->cellsel; - struct msgb *nmsg; LOGP(DSUM, LOGL_INFO, "Camping normally on cell (arfcn=%d mcc=%s " "mnc=%s %s, %s)\n", cs->sel_arfcn, gsm_print_mcc(cs->sel_mcc), @@ -2745,10 +2728,7 @@ static int gsm322_c_camp_normally(struct osmocom_ms *ms, struct msgb *msg) gsm_get_mnc(cs->sel_mcc, cs->sel_mnc)); /* tell that we have selected a (new) cell */ - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_CELL_SELECTED); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_CELL_SELECTED, NULL, 0); new_c_state(cs, GSM322_C3_CAMPED_NORMALLY); @@ -2759,7 +2739,6 @@ static int gsm322_c_camp_normally(struct osmocom_ms *ms, struct msgb *msg) static int gsm322_c_camp_any_cell(struct osmocom_ms *ms, struct msgb *msg) { struct gsm322_cellsel *cs = &ms->cellsel; - struct msgb *nmsg; LOGP(DSUM, LOGL_INFO, "Camping on any cell (arfcn=%d mcc=%s " "mnc=%s %s, %s)\n", cs->sel_arfcn, gsm_print_mcc(cs->sel_mcc), @@ -2768,10 +2747,7 @@ static int gsm322_c_camp_any_cell(struct osmocom_ms *ms, struct msgb *msg) /* tell that we have selected a (new) cell */ - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_CELL_SELECTED); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_CELL_SELECTED, NULL, 0); new_c_state(cs, GSM322_C7_CAMPED_ANY_CELL); @@ -2878,8 +2854,6 @@ static int gsm322_c_choose_cell(struct osmocom_ms *ms, struct msgb *msg) /* After location updating, we choose the last cell */ if (gm->same_cell) { - struct msgb *nmsg; - if (!cs->selected) { printf("No cell selected when ret.idle, please fix!\n"); exit(0L); @@ -2896,10 +2870,7 @@ static int gsm322_c_choose_cell(struct osmocom_ms *ms, struct msgb *msg) new_c_state(cs, GSM322_C3_CAMPED_NORMALLY); /* tell that we have selected the cell, so RR returns IDLE */ - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_CELL_SELECTED); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_CELL_SELECTED, NULL, 0); return 0; } diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 4652f34..6400373 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -658,7 +658,7 @@ struct msgb *gsm48_mmxx_msgb_alloc(int msg_type, uint32_t ref, } /* allocate MM event message */ -struct msgb *gsm48_mmevent_msgb_alloc(int msg_type) +static struct msgb *gsm48_mmevent_msgb_alloc(int msg_type) { struct msgb *msg; struct gsm48_mm_event *mme; @@ -710,7 +710,7 @@ int gsm48_mmr_downmsg(struct osmocom_ms *ms, struct msgb *msg) } /* queue MM event message */ -int gsm48_mmevent_msg(struct osmocom_ms *ms, struct msgb *msg) +static int gsm48_mmevent_msg(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; @@ -905,14 +905,10 @@ static void new_mm_state(struct gsm48_mmlayer *mm, int state, int substate) /* resend detach event, if flag is set */ if (state == GSM48_MM_ST_MM_IDLE && mm->delay_detach) { - struct msgb *nmsg; - mm->delay_detach = 0; - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_IMSI_DETACH); - if (!nmsg) - return; - gsm48_mmevent_msg(mm->ms, nmsg); + gsm48_mmevent_input(mm->ms, GSM48_MM_EVENT_IMSI_DETACH, + NULL, 0); } /* 4.4.2 start T3212 in MM IDLE mode if not started or has expired */ @@ -2431,7 +2427,8 @@ static int gsm48_mm_rel_loc_upd_rej(struct osmocom_ms *ms, struct msgb *msg) } memset(&ngm, 0, sizeof(ngm)); ngm.reject = mm->lupd_rej_cause; - gsm322_event_input(ms, GSM322_EVT_PLMN, msg_type, &ngm, sizeof(ngm)); + gsm322_event_input(ms, GSM322_EVT_PLMN, msg_type, + (uint8_t *)&ngm, sizeof(ngm)); /* forbidden list */ switch (mm->lupd_rej_cause) { @@ -4088,13 +4085,7 @@ static int gsm48_mmr_reg_req(struct osmocom_ms *ms) /* trigger detach of sim card */ static int gsm48_mmr_nreg_req(struct osmocom_ms *ms) { - struct gsm48_mmlayer *mm = &ms->mmlayer; - struct msgb *nmsg; - - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_IMSI_DETACH); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(mm->ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_IMSI_DETACH, NULL, 0); return 0; } @@ -4121,4 +4112,22 @@ static int gsm48_rcv_mmr(struct osmocom_ms *ms, struct msgb *msg) return rc; } +int gsm48_mmevent_input(struct osmocom_ms *ms, int msg_type, + const uint8_t *data, unsigned int len) +{ + struct msgb *nmsg = gsm48_mmevent_msgb_alloc(msg_type); + int rc; + + if (!nmsg) + return -ENOMEM; + if (data && len) { + uint8_t *cur = msgb_push(nmsg, len); + if (!cur) { + msgb_free(nmsg); + return -EIO; + } + memcpy(cur, data, len); + } + return gsm48_mmevent_msg(ms, nmsg); +} diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 177b272..afb53cb 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -1560,7 +1560,6 @@ fail: static int gsm48_new_sysinfo(struct osmocom_ms *ms, uint8_t type) { struct gsm48_sysinfo *s = ms->cellsel.si; - struct msgb *nmsg; struct gsm322_msg em; /* update list of measurements, if BA(SACCH) is complete and new */ @@ -1600,10 +1599,7 @@ static int gsm48_new_sysinfo(struct osmocom_ms *ms, uint8_t type) (uint8_t *)&em, sizeof(em)); /* send timer info to location update process */ - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_SYSINFO); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_SYSINFO, NULL, 0); return 0; } diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 3ba78f3..24d7f94 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -855,25 +855,16 @@ int gsm_subscr_generate_kc(struct osmocom_ms *ms, uint8_t key_seq, if ((subscr->sim_type != GSM_SIM_TYPE_READER && subscr->sim_type != GSM_SIM_TYPE_TEST) || !subscr->sim_valid || no_sim) { - struct gsm48_mm_event *nmme; + uint8_t dummy_sres[4] = { 0x12, 0x34, 0x56, 0x78 }; LOGP(DMM, LOGL_INFO, "Sending dummy authentication response\n"); - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_AUTH_RESPONSE); - if (!nmsg) - return -ENOMEM; - nmme = (struct gsm48_mm_event *) nmsg->data; - nmme->sres[0] = 0x12; - nmme->sres[1] = 0x34; - nmme->sres[2] = 0x56; - nmme->sres[3] = 0x78; - gsm48_mmevent_msg(ms, nmsg); - + gsm48_mmevent_input(ms, GSM48_MM_EVENT_AUTH_RESPONSE, + dummy_sres, sizeof(dummy_sres)); return 0; } /* test SIM */ if (subscr->sim_type == GSM_SIM_TYPE_TEST) { - struct gsm48_mm_event *nmme; uint8_t sres[4]; struct gsm_settings *set = &ms->settings; @@ -885,12 +876,8 @@ int gsm_subscr_generate_kc(struct osmocom_ms *ms, uint8_t key_seq, subscr->key_seq = key_seq; LOGP(DMM, LOGL_INFO, "Sending authentication response\n"); - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_AUTH_RESPONSE); - if (!nmsg) - return -ENOMEM; - nmme = (struct gsm48_mm_event *) nmsg->data; - memcpy(nmme->sres, sres, 4); - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_AUTH_RESPONSE, + sres, sizeof(sres)); return 0; } @@ -924,7 +911,6 @@ static void subscr_sim_key_cb(struct osmocom_ms *ms, struct msgb *msg) uint16_t payload_len = msg->len - sizeof(*sh); struct msgb *nmsg; struct sim_hdr *nsh; - struct gsm48_mm_event *nmme; uint8_t *data; /* error handling */ @@ -961,12 +947,7 @@ static void subscr_sim_key_cb(struct osmocom_ms *ms, struct msgb *msg) sim_job(ms, nmsg); /* return signed response */ - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_AUTH_RESPONSE); - if (!nmsg) - return; - nmme = (struct gsm48_mm_event *) nmsg->data; - memcpy(nmme->sres, payload, 4); - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_AUTH_RESPONSE, payload, 4); msgb_free(msg); } -- 1.7.2.3 --Kj7319i9nmIyA2yE--

13 years, 3 months

1
0
0 0

[PATCH 2/3] [mobile] replace 3 different gsm322_makesend_* functions with one

by Harald Welte

The new function is gsm322_event_input() and uses the event type as a function argument. --- .../layer23/include/osmocom/bb/mobile/gsm322.h | 12 +++- src/host/layer23/src/mobile/app_mobile.c | 8 ++-- src/host/layer23/src/mobile/gsm322.c | 56 +++++--------------- src/host/layer23/src/mobile/gsm48_mm.c | 34 +++++++----- src/host/layer23/src/mobile/gsm48_rr.c | 9 ++-- src/host/layer23/src/mobile/vty_interface.c | 9 ++-- 6 files changed, 57 insertions(+), 71 deletions(-) diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm322.h b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h index 3cd275f..30d96ee 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm322.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h @@ -32,6 +32,13 @@ #define GSM322_PLMN_SEARCH 10 #define GSM322_HPLMN_SEARCH 11 +/* GSM 03.22 event types */ +enum gsm322_evt_type { + GSM322_EVT_C, /* direct cell event, no queue */ + GSM322_EVT_CS, /* enqueue cs->event_queue */ + GSM322_EVT_PLMN, /* enqueue plmn->event_queue */ +}; + /* GSM 03.22 events */ #define GSM322_EVENT_SWITCH_ON 1 #define GSM322_EVENT_SWITCH_OFF 2 @@ -172,9 +179,8 @@ struct gsm322_msg { int gsm322_init(struct osmocom_ms *ms); int gsm322_exit(struct osmocom_ms *ms); -int gsm322_makesend_plmn_msg(struct osmocom_ms *ms, int msg_type, uint8_t *data, unsigned int len); -int gsm322_makesend_cs_event(struct osmocom_ms *ms, int msg_type, uint8_t *data, unsigned int len); -int gsm322_makesend_c_event(struct osmocom_ms *ms, int msg_type, uint8_t *data, unsigned int len); +int gsm322_event_input(struct osmocom_ms *ms, enum gsm322_evt_type type, + int msg_type, uint8_t *data, unsigned int len); int gsm322_plmn_dequeue(struct osmocom_ms *ms); int gsm322_cs_dequeue(struct osmocom_ms *ms); int gsm322_add_forbidden_la(struct osmocom_ms *ms, uint16_t mcc, diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 3d2100c..b3c3284 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -104,10 +104,10 @@ int mobile_signal_cb(unsigned int subsys, unsigned int signal, break; default: /* no SIM, trigger PLMN selection process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_SWITCH_ON, - NULL, 0); - gsm322_makesend_cs_event(ms, GSM322_EVENT_SWITCH_ON, - NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_SWITCH_ON, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_CS, + GSM322_EVENT_SWITCH_ON, NULL, 0); } ms->started = 1; diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 1429737..3243afc 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -3604,8 +3604,8 @@ int gsm322_exit(struct osmocom_ms *ms) return 0; } -int gsm322_makesend_c_event(struct osmocom_ms *ms, int msg_type, - uint8_t *data, unsigned int len) +int gsm322_event_input(struct osmocom_ms *ms, enum gsm322_evt_type type, + int msg_type, uint8_t *data, unsigned int len) { struct msgb *nmsg = gsm322_msgb_alloc(msg_type); int rc; @@ -3621,46 +3621,18 @@ int gsm322_makesend_c_event(struct osmocom_ms *ms, int msg_type, } memcpy(cur, data, len); } - rc = gsm322_c_event(ms, nmsg); - msgb_free(nmsg); - - return rc; -} - -int gsm322_makesend_cs_event(struct osmocom_ms *ms, int msg_type, - uint8_t *data, unsigned int len) -{ - struct msgb *nmsg = gsm322_msgb_alloc(msg_type); - - if (!nmsg) - return -ENOMEM; - - if (data && len) { - uint8_t *cur = msgb_push(nmsg, len); - if (!cur) { - msgb_free(nmsg); - return -EIO; - } - memcpy(cur, data, len); + switch (type) { + case GSM322_EVT_C: + rc = gsm322_c_event(ms, nmsg); + msgb_free(nmsg); + break; + case GSM322_EVT_CS: + rc = gsm322_cs_sendmsg(ms, nmsg); + break; + case GSM322_EVT_PLMN: + rc = gsm322_plmn_sendmsg(ms, nmsg); + break; } - return gsm322_cs_sendmsg(ms, nmsg); -} - -int gsm322_makesend_plmn_msg(struct osmocom_ms *ms, int msg_type, - uint8_t *data, unsigned int len) -{ - struct msgb *nmsg = gsm322_msgb_alloc(msg_type); - - if (!nmsg) - return -ENOMEM; - if (data && len) { - uint8_t *cur = msgb_push(nmsg, len); - if (!cur) { - msgb_free(nmsg); - return -EIO; - } - memcpy(cur, data, len); - } - return gsm322_plmn_sendmsg(ms, nmsg); + return rc; } diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 58253bd..4652f34 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -1123,8 +1123,8 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) GSM48_MM_SST_NORMAL_SERVICE); /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, - NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_REG_SUCCESS, NULL, 0); return 0; } if (!s->att_allowed) { @@ -1133,8 +1133,8 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) GSM48_MM_SST_NORMAL_SERVICE); /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, - NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_REG_SUCCESS, NULL, 0); return 0; } /* else, continue */ @@ -1150,8 +1150,8 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) GSM48_MM_SST_LIMITED_SERVICE); /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_ROAMING_NA, - NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_ROAMING_NA, NULL, 0); return 0; } @@ -1165,7 +1165,8 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) GSM48_MM_SST_LIMITED_SERVICE); /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_FAILED, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_REG_FAILED, NULL, 0); return 0; } @@ -1733,7 +1734,8 @@ static int gsm48_mm_imsi_detach_end(struct osmocom_ms *ms, struct msgb *msg) } /* send SIM remove event to gsm322 */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_SIM_REMOVE, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_SIM_REMOVE, NULL, 0); /* CS process will trigger return to MM IDLE / No SIM */ return 0; @@ -1993,7 +1995,7 @@ static int gsm48_mm_loc_upd(struct osmocom_ms *ms, struct msgb *msg) _stop: mm->lupd_pending = 0; /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, msg_type, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, msg_type, NULL, 0); return 0; } @@ -2062,7 +2064,8 @@ static int gsm48_mm_loc_upd_normal(struct osmocom_ms *ms, struct msgb *msg) LOGP(DMM, LOGL_INFO, "Loc. upd. not allowed.\n"); /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_FAILED, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_REG_FAILED, NULL, 0); return 0; } @@ -2083,7 +2086,8 @@ static int gsm48_mm_loc_upd_normal(struct osmocom_ms *ms, struct msgb *msg) GSM48_MM_SST_NORMAL_SERVICE); /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_REG_SUCCESS, NULL, 0); return 0; } @@ -2318,7 +2322,8 @@ static int gsm48_mm_rx_loc_upd_acc(struct osmocom_ms *ms, struct msgb *msg) } /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_REG_SUCCESS, NULL, 0); /* follow on proceed */ if (TLVP_PRESENT(&tp, GSM48_IE_MOBILE_ID)) @@ -2426,7 +2431,7 @@ static int gsm48_mm_rel_loc_upd_rej(struct osmocom_ms *ms, struct msgb *msg) } memset(&ngm, 0, sizeof(ngm)); ngm.reject = mm->lupd_rej_cause; - gsm322_makesend_plmn_msg(ms, msg_type, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, msg_type, &ngm, sizeof(ngm)); /* forbidden list */ switch (mm->lupd_rej_cause) { @@ -4068,7 +4073,8 @@ static int gsm48_mmr_reg_req(struct osmocom_ms *ms) struct gsm48_mmlayer *mm = &ms->mmlayer; /* schedule insertion of SIM */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_SIM_INSERT, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_SIM_INSERT, NULL, 0); /* 4.2.1.2 SIM is inserted in state NO IMSI */ if (mm->state == GSM48_MM_ST_MM_IDLE diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 4a48dc8..177b272 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -408,8 +408,8 @@ static void new_rr_state(struct gsm48_rrlayer *rr, int state) memset(&em, 0, sizeof(em)); em.same_cell = 1; } - gsm322_makesend_c_event(rr->ms, GSM322_EVENT_RET_IDLE, - (uint8_t *)&em, sizeof(em)); + gsm322_event_input(rr->ms, GSM322_EVT_C, GSM322_EVENT_RET_IDLE, + (uint8_t *)&em, sizeof(em)); /* reset any BA range */ rr->ba_ranges = 0; } @@ -1189,7 +1189,8 @@ static int gsm48_rr_chan_req(struct osmocom_ms *ms, int cause, int paging) * NOTE: this must be sent unbuffered, because the state may not * change until idle mode is left */ - rc = gsm322_makesend_c_event(ms, GSM322_EVENT_LEAVE_IDLE, NULL, 0); + rc = gsm322_event_input(ms, GSM322_EVT_C, GSM322_EVENT_LEAVE_IDLE, + NULL, 0); if (rc) { if (paging) return rc; @@ -1595,7 +1596,7 @@ static int gsm48_new_sysinfo(struct osmocom_ms *ms, uint8_t type) /* send sysinfo event to other layers */ memset(&em, 0, sizeof(em)); em.sysinfo = type; - gsm322_makesend_cs_event(ms, GSM322_EVENT_SYSINFO, + gsm322_event_input(ms, GSM322_EVT_CS, GSM322_EVENT_SYSINFO, (uint8_t *)&em, sizeof(em)); /* send timer info to location update process */ diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index e3e7c47..d83dae8 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -689,8 +689,8 @@ DEFUN(network_select, network_select_cmd, "network select MS_NAME MCC MNC", memset(&ngm, 0, sizeof(ngm)); ngm.mcc = mcc; ngm.mnc = mnc; - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_CHOOSE_PLMN, - (uint8_t *)&ngm, sizeof(ngm)); + gsm322_event_input(ms, GSM322_EVT_PLMN, GSM322_EVENT_CHOOSE_PLMN, + (uint8_t *)&ngm, sizeof(ngm)); return CMD_SUCCESS; } @@ -820,7 +820,8 @@ DEFUN(network_search, network_search_cmd, "network search MS_NAME", if (!ms) return CMD_WARNING; - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_USER_RESEL, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_USER_RESEL, NULL, 0); return CMD_SUCCESS; } @@ -1265,7 +1266,7 @@ DEFUN(cfg_ms_mode, cfg_ms_mode_cmd, "network-selection-mode (auto|manual)", msg_type = GSM322_EVENT_SEL_MANUAL; if (msg_type < 0) return CMD_WARNING; - gsm322_makesend_plmn_msg(ms, msg_type, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, msg_type, NULL, 0); return CMD_SUCCESS; } -- 1.7.2.3 --Kj7319i9nmIyA2yE Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0003-mobile-introduce-and-use-gsm48_mmevevent_input.patch"

13 years, 3 months

1
0
0 0

[PATCH 1/3] [mobile] simplify code to send events into GSM 3.22 code

by Harald Welte

instead of gsm322_msgb_alloc() followed by a sendmsg with intermittent error checks we now have only a single function call. --- .../layer23/include/osmocom/bb/mobile/gsm322.h | 7 +- src/host/layer23/src/mobile/app_mobile.c | 13 +-- src/host/layer23/src/mobile/gsm322.c | 69 ++++++++++++++- src/host/layer23/src/mobile/gsm48_mm.c | 88 +++++--------------- src/host/layer23/src/mobile/gsm48_rr.c | 33 +++----- src/host/layer23/src/mobile/vty_interface.c | 31 +++---- 6 files changed, 118 insertions(+), 123 deletions(-) diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm322.h b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h index 467ff39..3cd275f 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm322.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h @@ -172,10 +172,9 @@ struct gsm322_msg { int gsm322_init(struct osmocom_ms *ms); int gsm322_exit(struct osmocom_ms *ms); -struct msgb *gsm322_msgb_alloc(int msg_type); -int gsm322_plmn_sendmsg(struct osmocom_ms *ms, struct msgb *msg); -int gsm322_cs_sendmsg(struct osmocom_ms *ms, struct msgb *msg); -int gsm322_c_event(struct osmocom_ms *ms, struct msgb *msg); +int gsm322_makesend_plmn_msg(struct osmocom_ms *ms, int msg_type, uint8_t *data, unsigned int len); +int gsm322_makesend_cs_event(struct osmocom_ms *ms, int msg_type, uint8_t *data, unsigned int len); +int gsm322_makesend_c_event(struct osmocom_ms *ms, int msg_type, uint8_t *data, unsigned int len); int gsm322_plmn_dequeue(struct osmocom_ms *ms); int gsm322_cs_dequeue(struct osmocom_ms *ms); int gsm322_add_forbidden_la(struct osmocom_ms *ms, uint16_t mcc, diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 822ea64..3d2100c 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -79,7 +79,6 @@ int mobile_signal_cb(unsigned int subsys, unsigned int signal, { struct osmocom_ms *ms; struct gsm_settings *set; - struct msgb *nmsg; if (subsys != SS_L1CTL) return 0; @@ -105,14 +104,10 @@ int mobile_signal_cb(unsigned int subsys, unsigned int signal, break; default: /* no SIM, trigger PLMN selection process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_SWITCH_ON); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); - nmsg = gsm322_msgb_alloc(GSM322_EVENT_SWITCH_ON); - if (!nmsg) - return -ENOMEM; - gsm322_cs_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_SWITCH_ON, + NULL, 0); + gsm322_makesend_cs_event(ms, GSM322_EVENT_SWITCH_ON, + NULL, 0); } ms->started = 1; diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 3c920e4..1429737 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -45,6 +45,8 @@ static void gsm322_cs_loss(void *arg); static int gsm322_cs_select(struct osmocom_ms *ms, int any, int plmn_allowed); static int gsm322_m_switch_on(struct osmocom_ms *ms, struct msgb *msg); +static int gsm322_c_event(struct osmocom_ms *ms, struct msgb *msg); + #define SKIP_MAX_PER_BAND #warning HACKING!!! @@ -182,7 +184,7 @@ const char *get_event_name(int value) /* allocate a 03.22 event message */ -struct msgb *gsm322_msgb_alloc(int msg_type) +static struct msgb *gsm322_msgb_alloc(int msg_type) { struct msgb *msg; struct gsm322_msg *gm; @@ -198,7 +200,7 @@ struct msgb *gsm322_msgb_alloc(int msg_type) } /* queue PLMN selection message */ -int gsm322_plmn_sendmsg(struct osmocom_ms *ms, struct msgb *msg) +static int gsm322_plmn_sendmsg(struct osmocom_ms *ms, struct msgb *msg) { struct gsm322_plmn *plmn = &ms->plmn; @@ -208,7 +210,7 @@ int gsm322_plmn_sendmsg(struct osmocom_ms *ms, struct msgb *msg) } /* queue cell selection message */ -int gsm322_cs_sendmsg(struct osmocom_ms *ms, struct msgb *msg) +static int gsm322_cs_sendmsg(struct osmocom_ms *ms, struct msgb *msg) { struct gsm322_cellsel *cs = &ms->cellsel; @@ -3304,7 +3306,7 @@ static struct cellselstatelist { #define CELLSELSLLEN \ (sizeof(cellselstatelist) / sizeof(struct cellselstatelist)) -int gsm322_c_event(struct osmocom_ms *ms, struct msgb *msg) +static int gsm322_c_event(struct osmocom_ms *ms, struct msgb *msg) { struct gsm322_cellsel *cs = &ms->cellsel; struct gsm322_msg *gm = (struct gsm322_msg *) msg->data; @@ -3602,4 +3604,63 @@ int gsm322_exit(struct osmocom_ms *ms) return 0; } +int gsm322_makesend_c_event(struct osmocom_ms *ms, int msg_type, + uint8_t *data, unsigned int len) +{ + struct msgb *nmsg = gsm322_msgb_alloc(msg_type); + int rc; + if (!nmsg) + return -ENOMEM; + + if (data && len) { + uint8_t *cur = msgb_push(nmsg, len); + if (!cur) { + msgb_free(nmsg); + return -EIO; + } + memcpy(cur, data, len); + } + rc = gsm322_c_event(ms, nmsg); + msgb_free(nmsg); + + return rc; +} + +int gsm322_makesend_cs_event(struct osmocom_ms *ms, int msg_type, + uint8_t *data, unsigned int len) +{ + struct msgb *nmsg = gsm322_msgb_alloc(msg_type); + + if (!nmsg) + return -ENOMEM; + + if (data && len) { + uint8_t *cur = msgb_push(nmsg, len); + if (!cur) { + msgb_free(nmsg); + return -EIO; + } + memcpy(cur, data, len); + } + return gsm322_cs_sendmsg(ms, nmsg); +} + +int gsm322_makesend_plmn_msg(struct osmocom_ms *ms, int msg_type, + uint8_t *data, unsigned int len) +{ + struct msgb *nmsg = gsm322_msgb_alloc(msg_type); + + if (!nmsg) + return -ENOMEM; + + if (data && len) { + uint8_t *cur = msgb_push(nmsg, len); + if (!cur) { + msgb_free(nmsg); + return -EIO; + } + memcpy(cur, data, len); + } + return gsm322_plmn_sendmsg(ms, nmsg); +} diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 15bbd27..58253bd 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -1118,33 +1118,23 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) && cs->sel_lac == subscr->lac && !mm->lupd_periodic) { if (subscr->imsi_attached) { - struct msgb *nmsg; - LOGP(DMM, LOGL_INFO, "Valid in location area.\n"); new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_NORMAL_SERVICE); /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_SUCCESS); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); - + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, + NULL, 0); return 0; } if (!s->att_allowed) { - struct msgb *nmsg; - LOGP(DMM, LOGL_INFO, "Attachment not required.\n"); new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_NORMAL_SERVICE); /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_SUCCESS); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); - + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, + NULL, 0); return 0; } /* else, continue */ @@ -1155,17 +1145,13 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) && (gsm_subscr_is_forbidden_plmn(subscr, cs->sel_mcc, cs->sel_mnc) || gsm322_is_forbidden_la(ms, cs->sel_mcc, cs->sel_mnc, cs->sel_lac))) { - struct msgb *nmsg; - LOGP(DMM, LOGL_INFO, "Selected cell is forbidden.\n"); new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_LIMITED_SERVICE); /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_ROAMING_NA); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_ROAMING_NA, + NULL, 0); return 0; } @@ -1174,17 +1160,12 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) if (set->plmn_mode == PLMN_MODE_MANUAL && (plmn->mcc != cs->sel_mcc || plmn->mnc != cs->sel_mnc)) { - struct msgb *nmsg; - LOGP(DMM, LOGL_INFO, "Selected cell not found.\n"); new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_LIMITED_SERVICE); /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_FAILED); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_FAILED, NULL, 0); return 0; } @@ -1729,7 +1710,6 @@ static int gsm48_mm_imsi_detach_end(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; struct gsm_subscriber *subscr = &ms->subscr; - struct msgb *nmsg; LOGP(DMM, LOGL_INFO, "IMSI has been detached.\n"); @@ -1753,10 +1733,7 @@ static int gsm48_mm_imsi_detach_end(struct osmocom_ms *ms, struct msgb *msg) } /* send SIM remove event to gsm322 */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_SIM_REMOVE); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_SIM_REMOVE, NULL, 0); /* CS process will trigger return to MM IDLE / No SIM */ return 0; @@ -1999,7 +1976,6 @@ static int gsm48_mm_loc_upd(struct osmocom_ms *ms, struct msgb *msg) struct gsm48_sysinfo *s = &cs->sel_si; struct gsm_subscriber *subscr = &ms->subscr; struct gsm_settings *set = &ms->settings; - struct msgb *nmsg; int msg_type; /* (re)start only if we still require location update */ @@ -2017,10 +1993,7 @@ static int gsm48_mm_loc_upd(struct osmocom_ms *ms, struct msgb *msg) _stop: mm->lupd_pending = 0; /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(msg_type); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, msg_type, NULL, 0); return 0; } @@ -2076,7 +2049,6 @@ static int gsm48_mm_loc_upd_normal(struct osmocom_ms *ms, struct msgb *msg) struct gsm_subscriber *subscr = &ms->subscr; struct gsm322_cellsel *cs = &ms->cellsel; struct gsm48_sysinfo *s = &cs->sel_si; - struct msgb *nmsg; /* in case we already have a location update going on */ if (mm->lupd_pending) { @@ -2090,10 +2062,7 @@ static int gsm48_mm_loc_upd_normal(struct osmocom_ms *ms, struct msgb *msg) LOGP(DMM, LOGL_INFO, "Loc. upd. not allowed.\n"); /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_FAILED); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_FAILED, NULL, 0); return 0; } @@ -2114,10 +2083,7 @@ static int gsm48_mm_loc_upd_normal(struct osmocom_ms *ms, struct msgb *msg) GSM48_MM_SST_NORMAL_SERVICE); /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_SUCCESS); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, NULL, 0); return 0; } @@ -2256,7 +2222,6 @@ static int gsm48_mm_rx_loc_upd_acc(struct osmocom_ms *ms, struct msgb *msg) struct gsm48_loc_area_id *lai = (struct gsm48_loc_area_id *) gh->data; unsigned int payload_len = msgb_l3len(msg) - sizeof(*gh); struct tlv_parsed tp; - struct msgb *nmsg; if (payload_len < sizeof(struct gsm48_loc_area_id)) { short_read: @@ -2353,10 +2318,7 @@ static int gsm48_mm_rx_loc_upd_acc(struct osmocom_ms *ms, struct msgb *msg) } /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_SUCCESS); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, NULL, 0); /* follow on proceed */ if (TLVP_PRESENT(&tp, GSM48_IE_MOBILE_ID)) @@ -2408,8 +2370,8 @@ static int gsm48_mm_rel_loc_upd_rej(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; struct gsm_subscriber *subscr = &ms->subscr; - struct msgb *nmsg; - struct gsm322_msg *ngm; + struct gsm322_msg ngm; + int msg_type; LOGP(DMM, LOGL_INFO, "Loc. upd. rejected (cause %d)\n", mm->lupd_rej_cause); @@ -2450,23 +2412,21 @@ static int gsm48_mm_rel_loc_upd_rej(struct osmocom_ms *ms, struct msgb *msg) } /* send event to PLMN search process */ - switch(mm->lupd_rej_cause) { + switch (mm->lupd_rej_cause) { case GSM48_REJECT_ROAMING_NOT_ALLOWED: - nmsg = gsm322_msgb_alloc(GSM322_EVENT_ROAMING_NA); + msg_type = GSM322_EVENT_ROAMING_NA; break; case GSM48_REJECT_IMSI_UNKNOWN_IN_HLR: case GSM48_REJECT_ILLEGAL_MS: case GSM48_REJECT_ILLEGAL_ME: - nmsg = gsm322_msgb_alloc(GSM322_EVENT_INVALID_SIM); + msg_type = GSM322_EVENT_INVALID_SIM; break; default: - nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_FAILED); + msg_type = GSM322_EVENT_REG_FAILED; } - if (!nmsg) - return -ENOMEM; - ngm = (struct gsm322_msg *)nmsg->data; - ngm->reject = mm->lupd_rej_cause; - gsm322_plmn_sendmsg(ms, nmsg); + memset(&ngm, 0, sizeof(ngm)); + ngm.reject = mm->lupd_rej_cause; + gsm322_makesend_plmn_msg(ms, msg_type, NULL, 0); /* forbidden list */ switch (mm->lupd_rej_cause) { @@ -4106,13 +4066,9 @@ static int gsm48_mm_ev(struct osmocom_ms *ms, int msg_type, struct msgb *msg) static int gsm48_mmr_reg_req(struct osmocom_ms *ms) { struct gsm48_mmlayer *mm = &ms->mmlayer; - struct msgb *nmsg; /* schedule insertion of SIM */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_SIM_INSERT); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_SIM_INSERT, NULL, 0); /* 4.2.1.2 SIM is inserted in state NO IMSI */ if (mm->state == GSM48_MM_ST_MM_IDLE diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index dc2226a..4a48dc8 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -375,8 +375,8 @@ static void new_rr_state(struct gsm48_rrlayer *rr, int state) rr->state = state; if (state == GSM48_RR_ST_IDLE) { - struct msgb *msg, *nmsg; - struct gsm322_msg *em; + struct msgb *msg; + struct gsm322_msg em; /* release dedicated mode, if any */ l1ctl_tx_dm_rel_req(rr->ms); @@ -403,16 +403,13 @@ static void new_rr_state(struct gsm48_rrlayer *rr, int state) * cell selection process returned to camping state * again. (after cell reselection) */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_RET_IDLE); - if (!nmsg) - return; /* return to same cell after LOC.UPD. */ if (rr->est_cause == RR_EST_CAUSE_LOC_UPD) { - em = (struct gsm322_msg *) nmsg->data; - em->same_cell = 1; + memset(&em, 0, sizeof(em)); + em.same_cell = 1; } - gsm322_c_event(rr->ms, nmsg); - msgb_free(nmsg); + gsm322_makesend_c_event(rr->ms, GSM322_EVENT_RET_IDLE, + (uint8_t *)&em, sizeof(em)); /* reset any BA range */ rr->ba_ranges = 0; } @@ -1192,11 +1189,7 @@ static int gsm48_rr_chan_req(struct osmocom_ms *ms, int cause, int paging) * NOTE: this must be sent unbuffered, because the state may not * change until idle mode is left */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_LEAVE_IDLE); - if (!nmsg) - return -ENOMEM; - rc = gsm322_c_event(ms, nmsg); - msgb_free(nmsg); + rc = gsm322_makesend_c_event(ms, GSM322_EVENT_LEAVE_IDLE, NULL, 0); if (rc) { if (paging) return rc; @@ -1567,7 +1560,7 @@ static int gsm48_new_sysinfo(struct osmocom_ms *ms, uint8_t type) { struct gsm48_sysinfo *s = ms->cellsel.si; struct msgb *nmsg; - struct gsm322_msg *em; + struct gsm322_msg em; /* update list of measurements, if BA(SACCH) is complete and new */ if (s @@ -1600,12 +1593,10 @@ static int gsm48_new_sysinfo(struct osmocom_ms *ms, uint8_t type) } /* send sysinfo event to other layers */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_SYSINFO); - if (!nmsg) - return -ENOMEM; - em = (struct gsm322_msg *) nmsg->data; - em->sysinfo = type; - gsm322_cs_sendmsg(ms, nmsg); + memset(&em, 0, sizeof(em)); + em.sysinfo = type; + gsm322_makesend_cs_event(ms, GSM322_EVENT_SYSINFO, + (uint8_t *)&em, sizeof(em)); /* send timer info to location update process */ nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_SYSINFO); diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 4cc2209..e3e7c47 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -658,8 +658,7 @@ DEFUN(network_select, network_select_cmd, "network select MS_NAME MCC MNC", { struct osmocom_ms *ms; struct gsm322_plmn *plmn; - struct msgb *nmsg; - struct gsm322_msg *ngm; + struct gsm322_msg ngm; struct gsm322_plmn_list *temp; uint16_t mcc = gsm_input_mcc((char *)argv[1]), mnc = gsm_input_mnc((char *)argv[2]); @@ -687,13 +686,11 @@ DEFUN(network_select, network_select_cmd, "network select MS_NAME MCC MNC", return CMD_WARNING; } - nmsg = gsm322_msgb_alloc(GSM322_EVENT_CHOOSE_PLMN); - if (!nmsg) - return CMD_WARNING; - ngm = (struct gsm322_msg *) nmsg->data; - ngm->mcc = mcc; - ngm->mnc = mnc; - gsm322_plmn_sendmsg(ms, nmsg); + memset(&ngm, 0, sizeof(ngm)); + ngm.mcc = mcc; + ngm.mnc = mnc; + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_CHOOSE_PLMN, + (uint8_t *)&ngm, sizeof(ngm)); return CMD_SUCCESS; } @@ -818,16 +815,12 @@ DEFUN(network_search, network_search_cmd, "network search MS_NAME", "Network ...\nTrigger network search\nName of MS (see \"show ms\")") { struct osmocom_ms *ms; - struct msgb *nmsg; ms = get_ms(argv[0], vty); if (!ms) return CMD_WARNING; - nmsg = gsm322_msgb_alloc(GSM322_EVENT_USER_RESEL); - if (!nmsg) - return CMD_WARNING; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_USER_RESEL, NULL, 0); return CMD_SUCCESS; } @@ -1256,7 +1249,7 @@ DEFUN(cfg_ms_mode, cfg_ms_mode_cmd, "network-selection-mode (auto|manual)", { struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - struct msgb *nmsg; + int msg_type = -1; if (!ms->plmn.state) { if (argv[0][0] == 'a') @@ -1267,12 +1260,12 @@ DEFUN(cfg_ms_mode, cfg_ms_mode_cmd, "network-selection-mode (auto|manual)", return CMD_SUCCESS; } if (argv[0][0] == 'a') - nmsg = gsm322_msgb_alloc(GSM322_EVENT_SEL_AUTO); + msg_type = GSM322_EVENT_SEL_AUTO; else - nmsg = gsm322_msgb_alloc(GSM322_EVENT_SEL_MANUAL); - if (!nmsg) + msg_type = GSM322_EVENT_SEL_MANUAL; + if (msg_type < 0) return CMD_WARNING; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, msg_type, NULL, 0); return CMD_SUCCESS; } -- 1.7.2.3 --Kj7319i9nmIyA2yE Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0002-mobile-replace-3-different-gsm322_makesend_-function.patch"

13 years, 3 months

1
0
0 0

Channel info

by Bogdan Alecu

Hello, I noticed that when I start the mobile application, after the phone chooses a specific channel I get different messages regarding IMSI saying that it's not for us. What are these messages? Phones that camp on this channel? If so, I tried turning off/on a phone from the same operator but I can't see my IMSI showing up.

13 years, 3 months

5
9
0 0

Gpio driver for calypso

by Michal Demin

Hello, I have created few patches that aim to add abstraction for gpio handling. First patch adds functions: gpio_config - configure gpio as input/output gpio_read - read state of gpio(s) gpio_write - write/toggle state of gpio(s) gpio_set_handler - enables interrupt on given gpio. Also changes board init files to make them more sane :-) Second patch adds interrupt demuxing and masking into keypad driver as gpio and keypad are handled by the same peripheral. It would make sense to split the keypad driver into calypso-specific and generic stuff once there is support for other chipsets. Also note that interrupt levels in datasheet are active low (p.120), my testing shows otherwise. Michal Demin

13 years, 3 months

1
1
0 0

doesn't get output from osmocon

by tobsen

Hi, sorry if I shouldn`t write correclly, i`m not that good in english. i have a Motorola c118 and this usb/serial cable: http://www.gsmbase.de/shop/show_product.php?products_id=620 here my problem: compiling was successfully. than i run osmocon: ./osmocon -p /dev/ttyUSB0 -m c123xor /home/test/install/osmocom-bb/src/target/firmware/board/compal_e88/layer1.ramload.bin i pressed power on the phone. nothing happend. again. nothing happend, no output, no upload/download to/from the phone... what is my fault? can you help me? i have tested it with: -m 123 ; -m 118xor ; -m 118 (the same thing) my system is ubuntu 10.10 (not in a virtual box or something else). thanks a lot, tobsen -- View this message in context: http://baseband-devel.722152.n3.nabble.com/doesn-t-get-output-from-osmocon-… Sent from the baseband-devel mailing list archive at Nabble.com.

13 years, 3 months

6
6
0 0

Documentation for 'mobile' in the wiki

by Harald Welte

Hi guys, I think it is desparately needed that we write more documentation about the 'mobile' program in our wiki. It just occurred to me today that no such page exists so far, and I've created it at http://bb.osmocom.org/trac/wiki/mobile I believe a simple reference of commands is not even all that important (after all, there is 'list' in the telnet interface), but somethnig like common scenarios like * behaving like a normal phone with cell-selection (using real sim) * behaving like a normal phone with cell-selection (using simulated sim) * how to lock to a certain ARFCN/cell * how to manually trigger location area update * how to send/receive sms * how to make mo/mt phone call It would be great if some of the more experienced people would find a couple of minutes to contribute to it. Thanks a lot in advance. Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

13 years, 3 months

1
0
0 0

Bounce action notification

by mailman＠lists.osmocom.org

This is a Mailman mailing list bounce action notice: List: baseband-devel Member: arslangali(a)inbox.ru Action: Subscription disabled. Reason: Excessive or fatal bounces. The triggering bounce notice is attached below. Questions? Contact the Mailman site administrator at mailman(a)lists.osmocom.org.

13 years, 3 months

1
0
0 0

Re: Motorola usb cable

by Nikolaus Kohl

>> To make it work you have to recompile the module pl2303, with this >> patch >> (my kernel is 2.6.35.10-74.fc14.i686). Be careful to setup the right >> values in the kernel root Makefile in order to fit your running >> kernel. > > Not necessarily. You should also be able to check without recompiling. > > Just go to the drivers-directory in sysfs: > > cd /sys/bus/usb/drivers/<driver> > which <driver>?I cannot find any pl2303 driver here. (Debian and ubuntu 8.04)> and echo the data to the file new_id (as root): > > echo "067b 0307" > new_id > > This should bind the driver to the new_id. Niko

13 years, 3 months

3
2
0 0

[PATCH] How to compile osmocom on NetBSD

by Pierre Pronchery

Hi baseband developers, a couple days ago I managed to compile osmocom's binaries and firmware files from a NetBSD host, using a cross-compilation toolchain generated with the standard build script on this system. This was actually quite straightforward, but required some patches and tricks, so I figured it'd be worth posting it here. I will write the procedure in more details on my blog [1], in my case it was enough to do this: $ CPATH="/usr/include" gmake \ CROSS_TOOL_PREFIX="/home/arm/tools/bin/arm--netbsdelf-" The patch itself is certainly more interesting to discuss here. I do not expect it to be fully merged, but I think it may raise interesting points: - src/shared/libosmocore/src/Makefile.am linking with "-ldl" is hardcoded, but breaks the build on systems where it is not required; this is a usual portability issue, already solved about a thousand times, I'll try to come up with a cleaner solution here. - src/shared/libosmocore/src/gsm_utils.c I think this one is quite elegant, allowing to build even without support for backtraces; an additional #warning would help though/ - src/shared/libosmocore/src/msgfile.c here I had to bluntly emulate the functionality of the getline() call, which seems to be specific to glibc; again, it'd certainly be nicer if I added a test for HAVE_GETLINE or something along this line. - src/shared/libosmocore/src/talloc.c again, talloc seems to rely on strnlen() being part of the libc, which is already known to not be the case on MacOS X; considering it also absent of NetBSD fixes the build for me. - src/target/firmware/include/stdint.h this one is definitely more ugly, since I tricked the cross-compiler to believe /usr/include matches its specific needs I ended up with some essential type definitions already; therefore, I am not sure if this workaround would not be more harmful upstream than not. Anyway, the actual patch is attached. A few more things to NetBSD users: - my previous patch about building without GNU make is also necessary; - I haven't tested the resulting binaries on a NetBSD host; - the firmware images seem to be only partly functional at the moment. HTH, -- khorben

13 years, 3 months

1
1
0 0

Re: Trouble building Osmocom

by Holger Freyther

On 06/08/2010 09:41 PM, Huseyin Turan wrote: > root@name1-desktop:/home/name1/osmocom/gnuarm-4.0.2/bin# ls -l arm-elf-gcc > -rwxrwxrwx 1 name1 name1 112344 2006-02-17 23:59 arm-elf-gcc > root@name1-desktop:/home/name1/osmocom/gnuarm-4.0.2/bin# ./arm-elf-gcc > bash: ./arm-elf-gcc: cannot execute binary file > root@name1-desktop:/home/name1/osmocom/gnuarm-4.0.2/bin# uname -a > Linux name1-desktop 2.6.28-19-generic #61-Ubuntu SMP Wed May 26 23:35:15 > UTC 2010 i686 GNU/Linux > please try b.) again (you miss the file part) and also please reply to the mailinglist.

13 years, 3 months

6
10
0 0

Re: Cell_log > gsmmap

by Bogdan Alecu

I just thought of another way of using cell_log without GPS. The resulting KML could be parsed and sent to opencellid project, this way we could get the lat-long coordinates and afterward create another kml and send it to Google. Ex: http://www.opencellid.org/cell/get?mcc=232&mnc=01&cellid=1721&lac=4269

13 years, 3 months

2
1
0 0

[PATCH] Added command line switches to cell_log to change default gps device and baud rate.

by Dario Lombardo

--- src/host/layer23/src/misc/app_cell_log.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/host/layer23/src/misc/app_cell_log.c b/src/host/layer23/src/misc/app_cell_log.c index 84f5a83..9c05108 100644 --- a/src/host/layer23/src/misc/app_cell_log.c +++ b/src/host/layer23/src/misc/app_cell_log.c @@ -29,6 +29,7 @@ #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/l23_app.h> #include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/gps.h> #include <osmocom/bb/misc/cell_log.h> #include <osmocore/talloc.h> @@ -91,6 +92,8 @@ static int l23_getopt_options(struct option **options) {"logfile", 1, 0, 'l'}, {"rach", 1, 0, 'r'}, {"no-rach", 1, 0, 'n'}, + {"gps", 1, 0, 'g'}, + {"baud", 1, 0, 'b'} }; *options = opts; @@ -103,6 +106,8 @@ static int l23_cfg_print_help() printf(" -l --logfile LOGFILE Logfile for the cell log.\n"); printf(" -r --rach RACH Nr. of RACH bursts to send.\n"); printf(" -n --no-rach Send no rach bursts.\n"); + printf(" -g --gps DEVICE /dev/ttyACM0. GPS device.\n"); + printf(" -b --baud BAUDRATE The baud rate of the GPS device\n"); return 0; } @@ -118,6 +123,16 @@ static int l23_cfg_handle(int c, const char *optarg) case 'n': RACH_MAX = 0; break; + case 'g': + snprintf(gps.device, ARRAY_SIZE(gps.device), "%s", optarg); + /* force string terminator */ + gps.device[ARRAY_SIZE(gps.device - 1)] = '\0'; + LOGP(DGPS, LOGL_INFO, "Using GPS device %s\n", gps.device); + break; + case 'b': + gps.baud = atoi(optarg); + LOGP(DGPS, LOGL_INFO, "Setting GPS baudrate to %u\n", gps.baud); + break; } return 0; @@ -125,7 +140,7 @@ static int l23_cfg_handle(int c, const char *optarg) static struct l23_app_info info = { .copyright = "Copyright (C) 2010 Andreas Eversberg\n", - .getopt_string = "l:r:n", + .getopt_string = "l:r:ng:b:", .cfg_supported = l23_cfg_supported, .cfg_getopt_opt = l23_getopt_options, .cfg_handle_opt = l23_cfg_handle, -- 1.7.3.4 --------------090907080903040108080303--

13 years, 3 months

1
0
0 0

Re: Cell_log > gsmmap

by Bogdan Alecu

Or even better, use Google API and this way you could also include the Signal strenght and Timing advance for a better position. See http://translate.google.com/translate?js=y&prev=_t&hl=en&ie=UTF-8&layout=1&… --- On Wed, 1/26/11, Bogdan Alecu <b.alecu(a)yahoo.com> wrote: From: Bogdan Alecu <b.alecu(a)yahoo.com> Subject: Re: Cell_log > gsmmap To: Cc: baseband-devel(a)lists.osmocom.org Date: Wednesday, January 26, 2011, 7:27 AM I just thought of another way of using cell_log without GPS. The resulting KML could be parsed and sent to opencellid project, this way we could get the lat-long coordinates and afterward create another kml and send it to Google. Ex: http://www.opencellid.org/cell/get?mcc=232&mnc=01&cellid=1721&lac=4269

13 years, 3 months

1
0
0 0

[PATCH] Adjust top-level Makefile for arm-none-eabi toolchain

by Peter Stuge

The gnuarm.com toolchain works fine but is very old. And although it is based on newlib, the os name in the tuple that we used to configure for is arm-elf-linux, which is of course bogus since we are not building Linux applications. Finally, CC= should never be set, instead configure should detect the right compiler using the --host tuple. --- src/Makefile | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index b3594c1..e66f0ff 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,10 +1,10 @@ # this is not really used as we don't do 'make install'. You can still specify # it in case you _want_ to manually 'make install' the target libosmocore. -CROSS_INST_PREFIX=/usr/local/stow/osmocom-bb/arm-elf +CROSS_INST_PREFIX ?= /usr/local/stow/osmocom-bb/arm-2010.09 # this is the prefix of your cross-toolchain programs -CROSS_TOOL_PREFIX=arm-elf- +CROSS_TOOL_PREFIX ?= arm-none-eabi- TOPDIR=$(shell pwd) OSMOCORE_CONFIGURE_ENV= LIBOSMOCORE_LIBS=$(TOPDIR)/shared/libosmocore/build-host/src/.libs/libosmocore.a \ @@ -37,9 +37,9 @@ shared/libosmocore/build-target: shared/libosmocore/build-target/Makefile: shared/libosmocore/configure shared/libosmocore/build-target cd shared/libosmocore/build-target && ../configure \ - --host=arm-elf-linux --disable-vty --enable-panic-infloop \ + --host=arm-none-eabi --disable-vty --enable-panic-infloop \ --disable-shared --disable-talloc --disable-tests \ - CC="$(CROSS_TOOL_PREFIX)gcc" CFLAGS="-Os -ffunction-sections -I$(TOPDIR)/target/firmware/include -nostartfiles -nodefaultlibs" + CFLAGS="-Os -ffunction-sections -I$(TOPDIR)/target/firmware/include -nostartfiles -nodefaultlibs" shared/libosmocore/build-target/src/.libs/libosmocore.a: shared/libosmocore/build-target/Makefile cd shared/libosmocore/build-target && make -- 1.7.2

13 years, 3 months

4
6
0 0

[PATCH] Adjust top-level Makefile for arm-none-eabi toolchain

by Peter Stuge

The gnuarm.com toolchain works fine but is very old. And although it is based on newlib, the tuple that we used to configure for was arm-elf-linux, which is of course bogus since we aren't building Linux applications. This patch optimizes for the CodeSourcery G++ Lite 2010.09 ARM EABI toolchain, and assumes that it was unpacked next to the old one. Download here: http://www.codesourcery.com/sgpp/lite/arm/portal/release1592 (I haven't gotten the Linux Installer to work, so I recommend the TAR.) And since CC is detected by configure when a valid host tuple is given and that toolchain is sane there's no need for us to hard-code the gnuarm.com compiler name in our Makefile. --- src/Makefile | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index b3594c1..f2d935b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,10 +1,13 @@ # this is not really used as we don't do 'make install'. You can still specify # it in case you _want_ to manually 'make install' the target libosmocore. -CROSS_INST_PREFIX=/usr/local/stow/osmocom-bb/arm-elf +CROSS_INST_PREFIX ?= /usr/local/stow/osmocom-bb/arm-2010.09 + +# this is the host tuple of your cross-toolchain +HOST ?= arm-none-eabi- # this is the prefix of your cross-toolchain programs -CROSS_TOOL_PREFIX=arm-elf- +CROSS_TOOL_PREFIX ?= $(CROSS)- TOPDIR=$(shell pwd) OSMOCORE_CONFIGURE_ENV= LIBOSMOCORE_LIBS=$(TOPDIR)/shared/libosmocore/build-host/src/.libs/libosmocore.a \ @@ -37,9 +40,9 @@ shared/libosmocore/build-target: shared/libosmocore/build-target/Makefile: shared/libosmocore/configure shared/libosmocore/build-target cd shared/libosmocore/build-target && ../configure \ - --host=arm-elf-linux --disable-vty --enable-panic-infloop \ + --host=$(HOST) --disable-vty --enable-panic-infloop \ --disable-shared --disable-talloc --disable-tests \ - CC="$(CROSS_TOOL_PREFIX)gcc" CFLAGS="-Os -ffunction-sections -I$(TOPDIR)/target/firmware/include -nostartfiles -nodefaultlibs" + CFLAGS="-Os -ffunction-sections -I$(TOPDIR)/target/firmware/include -nostartfiles -nodefaultlibs" shared/libosmocore/build-target/src/.libs/libosmocore.a: shared/libosmocore/build-target/Makefile cd shared/libosmocore/build-target && make -- 1.7.2 --dMyqICaxQaaUjrCL--

13 years, 3 months

1
0
0 0

[PATCH] Adjust top-level Makefile for arm-none-eabi toolchain

by Peter Stuge

The gnuarm.com toolchain works fine but is very old. And although it is based on newlib, the tuple that we used to configure for was arm-elf-linux, which is of course bogus since we aren't building Linux applications. This patch optimizes for the CodeSourcery G++ Lite 2010.09 ARM EABI toolchain, and assumes that it was unpacked next to the old one. Download here: http://www.codesourcery.com/sgpp/lite/arm/portal/release1592 (I haven't gotten the Linux Installer to work, so I recommend the TAR.) And since CC is detected by configure when a valid host tuple is given and that toolchain is sane there's no need for us to hard-code the gnuarm.com compiler name in our Makefile. --- src/Makefile | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index b3594c1..bb34175 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,10 +1,13 @@ # this is not really used as we don't do 'make install'. You can still specify # it in case you _want_ to manually 'make install' the target libosmocore. -CROSS_INST_PREFIX=/usr/local/stow/osmocom-bb/arm-elf +CROSS_INST_PREFIX ?= /usr/local/stow/osmocom-bb/arm-2010.09 + +# this is the host tuple of your cross-toolchain +HOST ?= arm-none-eabi- # this is the prefix of your cross-toolchain programs -CROSS_TOOL_PREFIX=arm-elf- +CROSS_TOOL_PREFIX ?= $(HOST)- TOPDIR=$(shell pwd) OSMOCORE_CONFIGURE_ENV= LIBOSMOCORE_LIBS=$(TOPDIR)/shared/libosmocore/build-host/src/.libs/libosmocore.a \ @@ -37,9 +40,9 @@ shared/libosmocore/build-target: shared/libosmocore/build-target/Makefile: shared/libosmocore/configure shared/libosmocore/build-target cd shared/libosmocore/build-target && ../configure \ - --host=arm-elf-linux --disable-vty --enable-panic-infloop \ + --host=$(HOST) --disable-vty --enable-panic-infloop \ --disable-shared --disable-talloc --disable-tests \ - CC="$(CROSS_TOOL_PREFIX)gcc" CFLAGS="-Os -ffunction-sections -I$(TOPDIR)/target/firmware/include -nostartfiles -nodefaultlibs" + CFLAGS="-Os -ffunction-sections -I$(TOPDIR)/target/firmware/include -nostartfiles -nodefaultlibs" shared/libosmocore/build-target/src/.libs/libosmocore.a: shared/libosmocore/build-target/Makefile cd shared/libosmocore/build-target && make -- 1.7.2 --nEsDIrWrg+hrB7l1--

13 years, 3 months

1
0
0 0

[PATCH] Allow top-level Makefile to use arm-none-eabi toolchain

by Peter Stuge

The gnuarm.com toolchain works fine but is very old. And although it is based on newlib, the tuple that we used to configure for was arm-elf-linux, which is bogus since we aren't building for Linux. This patch optimizes for the CodeSourcery G++ Lite 2010.09 ARM EABI toolchain instead, and for libosmocore installation it assumes that the new toolchain was unpacked next to the old one. Download it here: http://www.codesourcery.com/sgpp/lite/arm/portal/release1592 (The Linux Installer seems not to work reliably so I recommend the TAR.) Since CC is detected by configure when the host tuple points to a sane toolchain we shouldn't hard-code the gnuarm.com compiler. The patch autodetects arm-elf-gcc installed in PATH, and uses arm-elf as prefix if it is found. Otherwise, it defaults to arm-none-eabi. make CROSS_HOST=arm-xyzzy can be used to override on the command line. --- src/Makefile | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index b3594c1..402f28a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,10 +1,13 @@ # this is not really used as we don't do 'make install'. You can still specify # it in case you _want_ to manually 'make install' the target libosmocore. -CROSS_INST_PREFIX=/usr/local/stow/osmocom-bb/arm-elf +CROSS_INST_PREFIX ?= /usr/local/stow/osmocom-bb/arm-2010.09 + +# this is the host tuple of your cross-toolchain +CROSS_HOST ?= $(shell which arm-elf-gcc >/dev/null 2>&1 && echo arm-elf || echo arm-none-eabi) # this is the prefix of your cross-toolchain programs -CROSS_TOOL_PREFIX=arm-elf- +CROSS_TOOL_PREFIX=$(CROSS_HOST)- TOPDIR=$(shell pwd) OSMOCORE_CONFIGURE_ENV= LIBOSMOCORE_LIBS=$(TOPDIR)/shared/libosmocore/build-host/src/.libs/libosmocore.a \ @@ -37,9 +40,9 @@ shared/libosmocore/build-target: shared/libosmocore/build-target/Makefile: shared/libosmocore/configure shared/libosmocore/build-target cd shared/libosmocore/build-target && ../configure \ - --host=arm-elf-linux --disable-vty --enable-panic-infloop \ + --host=$(CROSS_HOST) --disable-vty --enable-panic-infloop \ --disable-shared --disable-talloc --disable-tests \ - CC="$(CROSS_TOOL_PREFIX)gcc" CFLAGS="-Os -ffunction-sections -I$(TOPDIR)/target/firmware/include -nostartfiles -nodefaultlibs" + CFLAGS="-Os -ffunction-sections -I$(TOPDIR)/target/firmware/include -nostartfiles -nodefaultlibs" shared/libosmocore/build-target/src/.libs/libosmocore.a: shared/libosmocore/build-target/Makefile cd shared/libosmocore/build-target && make -- 1.7.2 --ibvzjYYg+QDzMCy1--

13 years, 3 months

1
0
0 0

C99 [was Fwd: Cell_log > gsmmap]

by Dieter Spaar

Hello Holger, On Tue, 25 Jan 2011 16:51:02 +0100, "Holger Hans Peter Freyther" <holger(a)freyther.de> wrote: > > Almost perfect. I can apply and modify myself or you could do two things. We > tend to avoid the '//' comments, they were only added in C99 and used to be a > GCC extension for C. This is a good one ;-) One of the biggest problems when I tried a long time ago to compile any of OpenBSC or OsmocomBB with a different compiler than GCC were designated initializer which are _heavily_ used all over the sources (I don't question their advantage, I only mention it). They are a C99 feature (besides the library function snprintf() in the patch you commented). So I would not care about the '//', this was the smallest problem I had when I did my porting experiment (in fact the compilers I am aware of silently accept it). Just out of interest, do we really want to to avoid C99 ? I know there is this implicit "kernel style" coding rule, does it include C99 ? Please note that I don't want to discuss this, I use GCC from Cygwin and can find workarounds for Linux specific issues on Windows on my own, so I don't care that much. I am just interested in the reasons for using C99 or not. Best regards, Dieter -- Dieter Spaar, Germany spaar(a)mirider.augusta.de

13 years, 3 months

5
5
0 0

RE:Cell_log > gsmmap

by Bogdan Alecu

A Wiki on how to use it would be great!

13 years, 3 months

2
3
0 0

Fwd: Cell_log > gsmmap

by MArc Richter

Do i need a GPS Reciver ? I tought that it will calculate the location over Triangulation ? On Tue, Jan 25, 2011 at 10:34 AM, Holger Hans Peter Freyther < holger(a)freyther.de> wrote: > On 01/25/2011 08:33 AM, MArc Richter wrote: > > > But when i convert it into a kml file with gsmmap i can't see any GPS > > koordinates. Why ? > > Do you have a GPS receiver attached to your computer? > >

13 years, 3 months

12
42
0 0

Cell_log > gsmmap

by MArc Richter

Hey! I've tryed out the Cell_log tool to get the Location of the GSM cells. But when i convert it into a kml file with gsmmap i can't see any GPS koordinates. Why ? I use the Sylvain branch an compiled with TX support thx

13 years, 3 months

2
1
0 0

question on pirelli dp l10

by Scott Weisman

I looked more into this phone recently and found out it supported SIP over WiFi as well. Does anyone know about the software running the phone? How are the VOIP codecs handled? Is there hardware support for them? Finally, does code and/or drivers already exist for the hardware components? I happened to be looking for something exactly like this anyway. Cool to know that OsmocomBB can (potentially) work on it too. Scott

13 years, 3 months

2
2
0 0

Re: Sniff Code..shown @chao conf.. CCC

by Aaron Zauner

Oh, i also found this: http://permalink.gmane.org/gmane.comp.gnu.radio.general/31145 -> http://en.wikipedia.org/wiki/Manoj_Kumar lol. so long, azet

13 years, 3 months

6
7
0 0

[PATCH] Support GNU make when it is not called "make"

by Pierre Pronchery

Hi baseband developers, just a small patch to help where GNU make is not directly called "make". HTH, -- khorben

13 years, 3 months

1
0
0 0

Creatng a list of known issues somewhere

by Holger Hans Peter Freyther

Hi all, it appears that we all know of some issues but we are not writing them down. Would it make sense to start using the bugtracker for that? Or just a dedicated wiki site?

13 years, 3 months

2
2
0 0

problems getting Pirelli DP-L10 to work

by Leif Jakob

Hi, maybe I'm missing something, but when I read that the Pirelli DP-L10 would be supported I tried to get it running: I didn't patch my usb-module, but used: modprobe -v cp210x echo "0489 e003" > /sys/bus/usb-serial/drivers/cp210x/new_id from the steve-m/testing-branch I compiled the firmware and loaded it with ./host/osmocon/osmocon -p /dev/ttyUSB0 -m romload target/firmware/board/pirelli_dpl10/hello_world.highram.bin onto the phone... that worked but I was never able to see any messages after the upload: Received block ack from phone Sending checksum: 0xaa Checksum on phone side matches, let's branch to your code Branching to 0x00820000 Received branch ack, your code is running now! ... there it stayed forever ... I'm pretty sure that the code runs, because I commented in init.c the keyboard lighting code and it didn't light up after upload. I've tried other bins but to no success. Any hint or am it too early playing with that hardware? Greetings Leif

13 years, 3 months

2
1
0 0

Regarding IMSI detach DoS

by Bogdan Alecu

Hello, In order for this attack to work it has to be on a GSM network because on 3G there is a higher security mechanism. A way to protect against this, for the opperator, could be to implement 3G over 900Mhz so this way even if the targeted phones are on 2G they will still be protected. Am I right? Regards, Bogdan

13 years, 3 months

2
1
0 0

serial cable

by Tommy R.

Hey, I ordered the serial cable coming from dealextreme and it has not arrived yet. I noticed today that the link was taken off the wiki due to it not being at TTL levels. I was wondering if I bought a Nokia serial cable (the ones that have the prolific chips in them) which runs at 3.3v out of the box, could I just connect the tx and rx pins to the cable I had bought and it would possibly work or would that be a bad idea and I should cut my losses and kill the order. -- -Tom

13 years, 3 months

2
1
0 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

baseband-devel January 2011