qemu: separated protobuf message & fixed a bug when it closed 24/10724/1
authorJinhyung Choi <jinhyung2.choi@samsung.com>
Mon, 30 Sep 2013 07:46:57 +0000 (16:46 +0900)
committerKitae Kim <kt920.kim@samsung.com>
Thu, 10 Oct 2013 07:24:16 +0000 (16:24 +0900)
Change-Id: I668b840624df066ff17ff1bce4a05de98d626000
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>
14 files changed:
tizen/src/ecs/Makefile.tizen
tizen/src/ecs/ecs.c
tizen/src/ecs/ecs.h
tizen/src/ecs/ecs_msg.c
tizen/src/ecs/genmsg/ecs.pb-c.c
tizen/src/ecs/genmsg/ecs.pb-c.h
tizen/src/ecs/genmsg/ecs_ids.pb-c.c [new file with mode: 0644]
tizen/src/ecs/genmsg/ecs_ids.pb-c.h [new file with mode: 0644]
tizen/src/ecs/genmsg/nfc.pb-c.c [new file with mode: 0644]
tizen/src/ecs/genmsg/nfc.pb-c.h [new file with mode: 0644]
tizen/src/ecs/msg/ecs.proto
tizen/src/ecs/msg/ecs_ids.proto [new file with mode: 0644]
tizen/src/ecs/msg/nfc.proto [new file with mode: 0644]
tizen/src/guest_server.h

