lib/nicif: rename nicsim.h -> nicif.h

lib/simbricks/nicbm/nicbm.h

@@ -31,7 +31,7 @@
 #include <set>
 
 extern "C" {
-#include <simbricks/nicif/nicsim.h>
+#include <simbricks/nicif/nicif.h>
 }
 
 namespace nicbm {

lib/simbricks/nicif/nicsim.c → lib/simbricks/nicif/nicif.c

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <simbricks/nicif/nicsim.h>
+#include <simbricks/nicif/nicif.h>
 
 #include <poll.h>
 #include <stdio.h>

lib/simbricks/nicif/nicsim.h → lib/simbricks/nicif/nicif.h

@@ -22,8 +22,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SIMBRICKS_NICIF_NICSIM_H_
-#define SIMBRICKS_NICIF_NICSIM_H_
+#ifndef SIMBRICKS_NICIF_NICIF_H_
+#define SIMBRICKS_NICIF_NICIF_H_
 
 #include <simbricks/proto/network.h>
 #include <simbricks/proto/pcie.h>
@@ -69,4 +69,4 @@ void SimbricksNicIfN2DNext(void);
 volatile union SimbricksProtoNetD2N *SimbricksNicIfD2NAlloc(
     struct SimbricksNicIfParams *params, uint64_t timestamp);
 
-#endif  // SIMBRICKS_NICIF_NICSIM_H_
+#endif  // SIMBRICKS_NICIF_NICIF_H_

lib/simbricks/nicif/rules.mk

@@ -22,11 +22,11 @@
 
 include mk/subdir_pre.mk
 
-lib_nicsim := $(d)libnicsim_common.a
+lib_nicif := $(d)libnicif_common.a
 
-OBJS := $(addprefix $(d),nicsim.o utils.o)
+OBJS := $(addprefix $(d),nicif.o utils.o)
 
-$(lib_nicsim): $(OBJS)
+$(lib_nicif): $(OBJS)
 
-CLEAN := $(lib_nicsim) $(OBJS)
+CLEAN := $(lib_nicif) $(OBJS)
 include mk/subdir_post.mk

sims/nic/corundum/corundum_verilator.cc

@@ -33,7 +33,7 @@
 #endif
 
 extern "C" {
-#include <simbricks/nicif/nicsim.h>
+#include <simbricks/nicif/nicif.h>
 #include <simbricks/proto/base.h>
 #include <simbricks/proto/pcie.h>
 }

sims/nic/corundum/rules.mk

@@ -44,10 +44,10 @@ $(verilator_src_corundum): $(vsrcs_corundum)
 	    -y $(dir_corundum)lib/axi/rtl \
 	    -y $(dir_corundum)lib/eth/lib/axis/rtl/ \
 	    -y $(dir_corundum)lib/pcie/rtl \
-	    $(dir_corundum)rtl/interface.v --exe $(abspath $(srcs_corundum)) $(abspath $(lib_nicsim))
+	    $(dir_corundum)rtl/interface.v --exe $(abspath $(srcs_corundum)) $(abspath $(lib_nicif))
 
 $(verilator_bin_corundum): $(verilator_src_corundum) $(srcs_corundum) \
-    $(lib_nicsim)
+    $(lib_nicif)
 	$(MAKE) -C $(verilator_dir_corundum) -f Vinterface.mk
 
 $(bin_corundum): $(verilator_bin_corundum)

sims/nic/corundum_bm/rules.mk

@@ -31,8 +31,8 @@ OBJS := $(objs_corundum_bm) $(objs_corundum_bm_tester)
 
 $(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/
 
-$(bin_corundum_bm): $(objs_corundum_bm) $(lib_nicbm) $(lib_nicsim)
-$(bin_corundum_bm_tester): $(objs_corundum_bm_tester) $(lib_nicbm) $(lib_nicsim)
+$(bin_corundum_bm): $(objs_corundum_bm) $(lib_nicbm) $(lib_nicif)
+$(bin_corundum_bm_tester): $(objs_corundum_bm_tester) $(lib_nicbm) $(lib_nicif)
 
 CLEAN := $(bin_corundum_bm) $(bin_corundum_bm_tester) $(OBJS)
 ALL := $(bin_corundum_bm)

sims/nic/corundum_bm/tester.c

@@ -33,7 +33,7 @@
 #include <sys/un.h>
 #include <unistd.h>
 
-#include <simbricks/nicif/nicsim.h>
+#include <simbricks/nicif/nicif.h>
 #include <simbricks/proto/pcie.h>
 
 static uint8_t *d2h_queue;

sims/nic/i40e_bm/rules.mk

@@ -29,7 +29,7 @@ OBJS := $(addprefix $(d),i40e_bm.o i40e_queues.o i40e_adminq.o i40e_hmc.o \
 
 $(OBJS): CPPFLAGS := $(CPPFLAGS) -I$(d)include/
 
-$(bin_i40e_bm): $(OBJS) $(lib_nicbm) $(lib_nicsim)
+$(bin_i40e_bm): $(OBJS) $(lib_nicbm) $(lib_nicif)
 
 CLEAN := $(bin_i40e_bm) $(OBJS)
 ALL := $(bin_i40e_bm)