reg [4:0] cntclk;
reg [13:0] lenclk;
wire [3:0] sndout1,sndout2,sndout3,sndout4;
- wire [3:0] right_snd = nr51[0] ? sndout1 : 4'b0;
- wire [3:0] left_snd = nr51[4] ? sndout1 : 4'b0;
-
+ wire [3:0] right_snd =
+ (nr51[0] ? sndout1 : 4'b0) +
+ (nr51[1] ? sndout2 : 4'b0) +
+ (nr51[2] ? sndout3 : 4'b0) +
+ (nr51[3] ? sndout4 : 4'b0);
+ wire [3:0] left_snd =
+ (nr51[4] ? sndout1 : 4'b0) +
+ (nr51[5] ? sndout2 : 4'b0) +
+ (nr51[6] ? sndout3 : 4'b0) +
+ (nr51[7] ? sndout4 : 4'b0);
assign sndout3 = 0;
assign sndout4 = 0;
case(addr)
`ADDR_NR50: nr50 <= data;
`ADDR_NR51: nr51 <= data;
- `ADDR_NR52: nr52 <= {data[7],3'b1,data[3:0]};
+ `ADDR_NR52: nr52 <= {data[7],7'b1111111};
endcase
end
cntclk <= cntclk + 1;
lenclk <= lenclk + 1;
pwmcnt <= pwmcnt + 1;
- snd_data_l <= (pwmcnt <= left_snd) ? 1 : 0;
- snd_data_r <= (pwmcnt <= right_snd) ? 1 : 0;
+ snd_data_l <= (pwmcnt <= left_snd) ? nr50[7] : 0;
+ snd_data_r <= (pwmcnt <= right_snd) ? nr50[3] : 0;
end
Sound1 s1(
.data(data),
.cntclk(cntclk[4]),
.lenclk(lenclk[13]),
- .en(nr52[7] & nr52[0]),
+ .en(nr52[7]),
.snd_data(sndout1)
);
.data(data),
.cntclk(cntclk[4]),
.lenclk(lenclk[13]),
- .en(nr52[7] & nr52[0]),
+ .en(nr52[7]),
.snd_data(sndout2)
);