From 93dc2eef3dbc55079fa23871fd02d0596feef02f Mon Sep 17 00:00:00 2001
From: Neel <neelgala@gmail.com>
Date: Mon, 16 Jul 2018 14:15:42 +0530
Subject: [PATCH] parameterized modules for mux and gpio

---
 src/bsv/bsv_lib/Makefile.gpio.templates |   4 +-
 src/bsv/bsv_lib/gpio.bsv                | 259 ++++++++++++------------
 src/bsv/bsv_lib/mux.bsv                 | 105 ++++++++++
 3 files changed, 231 insertions(+), 137 deletions(-)
 create mode 100644 src/bsv/bsv_lib/mux.bsv

diff --git a/src/bsv/bsv_lib/Makefile.gpio.templates b/src/bsv/bsv_lib/Makefile.gpio.templates
index 8e9060f..60a241d 100644
--- a/src/bsv/bsv_lib/Makefile.gpio.templates
+++ b/src/bsv/bsv_lib/Makefile.gpio.templates
@@ -1,6 +1,6 @@
 ### Makefile for the srio
 
-TOP_MODULE:=mkgpio
+TOP_MODULE:=mkgpio_real
 TOP_FILE:=gpio.bsv
 HOMEDIR:=./
 TOP_DIR:=./
@@ -19,7 +19,7 @@ timing_area: full_clean generate_verilog vivado_build
 compile:
 	@echo Compiling $(TOP_MODULE)....
 	@mkdir -p $(BSVBUILDDIR)
-	@bsc -u -sim -simdir $(BSVBUILDDIR) -bdir $(BSVBUILDDIR) -info-dir $(BSVBUILDDIR) -keep-fires -p $(BSVINCDIR) -g $(TOP_MODULE)  $(TOP_DIR)/$(TOP_FILE)
+	@bsc -u -sim -simdir $(BSVBUILDDIR) -bdir $(BSVBUILDDIR) -info-dir $(BSVBUILDDIR) -keep-fires -p  $(BSVINCDIR) -D NAME=neel -g $(TOP_MODULE)  $(TOP_DIR)/$(TOP_FILE)
 	@echo Compilation finished
 
 .PHONY: link
diff --git a/src/bsv/bsv_lib/gpio.bsv b/src/bsv/bsv_lib/gpio.bsv
index cf44bd4..203bfdf 100644
--- a/src/bsv/bsv_lib/gpio.bsv
+++ b/src/bsv/bsv_lib/gpio.bsv
@@ -24,105 +24,79 @@ package gpio;
 	/*============================ */
   `define ADDR 32
   `define DATA 64
-  `define USER 0
-  `define IONum 32
-  `define GPIO_MUX
+  `define USERSPACE 0
 
-	interface GPIO;
+	interface GPIO#(numeric type ionum);
 		(*always_ready,always_enabled*)
