change scf_eda.proto

diff --git a/scf_eda.pb-c.c b/scf_eda.pb-c.c
index 2b509ddfbb86264621933ce9eee2400d307c8736..1ccc9321eff56d19aec6e28360c04442d2600e87 100644 (file)
--- a/scf_eda.pb-c.c
+++ b/scf_eda.pb-c.c
@@ -385,63 +385,75 @@ const ProtobufCMessageDescriptor scf_line__descriptor =
   (ProtobufCMessageInit) scf_line__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor scf_epin__field_descriptors[7] =
+static const ProtobufCFieldDescriptor scf_epin__field_descriptors[8] =
 {
   {
-    "tos",
+    "id",
     1,
-    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_UINT64,
-    offsetof(ScfEpin, n_tos),
-    offsetof(ScfEpin, tos),
+    0,   /* quantifier_offset */
+    offsetof(ScfEpin, id),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "id",
+    "cid",
     2,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_UINT64,
     0,   /* quantifier_offset */
-    offsetof(ScfEpin, id),
+    offsetof(ScfEpin, cid),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "cid",
+    "lid",
     3,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_UINT64,
     0,   /* quantifier_offset */
-    offsetof(ScfEpin, cid),
+    offsetof(ScfEpin, lid),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "lid",
+    "flags",
     4,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_UINT64,
     0,   /* quantifier_offset */
-    offsetof(ScfEpin, lid),
+    offsetof(ScfEpin, flags),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "flags",
+    "tos",
     5,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_UINT64,
+    offsetof(ScfEpin, n_tos),
+    offsetof(ScfEpin, tos),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "c_tos",
+    6,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_UINT64,
     0,   /* quantifier_offset */
-    offsetof(ScfEpin, flags),
+    offsetof(ScfEpin, c_tos),
     NULL,
     NULL,
     0,             /* flags */
@@ -449,7 +461,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[7] =
   },
   {
     "x",
-    6,
+    7,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -461,7 +473,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[7] =
   },
   {
     "y",
-    7,
+    8,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -473,18 +485,19 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[7] =
   },
 };
 static const unsigned scf_epin__field_indices_by_name[] = {
-  2,   /* field[2] = cid */
-  4,   /* field[4] = flags */
-  1,   /* field[1] = id */
-  3,   /* field[3] = lid */
-  0,   /* field[0] = tos */
-  5,   /* field[5] = x */
-  6,   /* field[6] = y */
+  5,   /* field[5] = c_tos */
+  1,   /* field[1] = cid */
+  3,   /* field[3] = flags */
+  0,   /* field[0] = id */
+  2,   /* field[2] = lid */
+  4,   /* field[4] = tos */
+  6,   /* field[6] = x */
+  7,   /* field[7] = y */
 };
 static const ProtobufCIntRange scf_epin__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 7 }
+  { 0, 8 }
 };
 const ProtobufCMessageDescriptor scf_epin__descriptor =
 {
@@ -494,7 +507,7 @@ const ProtobufCMessageDescriptor scf_epin__descriptor =
   "ScfEpin",
   "",
   sizeof(ScfEpin),
-  7,
+  8,
   scf_epin__field_descriptors,
   scf_epin__field_indices_by_name,
   1,  scf_epin__number_ranges,
@@ -642,7 +655,7 @@ const ProtobufCMessageDescriptor scf_eline__descriptor =
   (ProtobufCMessageInit) scf_eline__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[7] =
+static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[8] =
 {
   {
     "id",
@@ -669,8 +682,20 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[7] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "pins",
+    "dfo",
     3,
+    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_INT64,
+    0,   /* quantifier_offset */
+    offsetof(ScfEcomponent, dfo),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "pins",
+    4,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_MESSAGE,
     offsetof(ScfEcomponent, n_pins),
@@ -682,7 +707,7 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[7] =
   },
   {
     "x",
-    4,
+    5,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -694,7 +719,7 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[7] =
   },
   {
     "y",
-    5,
+    6,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -706,7 +731,7 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[7] =
   },
   {
     "w",
-    6,
+    7,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -718,7 +743,7 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[7] =
   },
   {
     "h",
-    7,
+    8,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -730,18 +755,19 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[7] =
   },
 };
 static const unsigned scf_ecomponent__field_indices_by_name[] = {
-  6,   /* field[6] = h */
+  2,   /* field[2] = dfo */
+  7,   /* field[7] = h */
   0,   /* field[0] = id */
-  2,   /* field[2] = pins */
+  3,   /* field[3] = pins */
   1,   /* field[1] = type */
-  5,   /* field[5] = w */
-  3,   /* field[3] = x */
-  4,   /* field[4] = y */
+  6,   /* field[6] = w */
+  4,   /* field[4] = x */
+  5,   /* field[5] = y */
 };
 static const ProtobufCIntRange scf_ecomponent__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 7 }
