mirror of git://git.sysmocom.de/ofono
rilmodem: Get rid of radio-settings.h
This commit is contained in:
parent
25e99e3631
commit
a0ecd17069
|
@ -149,7 +149,6 @@ builtin_sources += drivers/rilmodem/rilmodem.h \
|
|||
drivers/rilmodem/call-settings.c \
|
||||
drivers/rilmodem/call-forwarding.c \
|
||||
drivers/rilmodem/radio-settings.c \
|
||||
drivers/rilmodem/radio-settings.h \
|
||||
drivers/rilmodem/call-barring.c \
|
||||
drivers/infineonmodem/infineon_constants.h
|
||||
endif
|
||||
|
|
|
@ -45,6 +45,13 @@
|
|||
#include "grilreply.h"
|
||||
#include "radio-settings.h"
|
||||
|
||||
struct radio_data {
|
||||
GRil *ril;
|
||||
struct ofono_modem *modem;
|
||||
gboolean fast_dormancy;
|
||||
gboolean pending_fd;
|
||||
};
|
||||
|
||||
static void ril_set_rat_cb(struct ril_msg *message, gpointer user_data)
|
||||
{
|
||||
struct cb_data *cbd = user_data;
|
||||
|
@ -61,7 +68,7 @@ static void ril_set_rat_cb(struct ril_msg *message, gpointer user_data)
|
|||
}
|
||||
}
|
||||
|
||||
void ril_set_rat_mode(struct ofono_radio_settings *rs,
|
||||
static void ril_set_rat_mode(struct ofono_radio_settings *rs,
|
||||
enum ofono_radio_access_mode mode,
|
||||
ofono_radio_settings_rat_mode_set_cb_t cb,
|
||||
void *data)
|
||||
|
@ -146,7 +153,7 @@ static void ril_rat_mode_cb(struct ril_msg *message, gpointer user_data)
|
|||
CALLBACK_WITH_SUCCESS(cb, mode, cbd->data);
|
||||
}
|
||||
|
||||
void ril_query_rat_mode(struct ofono_radio_settings *rs,
|
||||
static void ril_query_rat_mode(struct ofono_radio_settings *rs,
|
||||
ofono_radio_settings_rat_mode_query_cb_t cb,
|
||||
void *data)
|
||||
{
|
||||
|
@ -161,7 +168,7 @@ void ril_query_rat_mode(struct ofono_radio_settings *rs,
|
|||
}
|
||||
}
|
||||
|
||||
void ril_query_fast_dormancy(struct ofono_radio_settings *rs,
|
||||
static void ril_query_fast_dormancy(struct ofono_radio_settings *rs,
|
||||
ofono_radio_settings_fast_dormancy_query_cb_t cb,
|
||||
void *data)
|
||||
{
|
||||
|
@ -188,7 +195,7 @@ static void ril_display_state_cb(struct ril_msg *message, gpointer user_data)
|
|||
}
|
||||
}
|
||||
|
||||
void ril_set_fast_dormancy(struct ofono_radio_settings *rs,
|
||||
static void ril_set_fast_dormancy(struct ofono_radio_settings *rs,
|
||||
ofono_bool_t enable,
|
||||
ofono_radio_settings_fast_dormancy_set_cb_t cb,
|
||||
void *data)
|
||||
|
@ -229,7 +236,7 @@ static ofono_bool_t query_available_rats_cb(gpointer user_data)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
void ril_query_available_rats(struct ofono_radio_settings *rs,
|
||||
static void ril_query_available_rats(struct ofono_radio_settings *rs,
|
||||
ofono_radio_settings_available_rats_query_cb_t cb,
|
||||
void *data)
|
||||
{
|
||||
|
@ -238,7 +245,8 @@ void ril_query_available_rats(struct ofono_radio_settings *rs,
|
|||
g_idle_add(query_available_rats_cb, cbd);
|
||||
}
|
||||
|
||||
void ril_delayed_register(const struct ofono_error *error, void *user_data)
|
||||
static void ril_delayed_register(const struct ofono_error *error,
|
||||
void *user_data)
|
||||
{
|
||||
struct ofono_radio_settings *rs = user_data;
|
||||
|
||||
|
@ -264,7 +272,7 @@ static int ril_radio_settings_probe(struct ofono_radio_settings *rs,
|
|||
return 0;
|
||||
}
|
||||
|
||||
void ril_radio_settings_remove(struct ofono_radio_settings *rs)
|
||||
static void ril_radio_settings_remove(struct ofono_radio_settings *rs)
|
||||
{
|
||||
struct radio_data *rd = ofono_radio_settings_get_data(rs);
|
||||
ofono_radio_settings_set_data(rs, NULL);
|
||||
|
|
|
@ -1,47 +0,0 @@
|
|||
/*
|
||||
*
|
||||
* oFono - Open Source Telephony
|
||||
*
|
||||
* Copyright (C) 2014 Canonical Ltd.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
||||
struct radio_data {
|
||||
GRil *ril;
|
||||
struct ofono_modem *modem;
|
||||
gboolean fast_dormancy;
|
||||
gboolean pending_fd;
|
||||
};
|
||||
|
||||
void ril_delayed_register(const struct ofono_error *error, void *user_data);
|
||||
void ril_radio_settings_remove(struct ofono_radio_settings *rs);
|
||||
void ril_query_rat_mode(struct ofono_radio_settings *rs,
|
||||
ofono_radio_settings_rat_mode_query_cb_t cb,
|
||||
void *data);
|
||||
void ril_set_rat_mode(struct ofono_radio_settings *rs,
|
||||
enum ofono_radio_access_mode mode,
|
||||
ofono_radio_settings_rat_mode_set_cb_t cb,
|
||||
void *data);
|
||||
void ril_query_fast_dormancy(struct ofono_radio_settings *rs,
|
||||
ofono_radio_settings_fast_dormancy_query_cb_t cb,
|
||||
void *data);
|
||||
void ril_set_fast_dormancy(struct ofono_radio_settings *rs,
|
||||
ofono_bool_t enable,
|
||||
ofono_radio_settings_fast_dormancy_set_cb_t cb,
|
||||
void *data);
|
||||
void ril_query_available_rats(struct ofono_radio_settings *rs,
|
||||
ofono_radio_settings_available_rats_query_cb_t cb,
|
||||
void *data);
|
Loading…
Reference in New Issue