From 95a47df997f32335c32c2d53f99b8438c0f09f4a Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 2 Sep 2009 19:27:47 -0700 Subject: [PATCH] Fix some broken DOS newline messup --- plugins/phonesim.c | 345 +++++++++++++++++++++++---------------------- 1 file changed, 177 insertions(+), 168 deletions(-) diff --git a/plugins/phonesim.c b/plugins/phonesim.c index 68423e4e..9190874a 100644 --- a/plugins/phonesim.c +++ b/plugins/phonesim.c @@ -1,168 +1,177 @@ -/* - * - * 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 - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include - -#include -#include - -#define OFONO_API_SUBJECT_TO_CHANGE -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static int phonesim_probe(struct ofono_modem *modem) -{ - return 0; -} - -static void phonesim_remove(struct ofono_modem *modem) -{ -} - -static int phonesim_enable(struct ofono_modem *modem) -{ - GIOChannel *io; - GAtChat *chat; - GAtSyntax *syntax; - struct sockaddr_in addr; - int sk, err; - - DBG("%p", modem); - - sk = socket(PF_INET, SOCK_STREAM, 0); - if (sk < 0) - return -EINVAL; - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = inet_addr("127.0.0.1"); - addr.sin_port = htons(12345); - - err = connect(sk, (struct sockaddr *) &addr, sizeof(addr)); - if (err < 0) { - close(sk); - return err; - } - - io = g_io_channel_unix_new(sk); - if (!io) { - close(sk); - return -ENOMEM; - } - - syntax = g_at_syntax_new_gsmv1(); - chat = g_at_chat_new(io, syntax); - g_at_syntax_unref(syntax); - - if (!chat) { - g_io_channel_unref(io); - return -ENOMEM; - } - - g_io_channel_unref(io); - - ofono_modem_set_data(modem, chat); - - return 0; -} - -static int phonesim_disable(struct ofono_modem *modem) -{ - GAtChat *chat = ofono_modem_get_data(modem); - - DBG("%p", modem); - - ofono_modem_set_data(modem, NULL); - - g_at_chat_unref(chat); - - return 0; -} - -static void phonesim_populate(struct ofono_modem *modem) -{ - GAtChat *chat = ofono_modem_get_data(modem); - struct ofono_message_waiting *mw; - - DBG("%p", modem); - - ofono_devinfo_create(modem, 0, "atmodem", chat); - ofono_ussd_create(modem, 0, "atmodem", chat); - ofono_sim_create(modem, 0, "atmodem", chat); - ofono_call_forwarding_create(modem, 0, "atmodem", chat); - ofono_call_settings_create(modem, 0, "atmodem", chat); - ofono_netreg_create(modem, 0, "atmodem", chat); - ofono_voicecall_create(modem, 0, "atmodem", chat); - ofono_call_meter_create(modem, 0, "atmodem", chat); - ofono_call_barring_create(modem, 0, "atmodem", chat); - ofono_ssn_create(modem, 0, "atmodem", chat); - ofono_sms_create(modem, 0, "atmodem", chat); - ofono_phonebook_create(modem, 0, "atmodem", chat); - - mw = ofono_message_waiting_create(modem); - if (mw) - ofono_message_waiting_register(mw); -} - -static struct ofono_modem_driver phonesim_driver = { - .name = "phonesim", - .probe = phonesim_probe, - .remove = phonesim_remove, - .enable = phonesim_enable, - .disable = phonesim_disable, - .populate = phonesim_populate, -}; - -static int phonesim_init(void) -{ - return ofono_modem_driver_register(&phonesim_driver); -} - -static void phonesim_exit(void) -{ - ofono_modem_driver_unregister(&phonesim_driver); -} - -OFONO_PLUGIN_DEFINE(phonesim, "PhoneSIM driver", VERSION, - OFONO_PLUGIN_PRIORITY_DEFAULT, phonesim_init, phonesim_exit) +/* + * + * 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 + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#define OFONO_API_SUBJECT_TO_CHANGE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int phonesim_probe(struct ofono_modem *modem) +{ + return 0; +} + +static void phonesim_remove(struct ofono_modem *modem) +{ +} + +static void phonesim_debug(const char *str, void *user_data) +{ + ofono_info("%s", str); +} + +static int phonesim_enable(struct ofono_modem *modem) +{ + GIOChannel *io; + GAtChat *chat; + GAtSyntax *syntax; + struct sockaddr_in addr; + int sk, err; + + DBG("%p", modem); + + sk = socket(PF_INET, SOCK_STREAM, 0); + if (sk < 0) + return -EINVAL; + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + addr.sin_port = htons(12345); + + err = connect(sk, (struct sockaddr *) &addr, sizeof(addr)); + if (err < 0) { + close(sk); + return err; + } + + io = g_io_channel_unix_new(sk); + if (!io) { + close(sk); + return -ENOMEM; + } + + syntax = g_at_syntax_new_gsmv1(); + chat = g_at_chat_new(io, syntax); + g_at_syntax_unref(syntax); + + if (!chat) { + g_io_channel_unref(io); + return -ENOMEM; + } + + if (getenv("OFONO_AT_DEBUG")) + g_at_chat_set_debug(chat, phonesim_debug, NULL); + + g_io_channel_unref(io); + + ofono_modem_set_data(modem, chat); + + return 0; +} + +static int phonesim_disable(struct ofono_modem *modem) +{ + GAtChat *chat = ofono_modem_get_data(modem); + + DBG("%p", modem); + + ofono_modem_set_data(modem, NULL); + + g_at_chat_unref(chat); + + return 0; +} + +static void phonesim_populate(struct ofono_modem *modem) +{ + GAtChat *chat = ofono_modem_get_data(modem); + struct ofono_message_waiting *mw; + + DBG("%p", modem); + + ofono_devinfo_create(modem, 0, "atmodem", chat); + ofono_ussd_create(modem, 0, "atmodem", chat); + ofono_sim_create(modem, 0, "atmodem", chat); + ofono_call_forwarding_create(modem, 0, "atmodem", chat); + ofono_call_settings_create(modem, 0, "atmodem", chat); + ofono_netreg_create(modem, 0, "atmodem", chat); + ofono_voicecall_create(modem, 0, "atmodem", chat); + ofono_call_meter_create(modem, 0, "atmodem", chat); + ofono_call_barring_create(modem, 0, "atmodem", chat); + ofono_ssn_create(modem, 0, "atmodem", chat); + ofono_sms_create(modem, 0, "atmodem", chat); + ofono_phonebook_create(modem, 0, "atmodem", chat); + + mw = ofono_message_waiting_create(modem); + if (mw) + ofono_message_waiting_register(mw); +} + +static struct ofono_modem_driver phonesim_driver = { + .name = "phonesim", + .probe = phonesim_probe, + .remove = phonesim_remove, + .enable = phonesim_enable, + .disable = phonesim_disable, + .populate = phonesim_populate, +}; + +static int phonesim_init(void) +{ + return ofono_modem_driver_register(&phonesim_driver); +} + +static void phonesim_exit(void) +{ + ofono_modem_driver_unregister(&phonesim_driver); +} + +OFONO_PLUGIN_DEFINE(phonesim, "PhoneSIM driver", VERSION, + OFONO_PLUGIN_PRIORITY_DEFAULT, phonesim_init, phonesim_exit)