Get rid of modem.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 1b64870..2e3e607 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ endif
 sbin_PROGRAMS = ofonod
 
 ofonod_SOURCES = main.c ofono.h log.c plugin.c \
-               driver.h modem.h modem.c common.h common.c \
+               driver.h modem.c common.h common.c \
                manager.c dbus.c util.h util.c \
                network.c voicecall.c ussd.h ussd.c sms.c \
                call-settings.c call-forwarding.c call-meter.c \

diff --git a/src/modem.c b/src/modem.c
index e52a398..5b19b93 100644 (file)
--- a/src/modem.c
+++ b/src/modem.c
@@ -393,7 +393,8 @@ static gboolean query_manufacturer(gpointer user)
        return FALSE;
 }
 
-struct ofono_modem *modem_create(int id, struct ofono_modem_attribute_ops *ops)
+static struct ofono_modem *modem_create(int id,
+                                       struct ofono_modem_attribute_ops *ops)
 {
        char path[128];
        DBusConnection *conn = ofono_dbus_get_connection();
@@ -432,7 +433,7 @@ struct ofono_modem *modem_create(int id, struct ofono_modem_attribute_ops *ops)
        return modem;
 }
 
-void modem_remove(struct ofono_modem *modem)
+static void modem_remove(struct ofono_modem *modem)
 {
        DBusConnection *conn = ofono_dbus_get_connection();
        /* Need to make a copy to keep gdbus happy */

diff --git a/src/modem.h b/src/modem.h
deleted file mode 100644 (file)
index 60a142f..0000000
--- a/src/modem.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *
- *  oFono - Open Source Telephony
- *
- *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
- *
- *  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 ofono_modem_attribute_ops;
-
-struct ofono_modem *modem_create(int id, struct ofono_modem_attribute_ops *ops);
-void modem_remove(struct ofono_modem *modem);