index 1de913c..5ef9b70 100644 (file)
@@ -5,6 +5,8 @@ $(call set-vpath, $(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/tizen/src/ecs:$(SRC_PAT
 QEMU_CFLAGS += -I$(SRC_PATH)/tizen/distrib/protobuf
 QEMU_CFLAGS += -I$(SRC_PATH)/tizen/src/ecs/genmsg
 
-obj-y += ecs.pb-c.o protobuf-c.o
+obj-y += ecs.pb-c.o ecs_ids.pb-c.o protobuf-c.o
 obj-y += ecs_msg.o ecs.o ecs-json-streamer.o ecs_sensor.o
 
+# NFC message extension
+obj-y += nfc.pb-c.o
index b5c2c8f..974e38e 100644 (file)
@@ -934,13 +934,10 @@ static void ecs_close(ECS_State *cs) {
         cs->alive_timer = NULL;
     }
 
-    pthread_mutex_lock(&mutex_clilist);
-
     QTAILQ_FOREACH(clii, &clients, next)
     {
         ecs_client_close(clii);
     }
-    pthread_mutex_unlock(&mutex_clilist);
 
     if (NULL != cs) {
         g_free(cs);
@@ -1429,6 +1426,7 @@ static void* ecs_initialize(void* args) {
             break;
         }
     }
+    LOG("ecs_loop exited.");
 
     return NULL;
 }
@@ -1460,7 +1458,7 @@ bool handle_protobuf_msg(ECS_Client* cli, char* data, int len)
     ECS__Master* master = ecs__master__unpack(NULL, (size_t)len, (const uint8_t*)data);
     if (!master)
         return false;
-
+#if 0
     if (master->type == ECS__MASTER__TYPE__START_REQ)
     {
         ECS__StartReq* msg = master->start_req;
@@ -1468,6 +1466,7 @@ bool handle_protobuf_msg(ECS_Client* cli, char* data, int len)
             goto fail;
         msgproc_start_req(cli, msg);
     }
+#endif
     if (master->type == ECS__MASTER__TYPE__INJECTOR_REQ)
     {
         ECS__InjectorReq* msg = master->injector_req;
@@ -1475,6 +1474,7 @@ bool handle_protobuf_msg(ECS_Client* cli, char* data, int len)
             goto fail;
         msgproc_injector_req(cli, msg);
     }
+#if 0
     else if (master->type == ECS__MASTER__TYPE__CONTROL_MSG)
     {
         ECS__ControlMsg* msg = master->control_msg;
@@ -1482,6 +1482,7 @@ bool handle_protobuf_msg(ECS_Client* cli, char* data, int len)
             goto fail;
         msgproc_control_msg(cli, msg);
     }
+#endif
     else if (master->type == ECS__MASTER__TYPE__MONITOR_REQ)
     {
         ECS__MonitorReq* msg = master->monitor_req;
@@ -1496,6 +1497,7 @@ bool handle_protobuf_msg(ECS_Client* cli, char* data, int len)
             goto fail;
         msgproc_device_req(cli, msg);
     }
+#if 0
     else if (master->type == ECS__MASTER__TYPE__SCREEN_DUMP_REQ)
     {
         ECS__ScreenDumpReq* msg = master->screen_dump_req;
@@ -1503,6 +1505,7 @@ bool handle_protobuf_msg(ECS_Client* cli, char* data, int len)
             goto fail;
         msgproc_screen_dump_req(cli, msg);
     }
+#endif
     ecs__master__free_unpacked(master, NULL);
     return true;
 fail:
index efab4db..b1e9f5b 100644 (file)
@@ -39,6 +39,7 @@
 #include "qemu-common.h"
 #include "ecs-json-streamer.h"
 #include "genmsg/ecs.pb-c.h"
+#include "genmsg/ecs_ids.pb-c.h"
 
 #define ECS_DEBUG   1
 
@@ -192,25 +193,25 @@ void read_val_char(const char* data, unsigned char* ret_val);
 void read_val_str(const char* data, char* ret_val, int len);
 
 
-bool msgproc_start_req(ECS_Client* ccli, ECS__StartReq* msg);
+//bool msgproc_start_req(ECS_Client* ccli, ECS__StartReq* msg);
 bool msgproc_injector_req(ECS_Client* ccli, ECS__InjectorReq* msg);
-bool msgproc_control_msg(ECS_Client *cli, ECS__ControlMsg* msg);
+//bool msgproc_control_msg(ECS_Client *cli, ECS__ControlMsg* msg);
 bool msgproc_monitor_req(ECS_Client *ccli, ECS__MonitorReq* msg);
 bool msgproc_device_req(ECS_Client* ccli, ECS__DeviceReq* msg);
-bool msgproc_screen_dump_req(ECS_Client *ccli, ECS__ScreenDumpReq* msg);
+//bool msgproc_screen_dump_req(ECS_Client *ccli, ECS__ScreenDumpReq* msg);
 
 
-enum{
-    CONTROL_COMMAND_HOST_KEYBOARD_ONOFF_REQ = 1,
-    CONTROL_COMMAND_SCREENSHOT_REQ = 2
-};
+//enum{
+//    CONTROL_COMMAND_HOST_KEYBOARD_ONOFF_REQ = 1,
+//    CONTROL_COMMAND_SCREENSHOT_REQ = 2
+//};
 
 /* request */
 int accel_min_max(double value);
 void req_set_sensor_accel(int x, int y, int z);
 
 // control sub messages
-void msgproc_control_hostkeyboard_req(ECS_Client *cli, ECS__HostKeyboardReq* req);
+//void msgproc_control_hostkeyboard_req(ECS_Client *cli, ECS__HostKeyboardReq* req);
 
 void set_sensor_data(int length, const char* data);
 
index 68b2e46..77848f7 100644 (file)
@@ -103,7 +103,7 @@ bool send_to_ecp(ECS__Master* master)
 
 // message handlers
 
-
+#if 0
 bool msgproc_start_req(ECS_Client* ccli, ECS__StartReq* msg)
 {
     LOG("ecs_startinfo_req");
@@ -116,7 +116,7 @@ bool msgproc_start_req(ECS_Client* ccli, ECS__StartReq* msg)
 
     return true;
 }
-
+#endif
 bool msgproc_injector_req(ECS_Client* ccli, ECS__InjectorReq* msg)
 {
     char cmd[10];
@@ -169,7 +169,7 @@ bool msgproc_injector_req(ECS_Client* ccli, ECS__InjectorReq* msg)
 
     return true;
 }
-
+#if 0
 bool msgproc_control_msg(ECS_Client *cli, ECS__ControlMsg* msg)
 {
     if (msg->type == ECS__CONTROL_MSG__CONTROL_TYPE__HOSTKEYBOARD_REQ)
@@ -182,7 +182,7 @@ bool msgproc_control_msg(ECS_Client *cli, ECS__ControlMsg* msg)
 
     return true;
 }
-
+#endif
 bool msgproc_monitor_req(ECS_Client *ccli, ECS__MonitorReq* msg)
 {
 
@@ -236,7 +236,7 @@ bool msgproc_device_req(ECS_Client* ccli, ECS__DeviceReq* msg)
 
     return true;
 }
-
+#if 0
 bool msgproc_screen_dump_req(ECS_Client *ccli, ECS__ScreenDumpReq* msg)
 {
 
@@ -251,7 +251,7 @@ void msgproc_control_hostkeyboard_req(ECS_Client *clii, ECS__HostKeyboardReq* re
     int64_t is_on = req->ison;
     onoff_host_kbd(is_on);
 }
-
+#endif
 // end control command
 
 
@@ -319,7 +319,7 @@ bool ntf_to_injector(const char* data, const int len) {
 
     return true;
 }
-
+#if 0
 bool send_start_ans(int host_keyboard_onff)
 {
     ECS__Master master = ECS__MASTER__INIT;
@@ -339,7 +339,7 @@ bool send_start_ans(int host_keyboard_onff)
 
     return send_to_ecp(&master);
 }
-
+#endif
 bool send_injector_ntf(const char* data, const int len)
 {
     type_length length = 0;
@@ -396,7 +396,7 @@ bool send_injector_ntf(const char* data, const int len)
     return true;
 }
 
-
+#if 0
 bool send_hostkeyboard_ntf(int is_on)
 {
     ECS__Master master = ECS__MASTER__INIT;
@@ -415,7 +415,7 @@ bool send_hostkeyboard_ntf(int is_on)
 
     return send_to_ecp(&master);
 }
-
+#endif
 
 bool send_device_ntf(const char* data, const int len)
 {
index 536571d..7c85b22 100644 (file)
@@ -178,92 +178,6 @@ void   ecs__keep_alive_ans__free_unpacked
   PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__keep_alive_ans__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   ecs__start_req__init
-                     (ECS__StartReq         *message)
-{
-  static ECS__StartReq init_value = ECS__START_REQ__INIT;
-  *message = init_value;
-}
-size_t ecs__start_req__get_packed_size
-                     (const ECS__StartReq *message)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__start_req__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t ecs__start_req__pack
-                     (const ECS__StartReq *message,
-                      uint8_t       *out)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__start_req__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t ecs__start_req__pack_to_buffer
-                     (const ECS__StartReq *message,
-                      ProtobufCBuffer *buffer)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__start_req__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-ECS__StartReq *
-       ecs__start_req__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (ECS__StartReq *)
-     protobuf_c_message_unpack (&ecs__start_req__descriptor,
-                                allocator, len, data);
-}
-void   ecs__start_req__free_unpacked
-                     (ECS__StartReq *message,
-                      ProtobufCAllocator *allocator)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__start_req__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   ecs__start_ans__init
-                     (ECS__StartAns         *message)
-{
-  static ECS__StartAns init_value = ECS__START_ANS__INIT;
-  *message = init_value;
-}
-size_t ecs__start_ans__get_packed_size
-                     (const ECS__StartAns *message)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__start_ans__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t ecs__start_ans__pack
-                     (const ECS__StartAns *message,
-                      uint8_t       *out)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__start_ans__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t ecs__start_ans__pack_to_buffer
-                     (const ECS__StartAns *message,
-                      ProtobufCBuffer *buffer)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__start_ans__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-ECS__StartAns *
-       ecs__start_ans__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (ECS__StartAns *)
-     protobuf_c_message_unpack (&ecs__start_ans__descriptor,
-                                allocator, len, data);
-}
-void   ecs__start_ans__free_unpacked
-                     (ECS__StartAns *message,
-                      ProtobufCAllocator *allocator)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__start_ans__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
 void   ecs__injector_req__init
                      (ECS__InjectorReq         *message)
 {
@@ -522,221 +436,6 @@ void   ecs__device_ntf__free_unpacked
   PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__device_ntf__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   ecs__host_keyboard_req__init
-                     (ECS__HostKeyboardReq         *message)
-{
-  static ECS__HostKeyboardReq init_value = ECS__HOST_KEYBOARD_REQ__INIT;
-  *message = init_value;
-}
-size_t ecs__host_keyboard_req__get_packed_size
-                     (const ECS__HostKeyboardReq *message)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__host_keyboard_req__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t ecs__host_keyboard_req__pack
-                     (const ECS__HostKeyboardReq *message,
-                      uint8_t       *out)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__host_keyboard_req__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t ecs__host_keyboard_req__pack_to_buffer
-                     (const ECS__HostKeyboardReq *message,
-                      ProtobufCBuffer *buffer)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__host_keyboard_req__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-ECS__HostKeyboardReq *
-       ecs__host_keyboard_req__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (ECS__HostKeyboardReq *)
-     protobuf_c_message_unpack (&ecs__host_keyboard_req__descriptor,
-                                allocator, len, data);
-}
-void   ecs__host_keyboard_req__free_unpacked
-                     (ECS__HostKeyboardReq *message,
-                      ProtobufCAllocator *allocator)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__host_keyboard_req__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   ecs__host_keyboard_ntf__init
-                     (ECS__HostKeyboardNtf         *message)
-{
-  static ECS__HostKeyboardNtf init_value = ECS__HOST_KEYBOARD_NTF__INIT;
-  *message = init_value;
-}
-size_t ecs__host_keyboard_ntf__get_packed_size
-                     (const ECS__HostKeyboardNtf *message)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__host_keyboard_ntf__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t ecs__host_keyboard_ntf__pack
-                     (const ECS__HostKeyboardNtf *message,
-                      uint8_t       *out)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__host_keyboard_ntf__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t ecs__host_keyboard_ntf__pack_to_buffer
-                     (const ECS__HostKeyboardNtf *message,
-                      ProtobufCBuffer *buffer)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__host_keyboard_ntf__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-ECS__HostKeyboardNtf *
-       ecs__host_keyboard_ntf__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (ECS__HostKeyboardNtf *)
-     protobuf_c_message_unpack (&ecs__host_keyboard_ntf__descriptor,
-                                allocator, len, data);
-}
-void   ecs__host_keyboard_ntf__free_unpacked
-                     (ECS__HostKeyboardNtf *message,
-                      ProtobufCAllocator *allocator)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__host_keyboard_ntf__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   ecs__control_msg__init
-                     (ECS__ControlMsg         *message)
-{
-  static ECS__ControlMsg init_value = ECS__CONTROL_MSG__INIT;
-  *message = init_value;
-}
-size_t ecs__control_msg__get_packed_size
-                     (const ECS__ControlMsg *message)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__control_msg__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t ecs__control_msg__pack
-                     (const ECS__ControlMsg *message,
-                      uint8_t       *out)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__control_msg__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t ecs__control_msg__pack_to_buffer
-                     (const ECS__ControlMsg *message,
-                      ProtobufCBuffer *buffer)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__control_msg__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-ECS__ControlMsg *
-       ecs__control_msg__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (ECS__ControlMsg *)
-     protobuf_c_message_unpack (&ecs__control_msg__descriptor,
-                                allocator, len, data);
-}
-void   ecs__control_msg__free_unpacked
-                     (ECS__ControlMsg *message,
-                      ProtobufCAllocator *allocator)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__control_msg__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   ecs__control_ans__init
-                     (ECS__ControlAns         *message)
-{
-  static ECS__ControlAns init_value = ECS__CONTROL_ANS__INIT;
-  *message = init_value;
-}
-size_t ecs__control_ans__get_packed_size
-                     (const ECS__ControlAns *message)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__control_ans__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t ecs__control_ans__pack
-                     (const ECS__ControlAns *message,
-                      uint8_t       *out)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__control_ans__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t ecs__control_ans__pack_to_buffer
-                     (const ECS__ControlAns *message,
-                      ProtobufCBuffer *buffer)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__control_ans__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-ECS__ControlAns *
-       ecs__control_ans__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (ECS__ControlAns *)
-     protobuf_c_message_unpack (&ecs__control_ans__descriptor,
-                                allocator, len, data);
-}
-void   ecs__control_ans__free_unpacked
-                     (ECS__ControlAns *message,
-                      ProtobufCAllocator *allocator)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__control_ans__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   ecs__control_ntf__init
-                     (ECS__ControlNtf         *message)
-{
-  static ECS__ControlNtf init_value = ECS__CONTROL_NTF__INIT;
-  *message = init_value;
-}
-size_t ecs__control_ntf__get_packed_size
-                     (const ECS__ControlNtf *message)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__control_ntf__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t ecs__control_ntf__pack
-                     (const ECS__ControlNtf *message,
-                      uint8_t       *out)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__control_ntf__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t ecs__control_ntf__pack_to_buffer
-                     (const ECS__ControlNtf *message,
-                      ProtobufCBuffer *buffer)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__control_ntf__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-ECS__ControlNtf *
-       ecs__control_ntf__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (ECS__ControlNtf *)
-     protobuf_c_message_unpack (&ecs__control_ntf__descriptor,
-                                allocator, len, data);
-}
-void   ecs__control_ntf__free_unpacked
-                     (ECS__ControlNtf *message,
-                      ProtobufCAllocator *allocator)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__control_ntf__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
 void   ecs__monitor_req__init
                      (ECS__MonitorReq         *message)
 {
@@ -866,92 +565,6 @@ void   ecs__monitor_ntf__free_unpacked
   PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__monitor_ntf__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   ecs__screen_dump_req__init
-                     (ECS__ScreenDumpReq         *message)
-{
-  static ECS__ScreenDumpReq init_value = ECS__SCREEN_DUMP_REQ__INIT;
-  *message = init_value;
-}
-size_t ecs__screen_dump_req__get_packed_size
-                     (const ECS__ScreenDumpReq *message)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__screen_dump_req__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t ecs__screen_dump_req__pack
-                     (const ECS__ScreenDumpReq *message,
-                      uint8_t       *out)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__screen_dump_req__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t ecs__screen_dump_req__pack_to_buffer
-                     (const ECS__ScreenDumpReq *message,
-                      ProtobufCBuffer *buffer)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__screen_dump_req__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-ECS__ScreenDumpReq *
-       ecs__screen_dump_req__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (ECS__ScreenDumpReq *)
-     protobuf_c_message_unpack (&ecs__screen_dump_req__descriptor,
-                                allocator, len, data);
-}
-void   ecs__screen_dump_req__free_unpacked
-                     (ECS__ScreenDumpReq *message,
-                      ProtobufCAllocator *allocator)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__screen_dump_req__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-void   ecs__screen_dump_ans__init
-                     (ECS__ScreenDumpAns         *message)
-{
-  static ECS__ScreenDumpAns init_value = ECS__SCREEN_DUMP_ANS__INIT;
-  *message = init_value;
-}
-size_t ecs__screen_dump_ans__get_packed_size
-                     (const ECS__ScreenDumpAns *message)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__screen_dump_ans__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t ecs__screen_dump_ans__pack
-                     (const ECS__ScreenDumpAns *message,
-                      uint8_t       *out)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__screen_dump_ans__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t ecs__screen_dump_ans__pack_to_buffer
-                     (const ECS__ScreenDumpAns *message,
-                      ProtobufCBuffer *buffer)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__screen_dump_ans__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-ECS__ScreenDumpAns *
-       ecs__screen_dump_ans__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (ECS__ScreenDumpAns *)
-     protobuf_c_message_unpack (&ecs__screen_dump_ans__descriptor,
-                                allocator, len, data);
-}
-void   ecs__screen_dump_ans__free_unpacked
-                     (ECS__ScreenDumpAns *message,
-                      ProtobufCAllocator *allocator)
-{
-  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__screen_dump_ans__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
 void   ecs__master__init
                      (ECS__Master         *message)
 {
@@ -1160,124 +773,39 @@ const ProtobufCMessageDescriptor ecs__keep_alive_ans__descriptor =
   (ProtobufCMessageInit) ecs__keep_alive_ans__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor ecs__start_req__field_descriptors[0] =
-{
-};
-static const unsigned ecs__start_req__field_indices_by_name[] = {
-};
-#define ecs__start_req__number_ranges NULL
-const ProtobufCMessageDescriptor ecs__start_req__descriptor =
-{
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "ECS.StartReq",
-  "StartReq",
-  "ECS__StartReq",
-  "ECS",
-  sizeof(ECS__StartReq),
-  0,
-  ecs__start_req__field_descriptors,
-  ecs__start_req__field_indices_by_name,
-  0,  ecs__start_req__number_ranges,
-  (ProtobufCMessageInit) ecs__start_req__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor ecs__start_ans__field_descriptors[3] =
+static const ProtobufCFieldDescriptor ecs__injector_req__field_descriptors[5] =
 {
   {
-    "host_keyboard_onoff",
+    "category",
     1,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_INT32,
-    PROTOBUF_C_OFFSETOF(ECS__StartAns, has_host_keyboard_onoff),
-    PROTOBUF_C_OFFSETOF(ECS__StartAns, host_keyboard_onoff),
+    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
+    PROTOBUF_C_OFFSETOF(ECS__InjectorReq, category),
     NULL,
     NULL,
     0,            /* packed */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "earjack_onoff",
+    "length",
     2,
-    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
-    PROTOBUF_C_OFFSETOF(ECS__StartAns, has_earjack_onoff),
-    PROTOBUF_C_OFFSETOF(ECS__StartAns, earjack_onoff),
+    0,   /* quantifier_offset */
+    PROTOBUF_C_OFFSETOF(ECS__InjectorReq, length),
     NULL,
     NULL,
     0,            /* packed */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "camera_onoff",
+    "group",
     3,
-    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
-    PROTOBUF_C_OFFSETOF(ECS__StartAns, has_camera_onoff),
-    PROTOBUF_C_OFFSETOF(ECS__StartAns, camera_onoff),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned ecs__start_ans__field_indices_by_name[] = {
-  2,   /* field[2] = camera_onoff */
-  1,   /* field[1] = earjack_onoff */
-  0,   /* field[0] = host_keyboard_onoff */
-};
-static const ProtobufCIntRange ecs__start_ans__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 3 }
-};
-const ProtobufCMessageDescriptor ecs__start_ans__descriptor =
-{
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "ECS.StartAns",
-  "StartAns",
-  "ECS__StartAns",
-  "ECS",
-  sizeof(ECS__StartAns),
-  3,
-  ecs__start_ans__field_descriptors,
-  ecs__start_ans__field_indices_by_name,
-  1,  ecs__start_ans__number_ranges,
-  (ProtobufCMessageInit) ecs__start_ans__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor ecs__injector_req__field_descriptors[5] =
-{
-  {
-    "category",
-    1,
-    PROTOBUF_C_LABEL_REQUIRED,
-    PROTOBUF_C_TYPE_STRING,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__InjectorReq, category),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "length",
-    2,
-    PROTOBUF_C_LABEL_REQUIRED,
-    PROTOBUF_C_TYPE_INT32,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__InjectorReq, length),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "group",
-    3,
-    PROTOBUF_C_LABEL_REQUIRED,
-    PROTOBUF_C_TYPE_INT32,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__InjectorReq, group),
+    0,   /* quantifier_offset */
+    PROTOBUF_C_OFFSETOF(ECS__InjectorReq, group),
     NULL,
     NULL,
     0,            /* packed */
@@ -1837,315 +1365,6 @@ const ProtobufCMessageDescriptor ecs__device_ntf__descriptor =
   (ProtobufCMessageInit) ecs__device_ntf__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor ecs__host_keyboard_req__field_descriptors[1] =
-{
-  {
-    "ison",
-    3,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_INT32,
-    PROTOBUF_C_OFFSETOF(ECS__HostKeyboardReq, has_ison),
-    PROTOBUF_C_OFFSETOF(ECS__HostKeyboardReq, ison),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned ecs__host_keyboard_req__field_indices_by_name[] = {
-  0,   /* field[0] = ison */
-};
-static const ProtobufCIntRange ecs__host_keyboard_req__number_ranges[1 + 1] =
-{
-  { 3, 0 },
-  { 0, 1 }
-};
-const ProtobufCMessageDescriptor ecs__host_keyboard_req__descriptor =
-{
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "ECS.HostKeyboardReq",
-  "HostKeyboardReq",
-  "ECS__HostKeyboardReq",
-  "ECS",
-  sizeof(ECS__HostKeyboardReq),
-  1,
-  ecs__host_keyboard_req__field_descriptors,
-  ecs__host_keyboard_req__field_indices_by_name,
-  1,  ecs__host_keyboard_req__number_ranges,
-  (ProtobufCMessageInit) ecs__host_keyboard_req__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor ecs__host_keyboard_ntf__field_descriptors[3] =
-{
-  {
-    "errcode",
-    1,
-    PROTOBUF_C_LABEL_REQUIRED,
-    PROTOBUF_C_TYPE_INT32,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__HostKeyboardNtf, errcode),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "errstr",
-    2,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_STRING,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__HostKeyboardNtf, errstr),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "ison",
-    3,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_INT32,
-    PROTOBUF_C_OFFSETOF(ECS__HostKeyboardNtf, has_ison),
-    PROTOBUF_C_OFFSETOF(ECS__HostKeyboardNtf, ison),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned ecs__host_keyboard_ntf__field_indices_by_name[] = {
-  0,   /* field[0] = errcode */
-  1,   /* field[1] = errstr */
-  2,   /* field[2] = ison */
-};
-static const ProtobufCIntRange ecs__host_keyboard_ntf__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 3 }
-};
-const ProtobufCMessageDescriptor ecs__host_keyboard_ntf__descriptor =
-{
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "ECS.HostKeyboardNtf",
-  "HostKeyboardNtf",
-  "ECS__HostKeyboardNtf",
-  "ECS",
-  sizeof(ECS__HostKeyboardNtf),
-  3,
-  ecs__host_keyboard_ntf__field_descriptors,
-  ecs__host_keyboard_ntf__field_indices_by_name,
-  1,  ecs__host_keyboard_ntf__number_ranges,
-  (ProtobufCMessageInit) ecs__host_keyboard_ntf__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
-const ProtobufCEnumValue ecs__control_msg__control_type__enum_values_by_number[2] =
-{
-  { "HOSTKEYBOARD_REQ", "ECS__CONTROL_MSG__CONTROL_TYPE__HOSTKEYBOARD_REQ", 2 },
-  { "HOSTKEYBOARD_NTF", "ECS__CONTROL_MSG__CONTROL_TYPE__HOSTKEYBOARD_NTF", 3 },
-};
-static const ProtobufCIntRange ecs__control_msg__control_type__value_ranges[] = {
-{2, 0},{0, 2}
-};
-const ProtobufCEnumValueIndex ecs__control_msg__control_type__enum_values_by_name[2] =
-{
-  { "HOSTKEYBOARD_NTF", 1 },
-  { "HOSTKEYBOARD_REQ", 0 },
-};
-const ProtobufCEnumDescriptor ecs__control_msg__control_type__descriptor =
-{
-  PROTOBUF_C_ENUM_DESCRIPTOR_MAGIC,
-  "ECS.ControlMsg.ControlType",
-  "ControlType",
-  "ECS__ControlMsg__ControlType",
-  "ECS",
-  2,
-  ecs__control_msg__control_type__enum_values_by_number,
-  2,
-  ecs__control_msg__control_type__enum_values_by_name,
-  1,
-  ecs__control_msg__control_type__value_ranges,
-  NULL,NULL,NULL,NULL   /* reserved[1234] */
-};
-static const ProtobufCFieldDescriptor ecs__control_msg__field_descriptors[3] =
-{
-  {
-    "type",
-    1,
-    PROTOBUF_C_LABEL_REQUIRED,
-    PROTOBUF_C_TYPE_ENUM,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__ControlMsg, type),
-    &ecs__control_msg__control_type__descriptor,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "hostkeyboard_req",
-    2,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__ControlMsg, hostkeyboard_req),
-    &ecs__host_keyboard_req__descriptor,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "hostkeyboard_ntf",
-    3,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__ControlMsg, hostkeyboard_ntf),
-    &ecs__host_keyboard_ntf__descriptor,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned ecs__control_msg__field_indices_by_name[] = {
-  2,   /* field[2] = hostkeyboard_ntf */
-  1,   /* field[1] = hostkeyboard_req */
-  0,   /* field[0] = type */
-};
-static const ProtobufCIntRange ecs__control_msg__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 3 }
-};
-const ProtobufCMessageDescriptor ecs__control_msg__descriptor =
-{
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "ECS.ControlMsg",
-  "ControlMsg",
-  "ECS__ControlMsg",
-  "ECS",
-  sizeof(ECS__ControlMsg),
-  3,
-  ecs__control_msg__field_descriptors,
-  ecs__control_msg__field_indices_by_name,
-  1,  ecs__control_msg__number_ranges,
-  (ProtobufCMessageInit) ecs__control_msg__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor ecs__control_ans__field_descriptors[2] =
-{
-  {
-    "errcode",
-    1,
-    PROTOBUF_C_LABEL_REQUIRED,
-    PROTOBUF_C_TYPE_INT32,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__ControlAns, errcode),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "errmsg",
-    2,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_STRING,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__ControlAns, errmsg),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned ecs__control_ans__field_indices_by_name[] = {
-  0,   /* field[0] = errcode */
-  1,   /* field[1] = errmsg */
-};
-static const ProtobufCIntRange ecs__control_ans__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 2 }
-};
-const ProtobufCMessageDescriptor ecs__control_ans__descriptor =
-{
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "ECS.ControlAns",
-  "ControlAns",
-  "ECS__ControlAns",
-  "ECS",
-  sizeof(ECS__ControlAns),
-  2,
-  ecs__control_ans__field_descriptors,
-  ecs__control_ans__field_indices_by_name,
-  1,  ecs__control_ans__number_ranges,
-  (ProtobufCMessageInit) ecs__control_ans__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor ecs__control_ntf__field_descriptors[3] =
-{
-  {
-    "category",
-    1,
-    PROTOBUF_C_LABEL_REQUIRED,
-    PROTOBUF_C_TYPE_STRING,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__ControlNtf, category),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "command",
-    2,
-    PROTOBUF_C_LABEL_REQUIRED,
-    PROTOBUF_C_TYPE_STRING,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__ControlNtf, command),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "data",
-    3,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_BYTES,
-    PROTOBUF_C_OFFSETOF(ECS__ControlNtf, has_data),
-    PROTOBUF_C_OFFSETOF(ECS__ControlNtf, data),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned ecs__control_ntf__field_indices_by_name[] = {
-  0,   /* field[0] = category */
-  1,   /* field[1] = command */
-  2,   /* field[2] = data */
-};
-static const ProtobufCIntRange ecs__control_ntf__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 3 }
-};
-const ProtobufCMessageDescriptor ecs__control_ntf__descriptor =
-{
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "ECS.ControlNtf",
-  "ControlNtf",
-  "ECS__ControlNtf",
-  "ECS",
-  sizeof(ECS__ControlNtf),
-  3,
-  ecs__control_ntf__field_descriptors,
-  ecs__control_ntf__field_indices_by_name,
-  1,  ecs__control_ntf__number_ranges,
-  (ProtobufCMessageInit) ecs__control_ntf__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
 static const ProtobufCFieldDescriptor ecs__monitor_req__field_descriptors[1] =
 {
   {
@@ -2312,160 +1531,7 @@ const ProtobufCMessageDescriptor ecs__monitor_ntf__descriptor =
   (ProtobufCMessageInit) ecs__monitor_ntf__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor ecs__screen_dump_req__field_descriptors[1] =
-{
-  {
-    "output_path",
-    1,
-    PROTOBUF_C_LABEL_REQUIRED,
-    PROTOBUF_C_TYPE_STRING,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__ScreenDumpReq, output_path),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned ecs__screen_dump_req__field_indices_by_name[] = {
-  0,   /* field[0] = output_path */
-};
-static const ProtobufCIntRange ecs__screen_dump_req__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 1 }
-};
-const ProtobufCMessageDescriptor ecs__screen_dump_req__descriptor =
-{
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "ECS.ScreenDumpReq",
-  "ScreenDumpReq",
-  "ECS__ScreenDumpReq",
-  "ECS",
-  sizeof(ECS__ScreenDumpReq),
-  1,
-  ecs__screen_dump_req__field_descriptors,
-  ecs__screen_dump_req__field_indices_by_name,
-  1,  ecs__screen_dump_req__number_ranges,
-  (ProtobufCMessageInit) ecs__screen_dump_req__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
-static const ProtobufCFieldDescriptor ecs__screen_dump_ans__field_descriptors[2] =
-{
-  {
-    "errcode",
-    1,
-    PROTOBUF_C_LABEL_REQUIRED,
-    PROTOBUF_C_TYPE_INT32,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__ScreenDumpAns, errcode),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "errmsg",
-    2,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_STRING,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__ScreenDumpAns, errmsg),
-    NULL,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned ecs__screen_dump_ans__field_indices_by_name[] = {
-  0,   /* field[0] = errcode */
-  1,   /* field[1] = errmsg */
-};
-static const ProtobufCIntRange ecs__screen_dump_ans__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 2 }
-};
-const ProtobufCMessageDescriptor ecs__screen_dump_ans__descriptor =
-{
-  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "ECS.ScreenDumpAns",
-  "ScreenDumpAns",
-  "ECS__ScreenDumpAns",
-  "ECS",
-  sizeof(ECS__ScreenDumpAns),
-  2,
-  ecs__screen_dump_ans__field_descriptors,
-  ecs__screen_dump_ans__field_indices_by_name,
-  1,  ecs__screen_dump_ans__number_ranges,
-  (ProtobufCMessageInit) ecs__screen_dump_ans__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
-const ProtobufCEnumValue ecs__master__type__enum_values_by_number[20] =
-{
-  { "CHECKVERSION_REQ", "ECS__MASTER__TYPE__CHECKVERSION_REQ", 2 },
-  { "CHECKVERSION_ANS", "ECS__MASTER__TYPE__CHECKVERSION_ANS", 3 },
-  { "KEEPALIVE_REQ", "ECS__MASTER__TYPE__KEEPALIVE_REQ", 4 },
-  { "KEEPALIVE_ANS", "ECS__MASTER__TYPE__KEEPALIVE_ANS", 5 },
-  { "START_REQ", "ECS__MASTER__TYPE__START_REQ", 6 },
-  { "START_ANS", "ECS__MASTER__TYPE__START_ANS", 7 },
-  { "INJECTOR_REQ", "ECS__MASTER__TYPE__INJECTOR_REQ", 8 },
-  { "INJECTOR_ANS", "ECS__MASTER__TYPE__INJECTOR_ANS", 9 },
-  { "INJECTOR_NTF", "ECS__MASTER__TYPE__INJECTOR_NTF", 10 },
-  { "DEVICE_REQ", "ECS__MASTER__TYPE__DEVICE_REQ", 11 },
-  { "DEVICE_ANS", "ECS__MASTER__TYPE__DEVICE_ANS", 12 },
-  { "DEVICE_NTF", "ECS__MASTER__TYPE__DEVICE_NTF", 13 },
-  { "CONTROL_MSG", "ECS__MASTER__TYPE__CONTROL_MSG", 14 },
-  { "CONTROL_ANS", "ECS__MASTER__TYPE__CONTROL_ANS", 15 },
-  { "CONTROL_NTF", "ECS__MASTER__TYPE__CONTROL_NTF", 16 },
-  { "MONITOR_REQ", "ECS__MASTER__TYPE__MONITOR_REQ", 17 },
-  { "MONITOR_ANS", "ECS__MASTER__TYPE__MONITOR_ANS", 18 },
-  { "MONITOR_NTF", "ECS__MASTER__TYPE__MONITOR_NTF", 19 },
-  { "SCREEN_DUMP_REQ", "ECS__MASTER__TYPE__SCREEN_DUMP_REQ", 20 },
-  { "SCREEN_DUMP_ANS", "ECS__MASTER__TYPE__SCREEN_DUMP_ANS", 21 },
-};
-static const ProtobufCIntRange ecs__master__type__value_ranges[] = {
-{2, 0},{0, 20}
-};
-const ProtobufCEnumValueIndex ecs__master__type__enum_values_by_name[20] =
-{
-  { "CHECKVERSION_ANS", 1 },
-  { "CHECKVERSION_REQ", 0 },
-  { "CONTROL_ANS", 13 },
-  { "CONTROL_MSG", 12 },
-  { "CONTROL_NTF", 14 },
-  { "DEVICE_ANS", 10 },
-  { "DEVICE_NTF", 11 },
-  { "DEVICE_REQ", 9 },
-  { "INJECTOR_ANS", 7 },
-  { "INJECTOR_NTF", 8 },
-  { "INJECTOR_REQ", 6 },
-  { "KEEPALIVE_ANS", 3 },
-  { "KEEPALIVE_REQ", 2 },
-  { "MONITOR_ANS", 16 },
-  { "MONITOR_NTF", 17 },
-  { "MONITOR_REQ", 15 },
-  { "SCREEN_DUMP_ANS", 19 },
-  { "SCREEN_DUMP_REQ", 18 },
-  { "START_ANS", 5 },
-  { "START_REQ", 4 },
-};
-const ProtobufCEnumDescriptor ecs__master__type__descriptor =
-{
-  PROTOBUF_C_ENUM_DESCRIPTOR_MAGIC,
-  "ECS.Master.Type",
-  "Type",
-  "ECS__Master__Type",
-  "ECS",
-  20,
-  ecs__master__type__enum_values_by_number,
-  20,
-  ecs__master__type__enum_values_by_name,
-  1,
-  ecs__master__type__value_ranges,
-  NULL,NULL,NULL,NULL   /* reserved[1234] */
-};
-static const ProtobufCFieldDescriptor ecs__master__field_descriptors[21] =
+static const ProtobufCFieldDescriptor ecs__master__field_descriptors[14] =
 {
   {
     "type",
@@ -2528,32 +1594,8 @@ static const ProtobufCFieldDescriptor ecs__master__field_descriptors[21] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "start_req",
-    6,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__Master, start_req),
-    &ecs__start_req__descriptor,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "start_ans",
-    7,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__Master, start_ans),
-    &ecs__start_ans__descriptor,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
     "injector_req",
-    8,
+    6,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
@@ -2565,7 +1607,7 @@ static const ProtobufCFieldDescriptor ecs__master__field_descriptors[21] =
   },
   {
     "injector_ans",
-    9,
+    7,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
@@ -2577,7 +1619,7 @@ static const ProtobufCFieldDescriptor ecs__master__field_descriptors[21] =
   },
   {
     "injector_ntf",
-    10,
+    8,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
@@ -2589,7 +1631,7 @@ static const ProtobufCFieldDescriptor ecs__master__field_descriptors[21] =
   },
   {
     "device_req",
-    11,
+    9,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
@@ -2601,7 +1643,7 @@ static const ProtobufCFieldDescriptor ecs__master__field_descriptors[21] =
   },
   {
     "device_ans",
-    12,
+    10,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
@@ -2613,7 +1655,7 @@ static const ProtobufCFieldDescriptor ecs__master__field_descriptors[21] =
   },
   {
     "device_ntf",
-    13,
+    11,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
@@ -2624,44 +1666,8 @@ static const ProtobufCFieldDescriptor ecs__master__field_descriptors[21] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "control_msg",
-    14,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__Master, control_msg),
-    &ecs__control_msg__descriptor,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "control_ans",
-    15,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__Master, control_ans),
-    &ecs__control_ans__descriptor,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "control_ntf",
-    16,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__Master, control_ntf),
-    &ecs__control_ntf__descriptor,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
     "monitor_req",
