scf_eda.proto

diff --git a/scf_eda.pb-c.c b/scf_eda.pb-c.c
index dcbce1ec72a8f5b1d6be8951008fdb1c7cbb85e6..508ea2d622b0467d7da49ff80106ccd70f360b9d 100644 (file)
--- a/scf_eda.pb-c.c
+++ b/scf_eda.pb-c.c
@@ -448,12 +448,12 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[11] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "c_tos",
+    "c_lid",
     6,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_UINT64,
     0,   /* quantifier_offset */
-    offsetof(ScfEpin, c_tos),
+    offsetof(ScfEpin, c_lid),
     NULL,
     NULL,
     0,             /* flags */
@@ -523,7 +523,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[11] =
 static const unsigned scf_epin__field_indices_by_name[] = {
   7,   /* field[7] = A */
   6,   /* field[6] = V */
-  5,   /* field[5] = c_tos */
+  5,   /* field[5] = c_lid */
   1,   /* field[1] = cid */
   3,   /* field[3] = flags */
   0,   /* field[0] = id */
@@ -604,7 +604,7 @@ const ProtobufCMessageDescriptor scf_econn__descriptor =
   (ProtobufCMessageInit) scf_econn__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor scf_eline__field_descriptors[9] =
+static const ProtobufCFieldDescriptor scf_eline__field_descriptors[10] =
 {
   {
     "id",
@@ -631,11 +631,23 @@ static const ProtobufCFieldDescriptor scf_eline__field_descriptors[9] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "flags",
+    "c_pins",
     3,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_UINT64,
     0,   /* quantifier_offset */
+    offsetof(ScfEline, c_pins),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "flags",
+    4,
+    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_UINT64,
+    0,   /* quantifier_offset */
     offsetof(ScfEline, flags),
     NULL,
     NULL,
@@ -644,7 +656,7 @@ static const ProtobufCFieldDescriptor scf_eline__field_descriptors[9] =
   },
   {
     "dfo",
-    4,
+    5,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT64,
     0,   /* quantifier_offset */
@@ -656,7 +668,7 @@ static const ProtobufCFieldDescriptor scf_eline__field_descriptors[9] =
   },
   {
     "conns",
-    5,
+    6,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_MESSAGE,
     offsetof(ScfEline, n_conns),
@@ -668,7 +680,7 @@ static const ProtobufCFieldDescriptor scf_eline__field_descriptors[9] =
   },
   {
     "lines",
-    6,
+    7,
     PROTOBUF_C_LABEL_REPEATED,
     PROTOBUF_C_TYPE_MESSAGE,
     offsetof(ScfEline, n_lines),
@@ -680,7 +692,7 @@ static const ProtobufCFieldDescriptor scf_eline__field_descriptors[9] =
   },
   {
     "V",
-    7,
+    8,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_DOUBLE,
     0,   /* quantifier_offset */
@@ -692,7 +704,7 @@ static const ProtobufCFieldDescriptor scf_eline__field_descriptors[9] =
   },
   {
     "A",
-    8,
+    9,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_DOUBLE,
     0,   /* quantifier_offset */
@@ -704,7 +716,7 @@ static const ProtobufCFieldDescriptor scf_eline__field_descriptors[9] =
   },
   {
     "vflag",
-    9,
+    10,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_BOOL,
     0,   /* quantifier_offset */
@@ -716,20 +728,21 @@ static const ProtobufCFieldDescriptor scf_eline__field_descriptors[9] =
   },
 };
 static const unsigned scf_eline__field_indices_by_name[] = {
-  7,   /* field[7] = A */
-  6,   /* field[6] = V */
-  4,   /* field[4] = conns */
-  3,   /* field[3] = dfo */
-  2,   /* field[2] = flags */
+  8,   /* field[8] = A */
+  7,   /* field[7] = V */
+  2,   /* field[2] = c_pins */
+  5,   /* field[5] = conns */
+  4,   /* field[4] = dfo */
+  3,   /* field[3] = flags */
   0,   /* field[0] = id */
-  5,   /* field[5] = lines */
+  6,   /* field[6] = lines */
   1,   /* field[1] = pins */
-  8,   /* field[8] = vflag */
+  9,   /* field[9] = vflag */
 };
 static const ProtobufCIntRange scf_eline__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 9 }
+  { 0, 10 }
 };
 const ProtobufCMessageDescriptor scf_eline__descriptor =
 {
@@ -739,7 +752,7 @@ const ProtobufCMessageDescriptor scf_eline__descriptor =
   "ScfEline",
   "",
   sizeof(ScfEline),
-  9,
+  10,
   scf_eline__field_descriptors,
   scf_eline__field_indices_by_name,
   1,  scf_eline__number_ranges,

diff --git a/scf_eda.pb-c.h b/scf_eda.pb-c.h
index 76f38a849d789eea9ad99ae4e99165cb57e3bf42..b65f07bc68fa24580b5b997e402b34eb924c81ea 100644 (file)
--- a/scf_eda.pb-c.h
+++ b/scf_eda.pb-c.h
@@ -51,7 +51,7 @@ struct  _ScfEpin
   uint64_t flags;
   size_t n_tos;
   uint64_t *tos;
-  uint64_t c_tos;
+  uint64_t c_lid;
   double v;
   double a;
   int32_t x;
@@ -81,6 +81,7 @@ struct  _ScfEline
   uint64_t id;
   size_t n_pins;
   uint64_t *pins;
+  uint64_t c_pins;
   uint64_t flags;
   int64_t dfo;
   size_t n_conns;
@@ -93,7 +94,7 @@ struct  _ScfEline
 };
 #define SCF_ELINE__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&scf_eline__descriptor) \
-    , 0, 0,NULL, 0, 0, 0,NULL, 0,NULL, 0, 0, 0 }
+    , 0, 0,NULL, 0, 0, 0, 0,NULL, 0,NULL, 0, 0, 0 }
 
 
 struct  _ScfEcomponent

diff --git a/scf_eda.proto b/scf_eda.proto
index 26d7338000eb30865a4180995258ad172acfef38..7a4aabe0d9e0936257ba702d14ef039c348e3d72 100644 (file)
--- a/scf_eda.proto
+++ b/scf_eda.proto
@@ -15,7 +15,7 @@ message scf_epin
        required uint64    lid   = 3;
        required uint64    flags = 4;
        repeated uint64    tos   = 5;
-       required uint64    c_tos = 6;
+       required uint64    c_lid = 6;
 
        required double    V     = 7;
        required double    A     = 8;
@@ -33,17 +33,19 @@ message scf_econn
 
 message scf_eline
 {
-       required uint64    id    = 1;
-       repeated uint64    pins  = 2;
-       required uint64    flags = 3;
-       required int64     dfo   = 4;
-       repeated scf_econn conns = 5;
-       repeated scf_line  lines = 6;
+       required uint64    id     = 1;
+       repeated uint64    pins   = 2;
+       required uint64    c_pins = 3;
+       required uint64    flags  = 4;
+       required int64     dfo    = 5;
 
-       required double    V     = 7;
-       required double    A     = 8;
+       repeated scf_econn conns  = 6;
+       repeated scf_line  lines  = 7;
+
+       required double    V      = 8;
+       required double    A      = 9;
 
-       required bool      vflag = 9;
+       required bool      vflag  = 10;
 }
 
 message scf_ecomponent