r1282 - in trunk/src/target/gsm: include/gsmd src/libgsmd
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Thu Mar 8 22:51:12 CET 2007
Author: laforge
Date: 2007-03-08 22:51:11 +0100 (Thu, 08 Mar 2007)
New Revision: 1282
Added:
trunk/src/target/gsm/include/gsmd/state.h
Modified:
trunk/src/target/gsm/include/gsmd/event.h
trunk/src/target/gsm/include/gsmd/gsmd.h
trunk/src/target/gsm/include/gsmd/usock.h
trunk/src/target/gsm/src/libgsmd/libgsmd_voicecall.c
Log:
this was supposed to be part of the last commit (1281)
Modified: trunk/src/target/gsm/include/gsmd/event.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/event.h 2007-03-08 21:48:59 UTC (rev 1281)
+++ trunk/src/target/gsm/include/gsmd/event.h 2007-03-08 21:51:11 UTC (rev 1282)
@@ -15,6 +15,7 @@
GSMD_EVT_CALL_WAIT = 10, /* Call Waiting */
GSMD_EVT_TIMEZONE = 11, /* Timezone change */
GSMD_EVT_SUBSCRIPTIONS = 12, /* To which events are we subscribed to */
+ GSMD_EVT_CIPHER = 13, /* Chiphering Information */
__NUM_GSMD_EVT
};
Modified: trunk/src/target/gsm/include/gsmd/gsmd.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/gsmd.h 2007-03-08 21:48:59 UTC (rev 1281)
+++ trunk/src/target/gsm/include/gsmd/gsmd.h 2007-03-08 21:51:11 UTC (rev 1282)
@@ -9,6 +9,7 @@
#include <gsmd/vendorplugin.h>
#include <gsmd/select.h>
+#include <gsmd/state.h>
void *gsmd_tallocs;
@@ -64,6 +65,7 @@
struct llist_head pending_atcmds; /* our busy gsmd_atcmds */
struct llist_head busy_atcmds; /* our busy gsmd_atcmds */
struct gsmd_vendor_plugin *vendorpl;
+ struct gsmd_device_state dev_state;
};
struct gsmd_user {
Added: trunk/src/target/gsm/include/gsmd/state.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/state.h 2007-03-08 21:48:59 UTC (rev 1281)
+++ trunk/src/target/gsm/include/gsmd/state.h 2007-03-08 21:51:11 UTC (rev 1282)
@@ -0,0 +1,23 @@
+#ifndef _GSMD_STATE_H
+#define _GSMD_STATE_H
+
+#ifdef __GSMD__
+
+#define GSMD_CIPHIND_CAPABLE 0x01
+#define GSMD_CIPHIND_DISABLED_SIM 0x02
+#define GSMD_CIPHIND_ACTIVE 0x04
+
+struct gsmd_device_state {
+ struct {
+ unsigned int flags;
+ unsigned int network_state_gsm;
+ unsigned int network_state_gprs;
+ } ciph_ind;
+
+ unsigned int on;
+ unsigned int registered;
+};
+
+#endif /* __GSMD__ */
+
+#endif /* _GSMD_STATE_H */
Modified: trunk/src/target/gsm/include/gsmd/usock.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/usock.h 2007-03-08 21:48:59 UTC (rev 1281)
+++ trunk/src/target/gsm/include/gsmd/usock.h 2007-03-08 21:51:11 UTC (rev 1282)
@@ -35,6 +35,8 @@
GSMD_VOICECALL_HANGUP = 2,
GSMD_VOICECALL_ANSWER = 3,
GSMD_VOICECALL_DTMF = 4,
+ GSMD_VOICECALL_VOL_SET = 5,
+ GSMD_VOICECALL_VOL_GET = 6,
};
/* Handset / MT related commands */
@@ -58,6 +60,7 @@
GSMD_NETWORK_VMAIL_GET = 3,
GSMD_NETWORK_VMAIL_SET = 4,
GSMD_NETWORK_OPER_GET = 5,
+ GSMD_NETWORK_CIND_GET = 6,
};
/* Length from 3GPP TS 04.08, Clause 10.5.4.7 */
@@ -119,6 +122,11 @@
tch:1,
dir:2;
} call_status;
+ struct {
+ u_int16_t flags;
+ u_int16_t net_state_gsm;
+ u_int16_t net_state_gprs;
+ } cipher;
} u;
} __attribute__((packed));
Modified: trunk/src/target/gsm/src/libgsmd/libgsmd_voicecall.c
===================================================================
--- trunk/src/target/gsm/src/libgsmd/libgsmd_voicecall.c 2007-03-08 21:48:59 UTC (rev 1281)
+++ trunk/src/target/gsm/src/libgsmd/libgsmd_voicecall.c 2007-03-08 21:51:11 UTC (rev 1282)
@@ -107,3 +107,9 @@
{
return lgsm_send_simple(lh, GSMD_MSG_VOICECALL, GSMD_VOICECALL_HANGUP);
}
+
+int lgsm_voice_volume_set(struct lgsm_handle *lh, int volume)
+{
+ /* FIXME: we need to pass along the parameter */
+ return lgsm_send_simple(lh, GSMD_MSG_VOICECALL, GSMD_VOICECALL_VOL_SET);
+}
More information about the commitlog
mailing list