-		method Action gpio_in (Vector#(`IONum,Bit#(1)) inp);
-		method Vector#(`IONum,Bit#(1))   gpio_out;
-		method Vector#(`IONum,Bit#(1))   gpio_out_en;
-		method Vector#(`IONum,Bit#(1))   gpio_DRV0;
-		method Vector#(`IONum,Bit#(1))   gpio_DRV1;
-		method Vector#(`IONum,Bit#(1))   gpio_DRV2;
-		method Vector#(`IONum,Bit#(1))   gpio_PD;
-		method Vector#(`IONum,Bit#(1))   gpio_PPEN;
-		method Vector#(`IONum,Bit#(1))   gpio_PRG_SLEW;
-		method Vector#(`IONum,Bit#(1))   gpio_PUQ;
-		method Vector#(`IONum,Bit#(1))   gpio_PWRUPZHL;
-		method Vector#(`IONum,Bit#(1))   gpio_PWRUP_PULL_EN;
-		interface Vector#(`IONum,Reg#(Bit#(1))) to_plic;
-	    `ifdef GPIO_MUX
-		method Vector#(`IONum,Bit#(2))   gpio_MUX;
-	    `endif
-		interface AXI4_Lite_Slave_IFC#(`ADDR,`DATA,`USER) axi_slave;
+		method Action gpio_in (Vector#(ionum,Bit#(1)) inp);
+		method Vector#(ionum,Bit#(1))   gpio_out;
+		method Vector#(ionum,Bit#(1))   gpio_out_en;
+		method Vector#(ionum,Bit#(1))   gpio_DRV0;
+		method Vector#(ionum,Bit#(1))   gpio_DRV1;
+		method Vector#(ionum,Bit#(1))   gpio_DRV2;
+		method Vector#(ionum,Bit#(1))   gpio_PD;
+		method Vector#(ionum,Bit#(1))   gpio_PPEN;
+		method Vector#(ionum,Bit#(1))   gpio_PRG_SLEW;
+		method Vector#(ionum,Bit#(1))   gpio_PUQ;
+		method Vector#(ionum,Bit#(1))   gpio_PWRUPZHL;
+		method Vector#(ionum,Bit#(1))   gpio_PWRUP_PULL_EN;
+		interface AXI4_Lite_Slave_IFC#(`ADDR,`DATA,`USERSPACE) axi_slave;
 	endinterface
 
-	(*synthesize*)
-	module mkgpio(GPIO);
-		Vector#(`IONum,ConfigReg#(Bool)) direction_reg			<-replicateM(mkConfigReg(False));
-		Vector#(`IONum,ConfigReg#(Bit#(1))) dataout_register	<-replicateM(mkConfigReg(0));	
-		Vector#(`IONum,ConfigReg#(Bit#(1))) datain_register	<-replicateM(mkConfigReg(0));	
-		Vector#(`IONum,ConfigReg#(Bit#(1))) drv0_reg	<-replicateM(mkConfigReg(1'b1));	
-		Vector#(`IONum,ConfigReg#(Bit#(1))) drv1_reg	<-replicateM(mkConfigReg(1'b1));	
-		Vector#(`IONum,ConfigReg#(Bit#(1))) drv2_reg	<-replicateM(mkConfigReg(0));	
-		Vector#(`IONum,ConfigReg#(Bit#(1))) pd_reg	<-replicateM(mkConfigReg(0));	
-		Vector#(`IONum,ConfigReg#(Bit#(1))) ppen_reg	<-replicateM(mkConfigReg(0));	
-		Vector#(`IONum,ConfigReg#(Bit#(1))) prg_slew_reg	<-replicateM(mkConfigReg(1'b1));	
-		Vector#(`IONum,ConfigReg#(Bit#(1))) puq_reg	<-replicateM(mkConfigReg(0));	
-		Vector#(`IONum,ConfigReg#(Bit#(1))) pwrupzhl_reg	<-replicateM(mkConfigReg(0));	
-		Vector#(`IONum,ConfigReg#(Bit#(1))) pwrup_pull_en_reg	<-replicateM(mkConfigReg(0));	
-		Vector#(`IONum,ConfigReg#(Bit#(1))) toplic				<-replicateM(mkConfigReg(0));
-	  `ifdef GPIO_MUX
-		  Vector#(`IONum,ConfigReg#(Bit#(2))) muxer_reg 				<-replicateM(mkConfigReg(0));
-	  `endif
+	module mkgpio(GPIO#(ionum_));
+    let ionum = valueOf(ionum_);
+		Vector#(ionum_,ConfigReg#(Bool)) direction_reg			<-replicateM(mkConfigReg(False));
+		Vector#(ionum_,ConfigReg#(Bit#(1))) dataout_register	<-replicateM(mkConfigReg(0));	
+		Vector#(ionum_,ConfigReg#(Bit#(1))) datain_register	<-replicateM(mkConfigReg(0));	
+		Vector#(ionum_,ConfigReg#(Bit#(1))) drv0_reg	<-replicateM(mkConfigReg(1'b1));	
+		Vector#(ionum_,ConfigReg#(Bit#(1))) drv1_reg	<-replicateM(mkConfigReg(1'b1));	
+		Vector#(ionum_,ConfigReg#(Bit#(1))) drv2_reg	<-replicateM(mkConfigReg(0));	
+		Vector#(ionum_,ConfigReg#(Bit#(1))) pd_reg	<-replicateM(mkConfigReg(0));	
+		Vector#(ionum_,ConfigReg#(Bit#(1))) ppen_reg	<-replicateM(mkConfigReg(0));	
+		Vector#(ionum_,ConfigReg#(Bit#(1))) prg_slew_reg	<-replicateM(mkConfigReg(1'b1));	
+		Vector#(ionum_,ConfigReg#(Bit#(1))) puq_reg	<-replicateM(mkConfigReg(0));	
+		Vector#(ionum_,ConfigReg#(Bit#(1))) pwrupzhl_reg	<-replicateM(mkConfigReg(0));	
+		Vector#(ionum_,ConfigReg#(Bit#(1))) pwrup_pull_en_reg	<-replicateM(mkConfigReg(0));	
 		
-		AXI4_Lite_Slave_Xactor_IFC #(`ADDR, `DATA, `USER)  s_xactor <- mkAXI4_Lite_Slave_Xactor;
-    let ionum=valueOf(`IONum);
-		rule capture_interrupt;
-			for(Integer i=0;i<`IONum;i=i+1)
-				toplic[i]<=(!direction_reg[i])?datain_register[i]:0;
-		endrule
-	
+		AXI4_Lite_Slave_Xactor_IFC #(`ADDR, `DATA, `USERSPACE)  s_xactor <- mkAXI4_Lite_Slave_Xactor;
 		rule rl_wr_respond;
 			// Get the wr request
       	let aw <- pop_o (s_xactor.o_wr_addr);
       	let w  <- pop_o (s_xactor.o_wr_data);
 	   	let b = AXI4_Lite_Wr_Resp {bresp: AXI4_LITE_OKAY, buser: aw.awuser};
 			if(aw.awaddr[5:0]=='h0)
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					direction_reg[i]<=unpack(w.wdata[i]);
 			else if(aw.awaddr[5:0]=='h4)
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					dataout_register[i]<=w.wdata[i];
 			else if(aw.awaddr[5:0]=='h8)
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					drv0_reg[i]<=w.wdata[i];
 			else if(aw.awaddr[5:0]=='hC)
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					drv1_reg[i]<=w.wdata[i];
 			else if(aw.awaddr[5:0]=='h10)
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					drv2_reg[i]<=w.wdata[i];
 			else if(aw.awaddr[5:0]=='h14)
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					pd_reg[i]<=w.wdata[i];
 			else if(aw.awaddr[5:0]=='h18)
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					ppen_reg[i]<=w.wdata[i];
 			else if(aw.awaddr[5:0]=='h1C)
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					prg_slew_reg[i]<=w.wdata[i];
 			else if(aw.awaddr[5:0]=='h20)
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					puq_reg[i]<=w.wdata[i];
 			else if(aw.awaddr[5:0]=='h24)
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					pwrupzhl_reg[i]<=w.wdata[i];
 			else if(aw.awaddr[5:0]=='h28)
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					pwrup_pull_en_reg[i]<=w.wdata[i];
-      `ifdef GPIO_MUX
-		    	else if(aw.awaddr[5:0]=='h2c)
-		    		for(Integer i=0;i<min(`IONum, 16);i=i+1) begin
-              muxer_reg[i]<= w.wdata[i*2+1:i*2];
-		    		end
-		    	else if(aw.awaddr[5:0]=='h30 && ionum>=16)
-		    		for(Integer i=0;i<`IONum-16;i=i+1) begin
-              muxer_reg[i+16]<= w.wdata[i*2+1:i*2];
-		    		end
-      `endif
 			else
 				b.bresp=AXI4_LITE_SLVERR;
 				
@@ -132,76 +106,62 @@ package gpio;
 		rule rl_rd_respond;
 			let ar<- pop_o(s_xactor.o_rd_addr);
 			Bit#(32) temp=0;
-			AXI4_Lite_Rd_Data#(`DATA,`USER) r = AXI4_Lite_Rd_Data {rresp: AXI4_LITE_OKAY, rdata: ?, ruser: 0};
+			AXI4_Lite_Rd_Data#(`DATA,`USERSPACE) r = AXI4_Lite_Rd_Data {rresp: AXI4_LITE_OKAY, rdata: ?, ruser: 0};
 			if(ar.araddr[5:0]=='h0)begin
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					temp[i]=pack(direction_reg[i]);
 				r.rdata=duplicate(temp);
 			end
 			else if(ar.araddr[5:0]=='h4)begin
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					temp[i]=datain_register[i];
 				r.rdata=duplicate(temp);
 			end
 			else if(ar.araddr[5:0]=='h8)begin
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					temp[i]=drv0_reg[i];
 				r.rdata=duplicate(temp);
 			end
 			else if(ar.araddr[5:0]=='hC)begin
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					temp[i]=drv1_reg[i];
 				r.rdata=duplicate(temp);
 			end
 			else if(ar.araddr[5:0]=='h10)begin
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					temp[i]=drv2_reg[i];
 				r.rdata=duplicate(temp);
 			end
 			else if(ar.araddr[5:0]=='h14)begin
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					temp[i]=pd_reg[i];
 				r.rdata=duplicate(temp);
 			end
 			else if(ar.araddr[5:0]=='h18)begin
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					temp[i]=ppen_reg[i];
 				r.rdata=duplicate(temp);
 			end
 			else if(ar.araddr[5:0]=='h1C)begin
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					temp[i]=prg_slew_reg[i];
 				r.rdata=duplicate(temp);
 			end
 			else if(ar.araddr[5:0]=='h20)begin
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					temp[i]=puq_reg[i];
 				r.rdata=duplicate(temp);
 			end
 			else if(ar.araddr[5:0]=='h24)begin
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					temp[i]=pwrupzhl_reg[i];
 				r.rdata=duplicate(temp);
 			end
 			else if(ar.araddr[5:0]=='h28)begin
-				for(Integer i=0;i<`IONum;i=i+1)
+				for(Integer i=0;i<ionum;i=i+1)
 					temp[i]=pwrup_pull_en_reg[i];
 				r.rdata=duplicate(temp);
       end
-      `ifdef GPIO_MUX
-		    	else if(ar.araddr[5:0]=='h2c)begin
-		    		for(Integer i=0;i<min(`IONum, 16);i=i+1) begin
-              temp[i*2+ 1:i*2]=muxer_reg[i];
-		    		end
-            r.rdata=duplicate(temp);
-          end
-		    	else if(ar.araddr[5:0]=='h30 && ionum>=16)begin
-		    		for(Integer i=0;i<`IONum-16;i=i+1) begin
-              temp[i*2+ 1:i*2]=muxer_reg[i+ 16];
-		    		end
-            r.rdata=duplicate(temp);
-          end
-      `endif
 			else
 				r.rresp=AXI4_LITE_SLVERR;
 				
@@ -209,83 +169,112 @@ package gpio;
 		endrule
 
 		interface axi_slave= s_xactor.axi_side;
-		method Action gpio_in (Vector#(`IONum,Bit#(1)) inp);
-			for(Integer i=0;i<`IONum;i=i+1)
+		method Action gpio_in (Vector#(ionum,Bit#(1)) inp);
+			for(Integer i=0;i<ionum;i=i+1)
 				datain_register[i]<=inp[i];
 		endmethod
-		method Vector#(`IONum,Bit#(1))   gpio_out;
-			Vector#(`IONum,Bit#(1)) temp;
-			for(Integer i=0;i<`IONum;i=i+1)
+		method Vector#(ionum,Bit#(1))   gpio_out;
+			Vector#(ionum,Bit#(1)) temp;
+			for(Integer i=0;i<ionum;i=i+1)
 				temp[i]=dataout_register[i];
 			return temp;
 		endmethod
-		method Vector#(`IONum,Bit#(1))   gpio_out_en;
-			Vector#(`IONum,Bit#(1)) temp;
-			for(Integer i=0;i<`IONum;i=i+1)
+		method Vector#(ionum,Bit#(1))   gpio_out_en;
+			Vector#(ionum,Bit#(1)) temp;
+			for(Integer i=0;i<ionum;i=i+1)
 				temp[i]=pack(direction_reg[i]);
 			return temp;
 		endmethod
-		method Vector#(`IONum,Bit#(1))   gpio_DRV0;
-			Vector#(`IONum,Bit#(1)) temp;
-			for(Integer i=0;i<`IONum;i=i+1)
+		method Vector#(ionum,Bit#(1))   gpio_DRV0;
+			Vector#(ionum,Bit#(1)) temp;
+			for(Integer i=0;i<ionum;i=i+1)
 				temp[i]=pack(drv0_reg[i]);
 			return temp;
 		endmethod
-		method Vector#(`IONum,Bit#(1))   gpio_DRV1;
-			Vector#(`IONum,Bit#(1)) temp;
-			for(Integer i=0;i<`IONum;i=i+1)
+		method Vector#(ionum,Bit#(1))   gpio_DRV1;
+			Vector#(ionum,Bit#(1)) temp;
+			for(Integer i=0;i<ionum;i=i+1)
 				temp[i]=pack(drv1_reg[i]);
 			return temp;
 		endmethod
-		method Vector#(`IONum,Bit#(1))   gpio_DRV2;
-			Vector#(`IONum,Bit#(1)) temp;
-			for(Integer i=0;i<`IONum;i=i+1)
+		method Vector#(ionum,Bit#(1))   gpio_DRV2;
+			Vector#(ionum,Bit#(1)) temp;
+			for(Integer i=0;i<ionum;i=i+1)
 				temp[i]=pack(drv2_reg[i]);
 			return temp;
 		endmethod
-		method Vector#(`IONum,Bit#(1))   gpio_PD;
-			Vector#(`IONum,Bit#(1)) temp;
-			for(Integer i=0;i<`IONum;i=i+1)
+		method Vector#(ionum,Bit#(1))   gpio_PD;
+			Vector#(ionum,Bit#(1)) temp;
+			for(Integer i=0;i<ionum;i=i+1)
 				temp[i]=pack(pd_reg[i]);
 			return temp;
 		endmethod
-		method Vector#(`IONum,Bit#(1))   gpio_PPEN;
-			Vector#(`IONum,Bit#(1)) temp;
-			for(Integer i=0;i<`IONum;i=i+1)
+		method Vector#(ionum,Bit#(1))   gpio_PPEN;
+			Vector#(ionum,Bit#(1)) temp;
+			for(Integer i=0;i<ionum;i=i+1)
 				temp[i]=pack(ppen_reg[i]);
 			return temp;
 		endmethod
-		method Vector#(`IONum,Bit#(1))   gpio_PRG_SLEW;
-			Vector#(`IONum,Bit#(1)) temp;
-			for(Integer i=0;i<`IONum;i=i+1)
+		method Vector#(ionum,Bit#(1))   gpio_PRG_SLEW;
+			Vector#(ionum,Bit#(1)) temp;
+			for(Integer i=0;i<ionum;i=i+1)
 				temp[i]=pack(prg_slew_reg[i]);
 			return temp;
 		endmethod
-		method Vector#(`IONum,Bit#(1))   gpio_PUQ;
-			Vector#(`IONum,Bit#(1)) temp;
-			for(Integer i=0;i<`IONum;i=i+1)
+		method Vector#(ionum,Bit#(1))   gpio_PUQ;
+			Vector#(ionum,Bit#(1)) temp;
+			for(Integer i=0;i<ionum;i=i+1)
 				temp[i]=pack(puq_reg[i]);
 			return temp;
 		endmethod
-		method Vector#(`IONum,Bit#(1))   gpio_PWRUPZHL;
-			Vector#(`IONum,Bit#(1)) temp;
-			for(Integer i=0;i<`IONum;i=i+1)
+		method Vector#(ionum,Bit#(1))   gpio_PWRUPZHL;
+			Vector#(ionum,Bit#(1)) temp;
+			for(Integer i=0;i<ionum;i=i+1)
 				temp[i]=pack(pwrupzhl_reg[i]);
 			return temp;
 		endmethod
-		method Vector#(`IONum,Bit#(1))   gpio_PWRUP_PULL_EN;
-			Vector#(`IONum,Bit#(1)) temp;
-			for(Integer i=0;i<`IONum;i=i+1)
+		method Vector#(ionum,Bit#(1))   gpio_PWRUP_PULL_EN;
+			Vector#(ionum,Bit#(1)) temp;
+			for(Integer i=0;i<ionum;i=i+1)
 				temp[i]=pack(pwrup_pull_en_reg[i]);
 			return temp;
 		endmethod
-		method Vector#(`IONum,Bit#(2))   gpio_MUX;
-			Vector#(`IONum,Bit#(2)) temp;
-			for(Integer i=0;i<`IONum;i=i+1)
-				temp[i]=pack(muxer_reg[i]);
-			return temp;
-		endmethod
-		interface to_plic=toplic;
 	endmodule
+
+  // instantiation template
+	interface GPIO_real;
+		method Action gpio_in (Vector#(32,Bit#(1)) inp);
+		method Vector#(32,Bit#(1))   gpio_out;
+		method Vector#(32,Bit#(1))   gpio_out_en;
+		method Vector#(32,Bit#(1))   gpio_DRV0;
+		method Vector#(32,Bit#(1))   gpio_DRV1;
+		method Vector#(32,Bit#(1))   gpio_DRV2;
+		method Vector#(32,Bit#(1))   gpio_PD;
+		method Vector#(32,Bit#(1))   gpio_PPEN;
+		method Vector#(32,Bit#(1))   gpio_PRG_SLEW;
+		method Vector#(32,Bit#(1))   gpio_PUQ;
+		method Vector#(32,Bit#(1))   gpio_PWRUPZHL;
+		method Vector#(32,Bit#(1))   gpio_PWRUP_PULL_EN;
+		interface AXI4_Lite_Slave_IFC#(`ADDR,`DATA,`USERSPACE) axi_slave;
+	endinterface
+  (*synthesize*)
+  module mkgpio_real(GPIO_real);
+    GPIO#(32) mygpio <-mkgpio();
+    method  gpio_out              =mygpio.gpio_out ;
+    method  gpio_out_en           =mygpio.gpio_out_en;
+    method  gpio_DRV0             =mygpio.gpio_DRV0;
+    method  gpio_DRV1             =mygpio.gpio_DRV1;
+    method  gpio_DRV2             =mygpio.gpio_DRV2;
+    method  gpio_PD               =mygpio.gpio_PD;
+    method  gpio_PPEN             =mygpio.gpio_PPEN;
+    method  gpio_PRG_SLEW         =mygpio.gpio_PRG_SLEW;
+    method  gpio_PUQ              =mygpio.gpio_PUQ;
+    method  gpio_PWRUPZHL         =mygpio.gpio_PWRUPZHL;
+    method  gpio_PWRUP_PULL_EN    =mygpio.gpio_PWRUP_PULL_EN;
+		method Action gpio_in (Vector#(32,Bit#(1)) inp);
+      mygpio.gpio_in(inp);
+    endmethod
+    interface axi_slave=mygpio.axi_slave;
+  endmodule
 endpackage
 
diff --git a/src/bsv/bsv_lib/mux.bsv b/src/bsv/bsv_lib/mux.bsv
new file mode 100644
index 0000000..bb9a281
--- /dev/null
+++ b/src/bsv/bsv_lib/mux.bsv
@@ -0,0 +1,105 @@
+/*
+Copyright (c) 2013, IIT Madras
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+*  Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+*  Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+*  Neither the name of IIT Madras  nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+*/
+package mux;
+	/*==== Package imports ==== */
+	import TriState          ::*;
+	import Vector				 ::*;
+	import BUtils::*;
+	import ConfigReg			::*;
+	/*============================ */
+	/*===== Project Imports ===== */
+	import Semi_FIFOF        :: *;
+	import AXI4_Lite_Types   :: *;
+	/*============================ */
+  `define ADDR 32
+  `define DATA 64
+  `define USER 0
+  `define IONum 32
+  `define GPIO_MUX
+
+	interface MUX#(numeric type ionum);
+		(*always_ready,always_enabled*)
+		method Vector#(ionum,Bit#(2))   mux;
+		interface AXI4_Lite_Slave_IFC#(`ADDR,`DATA,`USER) axi_slave;
+	endinterface
+
+//	(*synthesize*)
+	module mkmux(MUX#(ionum_));
+	  Vector#(ionum_,ConfigReg#(Bit#(2))) muxer_reg 				<-replicateM(mkConfigReg(0));
+		
+		AXI4_Lite_Slave_Xactor_IFC #(`ADDR, `DATA, `USER)  s_xactor <- mkAXI4_Lite_Slave_Xactor;
+    let ionum=valueOf(ionum_);
+		rule rl_wr_respond;
+			// Get the wr request
+      let aw <- pop_o (s_xactor.o_wr_addr);
+      let w  <- pop_o (s_xactor.o_wr_data);
+	   	let b = AXI4_Lite_Wr_Resp {bresp: AXI4_LITE_OKAY, buser: aw.awuser};
+		  if(aw.awaddr[5:0]=='h2c)
+		    for(Integer i=0;i<min(ionum, 16);i=i+1) begin
+          muxer_reg[i]<= w.wdata[i*2+1:i*2];
+		  	end
+		  else if(aw.awaddr[5:0]=='h30 && ionum>=16)
+		  	for(Integer i=0;i<ionum-16;i=i+1) begin
+          muxer_reg[i+16]<= w.wdata[i*2+1:i*2];
+		  	end
+			else
+				b.bresp=AXI4_LITE_SLVERR;
+      	s_xactor.i_wr_resp.enq (b);
+		endrule
+
+		rule rl_rd_respond;
+			let ar<- pop_o(s_xactor.o_rd_addr);
+			Bit#(32) temp=0;
+			AXI4_Lite_Rd_Data#(`DATA,`USER) r = AXI4_Lite_Rd_Data {rresp: AXI4_LITE_OKAY, rdata: ?, ruser: 0};
+		  if(ar.araddr[5:0]=='h2c)begin
+		  	for(Integer i=0;i<min(ionum, 16);i=i+1) begin
+          temp[i*2+ 1:i*2]=muxer_reg[i];
+		  	end
+        r.rdata=duplicate(temp);
+      end
+		  else if(ar.araddr[5:0]=='h30 && ionum>=16)begin
+		  	for(Integer i=0;i<ionum-16;i=i+1) begin
+          temp[i*2+ 1:i*2]=muxer_reg[i+ 16];
+		  	end
+        r.rdata=duplicate(temp);
+      end
+			else
+				r.rresp=AXI4_LITE_SLVERR;
+			s_xactor.i_rd_data.enq(r);
+		endrule
+
+		interface axi_slave= s_xactor.axi_side;
+		method Vector#(ionum,Bit#(2))   mux;
+			Vector#(ionum,Bit#(2)) temp;
+			for(Integer i=0;i<ionum;i=i+1)
+				temp[i]=pack(muxer_reg[i]);
+			return temp;
+		endmethod
+	endmodule
+
+
+  // instantiation template
+	interface MUX_real;
+		(*always_ready,always_enabled*)
+		method Vector#(32,Bit#(2))   mux;
+		interface AXI4_Lite_Slave_IFC#(`ADDR,`DATA,`USER) axi_slave;
+	endinterface
+  (*synthesize*)
+  module mkmux_real(MUX_real);
+    MUX#(32) mymux <-mkmux();
+    method mux=mymux.mux;
+    interface axi_slave=mymux.axi_slave;
+  endmodule
+endpackage
+
-- 
2.30.2