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

Phonet: add modem parameter to ISI client API

This commit is contained in:
Rémi Denis-Courmont 2009-08-18 14:34:27 +03:00 committed by Aki Niemi
parent 20f73898ec
commit 5e2a1745fb
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/isimodem/isimodem.c
View File

@ -418,7 +418,7 @@ static void netlink_status_cb(bool up, uint8_t addr, GIsiModem *idx,
if (up) {
if (!client) {
client = g_isi_client_create(PN_PHONE_INFO);
client = g_isi_client_create(idx, PN_PHONE_INFO);
if (!client)
return;
}

3
drivers/isimodem/isiphonebook.c
View File

@ -390,7 +390,8 @@ static int isi_phonebook_probe(struct ofono_phonebook *pb)
struct pb_data *pbd;
if (!client) {
client = g_isi_client_create(PN_SIM);
/* FIXME: pass GIsiModem object */
client = g_isi_client_create(NULL, PN_SIM);
if (!client)
return -ENOMEM;
}

4
gisi/client.c
View File

@ -84,7 +84,7 @@ static inline GIsiClient *g_isi_cl(void *ptr)
* @param resource PhoNet resource ID for the client
* @return NULL on error (see errno), a GIsiClient pointer on success,
*/
GIsiClient *g_isi_client_create(uint8_t resource)
GIsiClient *g_isi_client_create(GIsiModem *modem, uint8_t resource)
{
void *ptr;
GIsiClient *cl;
@ -112,7 +112,7 @@ GIsiClient *g_isi_client_create(uint8_t resource)
cl->next[254] = 0;
cl->prev[255] = cl->next[255] = 255;
channel = phonet_new(NULL, resource);
channel = phonet_new(modem, resource);
if (channel == NULL) {
free(cl);
return NULL;

3
gisi/client.h
View File

@ -30,6 +30,7 @@ extern "C" {
#include <stdint.h>
#include <stdbool.h>
#include <gisi/modem.h>
struct _GIsiClient;
typedef struct _GIsiClient GIsiClient;
@ -45,7 +46,7 @@ typedef void (*GIsiIndicationFunc) (GIsiClient *client,
const void *restrict data, size_t len,
uint16_t object, void *opaque);
GIsiClient *g_isi_client_create(uint8_t resource);
GIsiClient *g_isi_client_create(GIsiModem *modem, uint8_t resource);
uint8_t g_isi_client_resource(GIsiClient *client);

2
gisi/pipe.c
View File

@ -191,7 +191,7 @@ GIsiPipe *g_isi_pipe_create(uint16_t obj1, uint16_t obj2,
};
GIsiPipe *pipe = g_malloc(sizeof(*pipe));
pipe->client = g_isi_client_create(PN_PIPE);
pipe->client = g_isi_client_create(NULL, PN_PIPE);
pipe->error = 0;
pipe->enabling = false;
pipe->enabled = false;