ext/bridge.c in origen_sim-0.8.0 vs ext/bridge.c in origen_sim-0.9.0

@@ -81,11 +81,11 @@
   (*pin).compare_wave = atoi(compare_wave_ix);
   (*pin).previous_state = 0;
   (*pin).capture_en = false;
 
   char * driver = (char *) malloc(strlen(name) + 16);
-  strcpy(driver, "origen.pins.");
+  strcpy(driver, ORIGEN_SIM_TESTBENCH_CAT("pins."));
   strcat(driver, name);
 
   char * data = (char *) malloc(strlen(driver) + 16);
   strcpy(data, driver);
   strcat(data, ".data");
@@ -659,11 +659,11 @@
         }
         break;
       // Set Pattern Name
       //   a^atd_ramp_25mhz
       case 'a' :
-        handle = vpi_handle_by_name("origen.debug.pattern", NULL);
+        handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("debug.pattern"), NULL);
         arg1 = strtok(NULL, "^");
 
         v.format = vpiStringVal;
         v.value.str = arg1;
         vpi_put_value(handle, &v, NULL, vpiNoDelay);
@@ -684,11 +684,11 @@
         }
         break;
       // Set Comment
       //   c^Some comment about the pattern
       case 'c' :
-        handle = vpi_handle_by_name("origen.debug.comments", NULL);
+        handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("debug.comments"), NULL);
         arg1 = strtok(NULL, "^");
 
         v.format = vpiStringVal;
         v.value.str = arg1;
         vpi_put_value(handle, &v, NULL, vpiNoDelay);
@@ -708,18 +708,18 @@
         arg1 = strtok(NULL, "^");
         bridge_capture_pin(arg1);
         break;
       // Sync enable
       case 'f' :
-        handle = vpi_handle_by_name("origen.pins.sync", NULL);
+        handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("pins.sync"), NULL);
         v.format = vpiDecStrVal;
         v.value.str = "1";
         vpi_put_value(handle, &v, NULL, vpiNoDelay);
         break;
       // Sync disable
       case 'g' :
-        handle = vpi_handle_by_name("origen.pins.sync", NULL);
+        handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("pins.sync"), NULL);
         v.format = vpiDecStrVal;
         v.value.str = "0";
         vpi_put_value(handle, &v, NULL, vpiNoDelay);
         break;
       // Stop Capture Pin
@@ -749,10 +749,10 @@
 static void end_simulation() {
   vpiHandle handle;
   s_vpi_value v;
 
   // Setting this node will cause the testbench to call $finish
-  handle = vpi_handle_by_name("origen.finish", NULL);
+  handle = vpi_handle_by_name(ORIGEN_SIM_TESTBENCH_CAT("finish"), NULL);
   v.format = vpiDecStrVal;
   v.value.str = "1";
   vpi_put_value(handle, &v, NULL, vpiNoDelay);
   // Corner case during testing, the timeset may not have been set yet
   bridge_set_period("1000");