-    17,
+    12,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
@@ -2673,7 +1679,7 @@ static const ProtobufCFieldDescriptor ecs__master__field_descriptors[21] =
   },
   {
     "monitor_ans",
-    18,
+    13,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
@@ -2685,7 +1691,7 @@ static const ProtobufCFieldDescriptor ecs__master__field_descriptors[21] =
   },
   {
     "monitor_ntf",
-    19,
+    14,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
@@ -2695,58 +1701,27 @@ static const ProtobufCFieldDescriptor ecs__master__field_descriptors[21] =
     0,            /* packed */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
-  {
-    "screen_dump_req",
-    20,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__Master, screen_dump_req),
-    &ecs__screen_dump_req__descriptor,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "screen_dump_ans",
-    21,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(ECS__Master, screen_dump_ans),
-    &ecs__screen_dump_ans__descriptor,
-    NULL,
-    0,            /* packed */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
 };
 static const unsigned ecs__master__field_indices_by_name[] = {
   2,   /* field[2] = checkversion_ans */
   1,   /* field[1] = checkversion_req */
-  14,   /* field[14] = control_ans */
-  13,   /* field[13] = control_msg */
-  15,   /* field[15] = control_ntf */
-  11,   /* field[11] = device_ans */
-  12,   /* field[12] = device_ntf */
-  10,   /* field[10] = device_req */
-  8,   /* field[8] = injector_ans */
-  9,   /* field[9] = injector_ntf */
-  7,   /* field[7] = injector_req */
+  9,   /* field[9] = device_ans */
+  10,   /* field[10] = device_ntf */
+  8,   /* field[8] = device_req */
+  6,   /* field[6] = injector_ans */
+  7,   /* field[7] = injector_ntf */
+  5,   /* field[5] = injector_req */
   4,   /* field[4] = keepalive_ans */
   3,   /* field[3] = keepalive_req */
-  17,   /* field[17] = monitor_ans */
-  18,   /* field[18] = monitor_ntf */
-  16,   /* field[16] = monitor_req */
-  20,   /* field[20] = screen_dump_ans */
-  19,   /* field[19] = screen_dump_req */
-  6,   /* field[6] = start_ans */
-  5,   /* field[5] = start_req */
+  12,   /* field[12] = monitor_ans */
+  13,   /* field[13] = monitor_ntf */
+  11,   /* field[11] = monitor_req */
   0,   /* field[0] = type */
 };
 static const ProtobufCIntRange ecs__master__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 21 }
