summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAki Niemi <aki.niemi@nokia.com>2011-03-03 15:37:38 +0200
committerAki Niemi <aki.niemi@nokia.com>2011-03-03 17:43:30 +0200
commit1e81ed20ead8157c7513f3eaa8c054291529ad93 (patch)
tree035d964ca7d1f57afec2892916dd686f52ff2202 /drivers
parent4ba0846ecd273eeccc4c40f8274a6a82c56414d9 (diff)
downloadofono-1e81ed20ead8157c7513f3eaa8c054291529ad93.tar.bz2
isimodem: Move SS related codepoints to ss.h
Diffstat (limited to 'drivers')
-rw-r--r--drivers/isimodem/ss.h26
-rw-r--r--drivers/isimodem/ssn.c27
2 files changed, 26 insertions, 27 deletions
diff --git a/drivers/isimodem/ss.h b/drivers/isimodem/ss.h
index 8a2942ed..266d883d 100644
--- a/drivers/isimodem/ss.h
+++ b/drivers/isimodem/ss.h
@@ -144,4 +144,30 @@ enum ss_constants {
SS_UNDEFINED_TIME = 0x00,
};
+/* TS 27.007 Supplementary service notifications +CSSN */
+enum ss_cssi {
+ SS_MO_UNCONDITIONAL_FORWARDING = 0,
+ SS_MO_CONDITIONAL_FORWARDING = 1,
+ SS_MO_CALL_FORWARDED = 2,
+ SS_MO_CALL_WAITING = 3,
+ SS_MO_CUG_CALL = 4,
+ SS_MO_OUTGOING_BARRING = 5,
+ SS_MO_INCOMING_BARRING = 6,
+ SS_MO_CLIR_SUPPRESSION_REJECTED = 7,
+ SS_MO_CALL_DEFLECTED = 8,
+};
+
+enum ss_cssu {
+ SS_MT_CALL_FORWARDED = 0,
+ SS_MT_CUG_CALL = 1,
+ SS_MT_VOICECALL_ON_HOLD = 2,
+ SS_MT_VOICECALL_RETRIEVED = 3,
+ SS_MT_MULTIPARTY_VOICECALL = 4,
+ SS_MT_VOICECALL_HOLD_RELEASED = 5,
+ SS_MT_FORWARD_CHECK_SS_MESSAGE = 6,
+ SS_MT_VOICECALL_IN_TRANSFER = 7,
+ SS_MT_VOICECALL_TRANSFERRED = 8,
+ SS_MT_CALL_DEFLECTED = 9,
+};
+
#endif /* __ISIMODEM_SS_H */
diff --git a/drivers/isimodem/ssn.c b/drivers/isimodem/ssn.c
index c2a1f19a..115924be 100644
--- a/drivers/isimodem/ssn.c
+++ b/drivers/isimodem/ssn.c
@@ -45,34 +45,7 @@
#include "isiutil.h"
#include "debug.h"
-#define NOT_3GGP_NOTIFICATION -1
-#define PN_SS 0x06
-
-/* TS 27.007 Supplementary service notifications +CSSN */
-enum ss_cssi {
- SS_MO_UNCONDITIONAL_FORWARDING = 0,
- SS_MO_CONDITIONAL_FORWARDING = 1,
- SS_MO_CALL_FORWARDED = 2,
- SS_MO_CALL_WAITING = 3,
- SS_MO_CUG_CALL = 4,
- SS_MO_OUTGOING_BARRING = 5,
- SS_MO_INCOMING_BARRING = 6,
- SS_MO_CLIR_SUPPRESSION_REJECTED = 7,
- SS_MO_CALL_DEFLECTED = 8,
-};
-enum ss_cssu {
- SS_MT_CALL_FORWARDED = 0,
- SS_MT_CUG_CALL = 1,
- SS_MT_VOICECALL_ON_HOLD = 2,
- SS_MT_VOICECALL_RETRIEVED = 3,
- SS_MT_MULTIPARTY_VOICECALL = 4,
- SS_MT_VOICECALL_HOLD_RELEASED = 5,
- SS_MT_FORWARD_CHECK_SS_MESSAGE = 6,
- SS_MT_VOICECALL_IN_TRANSFER = 7,
- SS_MT_VOICECALL_TRANSFERRED = 8,
- SS_MT_CALL_DEFLECTED = 9,
-};
struct ssn_data {
GIsiClient *client;