--- previous/src/includes/nbic.h	2018/04/24 19:30:32	1.1.1.1
+++ previous/src/includes/nbic.h	2018/04/24 19:34:13	1.1.1.2
@@ -1,16 +1,6 @@
-Uint32 nextbus_slot_lget(Uint32 addr);
-Uint32 nextbus_slot_wget(Uint32 addr);
-Uint32 nextbus_slot_bget(Uint32 addr);
-void nextbus_slot_lput(Uint32 addr, Uint32 val);
-void nextbus_slot_wput(Uint32 addr, Uint32 val);
-void nextbus_slot_bput(Uint32 addr, Uint32 val);
-
-Uint32 nextbus_board_lget(Uint32 addr);
-Uint32 nextbus_board_wget(Uint32 addr);
-Uint32 nextbus_board_bget(Uint32 addr);
-void nextbus_board_lput(Uint32 addr, Uint32 val);
-void nextbus_board_wput(Uint32 addr, Uint32 val);
-void nextbus_board_bput(Uint32 addr, Uint32 val);
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 Uint32 nbic_reg_lget(Uint32 addr);
 Uint32 nbic_reg_wget(Uint32 addr);
@@ -19,4 +9,13 @@ void nbic_reg_lput(Uint32 addr, Uint32 v
 void nbic_reg_wput(Uint32 addr, Uint32 val);
 void nbic_reg_bput(Uint32 addr, Uint32 val);
 
-void nextbus_init(void);
+Uint32 nb_cpu_slot_lget(Uint32 addr);
+Uint16 nb_cpu_slot_wget(Uint32 addr);
+Uint8 nb_cpu_slot_bget(Uint32 addr);
+void nb_cpu_slot_lput(Uint32 addr, Uint32 l);
+void nb_cpu_slot_wput(Uint32 addr, Uint16 w);
+void nb_cpu_slot_bput(Uint32 addr, Uint8 b);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */