sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

atmodem: export generic netreg funcs 

An upcoming netreg driver for uBlox modems will need to override the
probe method in order to set itself up, but for further functionality
the "generic" AT implementations are sufficient.  The easiest way to do
this is to just set up a vtable with a custom probe implementation and
defer all other methods to the common/generic methods.

The problem is that the AT methods are not actually exported.  This
generic AT functionality was not intended to be hooked directly into
other drivers.

This patch exports all the methods of the atmodem network-registration
driver implementation so that they can be used as generic/common
implementations for other drivers.
This commit is contained in:
Jonas Bonn 2019-07-18 12:23:05 +02:00 committed by Denis Kenzior
parent 1c168e8338
commit 3e55559301
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/atmodem/network-registration.c
View File

@ -41,6 +41,8 @@
#include "atmodem.h"
#include "vendor.h"
#include "network-registration.h"
static const char *none_prefix[] = { NULL };
static const char *creg_prefix[] = { "+CREG:", NULL };
static const char *cops_prefix[] = { "+COPS:", NULL };
@ -270,7 +272,7 @@ static void option_tech_cb(gboolean ok, GAtResult *result, gpointer user_data)
nd->tech = -1;
}
static void at_registration_status(struct ofono_netreg *netreg,
void at_registration_status(struct ofono_netreg *netreg,
ofono_netreg_status_cb_t cb,
void *data)
{
@ -450,7 +452,7 @@ error:
g_free(cbd);
}
static void at_current_operator(struct ofono_netreg *netreg,
void at_current_operator(struct ofono_netreg *netreg,
ofono_netreg_operator_cb_t cb, void *data)
{
struct netreg_data *nd = ofono_netreg_get_data(netreg);
@ -589,7 +591,7 @@ static void cops_list_cb(gboolean ok, GAtResult *result, gpointer user_data)
g_free(list);
}
static void at_list_operators(struct ofono_netreg *netreg,
void at_list_operators(struct ofono_netreg *netreg,
ofono_netreg_operator_list_cb_t cb, void *data)
{
struct netreg_data *nd = ofono_netreg_get_data(netreg);
@ -615,7 +617,7 @@ static void register_cb(gboolean ok, GAtResult *result, gpointer user_data)
cb(&error, cbd->data);
}
static void at_register_auto(struct ofono_netreg *netreg,
void at_register_auto(struct ofono_netreg *netreg,
ofono_netreg_register_cb_t cb, void *data)
{
struct netreg_data *nd = ofono_netreg_get_data(netreg);
@ -630,7 +632,7 @@ static void at_register_auto(struct ofono_netreg *netreg,
CALLBACK_WITH_FAILURE(cb, data);
}
static void at_register_manual(struct ofono_netreg *netreg,
void at_register_manual(struct ofono_netreg *netreg,
const char *mcc, const char *mnc,
ofono_netreg_register_cb_t cb, void *data)
{
@ -1228,7 +1230,7 @@ static void csq_cb(gboolean ok, GAtResult *result, gpointer user_data)
cb(&error, strength, cbd->data);
}
static void at_signal_strength(struct ofono_netreg *netreg,
void at_signal_strength(struct ofono_netreg *netreg,
ofono_netreg_strength_cb_t cb, void *data)
{
struct netreg_data *nd = ofono_netreg_get_data(netreg);
@ -2144,7 +2146,7 @@ static int at_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
return 0;
}
static void at_netreg_remove(struct ofono_netreg *netreg)
void at_netreg_remove(struct ofono_netreg *netreg)
{
struct netreg_data *nd = ofono_netreg_get_data(netreg);

17
drivers/atmodem/network-registration.h Normal file
View File

@ -0,0 +1,17 @@
#pragma once
void at_registration_status(struct ofono_netreg *netreg,
ofono_netreg_status_cb_t cb,
void *data);
void at_current_operator(struct ofono_netreg *netreg,
ofono_netreg_operator_cb_t cb, void *data);
void at_list_operators(struct ofono_netreg *netreg,
ofono_netreg_operator_list_cb_t cb, void *data);
void at_register_auto(struct ofono_netreg *netreg,
ofono_netreg_register_cb_t cb, void *data);
void at_register_manual(struct ofono_netreg *netreg,
const char *mcc, const char *mnc,
ofono_netreg_register_cb_t cb, void *data);
void at_signal_strength(struct ofono_netreg *netreg,
ofono_netreg_strength_cb_t cb, void *data);
void at_netreg_remove(struct ofono_netreg *netreg);