mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

Browse Source 
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a222240dbb
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Bas
2012-09-26 17:52:47 +08:00
parent 52e2829082 891e36bff4
commit 89dd15ca8f
15 changed files with 163 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libcoolstream/ca_cs.h
View File

@@ -11,8 +11,8 @@
#define __CA_CS_H_
#include <OpenThreads/Thread>
#include "cs_types.h"
#include <vector>
#include "cs_types.h"
enum CA_INIT_MASK {
CA_INIT_SC = 1,
@@ -23,7 +23,7 @@ enum CA_INIT_MASK {
enum CA_SLOT_TYPE {
CA_SLOT_TYPE_SMARTCARD,
CA_SLOT_TYPE_CI,
CA_SLOT_TYPE_ALL
CA_SLOT_TYPE_ALL,
};
enum CA_MESSAGE_FLAGS {
@@ -49,7 +49,7 @@ enum CA_MESSAGE_FLAGS {
CA_MESSAGE_HAS_PARAM1_LONG = (1 << 19),
CA_MESSAGE_HAS_PARAM2_LONG = (1 << 20),
CA_MESSAGE_HAS_PARAM3_LONG = (1 << 21),
CA_MESSAGE_HAS_PARAM4_LONG = (1 << 22)
CA_MESSAGE_HAS_PARAM4_LONG = (1 << 22),
};
enum CA_MESSAGE_MSGID {
@@ -72,7 +72,7 @@ enum CA_MESSAGE_MSGID {
CA_MESSAGE_MSG_EMM_ARRIVED,
CA_MESSAGE_MSG_CHANNEL_CHANGE,
CA_MESSAGE_MSG_GUI_READY,
CA_MESSAGE_MSG_EXIT
CA_MESSAGE_MSG_EXIT,
};
typedef struct CA_MESSAGE {