sailfishos/ofono
1
0
Fork 1
mirror of https://github.com/sailfishos/ofono synced 2025-12-02 23:51:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some minor style cleanups for STE support

Browse Source
This commit is contained in:
Marcel Holtmann
2010-01-28 11:30:56 +01:00
parent 5431aeea0d
commit ae6a0b32cf
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/ste.c
View File

@@ -53,6 +53,7 @@
#include <ofono/gprs.h> #include <ofono/gprs.h>
#include <ofono/gprs-context.h> #include <ofono/gprs-context.h>
#include <drivers/atmodem/vendor.h> #include <drivers/atmodem/vendor.h>
#include <drivers/stemodem/caif_socket.h> #include <drivers/stemodem/caif_socket.h>
#include <drivers/stemodem/if_caif.h> #include <drivers/stemodem/if_caif.h>
@@ -67,11 +68,11 @@ static int ste_probe(struct ofono_modem *modem)
DBG("%p", modem); DBG("%p", modem);
data = g_try_new0(struct ste_data, 1); data = g_try_new0(struct ste_data, 1);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
ofono_modem_set_data(modem, data); ofono_modem_set_data(modem, data);
return 0; return 0;
} }
@@ -117,9 +118,10 @@ static int ste_enable(struct ofono_modem *modem)
/* Create a CAIF socket for AT Service */ /* Create a CAIF socket for AT Service */
fd = socket(AF_CAIF, SOCK_SEQPACKET, CAIFPROTO_AT); fd = socket(AF_CAIF, SOCK_SEQPACKET, CAIFPROTO_AT);
if (fd < 0) { if (fd < 0) {
ofono_debug("Failed to create CAIF socket for AT"); ofono_error("Failed to create CAIF socket for AT");
return -EIO; return -EIO;
} }
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
addr.family = AF_CAIF; addr.family = AF_CAIF;
addr.u.at.type = CAIF_ATTYPE_PLAIN; addr.u.at.type = CAIF_ATTYPE_PLAIN;
@@ -127,6 +129,7 @@ static int ste_enable(struct ofono_modem *modem)
/* Connect to the AT Service at the modem */ /* Connect to the AT Service at the modem */
err = connect(fd, (struct sockaddr *) &addr, sizeof(addr)); err = connect(fd, (struct sockaddr *) &addr, sizeof(addr));
if (err < 0) { if (err < 0) {
ofono_error("Failed to connect CAIF socket for AT");
close(fd); close(fd);
return err; return err;
} }
@@ -190,6 +193,7 @@ static int ste_disable(struct ofono_modem *modem)
static void ste_pre_sim(struct ofono_modem *modem) static void ste_pre_sim(struct ofono_modem *modem)
{ {
struct ste_data *data = ofono_modem_get_data(modem); struct ste_data *data = ofono_modem_get_data(modem);
DBG("%p", modem); DBG("%p", modem);
ofono_devinfo_create(modem, 0, "atmodem", data->chat); ofono_devinfo_create(modem, 0, "atmodem", data->chat);
@@ -205,6 +209,7 @@ static void ste_post_sim(struct ofono_modem *modem)
struct ofono_gprs_context *gc; struct ofono_gprs_context *gc;
DBG("%p", modem); DBG("%p", modem);
ofono_ussd_create(modem, 0, "atmodem", data->chat); ofono_ussd_create(modem, 0, "atmodem", data->chat);
ofono_call_forwarding_create(modem, 0, "atmodem", data->chat); ofono_call_forwarding_create(modem, 0, "atmodem", data->chat);
ofono_call_settings_create(modem, 0, "atmodem", data->chat); ofono_call_settings_create(modem, 0, "atmodem", data->chat);
@@ -250,4 +255,4 @@ static void ste_exit(void)
} }
OFONO_PLUGIN_DEFINE(ste, "ST-Ericsson modem driver", VERSION, OFONO_PLUGIN_DEFINE(ste, "ST-Ericsson modem driver", VERSION,
OFONO_PLUGIN_PRIORITY_DEFAULT, ste_init, ste_exit) OFONO_PLUGIN_PRIORITY_DEFAULT, ste_init, ste_exit)

1
unit/test-caif.c
View File

@@ -49,6 +49,7 @@ static int do_connect(void)
g_printerr("CAIF socket creation failed (%d)\n", errno); g_printerr("CAIF socket creation failed (%d)\n", errno);
return -EIO; return -EIO;
} }
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
addr.family = AF_CAIF; addr.family = AF_CAIF;
addr.u.at.type = CAIF_ATTYPE_PLAIN; addr.u.at.type = CAIF_ATTYPE_PLAIN;