diff --git a/Nexys-A7-100T-Master.xdc b/Nexys-A7-100T-Master.xdc index 5b4b9cf..797d8c7 100644 --- a/Nexys-A7-100T-Master.xdc +++ b/Nexys-A7-100T-Master.xdc @@ -249,8 +249,8 @@ set_property port_width 16 [get_debug_ports u_ila_0/probe4] connect_debug_port u_ila_0/probe4 [get_nets [list {audioOutput/sample_buffer[0]} {audioOutput/sample_buffer[1]} {audioOutput/sample_buffer[2]} {audioOutput/sample_buffer[3]} {audioOutput/sample_buffer[4]} {audioOutput/sample_buffer[5]} {audioOutput/sample_buffer[6]} {audioOutput/sample_buffer[7]} {audioOutput/sample_buffer[8]} {audioOutput/sample_buffer[9]} {audioOutput/sample_buffer[10]} {audioOutput/sample_buffer[11]} {audioOutput/sample_buffer[12]} {audioOutput/sample_buffer[13]} {audioOutput/sample_buffer[14]} {audioOutput/sample_buffer[15]}]] create_debug_port u_ila_0 probe set_property PROBE_TYPE DATA_AND_TRIGGER [get_debug_ports u_ila_0/probe5] -set_property port_width 11 [get_debug_ports u_ila_0/probe5] -connect_debug_port u_ila_0/probe5 [get_nets [list {audioBuffer/address[0]} {audioBuffer/address[1]} {audioBuffer/address[2]} {audioBuffer/address[3]} {audioBuffer/address[4]} {audioBuffer/address[5]} {audioBuffer/address[6]} {audioBuffer/address[7]} {audioBuffer/address[8]} {audioBuffer/address[9]} {audioBuffer/address[10]}]] +set_property port_width 10 [get_debug_ports u_ila_0/probe5] +connect_debug_port u_ila_0/probe5 [get_nets [list {audioBuffer/address[0]} {audioBuffer/address[1]} {audioBuffer/address[2]} {audioBuffer/address[3]} {audioBuffer/address[4]} {audioBuffer/address[5]} {audioBuffer/address[6]} {audioBuffer/address[7]} {audioBuffer/address[8]} {audioBuffer/address[9]}]] create_debug_port u_ila_0 probe set_property PROBE_TYPE DATA_AND_TRIGGER [get_debug_ports u_ila_0/probe6] set_property port_width 1 [get_debug_ports u_ila_0/probe6] diff --git a/SDVD.xpr b/SDVD.xpr index 9d85eea..916da10 100644 --- a/SDVD.xpr +++ b/SDVD.xpr @@ -664,7 +664,7 @@ - + @@ -677,6 +677,7 @@ + diff --git a/design/nexys_a7_top.sv b/design/nexys_a7_top.sv index a6db652..13ac5da 100644 --- a/design/nexys_a7_top.sv +++ b/design/nexys_a7_top.sv @@ -130,6 +130,7 @@ playback_controller playbackController (clk_10hz,reset,BTNC, BTNR, speed); clk_100khz, clk_25mhz, CLK100MHZ, + clk_1mhz, reset, SD_DAT, SD_CMD, @@ -138,7 +139,7 @@ playback_controller playbackController (clk_10hz,reset,BTNC, BTNR, speed); audio_interface.driver ); - audio_buffer #(.SIZE(8)) audioBuffer( + audio_buffer #(.SIZE(16)) audioBuffer( clk_48khz, reset, sd_ready, @@ -148,7 +149,7 @@ playback_controller playbackController (clk_10hz,reset,BTNC, BTNR, speed); audio_sample, audio_interface.receiver ); - pwm #(8) audioOutput(CLK100MHZ, reset, clk_48khz, audio_sample, AUD_PWM); + pwm #(11) audioOutput(CLK100MHZ, reset, clk_48khz, audio_sample, AUD_PWM); `endif diff --git a/design/sd/read_data.sv b/design/sd/read_data.sv index f4df574..04bd3fd 100644 --- a/design/sd/read_data.sv +++ b/design/sd/read_data.sv @@ -9,6 +9,7 @@ ***/ module read_data( input clk, + input mem_clk, input reset, input [3:0] sd_data, audio_buffer_interface.driver buffer diff --git a/design/sd/sd_controller.sv b/design/sd/sd_controller.sv index d192bd1..9df415d 100644 --- a/design/sd/sd_controller.sv +++ b/design/sd/sd_controller.sv @@ -12,6 +12,7 @@ module sd_controller( (* MARK_DEBUG = "TRUE" *) input logic fast_clk, input logic crc_clk, + input logic mem_clk, input logic reset, (* MARK_DEBUG = "TRUE" *) input logic [3:0] sd_data, @@ -104,6 +105,7 @@ read_command slowReader( // The data line is only ever used at fast_clk speeds read_data dataHandler( fast_clk, + mem_clk, reset, sd_data, buffer diff --git a/roms/birds_16_full.raw b/roms/birds_16_full.raw new file mode 100644 index 0000000..bc5b442 Binary files /dev/null and b/roms/birds_16_full.raw differ diff --git a/roms/hampster_dance.raw b/roms/hampster_dance.raw new file mode 100644 index 0000000..5ea10a3 Binary files /dev/null and b/roms/hampster_dance.raw differ