From 21d31939d1d13feedafd41c938b8f99eaeddf8ff Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Sat, 20 Mar 2004 17:27:10 +0000
Subject: [PATCH] Merge ADSI fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2501 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_adsiprog.c | 13 +++++++++++++
include/asterisk/adsi.h | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 7b6e06d50a..12742609d0 100755
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -695,6 +695,18 @@ static int digitdirect(char *buf, char *name, int id, char *args, struct adsi_sc
return 2;
}
+static int clearcbone(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+{
+ char *tok;
+ tok = get_token(&args, script, lineno);
+ if (tok)
+ ast_log(LOG_WARNING, "CLEARCB1 requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
+
+ buf[0] = id;
+ buf[1] = 0;
+ return 2;
+}
+
static int digitcollect(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
{
char *tok;
@@ -831,6 +843,7 @@ static struct adsi_key_cmd kcmds[] = {
{ "VOICEMODE", 0x93 },
/* Display call buffer 'n' */
/* Clear call buffer 'n' */
+ { "CLEARCB1", 0x95, clearcbone },
{ "DIGITCOLLECT", 0x96, digitcollect },
{ "DIGITDIRECT", 0x96, digitdirect },
{ "CLEAR", 0x97 },
diff --git a/include/asterisk/adsi.h b/include/asterisk/adsi.h
index 87b18c31fa..33d5a1ae95 100755
--- a/include/asterisk/adsi.h
+++ b/include/asterisk/adsi.h
@@ -96,8 +96,8 @@
#define ADSI_INFO_PAGE 0x0
#define ADSI_COMM_PAGE 0x1
-#define ADSI_KEY_APPS 16 /* 16 to 33 reserved for applications */
-
+#define ADSI_KEY_APPS 20 /* 16 to 33 reserved for applications */
+ /* Changed to 20 by MDH */
/* Justification */
#define ADSI_JUST_LEFT 0x2
#define ADSI_JUST_RIGHT 0x1
--
GitLab