[otbn,dv] Rename some DPI functions into "otbn_model" namespace

Signed-off-by: Rupert Swarbrick <rswarbrick@lowrisc.org>
diff --git a/hw/ip/otbn/dv/model/otbn_core_model.sv b/hw/ip/otbn/dv/model/otbn_core_model.sv
index 41d3904..4f55445 100644
--- a/hw/ip/otbn/dv/model/otbn_core_model.sv
+++ b/hw/ip/otbn/dv/model/otbn_core_model.sv
@@ -147,15 +147,13 @@
   // EDN Stepping is done with the EDN clock for also asserting the CDC measures in the design.
   always_ff @(posedge clk_edn_i or negedge rst_edn_ni) begin
     if (!rst_edn_ni) begin
-      edn_model_flush(model_handle);
+      otbn_model_edn_flush(model_handle);
     end else begin
       if (edn_rnd_i.edn_ack) begin
-        edn_model_rnd_step(model_handle,
-                           edn_rnd_i.edn_bus);
+        otbn_model_edn_rnd_step(model_handle, edn_rnd_i.edn_bus);
       end
       if (edn_urnd_i.edn_ack) begin
-        edn_model_urnd_step(model_handle,
-                             edn_urnd_i.edn_bus);
+        otbn_model_edn_urnd_step(model_handle, edn_urnd_i.edn_bus);
       end
     end
   end
@@ -236,13 +234,13 @@
                                                             keymgr_key_i.valid) != 0);
       end
       if (edn_urnd_cdc_done_i) begin
-        edn_model_urnd_cdc_done(model_handle);
+        otbn_model_urnd_cdc_done(model_handle);
       end
       if (edn_rnd_cdc_done_i) begin
-        edn_model_rnd_cdc_done(model_handle);
+        otbn_model_rnd_cdc_done(model_handle);
       end
       if (otp_key_cdc_done_i) begin