+  { 0, 14 }
 };
 const ProtobufCMessageDescriptor ecs__master__descriptor =
 {
@@ -2756,7 +1731,7 @@ const ProtobufCMessageDescriptor ecs__master__descriptor =
   "ECS__Master",
   "ECS",
   sizeof(ECS__Master),
-  21,
+  14,
   ecs__master__field_descriptors,
   ecs__master__field_indices_by_name,
   1,  ecs__master__number_ranges,
index 09ef146..eeae677 100644 (file)
@@ -3,64 +3,30 @@
 #ifndef PROTOBUF_C_ecs_2eproto__INCLUDED
 #define PROTOBUF_C_ecs_2eproto__INCLUDED
 
-#include "../../../distrib/protobuf/protobuf-c.h"
+#include <google/protobuf-c/protobuf-c.h>
 
 PROTOBUF_C_BEGIN_DECLS
 
+#include "ecs_ids.pb-c.h"
 
 typedef struct _ECS__CheckVersionReq ECS__CheckVersionReq;
 typedef struct _ECS__CheckVersionAns ECS__CheckVersionAns;
 typedef struct _ECS__KeepAliveReq ECS__KeepAliveReq;
 typedef struct _ECS__KeepAliveAns ECS__KeepAliveAns;
-typedef struct _ECS__StartReq ECS__StartReq;
-typedef struct _ECS__StartAns ECS__StartAns;
 typedef struct _ECS__InjectorReq ECS__InjectorReq;
 typedef struct _ECS__InjectorAns ECS__InjectorAns;
 typedef struct _ECS__InjectorNtf ECS__InjectorNtf;
 typedef struct _ECS__DeviceReq ECS__DeviceReq;
 typedef struct _ECS__DeviceAns ECS__DeviceAns;
 typedef struct _ECS__DeviceNtf ECS__DeviceNtf;
-typedef struct _ECS__HostKeyboardReq ECS__HostKeyboardReq;
-typedef struct _ECS__HostKeyboardNtf ECS__HostKeyboardNtf;
-typedef struct _ECS__ControlMsg ECS__ControlMsg;
-typedef struct _ECS__ControlAns ECS__ControlAns;
-typedef struct _ECS__ControlNtf ECS__ControlNtf;
 typedef struct _ECS__MonitorReq ECS__MonitorReq;
 typedef struct _ECS__MonitorAns ECS__MonitorAns;
 typedef struct _ECS__MonitorNtf ECS__MonitorNtf;
-typedef struct _ECS__ScreenDumpReq ECS__ScreenDumpReq;
-typedef struct _ECS__ScreenDumpAns ECS__ScreenDumpAns;
 typedef struct _ECS__Master ECS__Master;
 
 
 /* --- enums --- */
 
-typedef enum _ECS__ControlMsg__ControlType {
-  ECS__CONTROL_MSG__CONTROL_TYPE__HOSTKEYBOARD_REQ = 2,
-  ECS__CONTROL_MSG__CONTROL_TYPE__HOSTKEYBOARD_NTF = 3
-} ECS__ControlMsg__ControlType;
-typedef enum _ECS__Master__Type {
-  ECS__MASTER__TYPE__CHECKVERSION_REQ = 2,
-  ECS__MASTER__TYPE__CHECKVERSION_ANS = 3,
-  ECS__MASTER__TYPE__KEEPALIVE_REQ = 4,
-  ECS__MASTER__TYPE__KEEPALIVE_ANS = 5,
-  ECS__MASTER__TYPE__START_REQ = 6,
-  ECS__MASTER__TYPE__START_ANS = 7,
-  ECS__MASTER__TYPE__INJECTOR_REQ = 8,
-  ECS__MASTER__TYPE__INJECTOR_ANS = 9,
-  ECS__MASTER__TYPE__INJECTOR_NTF = 10,
-  ECS__MASTER__TYPE__DEVICE_REQ = 11,
-  ECS__MASTER__TYPE__DEVICE_ANS = 12,
-  ECS__MASTER__TYPE__DEVICE_NTF = 13,
-  ECS__MASTER__TYPE__CONTROL_MSG = 14,
-  ECS__MASTER__TYPE__CONTROL_ANS = 15,
-  ECS__MASTER__TYPE__CONTROL_NTF = 16,
-  ECS__MASTER__TYPE__MONITOR_REQ = 17,
-  ECS__MASTER__TYPE__MONITOR_ANS = 18,
-  ECS__MASTER__TYPE__MONITOR_NTF = 19,
-  ECS__MASTER__TYPE__SCREEN_DUMP_REQ = 20,
-  ECS__MASTER__TYPE__SCREEN_DUMP_ANS = 21
-} ECS__Master__Type;
 
 /* --- messages --- */
 
@@ -105,30 +71,6 @@ struct  _ECS__KeepAliveAns
     , NULL }
 
 
-struct  _ECS__StartReq
-{
-  ProtobufCMessage base;
-};
-#define ECS__START_REQ__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&ecs__start_req__descriptor) \
-     }
-
-
-struct  _ECS__StartAns
-{
-  ProtobufCMessage base;
-  protobuf_c_boolean has_host_keyboard_onoff;
-  int32_t host_keyboard_onoff;
-  protobuf_c_boolean has_earjack_onoff;
-  int32_t earjack_onoff;
-  protobuf_c_boolean has_camera_onoff;
-  int32_t camera_onoff;
-};
-#define ECS__START_ANS__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&ecs__start_ans__descriptor) \
-    , 0,0, 0,0, 0,0 }
-
-
 struct  _ECS__InjectorReq
 {
   ProtobufCMessage base;
@@ -223,66 +165,6 @@ struct  _ECS__DeviceNtf
     , NULL, 0, 0, 0, 0,{0,NULL} }
 
 
-struct  _ECS__HostKeyboardReq
-{
-  ProtobufCMessage base;
-  protobuf_c_boolean has_ison;
-  int32_t ison;
-};
-#define ECS__HOST_KEYBOARD_REQ__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&ecs__host_keyboard_req__descriptor) \
-    , 0,0 }
-
-
-struct  _ECS__HostKeyboardNtf
-{
-  ProtobufCMessage base;
-  int32_t errcode;
-  char *errstr;
-  protobuf_c_boolean has_ison;
-  int32_t ison;
-};
-#define ECS__HOST_KEYBOARD_NTF__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&ecs__host_keyboard_ntf__descriptor) \
-    , 0, NULL, 0,0 }
-
-
-struct  _ECS__ControlMsg
-{
-  ProtobufCMessage base;
-  ECS__ControlMsg__ControlType type;
-  ECS__HostKeyboardReq *hostkeyboard_req;
-  ECS__HostKeyboardNtf *hostkeyboard_ntf;
-};
-#define ECS__CONTROL_MSG__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&ecs__control_msg__descriptor) \
-    , 0, NULL, NULL }
-
-
-struct  _ECS__ControlAns
-{
-  ProtobufCMessage base;
-  int32_t errcode;
-  char *errmsg;
-};
-#define ECS__CONTROL_ANS__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&ecs__control_ans__descriptor) \
-    , 0, NULL }
-
-
-struct  _ECS__ControlNtf
-{
-  ProtobufCMessage base;
-  char *category;
-  char *command;
-  protobuf_c_boolean has_data;
-  ProtobufCBinaryData data;
-};
-#define ECS__CONTROL_NTF__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&ecs__control_ntf__descriptor) \
-    , NULL, NULL, 0,{0,NULL} }
-
-
 struct  _ECS__MonitorReq
 {
   ProtobufCMessage base;
@@ -319,55 +201,27 @@ struct  _ECS__MonitorNtf
     , NULL, 0,{0,NULL} }
 
 
-struct  _ECS__ScreenDumpReq
-{
-  ProtobufCMessage base;
-  char *output_path;
-};
-#define ECS__SCREEN_DUMP_REQ__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&ecs__screen_dump_req__descriptor) \
-    , NULL }
-
-
-struct  _ECS__ScreenDumpAns
-{
-  ProtobufCMessage base;
-  int32_t errcode;
-  char *errmsg;
-};
-#define ECS__SCREEN_DUMP_ANS__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&ecs__screen_dump_ans__descriptor) \
-    , 0, NULL }
-
-
 struct  _ECS__Master
 {
   ProtobufCMessage base;
-  ECS__Master__Type type;
+  ECS__MasterType type;
   ECS__CheckVersionReq *checkversion_req;
   ECS__CheckVersionAns *checkversion_ans;
   ECS__KeepAliveReq *keepalive_req;
   ECS__KeepAliveAns *keepalive_ans;
-  ECS__StartReq *start_req;
-  ECS__StartAns *start_ans;
   ECS__InjectorReq *injector_req;
   ECS__InjectorAns *injector_ans;
   ECS__InjectorNtf *injector_ntf;
   ECS__DeviceReq *device_req;
   ECS__DeviceAns *device_ans;
   ECS__DeviceNtf *device_ntf;
-  ECS__ControlMsg *control_msg;
-  ECS__ControlAns *control_ans;
-  ECS__ControlNtf *control_ntf;
   ECS__MonitorReq *monitor_req;
   ECS__MonitorAns *monitor_ans;
   ECS__MonitorNtf *monitor_ntf;
-  ECS__ScreenDumpReq *screen_dump_req;
-  ECS__ScreenDumpAns *screen_dump_ans;
 };
 #define ECS__MASTER__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&ecs__master__descriptor) \
-    , 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+    , 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
 
 
 /* ECS__CheckVersionReq methods */
@@ -446,44 +300,6 @@ ECS__KeepAliveAns *
 void   ecs__keep_alive_ans__free_unpacked
                      (ECS__KeepAliveAns *message,
                       ProtobufCAllocator *allocator);
