Skip to content

Commit

Permalink
Revert "Merge pull request #11 from kitune-san/dma-ram-refresh"
Browse files Browse the repository at this point in the history 
This reverts commit f205e8a, reversing
changes made to bac15f3.
  • Loading branch information
@spark2k06
spark2k06 committed Jun 24, 2022
1 parent 0cdc887 commit 0ed5edd
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 54 deletions.
20 changes: 1 addition & 19 deletions rtl/KFPC-XT/HDL/Chipset.sv
View file
Expand Up @@ -124,24 +124,6 @@ module CHIPSET (
logic data_bus_out_from_chipset;
logic internal_data_bus_direction;

logic prev_timer_count_1;
logic DRQ0;

always_ff @(negedge clock) begin
prev_timer_count_1 <= timer_counter_out[1];
end

always_ff @(negedge clock, posedge reset) begin
if (reset)
DRQ0 <= 1'b0;
else if (~dma_acknowledge_n[0])
DRQ0 <= 1'b0;
else if (~prev_timer_count_1 & timer_counter_out[1])
DRQ0 <= 1'b1;
else
DRQ0 <= DRQ0;
end

READY u_READY (
.clock (clock),
.reset (reset),
Expand Down Expand Up @@ -188,7 +170,7 @@ module CHIPSET (
.memory_write_n (memory_write_n),
.memory_write_n_ext (memory_write_n_ext),
.memory_write_n_direction (memory_write_n_direction),
.dma_request ({dma_request[3:1], DRQ0}),
.dma_request (dma_request),
.dma_acknowledge_n (dma_acknowledge_n),
.address_enable_n (address_enable_n),
.terminal_count_n (terminal_count_n)
Expand Down
3 changes: 0 additions & 3 deletions rtl/KFPC-XT/HDL/KF8237/HDL/KF8237.sv
View file
Expand Up @@ -46,7 +46,6 @@ module KF8237 (
logic [3:0] write_base_and_current_address;
logic [3:0] write_base_and_current_word_count;
logic clear_byte_pointer;
logic set_byte_pointer;
logic master_clear;
logic clear_mask_register;
logic read_temporary_register;
Expand Down Expand Up @@ -79,7 +78,6 @@ module KF8237 (
.write_base_and_current_word_count (write_base_and_current_word_count),
// -- software command
.clear_byte_pointer (clear_byte_pointer),
.set_byte_pointer (set_byte_pointer),
.master_clear (master_clear),
.clear_mask_register (clear_mask_register),
// -- read
Expand Down Expand Up @@ -152,7 +150,6 @@ module KF8237 (
.write_base_and_current_word_count (write_base_and_current_word_count),
// -- software command
.clear_byte_pointer (clear_byte_pointer),
.set_byte_pointer (set_byte_pointer),
.master_clear (master_clear),
// -- read
.read_current_address (read_current_address),
Expand Down
3 changes: 0 additions & 3 deletions rtl/KFPC-XT/HDL/KF8237/HDL/KF8237_Address_And_Count_Registers.sv
View file
Expand Up @@ -19,7 +19,6 @@ module KF8237_Address_And_Count_Registers (
input logic [3:0] write_base_and_current_word_count,
// -- software command
input logic clear_byte_pointer,
input logic set_byte_pointer,
input logic master_clear,
// -- read
input logic [3:0] read_current_address,
Expand Down Expand Up @@ -75,8 +74,6 @@ module KF8237_Address_And_Count_Registers (
byte_pointer <= 1'b0;
else if ((master_clear) || (clear_byte_pointer))
byte_pointer <= 1'b0;
else if (set_byte_pointer)
byte_pointer <= 1'b1;
else if (update_byte_pointer)
if (byte_pointer)
byte_pointer <= 1'b0;
Expand Down
2 changes: 0 additions & 2 deletions rtl/KFPC-XT/HDL/KF8237/HDL/KF8237_Bus_Control_Logic.sv
View file
Expand Up @@ -30,7 +30,6 @@ module KF8237_Bus_Control_Logic (
output logic [3:0] write_base_and_current_word_count,
// -- software command
output logic clear_byte_pointer,
output logic set_byte_pointer,
output logic master_clear,
output logic clear_mask_register,
// -- read
Expand Down Expand Up @@ -94,7 +93,6 @@ module KF8237_Bus_Control_Logic (

// Generate software command
assign clear_byte_pointer = write_flag & (stable_address == 4'b1100);
assign set_byte_pointer = read_flag & (stable_address == 4'b1100);
assign master_clear = write_flag & (stable_address == 4'b1101);
assign clear_mask_register = write_flag & (stable_address == 4'b1110);

Expand Down
35 changes: 8 additions & 27 deletions rtl/KFPC-XT/HDL/KF8237/HDL/KF8237_Timing_And_Control.sv
View file
Expand Up @@ -86,10 +86,8 @@ module KF8237_Timing_And_Control (
logic [1:0] dma_select;
logic [3:0] dma_acknowledge_ff;
logic terminal_count;
logic terminal_count_internal;
logic reoutput_high_address;
logic external_end_of_process;
logic prev_read_status_register;

//
// Command Register
Expand Down Expand Up @@ -518,26 +516,16 @@ module KF8237_Timing_And_Control (
// Terminal Count Signal (NOTE:Posedge)
//
always_ff @(posedge clock, posedge reset) begin
if (reset) begin
if (reset)
terminal_count <= 1'b0;
terminal_count_internal <= 1'b0;
end
else if (master_clear) begin
else if (master_clear)
terminal_count <= 1'b0;
terminal_count_internal <= 1'b0;
end
else if (state == S4) begin
else if (state == S4)
terminal_count <= 1'b0;
terminal_count_internal <= 1'b0;
end
else if (next_word) begin
else if (next_word)
terminal_count <= underflow;
terminal_count_internal <= underflow;
end
else begin
else
terminal_count <= 1'b0;
terminal_count_internal <= terminal_count_internal;
end
end

assign end_of_process_n_out = ~terminal_count;
Expand All @@ -564,30 +552,23 @@ module KF8237_Timing_And_Control (
else if (master_clear)
end_of_process_internal <= 1'b0;
else if (next_state == S4)
end_of_process_internal <= terminal_count_internal | external_end_of_process;
end_of_process_internal <= terminal_count | external_end_of_process;
else
end_of_process_internal <= 1'b0;
end

//
// Status Register
//
always_ff @(negedge clock, posedge reset) begin
if (reset)
prev_read_status_register <= 1'b0;
else
prev_read_status_register <= read_status_register;
end

always_ff @(negedge clock, posedge reset) begin
if (reset)
terminal_count_state <= 0;
else if (master_clear)
terminal_count_state <= 0;
else if (prev_read_status_register & ~read_status_register)
else if (read_status_register)
terminal_count_state <= 0;
else if (end_of_process_internal)
terminal_count_state <= terminal_count_state | dma_acknowledge_internal;
terminal_count_state <= dma_acknowledge_internal;
else
terminal_count_state <= terminal_count_state;
end
Expand Down

0 comments on commit 0ed5edd

Please sign in to comment.