-        otp_key_cdc_done(model_handle);
+        otbn_model_otp_key_cdc_done(model_handle);
       end
       if (step_iss) begin
         model_state <= otbn_model_step(model_handle,
diff --git a/hw/ip/otbn/dv/model/otbn_model.cc b/hw/ip/otbn/dv/model/otbn_model.cc
index cbba08b..50319b9 100644
--- a/hw/ip/otbn/dv/model/otbn_model.cc
+++ b/hw/ip/otbn/dv/model/otbn_model.cc
@@ -748,23 +748,29 @@
 
 void otbn_model_destroy(OtbnModel *model) { delete model; }
 
-void edn_model_flush(OtbnModel *model) { model->edn_flush(); }
+void otbn_model_edn_flush(OtbnModel *model) { model->edn_flush(); }
 
-void edn_model_rnd_step(OtbnModel *model,
-                        svLogicVecVal *edn_rnd_data /* logic [31:0] */) {
+void otbn_model_edn_rnd_step(OtbnModel *model,
+                             svLogicVecVal *edn_rnd_data /* logic [31:0] */) {
   model->edn_rnd_step(edn_rnd_data);
 }
 
-void edn_model_urnd_step(OtbnModel *model,
-                         svLogicVecVal *edn_urnd_data /* logic [31:0] */) {
+void otbn_model_edn_urnd_step(OtbnModel *model,
+                              svLogicVecVal *edn_urnd_data /* logic [31:0] */) {
   model->edn_urnd_step(edn_urnd_data);
 }
 
-void otp_key_cdc_done(OtbnModel *model) { model->otp_key_cdc_done(); }
+void otbn_model_otp_key_cdc_done(OtbnModel *model) {
+  return model->otp_key_cdc_done();
+}
 
-void edn_model_rnd_cdc_done(OtbnModel *model) { model->edn_rnd_cdc_done(); }
+void otbn_model_rnd_cdc_done(OtbnModel *model) {
+  return model->edn_rnd_cdc_done();
+}
 
-void edn_model_urnd_cdc_done(OtbnModel *model) { model->edn_urnd_cdc_done(); }
+void otbn_model_urnd_cdc_done(OtbnModel *model) {
+  return model->edn_urnd_cdc_done();
+}
 
 unsigned otbn_model_step(OtbnModel *model, unsigned model_state,
                          svBitVecVal *cmd /* bit [7:0] */,
diff --git a/hw/ip/otbn/dv/model/otbn_model_dpi.h b/hw/ip/otbn/dv/model/otbn_model_dpi.h
index fbcbb5f..770e08e 100644
--- a/hw/ip/otbn/dv/model/otbn_model_dpi.h
+++ b/hw/ip/otbn/dv/model/otbn_model_dpi.h
@@ -23,24 +23,24 @@
 void otbn_model_destroy(OtbnModel *model);
 
 // Flush URND and RND EDN data from model because of edn_rst_n signal
-void edn_model_flush(OtbnModel *model);
+void otbn_model_edn_flush(OtbnModel *model);
 
 // Call edn_rnd_step function of OtbnModel
-void edn_model_rnd_step(OtbnModel *model,
-                        svLogicVecVal *edn_rnd_data /* logic [31:0] */);
+void otbn_model_edn_rnd_step(OtbnModel *model,
+                             svLogicVecVal *edn_rnd_data /* logic [31:0] */);
 
 // Call edn_urnd_step function of OtbnModel
-void edn_model_urnd_step(OtbnModel *model,
-                         svLogicVecVal *edn_urnd_data /* logic [31:0] */);
+void otbn_model_edn_urnd_step(OtbnModel *model,
+                              svLogicVecVal *edn_urnd_data /* logic [31:0] */);
 
 // Signal RTL is finished processing RND data to Model
-void edn_model_rnd_cdc_done(OtbnModel *model);
+void otbn_model_otp_key_cdc_done(OtbnModel *model);
 
 // Signal RTL is finished processing OTP key to the Model
-void otp_key_cdc_done(OtbnModel *model);
+void otbn_model_rnd_cdc_done(OtbnModel *model);
 
 // Signal RTL is finished processing EDN data for URND to Model
-void edn_model_urnd_cdc_done(OtbnModel *model);
+void otbn_model_urnd_cdc_done(OtbnModel *model);
 
 // Pass keymgr data to model. Returns 0 on success; -1 on error.
 int otbn_model_set_keymgr_value(OtbnModel *model, svLogicVecVal *key0,
diff --git a/hw/ip/otbn/dv/model/otbn_model_dpi.svh b/hw/ip/otbn/dv/model/otbn_model_dpi.svh
index 35bc1a7..95ca070 100644
--- a/hw/ip/otbn/dv/model/otbn_model_dpi.svh
+++ b/hw/ip/otbn/dv/model/otbn_model_dpi.svh
@@ -13,26 +13,23 @@
 
 import "DPI-C" function void otbn_model_destroy(chandle model);
 
-import "DPI-C" function void edn_model_flush(chandle model);
+import "DPI-C" function void otbn_model_edn_flush(chandle model);
 
-import "DPI-C" function void edn_model_rnd_step(chandle model,
-                                                logic [31:0] edn_rnd_data);
+import "DPI-C" function void otbn_model_edn_rnd_step(chandle model,
+                                                     logic [31:0] edn_rnd_data);
 
-import "DPI-C" function void edn_model_urnd_step(chandle model,
-                                                 logic [31:0] edn_urnd_data);
+import "DPI-C" function void otbn_model_edn_urnd_step(chandle model,
+                                                      logic [31:0] edn_urnd_data);
 
-import "DPI-C" function
-  void edn_model_urnd_cdc_done(chandle model);
+import "DPI-C" function void otbn_model_urnd_cdc_done(chandle model);
 
 import "DPI-C" function
   int otbn_model_set_keymgr_value(chandle model, logic [383:0] key0,
                                   logic [383:0] key1, bit valid);
 
-import "DPI-C" function
-  void edn_model_rnd_cdc_done(chandle model);
+import "DPI-C" function void otbn_model_rnd_cdc_done(chandle model);
 
-import "DPI-C" function
-  void otp_key_cdc_done(chandle model);
+import "DPI-C" function void otbn_model_otp_key_cdc_done(chandle model);
 
 import "DPI-C" context function
   int unsigned otbn_model_step(chandle          model,