-/* ECS__StartReq methods */
-void   ecs__start_req__init
-                     (ECS__StartReq         *message);
-size_t ecs__start_req__get_packed_size
-                     (const ECS__StartReq   *message);
-size_t ecs__start_req__pack
-                     (const ECS__StartReq   *message,
-                      uint8_t             *out);
-size_t ecs__start_req__pack_to_buffer
-                     (const ECS__StartReq   *message,
-                      ProtobufCBuffer     *buffer);
-ECS__StartReq *
-       ecs__start_req__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   ecs__start_req__free_unpacked
-                     (ECS__StartReq *message,
-                      ProtobufCAllocator *allocator);
-/* ECS__StartAns methods */
-void   ecs__start_ans__init
-                     (ECS__StartAns         *message);
-size_t ecs__start_ans__get_packed_size
-                     (const ECS__StartAns   *message);
-size_t ecs__start_ans__pack
-                     (const ECS__StartAns   *message,
-                      uint8_t             *out);
-size_t ecs__start_ans__pack_to_buffer
-                     (const ECS__StartAns   *message,
-                      ProtobufCBuffer     *buffer);
-ECS__StartAns *
-       ecs__start_ans__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   ecs__start_ans__free_unpacked
-                     (ECS__StartAns *message,
-                      ProtobufCAllocator *allocator);
 /* ECS__InjectorReq methods */
 void   ecs__injector_req__init
                      (ECS__InjectorReq         *message);
@@ -598,101 +414,6 @@ ECS__DeviceNtf *
 void   ecs__device_ntf__free_unpacked
                      (ECS__DeviceNtf *message,
                       ProtobufCAllocator *allocator);
-/* ECS__HostKeyboardReq methods */
-void   ecs__host_keyboard_req__init
-                     (ECS__HostKeyboardReq         *message);
-size_t ecs__host_keyboard_req__get_packed_size
-                     (const ECS__HostKeyboardReq   *message);
-size_t ecs__host_keyboard_req__pack
-                     (const ECS__HostKeyboardReq   *message,
-                      uint8_t             *out);
-size_t ecs__host_keyboard_req__pack_to_buffer
-                     (const ECS__HostKeyboardReq   *message,
-                      ProtobufCBuffer     *buffer);
-ECS__HostKeyboardReq *
-       ecs__host_keyboard_req__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   ecs__host_keyboard_req__free_unpacked
-                     (ECS__HostKeyboardReq *message,
-                      ProtobufCAllocator *allocator);
-/* ECS__HostKeyboardNtf methods */
-void   ecs__host_keyboard_ntf__init
-                     (ECS__HostKeyboardNtf         *message);
-size_t ecs__host_keyboard_ntf__get_packed_size
-                     (const ECS__HostKeyboardNtf   *message);
-size_t ecs__host_keyboard_ntf__pack
-                     (const ECS__HostKeyboardNtf   *message,
-                      uint8_t             *out);
-size_t ecs__host_keyboard_ntf__pack_to_buffer
-                     (const ECS__HostKeyboardNtf   *message,
-                      ProtobufCBuffer     *buffer);
-ECS__HostKeyboardNtf *
-       ecs__host_keyboard_ntf__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   ecs__host_keyboard_ntf__free_unpacked
-                     (ECS__HostKeyboardNtf *message,
-                      ProtobufCAllocator *allocator);
-/* ECS__ControlMsg methods */
-void   ecs__control_msg__init
-                     (ECS__ControlMsg         *message);
-size_t ecs__control_msg__get_packed_size
-                     (const ECS__ControlMsg   *message);
-size_t ecs__control_msg__pack
-                     (const ECS__ControlMsg   *message,
-                      uint8_t             *out);
-size_t ecs__control_msg__pack_to_buffer
-                     (const ECS__ControlMsg   *message,
-                      ProtobufCBuffer     *buffer);
-ECS__ControlMsg *
-       ecs__control_msg__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   ecs__control_msg__free_unpacked
-                     (ECS__ControlMsg *message,
-                      ProtobufCAllocator *allocator);
-/* ECS__ControlAns methods */
-void   ecs__control_ans__init
-                     (ECS__ControlAns         *message);
-size_t ecs__control_ans__get_packed_size
-                     (const ECS__ControlAns   *message);
-size_t ecs__control_ans__pack
-                     (const ECS__ControlAns   *message,
-                      uint8_t             *out);
-size_t ecs__control_ans__pack_to_buffer
-                     (const ECS__ControlAns   *message,
-                      ProtobufCBuffer     *buffer);
-ECS__ControlAns *
-       ecs__control_ans__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   ecs__control_ans__free_unpacked
-                     (ECS__ControlAns *message,
-                      ProtobufCAllocator *allocator);
-/* ECS__ControlNtf methods */
-void   ecs__control_ntf__init
-                     (ECS__ControlNtf         *message);
-size_t ecs__control_ntf__get_packed_size
-                     (const ECS__ControlNtf   *message);
-size_t ecs__control_ntf__pack
-                     (const ECS__ControlNtf   *message,
-                      uint8_t             *out);
-size_t ecs__control_ntf__pack_to_buffer
-                     (const ECS__ControlNtf   *message,
-                      ProtobufCBuffer     *buffer);
-ECS__ControlNtf *
-       ecs__control_ntf__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   ecs__control_ntf__free_unpacked
-                     (ECS__ControlNtf *message,
-                      ProtobufCAllocator *allocator);
 /* ECS__MonitorReq methods */
 void   ecs__monitor_req__init
                      (ECS__MonitorReq         *message);
@@ -750,44 +471,6 @@ ECS__MonitorNtf *
 void   ecs__monitor_ntf__free_unpacked
                      (ECS__MonitorNtf *message,
                       ProtobufCAllocator *allocator);
-/* ECS__ScreenDumpReq methods */
-void   ecs__screen_dump_req__init
-                     (ECS__ScreenDumpReq         *message);
-size_t ecs__screen_dump_req__get_packed_size
-                     (const ECS__ScreenDumpReq   *message);
-size_t ecs__screen_dump_req__pack
-                     (const ECS__ScreenDumpReq   *message,
-                      uint8_t             *out);
-size_t ecs__screen_dump_req__pack_to_buffer
-                     (const ECS__ScreenDumpReq   *message,
-                      ProtobufCBuffer     *buffer);
-ECS__ScreenDumpReq *
-       ecs__screen_dump_req__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   ecs__screen_dump_req__free_unpacked
-                     (ECS__ScreenDumpReq *message,
-                      ProtobufCAllocator *allocator);
-/* ECS__ScreenDumpAns methods */
-void   ecs__screen_dump_ans__init
-                     (ECS__ScreenDumpAns         *message);
-size_t ecs__screen_dump_ans__get_packed_size
-                     (const ECS__ScreenDumpAns   *message);
-size_t ecs__screen_dump_ans__pack
-                     (const ECS__ScreenDumpAns   *message,
-                      uint8_t             *out);
-size_t ecs__screen_dump_ans__pack_to_buffer
-                     (const ECS__ScreenDumpAns   *message,
-                      ProtobufCBuffer     *buffer);
-ECS__ScreenDumpAns *
-       ecs__screen_dump_ans__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   ecs__screen_dump_ans__free_unpacked
-                     (ECS__ScreenDumpAns *message,
-                      ProtobufCAllocator *allocator);
 /* ECS__Master methods */
 void   ecs__master__init
                      (ECS__Master         *message);
@@ -821,12 +504,6 @@ typedef void (*ECS__KeepAliveReq_Closure)
 typedef void (*ECS__KeepAliveAns_Closure)
                  (const ECS__KeepAliveAns *message,
                   void *closure_data);
-typedef void (*ECS__StartReq_Closure)
-                 (const ECS__StartReq *message,
-                  void *closure_data);
-typedef void (*ECS__StartAns_Closure)
-                 (const ECS__StartAns *message,
-                  void *closure_data);
 typedef void (*ECS__InjectorReq_Closure)
                  (const ECS__InjectorReq *message,
                   void *closure_data);
@@ -845,21 +522,6 @@ typedef void (*ECS__DeviceAns_Closure)
 typedef void (*ECS__DeviceNtf_Closure)
                  (const ECS__DeviceNtf *message,
                   void *closure_data);
-typedef void (*ECS__HostKeyboardReq_Closure)
-                 (const ECS__HostKeyboardReq *message,
-                  void *closure_data);
-typedef void (*ECS__HostKeyboardNtf_Closure)
-                 (const ECS__HostKeyboardNtf *message,
-                  void *closure_data);
-typedef void (*ECS__ControlMsg_Closure)
-                 (const ECS__ControlMsg *message,
-                  void *closure_data);
-typedef void (*ECS__ControlAns_Closure)
-                 (const ECS__ControlAns *message,
-                  void *closure_data);
-typedef void (*ECS__ControlNtf_Closure)
-                 (const ECS__ControlNtf *message,
-                  void *closure_data);
 typedef void (*ECS__MonitorReq_Closure)
                  (const ECS__MonitorReq *message,
                   void *closure_data);
@@ -869,12 +531,6 @@ typedef void (*ECS__MonitorAns_Closure)
 typedef void (*ECS__MonitorNtf_Closure)
                  (const ECS__MonitorNtf *message,
                   void *closure_data);
-typedef void (*ECS__ScreenDumpReq_Closure)
-                 (const ECS__ScreenDumpReq *message,
-                  void *closure_data);
-typedef void (*ECS__ScreenDumpAns_Closure)
-                 (const ECS__ScreenDumpAns *message,
-                  void *closure_data);
 typedef void (*ECS__Master_Closure)
                  (const ECS__Master *message,
                   void *closure_data);
@@ -888,27 +544,16 @@ extern const ProtobufCMessageDescriptor ecs__check_version_req__descriptor;
 extern const ProtobufCMessageDescriptor ecs__check_version_ans__descriptor;
 extern const ProtobufCMessageDescriptor ecs__keep_alive_req__descriptor;
 extern const ProtobufCMessageDescriptor ecs__keep_alive_ans__descriptor;
-extern const ProtobufCMessageDescriptor ecs__start_req__descriptor;
-extern const ProtobufCMessageDescriptor ecs__start_ans__descriptor;
 extern const ProtobufCMessageDescriptor ecs__injector_req__descriptor;
 extern const ProtobufCMessageDescriptor ecs__injector_ans__descriptor;
 extern const ProtobufCMessageDescriptor ecs__injector_ntf__descriptor;
 extern const ProtobufCMessageDescriptor ecs__device_req__descriptor;
 extern const ProtobufCMessageDescriptor ecs__device_ans__descriptor;
 extern const ProtobufCMessageDescriptor ecs__device_ntf__descriptor;
-extern const ProtobufCMessageDescriptor ecs__host_keyboard_req__descriptor;
-extern const ProtobufCMessageDescriptor ecs__host_keyboard_ntf__descriptor;
-extern const ProtobufCMessageDescriptor ecs__control_msg__descriptor;
-extern const ProtobufCEnumDescriptor    ecs__control_msg__control_type__descriptor;
-extern const ProtobufCMessageDescriptor ecs__control_ans__descriptor;
-extern const ProtobufCMessageDescriptor ecs__control_ntf__descriptor;
 extern const ProtobufCMessageDescriptor ecs__monitor_req__descriptor;
 extern const ProtobufCMessageDescriptor ecs__monitor_ans__descriptor;
 extern const ProtobufCMessageDescriptor ecs__monitor_ntf__descriptor;
