URL
https://opencores.org/ocsvn/xulalx25soc/xulalx25soc/trunk
Subversion Repositories xulalx25soc
Compare Revisions
- This comparison shows the changes necessary to convert path
/xulalx25soc/trunk/rtl
- from Rev 74 to Rev 83
- ↔ Reverse comparison
Rev 74 → Rev 83
/busmaster.v
364,7 → 364,6
// 001x xxxx Down-sampler taps (64 taps, 2 at a time) |
// 1xxx xxxx Up-sampler taps |
// 1 xxxx xxxx xxxx xxxx xxxx Up-sampler taps |
|
wire pre_io, pre_pwm, pre_uart, pre_flctl, pre_scop; |
assign io_bank = (wb_cyc)&&(wb_addr[31:5] == 27'h8); |
assign pre_io = (~pre_flctl)&&(~pre_pwm)&&(~pre_uart)&&(~pre_scop); |
473,7 → 472,11
// second parameter is zero or one, indicating whether or not the |
// audio rate can be adjusted (1), or whether it is fixed within the |
// build (0). |
wbpwmaudio #(16'h270f,0,16) // 8 kHz, fixed audio rate |
`ifdef XULA25 |
wbpwmaudio #(16'd1813,1) // 44.1 kHz, user adjustable |
`else |
wbpwmaudio #(16'h2710,0,16) // 8 kHz, fixed audio rate |
`endif |
pwmdev(i_clk, |
wb_cyc, (wb_stb)&&(pwm_sel), wb_we, wb_addr[0], |
wb_data, pwm_ack, pwm_stall, pwm_data, o_pwm, pwm_int); |
552,6 → 555,8
assign o_spi_sck = flash_sck; |
assign o_spi_mosi = flash_mosi; |
assign spi_user = 1'b0; |
assign flash_grant = 1'b1; |
assign sdcard_grant= 1'b0; |
`endif // SDCARD_ACCESS && FLASH_ACCESS |
`else // FLASH_ACCESS |
`ifdef SDCARD_ACCESS |
561,6 → 566,8
assign o_spi_sck = sdcard_sck; |
assign o_spi_mosi = sdcard_mosi; |
assign spi_user = 1'b1; |
assign flash_grant = 1'b0; |
assign sdcard_grant= 1'b1; |
`else |
// No SPI access ... |
assign o_sf_cs_n = 1'b1; |
568,6 → 575,8
assign o_spi_sck = 1'b1; |
assign o_spi_mosi = 1'b1; |
assign spi_user = 1'b0; |
assign flash_grant = 1'b0; |
assign sdcard_grant= 1'b0; |
`endif // SDCARD_ACCESS, w/o FLASH_ACCESS |
`endif // !FLASH_ACCESS |
|