Cleanup of Verilog code
This commit is contained in:
		
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
									
									
									
									
								
							| @@ -12,7 +12,7 @@ TBOUTPUT = vgasquare_tb.vcd	#THIS NEEDS TO MATCH THE OUTPUT FILE | |||||||
| # BE CAREFUL WHEN CHANGING ITEMS BELOW THIS LINE | # BE CAREFUL WHEN CHANGING ITEMS BELOW THIS LINE | ||||||
| ############################################################################### | ############################################################################### | ||||||
| #TOOL OPTIONS | #TOOL OPTIONS | ||||||
| COFLAGS =  -o | COFLAGS = -o | ||||||
| SFLAGS =  | SFLAGS =  | ||||||
| SOUTPUT = -lxt		#SIMULATOR OUTPUT TYPE | SOUTPUT = -lxt		#SIMULATOR OUTPUT TYPE | ||||||
| #TOOL OUTPUT | #TOOL OUTPUT | ||||||
| @@ -20,7 +20,7 @@ COUTPUT = vgasquare_tb.vpp			#COMPILER OUTPUT | |||||||
| ############################################################################### | ############################################################################### | ||||||
| #MAKE DIRECTIVES | #MAKE DIRECTIVES | ||||||
| check : $(TESTBENCH) $(SRC) | check : $(TESTBENCH) $(SRC) | ||||||
| 	$(COMPILER) -v $(SRC) | 	$(COMPILER) $(SRC) | ||||||
|  |  | ||||||
| simulate: $(COUTPUT) | simulate: $(COUTPUT) | ||||||
| 	$(SIMULATOR) $(SFLAGS) $(COUTPUT) $(SOUTPUT) | 	$(SIMULATOR) $(SFLAGS) $(COUTPUT) $(SOUTPUT) | ||||||
|   | |||||||
| @@ -30,8 +30,8 @@ module vga640x480( | |||||||
|     localparam LINE   = 800;             // complete line (pixels) |     localparam LINE   = 800;             // complete line (pixels) | ||||||
|     localparam SCREEN = 524;             // complete screen (lines) |     localparam SCREEN = 524;             // complete screen (lines) | ||||||
|  |  | ||||||
|     reg [9:0] h_count;  // line position |     reg [9:0] h_count = 0;  // line position | ||||||
|     reg [9:0] v_count;  // screen position |     reg [9:0] v_count = 0;  // screen position | ||||||
|  |  | ||||||
|     // generate sync signals (active low for 640x480) |     // generate sync signals (active low for 640x480) | ||||||
|     assign o_hs = ~((h_count >= HS_STA) & (h_count < HS_END)); |     assign o_hs = ~((h_count >= HS_STA) & (h_count < HS_END)); | ||||||
|   | |||||||
| @@ -29,9 +29,9 @@ module vgasquare( | |||||||
|     vga640x480 display ( |     vga640x480 display ( | ||||||
|         .i_pix_stb(PIXEL_CLK), |         .i_pix_stb(PIXEL_CLK), | ||||||
|         .i_rst(rst), |         .i_rst(rst), | ||||||
|         .o_active(VGA_ACTIVE), |  | ||||||
|         .o_hs(VGA_HS),  |         .o_hs(VGA_HS),  | ||||||
|         .o_vs(VGA_VS),  |         .o_vs(VGA_VS),  | ||||||
|  |         .o_active(VGA_ACTIVE), | ||||||
|         .o_x(x),  |         .o_x(x),  | ||||||
|         .o_y(y) |         .o_y(y) | ||||||
|     ); |     ); | ||||||
|   | |||||||
| @@ -18,16 +18,19 @@ module vgasquare_tb; | |||||||
|   wire O_VGA_HS; |   wire O_VGA_HS; | ||||||
|   wire O_VGA_VS; |   wire O_VGA_VS; | ||||||
|  |  | ||||||
|   vgasquare display (  |   vgasquare DUT (  | ||||||
|         .PIXEL_CLK(pixel_clk),       // Pixel clock: 25Mhz (or 25.125MHz) for VGA |         .PIXEL_CLK(pixel_clk),       // Pixel clock: 25Mhz (or 25.125MHz) for VGA | ||||||
|         .RST_BTN(reset),         // reset button |         .RST_BTN(reset),         // reset button | ||||||
|         .box_x1(10'd120), |         .box_x1(10'd120), | ||||||
|         .box_x2(10'd520), |         .box_x2(10'd520), | ||||||
|         .box_y1(9'd120), |         .box_y1(9'd440), | ||||||
|         .box_y2(9'd360),     |         .box_y2(9'd480),     | ||||||
|         .box_color(6'b111000),      //1 bit for each color  Foreground and background |         .box_color(6'b100001),      //1 bit for each color  Foreground and background | ||||||
|         .VGA_ACTIVE(O_VGA_ACTIVE), |         .VGA_ACTIVE(O_VGA_ACTIVE), | ||||||
|         .VGA_HS(O_VGA_HS),       // horizontal sync output |         .VGA_HS(O_VGA_HS),       // horizontal sync output | ||||||
|         .VGA_VS(O_VGA_VS)       // vertical sync output |         .VGA_VS(O_VGA_VS),       // vertical sync output | ||||||
|  |         .VGA_R(O_VGA_R),            // 1-bit VGA red output | ||||||
|  |         .VGA_G(O_VGA_G),            // 1-bit VGA green output | ||||||
|  |         .VGA_B(O_VGA_B)             // 1-bit VGA blue output | ||||||
|         ); |         ); | ||||||
| endmodule // test | endmodule // test | ||||||
		Reference in New Issue
	
	Block a user