-extern const ProtobufCMessageDescriptor ecs__screen_dump_req__descriptor;
-extern const ProtobufCMessageDescriptor ecs__screen_dump_ans__descriptor;
 extern const ProtobufCMessageDescriptor ecs__master__descriptor;
-extern const ProtobufCEnumDescriptor    ecs__master__type__descriptor;
 
 PROTOBUF_C_END_DECLS
 
diff --git a/tizen/src/ecs/genmsg/ecs_ids.pb-c.c b/tizen/src/ecs/genmsg/ecs_ids.pb-c.c
new file mode 100644 (file)
index 0000000..6e3747c
--- /dev/null
@@ -0,0 +1,62 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C_NO_DEPRECATED
+#define PROTOBUF_C_NO_DEPRECATED
+#endif
+
+#include "ecs_ids.pb-c.h"
+const ProtobufCEnumValue ecs__master__type__enum_values_by_number[15] =
+{
+  { "CHECKVERSION_REQ", "ECS__MASTER__TYPE__CHECKVERSION_REQ", 2 },
+  { "CHECKVERSION_ANS", "ECS__MASTER__TYPE__CHECKVERSION_ANS", 3 },
+  { "KEEPALIVE_REQ", "ECS__MASTER__TYPE__KEEPALIVE_REQ", 4 },
+  { "KEEPALIVE_ANS", "ECS__MASTER__TYPE__KEEPALIVE_ANS", 5 },
+  { "INJECTOR_REQ", "ECS__MASTER__TYPE__INJECTOR_REQ", 6 },
+  { "INJECTOR_ANS", "ECS__MASTER__TYPE__INJECTOR_ANS", 7 },
+  { "INJECTOR_NTF", "ECS__MASTER__TYPE__INJECTOR_NTF", 8 },
+  { "DEVICE_REQ", "ECS__MASTER__TYPE__DEVICE_REQ", 9 },
+  { "DEVICE_ANS", "ECS__MASTER__TYPE__DEVICE_ANS", 10 },
+  { "DEVICE_NTF", "ECS__MASTER__TYPE__DEVICE_NTF", 11 },
+  { "MONITOR_REQ", "ECS__MASTER__TYPE__MONITOR_REQ", 12 },
+  { "MONITOR_ANS", "ECS__MASTER__TYPE__MONITOR_ANS", 13 },
+  { "MONITOR_NTF", "ECS__MASTER__TYPE__MONITOR_NTF", 14 },
+  { "NFC_REQ", "ECS__MASTER__TYPE__NFC_REQ", 101 },
+  { "NFC_NTF", "ECS__MASTER__TYPE__NFC_NTF", 102 },
+};
+static const ProtobufCIntRange ecs__master__type__value_ranges[] = {
+{2, 0},{101, 13},{0, 15}
+};
+const ProtobufCEnumValueIndex ecs__master__type__enum_values_by_name[15] =
+{
+  { "CHECKVERSION_ANS", 1 },
+  { "CHECKVERSION_REQ", 0 },
+  { "DEVICE_ANS", 8 },
+  { "DEVICE_NTF", 9 },
+  { "DEVICE_REQ", 7 },
+  { "INJECTOR_ANS", 5 },
+  { "INJECTOR_NTF", 6 },
+  { "INJECTOR_REQ", 4 },
+  { "KEEPALIVE_ANS", 3 },
+  { "KEEPALIVE_REQ", 2 },
+  { "MONITOR_ANS", 11 },
+  { "MONITOR_NTF", 12 },
+  { "MONITOR_REQ", 10 },
+  { "NFC_NTF", 14 },
+  { "NFC_REQ", 13 },
+};
+const ProtobufCEnumDescriptor ecs__master__type__descriptor =
+{
+  PROTOBUF_C_ENUM_DESCRIPTOR_MAGIC,
+  "ECS.Master_Type",
+  "Master_Type",
+  "ECS__MasterType",
+  "ECS",
+  15,
+  ecs__master__type__enum_values_by_number,
+  15,
+  ecs__master__type__enum_values_by_name,
+  2,
+  ecs__master__type__value_ranges,
+  NULL,NULL,NULL,NULL   /* reserved[1234] */
+};
diff --git a/tizen/src/ecs/genmsg/ecs_ids.pb-c.h b/tizen/src/ecs/genmsg/ecs_ids.pb-c.h
new file mode 100644 (file)
index 0000000..d4ce9d1
--- /dev/null
@@ -0,0 +1,48 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+
+#ifndef PROTOBUF_C_ecs_5fids_2eproto__INCLUDED
+#define PROTOBUF_C_ecs_5fids_2eproto__INCLUDED
+
+#include "../../../distrib/protobuf/protobuf-c.h"
+
+PROTOBUF_C_BEGIN_DECLS
+
+
+
+
+/* --- enums --- */
+
+typedef enum _ECS__MasterType {
+  ECS__MASTER__TYPE__CHECKVERSION_REQ = 2,
+  ECS__MASTER__TYPE__CHECKVERSION_ANS = 3,
+  ECS__MASTER__TYPE__KEEPALIVE_REQ = 4,
+  ECS__MASTER__TYPE__KEEPALIVE_ANS = 5,
+  ECS__MASTER__TYPE__INJECTOR_REQ = 6,
+  ECS__MASTER__TYPE__INJECTOR_ANS = 7,
+  ECS__MASTER__TYPE__INJECTOR_NTF = 8,
+  ECS__MASTER__TYPE__DEVICE_REQ = 9,
+  ECS__MASTER__TYPE__DEVICE_ANS = 10,
+  ECS__MASTER__TYPE__DEVICE_NTF = 11,
+  ECS__MASTER__TYPE__MONITOR_REQ = 12,
+  ECS__MASTER__TYPE__MONITOR_ANS = 13,
+  ECS__MASTER__TYPE__MONITOR_NTF = 14,
+  ECS__MASTER__TYPE__NFC_REQ = 101,
+  ECS__MASTER__TYPE__NFC_NTF = 102
+} ECS__MasterType;
+
+/* --- messages --- */
+
+/* --- per-message closures --- */
+
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCEnumDescriptor    ecs__master__type__descriptor;
+
+PROTOBUF_C_END_DECLS
+
+
+#endif  /* PROTOBUF_ecs_5fids_2eproto__INCLUDED */
diff --git a/tizen/src/ecs/genmsg/nfc.pb-c.c b/tizen/src/ecs/genmsg/nfc.pb-c.c
new file mode 100644 (file)
index 0000000..5f4211c
--- /dev/null
@@ -0,0 +1,196 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C_NO_DEPRECATED
+#define PROTOBUF_C_NO_DEPRECATED
+#endif
+
+#include "nfc.pb-c.h"
+void   ecs__nfc_req__init
+                     (ECS__NfcReq         *message)
+{
+  static ECS__NfcReq init_value = ECS__NFC_REQ__INIT;
+  *message = init_value;
+}
+size_t ecs__nfc_req__get_packed_size
+                     (const ECS__NfcReq *message)
+{
+  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__nfc_req__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t ecs__nfc_req__pack
+                     (const ECS__NfcReq *message,
+                      uint8_t       *out)
+{
+  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__nfc_req__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t ecs__nfc_req__pack_to_buffer
+                     (const ECS__NfcReq *message,
+                      ProtobufCBuffer *buffer)
+{
+  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__nfc_req__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+ECS__NfcReq *
+       ecs__nfc_req__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (ECS__NfcReq *)
+     protobuf_c_message_unpack (&ecs__nfc_req__descriptor,
+                                allocator, len, data);
+}
+void   ecs__nfc_req__free_unpacked
+                     (ECS__NfcReq *message,
+                      ProtobufCAllocator *allocator)
+{
+  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__nfc_req__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+void   ecs__nfc_ntf__init
+                     (ECS__NfcNtf         *message)
+{
+  static ECS__NfcNtf init_value = ECS__NFC_NTF__INIT;
+  *message = init_value;
+}
+size_t ecs__nfc_ntf__get_packed_size
+                     (const ECS__NfcNtf *message)
+{
+  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__nfc_ntf__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t ecs__nfc_ntf__pack
+                     (const ECS__NfcNtf *message,
+                      uint8_t       *out)
+{
+  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__nfc_ntf__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t ecs__nfc_ntf__pack_to_buffer
+                     (const ECS__NfcNtf *message,
+                      ProtobufCBuffer *buffer)
+{
+  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__nfc_ntf__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+ECS__NfcNtf *
+       ecs__nfc_ntf__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (ECS__NfcNtf *)
+     protobuf_c_message_unpack (&ecs__nfc_ntf__descriptor,
+                                allocator, len, data);
+}
+void   ecs__nfc_ntf__free_unpacked
+                     (ECS__NfcNtf *message,
+                      ProtobufCAllocator *allocator)
+{
+  PROTOBUF_C_ASSERT (message->base.descriptor == &ecs__nfc_ntf__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor ecs__nfc_req__field_descriptors[2] =
+{
+  {
+    "category",
+    1,
+    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
+    PROTOBUF_C_OFFSETOF(ECS__NfcReq, category),
+    NULL,
+    NULL,
+    0,            /* packed */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "data",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BYTES,
+    PROTOBUF_C_OFFSETOF(ECS__NfcReq, has_data),
+    PROTOBUF_C_OFFSETOF(ECS__NfcReq, data),
+    NULL,
+    NULL,
+    0,            /* packed */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned ecs__nfc_req__field_indices_by_name[] = {
+  0,   /* field[0] = category */
+  1,   /* field[1] = data */
+};
+static const ProtobufCIntRange ecs__nfc_req__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 2 }
+};
+const ProtobufCMessageDescriptor ecs__nfc_req__descriptor =
+{
+  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+  "ECS.NfcReq",
+  "NfcReq",
+  "ECS__NfcReq",
+  "ECS",
+  sizeof(ECS__NfcReq),
+  2,
+  ecs__nfc_req__field_descriptors,
+  ecs__nfc_req__field_indices_by_name,
+  1,  ecs__nfc_req__number_ranges,
+  (ProtobufCMessageInit) ecs__nfc_req__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
+static const ProtobufCFieldDescriptor ecs__nfc_ntf__field_descriptors[2] =
+{
+  {
+    "category",
+    1,
+    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
+    PROTOBUF_C_OFFSETOF(ECS__NfcNtf, category),
+    NULL,
+    NULL,
+    0,            /* packed */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "data",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BYTES,
+    PROTOBUF_C_OFFSETOF(ECS__NfcNtf, has_data),
+    PROTOBUF_C_OFFSETOF(ECS__NfcNtf, data),
+    NULL,
+    NULL,
+    0,            /* packed */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned ecs__nfc_ntf__field_indices_by_name[] = {
+  0,   /* field[0] = category */
+  1,   /* field[1] = data */
+};
+static const ProtobufCIntRange ecs__nfc_ntf__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 2 }
+};
+const ProtobufCMessageDescriptor ecs__nfc_ntf__descriptor =
+{
+  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+  "ECS.NfcNtf",
+  "NfcNtf",
+  "ECS__NfcNtf",
+  "ECS",
+  sizeof(ECS__NfcNtf),
+  2,
+  ecs__nfc_ntf__field_descriptors,
+  ecs__nfc_ntf__field_indices_by_name,
+  1,  ecs__nfc_ntf__number_ranges,
+  (ProtobufCMessageInit) ecs__nfc_ntf__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/tizen/src/ecs/genmsg/nfc.pb-c.h b/tizen/src/ecs/genmsg/nfc.pb-c.h
new file mode 100644 (file)
index 0000000..b0ece62
--- /dev/null
@@ -0,0 +1,103 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+
+#ifndef PROTOBUF_C_nfc_2eproto__INCLUDED
+#define PROTOBUF_C_nfc_2eproto__INCLUDED
+
+#include "../../../distrib/protobuf/protobuf-c.h"
+
+PROTOBUF_C_BEGIN_DECLS
+
+#include "ecs.pb-c.h"
+
+typedef struct _ECS__NfcReq ECS__NfcReq;
+typedef struct _ECS__NfcNtf ECS__NfcNtf;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _ECS__NfcReq
+{
+  ProtobufCMessage base;
+  char *category;
+  protobuf_c_boolean has_data;
+  ProtobufCBinaryData data;
+};
+#define ECS__NFC_REQ__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&ecs__nfc_req__descriptor) \
+    , NULL, 0,{0,NULL} }
+
+
+struct  _ECS__NfcNtf
+{
+  ProtobufCMessage base;
+  char *category;
+  protobuf_c_boolean has_data;
+  ProtobufCBinaryData data;
+};
+#define ECS__NFC_NTF__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&ecs__nfc_ntf__descriptor) \
+    , NULL, 0,{0,NULL} }
+
+
+/* ECS__NfcReq methods */
+void   ecs__nfc_req__init
+                     (ECS__NfcReq         *message);
+size_t ecs__nfc_req__get_packed_size
+                     (const ECS__NfcReq   *message);
+size_t ecs__nfc_req__pack
+                     (const ECS__NfcReq   *message,
+                      uint8_t             *out);
+size_t ecs__nfc_req__pack_to_buffer
+                     (const ECS__NfcReq   *message,
+                      ProtobufCBuffer     *buffer);
+ECS__NfcReq *
+       ecs__nfc_req__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   ecs__nfc_req__free_unpacked
+                     (ECS__NfcReq *message,
+                      ProtobufCAllocator *allocator);
+/* ECS__NfcNtf methods */
+void   ecs__nfc_ntf__init
+                     (ECS__NfcNtf         *message);
+size_t ecs__nfc_ntf__get_packed_size
+                     (const ECS__NfcNtf   *message);
+size_t ecs__nfc_ntf__pack
+                     (const ECS__NfcNtf   *message,
+                      uint8_t             *out);
+size_t ecs__nfc_ntf__pack_to_buffer
+                     (const ECS__NfcNtf   *message,
+                      ProtobufCBuffer     *buffer);
+ECS__NfcNtf *
+       ecs__nfc_ntf__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   ecs__nfc_ntf__free_unpacked
+                     (ECS__NfcNtf *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*ECS__NfcReq_Closure)
+                 (const ECS__NfcReq *message,
+                  void *closure_data);
+typedef void (*ECS__NfcNtf_Closure)
+                 (const ECS__NfcNtf *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor ecs__nfc_req__descriptor;
+extern const ProtobufCMessageDescriptor ecs__nfc_ntf__descriptor;
+
+PROTOBUF_C_END_DECLS
+
+
+#endif  /* PROTOBUF_nfc_2eproto__INCLUDED */
index c5f4442..461c8bb 100644 (file)
@@ -1,3 +1,5 @@
+import "ecs_ids.proto";
+
 package ECS;
 
 
@@ -22,17 +24,6 @@ message KeepAliveAns {
        optional string time_str = 1;
 }
 
-
-message StartReq {
-
-}
-
-message StartAns {
-       optional int32 host_keyboard_onoff = 1;
-       optional int32 earjack_onoff = 2;
-       optional int32 camera_onoff = 3;
-}
-
 message InjectorReq {
        required string category = 1;
        required int32 length = 2;
@@ -85,46 +76,6 @@ message DeviceNtf {
        optional bytes data = 5;
 }
 
-
-
-// control message
-
-message HostKeyboardReq {
-       optional int32 ison = 3;
-}
-
-message HostKeyboardNtf {
-
-       required int32 errcode = 1;
-       optional string errstr = 2;
-       optional int32 ison = 3;
-}
-
-message ControlMsg {
-
-       enum ControlType { 
-               HOSTKEYBOARD_REQ = 2; HOSTKEYBOARD_NTF = 3;
-       }
-       
-       required ControlType type = 1;
-       
-       optional HostKeyboardReq hostkeyboard_req = 2;
-       optional HostKeyboardNtf hostkeyboard_ntf = 3;
-}
-
-//
-
-message ControlAns {
-       required int32 errcode = 1;
-       optional string errmsg = 2;
-}
-
-message ControlNtf {
-       required string category = 1;
-       required string command = 2;
-       optional bytes data = 3;
-}
-
 message MonitorReq {
        required string command = 1;
 }
@@ -141,29 +92,9 @@ message MonitorNtf {
        optional bytes data = 2;
 }
 
-message ScreenDumpReq {
-       required string output_path = 1;
-}
-
-message ScreenDumpAns {
-       required int32 errcode = 1;
-       optional string errmsg = 2;
-}
-
 
 message Master {
-       enum Type { 
-       CHECKVERSION_REQ = 2; CHECKVERSION_ANS = 3; 
-       KEEPALIVE_REQ = 4; KEEPALIVE_ANS = 5; 
-       START_REQ = 6; START_ANS = 7; 
-       INJECTOR_REQ = 8; INJECTOR_ANS = 9; INJECTOR_NTF = 10;
-       DEVICE_REQ = 11; DEVICE_ANS = 12; DEVICE_NTF = 13; 
-       CONTROL_MSG = 14; CONTROL_ANS = 15; CONTROL_NTF = 16; 
-       MONITOR_REQ = 17; MONITOR_ANS = 18; MONITOR_NTF = 19; 
-       SCREEN_DUMP_REQ = 20; SCREEN_DUMP_ANS = 21; 
-       }
-       
-       required Type type = 1;
+       required Master_Type type = 1;
 
        optional CheckVersionReq checkversion_req = 2;
        optional CheckVersionAns checkversion_ans = 3;
@@ -171,28 +102,19 @@ message Master {
        optional KeepAliveReq keepalive_req = 4;
        optional KeepAliveAns keepalive_ans = 5;
        
-       optional StartReq start_req = 6;
-       optional StartAns start_ans = 7;
-
-       optional InjectorReq injector_req = 8;
-       optional InjectorAns injector_ans = 9;
-       optional InjectorNtf injector_ntf = 10;
+       optional InjectorReq injector_req = 6;
+       optional InjectorAns injector_ans = 7;
+       optional InjectorNtf injector_ntf = 8;
        
-       optional DeviceReq device_req = 11;
-       optional DeviceAns device_ans = 12;
-       optional DeviceNtf device_ntf = 13;
-
-       optional ControlMsg control_msg = 14;
-       optional ControlAns control_ans = 15;
-       optional ControlNtf control_ntf = 16;
-
-       optional MonitorReq monitor_req = 17;
-       optional MonitorAns monitor_ans = 18;
-       optional MonitorNtf monitor_ntf = 19;
+       optional DeviceReq device_req = 9;
+       optional DeviceAns device_ans = 10;
+       optional DeviceNtf device_ntf = 11;
 
-       optional ScreenDumpReq screen_dump_req = 20;
-       optional ScreenDumpAns screen_dump_ans = 21;
+       optional MonitorReq monitor_req = 12;
+       optional MonitorAns monitor_ans = 13;
+       optional MonitorNtf monitor_ntf = 14;
 
+       extensions 101 to 150;
 }
 
 
diff --git a/tizen/src/ecs/msg/ecs_ids.proto b/tizen/src/ecs/msg/ecs_ids.proto
new file mode 100644 (file)
index 0000000..47f7d2f
--- /dev/null
@@ -0,0 +1,22 @@
+package ECS;
+
+option java_package = "org.tizen.ecp.msg.genmsg.ecs";
+
+enum Master_Type {
+    CHECKVERSION_REQ = 2;
+    CHECKVERSION_ANS = 3;
+       KEEPALIVE_REQ = 4;
+       KEEPALIVE_ANS = 5;
+       INJECTOR_REQ = 6;
+       INJECTOR_ANS = 7;
+       INJECTOR_NTF = 8;
+       DEVICE_REQ = 9;
+       DEVICE_ANS = 10;
+       DEVICE_NTF = 11;
+       MONITOR_REQ = 12;
+       MONITOR_ANS = 13;
+       MONITOR_NTF = 14;
+
+       NFC_REQ = 101;
+       NFC_NTF = 102;
+}
diff --git a/tizen/src/ecs/msg/nfc.proto b/tizen/src/ecs/msg/nfc.proto
new file mode 100644 (file)
index 0000000..018c558
--- /dev/null
@@ -0,0 +1,21 @@
+import "ecs.proto";
+
+package ECS;
+
+message NfcReq {
+       required string category = 1;
+       optional bytes data = 2;
+}
+
+message NfcNtf {
+       required string category = 1;
+       optional bytes data = 2;
+}
+
+
+extend Master {
+       optional NfcReq nfc_req = 101;
+       optional NfcNtf nfc_ntf = 102;
+}
+
+
index 795f54b..aa5afd4 100644 (file)
@@ -37,6 +37,9 @@
 pthread_t start_guest_server( int server_port );
 void shutdown_guest_server( void );
 
+
+#define STATE_RESUME 0
+#define STATE_SUSPEND 1
 void notify_all_sdb_clients(int state);
 
 #endif /* GUEST_SERVER_H_ */