From 03066eab04c5515e069dc6f6bf5fedca79b1192c Mon Sep 17 00:00:00 2001
From: focus <focus@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Wed, 17 Mar 2010 09:49:44 +0000
Subject: [PATCH] Testing CI reset

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@491 e54a6e83-5905-42d5-8d5c-058d10e6a962
---
 data/locale/english.locale |  1 +
 lib/libcoolstream/dvb-ci.h | 22 +++++++++++-----------
 src/gui/cam_menu.cpp       |  7 +++++++
 src/system/locals.h        |  1 +
 src/system/locals_intern.h |  1 +
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/data/locale/english.locale b/data/locale/english.locale
index ead7c801b..2a104b45d 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1361,6 +1361,7 @@ cam.removed CAM removed from slot
 cam.init_ok CAM init complete
 cam.waiting Waiting for CI answer
 cam.timeout Timeout waiting CI menu ready
+cam.reset Reset
 subtitles.head Subtitles
 subtitles.stop Stop subtitles
 favorites.copy Copy bouquet to Favorites
diff --git a/lib/libcoolstream/dvb-ci.h b/lib/libcoolstream/dvb-ci.h
index 483ae2c4a..9b5f8486b 100644
--- a/lib/libcoolstream/dvb-ci.h
+++ b/lib/libcoolstream/dvb-ci.h
@@ -18,21 +18,20 @@ void CI_EnterMenu(unsigned char bSlotIndex);
 
 typedef struct
 {
-        int slot;
-        int choice_nb;
-        char title[MAX_MMI_TEXT_LEN];
-        char subtitle[MAX_MMI_TEXT_LEN];
-        char bottom[MAX_MMI_TEXT_LEN];
-        char choice_item[MAX_MMI_ITEMS][MAX_MMI_CHOICE_TEXT_LEN];
+	int slot;
+	int choice_nb;
+	char title[MAX_MMI_TEXT_LEN];
+	char subtitle[MAX_MMI_TEXT_LEN];
+	char bottom[MAX_MMI_TEXT_LEN];
+	char choice_item[MAX_MMI_ITEMS][MAX_MMI_CHOICE_TEXT_LEN];
 } MMI_MENU_LIST_INFO;
 
 typedef struct
 {
-        int slot;
-        int blind;
-        int answerlen;
-        char enguiryText[MAX_MMI_TEXT_LEN];
-
+	int slot;
+	int blind;
+	int answerlen;
+	char enguiryText[MAX_MMI_TEXT_LEN];
 } MMI_ENGUIRY_INFO;
 
 typedef void (*SEND_MSG_HOOK) (unsigned int msg, unsigned int data);
@@ -57,6 +56,7 @@ class cDvbCi {
 		void SetHook(SEND_MSG_HOOK _SendMessage) { SendMessage = _SendMessage; };
 		bool CamPresent(int slot);
 		bool GetName(int slot, char * name);
+		bool Reset(int slot);
 };
 
 #endif //__DVBCI_H
diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp
index b98e36a1e..f9d976a69 100644
--- a/src/gui/cam_menu.cpp
+++ b/src/gui/cam_menu.cpp
@@ -80,6 +80,10 @@ printf("CCAMMenuHandler::exec: actionkey %s\n", actionkey.c_str());
 		return doMenu(0);
 	} else if(actionkey == "cam2") {
 		return doMenu(1);
+	} else if(actionkey == "reset1") {
+		ci->Reset(0);
+	} else if(actionkey == "reset2") {
+		ci->Reset(1);
 	}
 
 	return doMainMenu ();
@@ -105,6 +109,8 @@ int CCAMMenuHandler::doMainMenu ()
 		ci->GetName(0, name1);
 printf("CCAMMenuHandler::doMenu cam1 name %s\n", name1);
 		cammenu->addItem(new CMenuForwarderNonLocalized(name1, true, NULL, this, "cam1", CRCInput::RC_1));
+		cammenu->addItem(new CMenuForwarder(LOCALE_CAM_RESET, true, NULL, this, "reset1"));
+		cammenu->addItem( GenericMenuSeparatorLine );
 	} else {
 		sprintf(str1, "%s 1", g_Locale->getText(LOCALE_CAM_EMPTY));
 		tempMenu = new CMenuWidget(str1, NEUTRINO_ICON_SETTINGS);
@@ -115,6 +121,7 @@ printf("CCAMMenuHandler::doMenu cam1 name %s\n", name1);
 		ci->GetName(1, name2);
 printf("CCAMMenuHandler::doMenu cam2 name %s\n", name2);
 		cammenu->addItem(new CMenuForwarderNonLocalized(name2, true, NULL, this, "cam2", CRCInput::RC_2));
+		cammenu->addItem(new CMenuForwarder(LOCALE_CAM_RESET, true, NULL, this, "reset2"));
 	} else {
 		sprintf(str2, "%s 2", g_Locale->getText(LOCALE_CAM_EMPTY));
 		tempMenu = new CMenuWidget(str2, NEUTRINO_ICON_SETTINGS);
diff --git a/src/system/locals.h b/src/system/locals.h
index 0d3c44863..52c421bcd 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1377,6 +1377,7 @@ typedef enum {
 	LOCALE_CAM_INIT_OK,
 	LOCALE_CAM_WAITING,
 	LOCALE_CAM_TIMEOUT,
+	LOCALE_CAM_RESET,
 	LOCALE_SUBTITLES_HEAD,
 	LOCALE_SUBTITLES_STOP,
 	LOCALE_FAN_SPEED,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 7232445ca..d2a9d600b 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1377,6 +1377,7 @@ const char *locale_real_names[] = {
 	"cam.init_ok",
 	"cam.waiting",
 	"cam.timeout",
+	"cam.reset",
 	"subtitles.head",
 	"subtitles.stop",
 	"fan_speed",