From 234dfedbaaaafe110970ec0a140ae222c10cdae5 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 3 Dec 2015 13:25:47 -0600 Subject: rilmodem: Remove drivers/rilmodem/gprs.h --- Makefile.am | 1 - drivers/rilmodem/gprs.c | 8 ++++++++ drivers/rilmodem/gprs.h | 30 ------------------------------ 3 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 drivers/rilmodem/gprs.h diff --git a/Makefile.am b/Makefile.am index 74c8c730..f2ed33c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -137,7 +137,6 @@ builtin_sources += drivers/rilmodem/rilmodem.h \ drivers/rilmodem/voicecall.h \ drivers/rilmodem/call-volume.c \ drivers/rilmodem/gprs.c \ - drivers/rilmodem/gprs.h \ drivers/rilmodem/gprs-context.c \ drivers/rilmodem/sim.c \ drivers/rilmodem/sms.c \ diff --git a/drivers/rilmodem/gprs.c b/drivers/rilmodem/gprs.c index 6ef45768..955f2de2 100644 --- a/drivers/rilmodem/gprs.c +++ b/drivers/rilmodem/gprs.c @@ -50,6 +50,14 @@ /* Time between get data status retries */ #define GET_STATUS_TIMER_MS 5000 +struct ril_gprs_data { + GRil *ril; + struct ofono_modem *modem; + gboolean ofono_attached; + int rild_status; + int pending_deact_req; +}; + /* * This module is the ofono_gprs_driver implementation for rilmodem. * diff --git a/drivers/rilmodem/gprs.h b/drivers/rilmodem/gprs.h deleted file mode 100644 index 5a1cd6c5..00000000 --- a/drivers/rilmodem/gprs.h +++ /dev/null @@ -1,30 +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 - * - */ - -#include "drivers/rilmodem/rilutil.h" - -struct ril_gprs_data { - GRil *ril; - struct ofono_modem *modem; - gboolean ofono_attached; - int rild_status; - int pending_deact_req; -}; -- cgit v1.2.3