+  { 0, 8 }
 };
 const ProtobufCMessageDescriptor scf_ecomponent__descriptor =
 {
@@ -751,7 +777,7 @@ const ProtobufCMessageDescriptor scf_ecomponent__descriptor =
   "ScfEcomponent",
   "",
   sizeof(ScfEcomponent),
-  7,
+  8,
   scf_ecomponent__field_descriptors,
   scf_ecomponent__field_indices_by_name,
   1,  scf_ecomponent__number_ranges,

diff --git a/scf_eda.pb-c.h b/scf_eda.pb-c.h
index 977ddb6c553eaf428630c0e4482deccd46682a1d..9d24182ec7e407384c5cda2f9eb650c2045eae0a 100644 (file)
--- a/scf_eda.pb-c.h
+++ b/scf_eda.pb-c.h
@@ -45,18 +45,19 @@ struct  _ScfLine
 struct  _ScfEpin
 {
   ProtobufCMessage base;
-  size_t n_tos;
-  uint64_t *tos;
   uint64_t id;
   uint64_t cid;
   uint64_t lid;
   uint64_t flags;
+  size_t n_tos;
+  uint64_t *tos;
+  uint64_t c_tos;
   int32_t x;
   int32_t y;
 };
 #define SCF_EPIN__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&scf_epin__descriptor) \
-    , 0,NULL, 0, 0, 0, 0, 0, 0 }
+    , 0, 0, 0, 0, 0,NULL, 0, 0, 0 }
 
 
 struct  _ScfEconn
@@ -93,6 +94,7 @@ struct  _ScfEcomponent
   ProtobufCMessage base;
   uint64_t id;
   uint64_t type;
+  int64_t dfo;
   size_t n_pins;
   ScfEpin **pins;
   int32_t x;
@@ -102,7 +104,7 @@ struct  _ScfEcomponent
 };
 #define SCF_ECOMPONENT__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&scf_ecomponent__descriptor) \
-    , 0, 0, 0,NULL, 0, 0, 0, 0 }
+    , 0, 0, 0, 0,NULL, 0, 0, 0, 0 }
 
 
 struct  _ScfEfunction

diff --git a/scf_eda.proto b/scf_eda.proto
index 1d4af8d7767f11162e82ee555909cea47d2a5cee..95970566987c456bc4512e5d26dd3486ac7435ab 100644 (file)
--- a/scf_eda.proto
+++ b/scf_eda.proto
@@ -10,14 +10,15 @@ message scf_line
 
 message scf_epin
 {
-       repeated uint64    tos   = 1;
-       required uint64    id    = 2;
-       required uint64    cid   = 3;
-       required uint64    lid   = 4;
-       required uint64    flags = 5;
+       required uint64    id    = 1;
+       required uint64    cid   = 2;
+       required uint64    lid   = 3;
+       required uint64    flags = 4;
+       repeated uint64    tos   = 5;
+       required uint64    c_tos = 6;
 
-       required int32     x     = 6;
-       required int32     y     = 7;
+       required int32     x     = 7;
+       required int32     y     = 8;
 }
 
 message scf_econn
@@ -39,12 +40,13 @@ message scf_ecomponent
 {
        required uint64    id   = 1;
        required uint64    type = 2;
-       repeated scf_epin  pins = 3;
+       required int64     dfo  = 3;
+       repeated scf_epin  pins = 4;
 
-       required int32     x    = 4;
-       required int32     y    = 5;
-       required int32     w    = 6;
-       required int32     h    = 7;
+       required int32     x    = 5;
+       required int32     y    = 6;
+       required int32     w    = 7;
+       required int32     h    = 8;
 }
 
 message scf_efunction