sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Add support for using old CAIF subsystem with character devices

This commit is contained in:
Marcel Holtmann 2010-01-30 07:44:13 -08:00
parent 3e46541dd4
commit 16f477653d
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/modemconf.c
View File

@ -121,6 +121,7 @@ static struct {
{ "phonesim", set_address },
{ "atgen", set_device },
{ "g1", set_device },
{ "ste", set_device },
{ "calypso", set_device },
{ "palmpre", set_device },
{ NULL }

51
plugins/ste.c
View File

@ -25,6 +25,8 @@
#endif
#include <errno.h>
#include <stdio.h>
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@ -110,29 +112,42 @@ static int ste_enable(struct ofono_modem *modem)
struct ste_data *data = ofono_modem_get_data(modem);
GIOChannel *channel;
GAtSyntax *syntax;
int fd, err;
struct sockaddr_caif addr;
const char *device;
int fd;
DBG("%p", modem);
/* Create a CAIF socket for AT Service */
fd = socket(AF_CAIF, SOCK_SEQPACKET, CAIFPROTO_AT);
if (fd < 0) {
ofono_error("Failed to create CAIF socket for AT");
return -EIO;
device = ofono_modem_get_string(modem, "Device");
if (!device) {
struct sockaddr_caif addr;
int err;
/* Create a CAIF socket for AT Service */
fd = socket(AF_CAIF, SOCK_SEQPACKET, CAIFPROTO_AT);
if (fd < 0) {
ofono_error("Failed to create CAIF socket for AT");
return -EIO;
}
memset(&addr, 0, sizeof(addr));
addr.family = AF_CAIF;
addr.u.at.type = CAIF_ATTYPE_PLAIN;
/* Connect to the AT Service at the modem */
err = connect(fd, (struct sockaddr *) &addr, sizeof(addr));
if (err < 0) {
ofono_error("Failed to connect CAIF socket for AT");
close(fd);
return err;
}
} else {
fd = open(device, O_RDWR);
if (fd < 0) {
ofono_error("Failed to open device %s", device);
return -EIO;
}
}
memset(&addr, 0, sizeof(addr));
addr.family = AF_CAIF;
addr.u.at.type = CAIF_ATTYPE_PLAIN;
/* Connect to the AT Service at the modem */
err = connect(fd, (struct sockaddr *) &addr, sizeof(addr));
if (err < 0) {
ofono_error("Failed to connect CAIF socket for AT");
close(fd);
return err;
}
channel = g_io_channel_unix_new(fd);
if (!channel) {
close(fd);