projects
/
hwmod.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spartan3e: hier auch components verwenden... (hab ich vergessen)
[hwmod.git]
/
src
/
calc_s3e.vhd
diff --git
a/src/calc_s3e.vhd
b/src/calc_s3e.vhd
index e1bfe689fb774ca9f809b9b4495aa4b9279148c0..148be809c52981067999b1d44fbaa0f6eac63838 100644
(file)
--- a/
src/calc_s3e.vhd
+++ b/
src/calc_s3e.vhd
@@
-30,6
+30,8
@@
entity calc is
end entity calc;
architecture top of calc is
end entity calc;
architecture top of calc is
+ constant CLK_FREQ : integer := 50000000;
+ constant BAUDRATE : integer := 115200;
-- reset
signal sys_res_n : std_logic;
-- ps/2
-- reset
signal sys_res_n : std_logic;
-- ps/2
@@
-63,7
+65,6
@@
architecture top of calc is
signal pc_zeile : hzeile;
signal pc_char : hbyte;
signal pc_done : std_logic;
signal pc_zeile : hzeile;
signal pc_char : hbyte;
signal pc_done : std_logic;
- signal pc_busy : std_logic;
-- parser/scanner
signal do_it, finished : std_logic;
-- rs232
-- parser/scanner
signal do_it, finished : std_logic;
-- rs232
@@
-75,7
+76,7
@@
begin
sys_res_n <= not sys_res;
-- vga/ipcore
sys_res_n <= not sys_res;
-- vga/ipcore
- textmode_vga_inst :
entity work.textmode_vga(struct)
+ textmode_vga_inst :
textmode_vga
generic map (
VGA_CLK_FREQ => 25000000,
BLINK_INTERVAL_MS => 500,
generic map (
VGA_CLK_FREQ => 25000000,
BLINK_INTERVAL_MS => 500,
@@
-97,14
+98,14
@@
begin
);
-- pll fuer vga
);
-- pll fuer vga
- clk_vga_s3e_inst :
entity work.clk_vga_s3e(beh)
+ clk_vga_s3e_inst :
clk_vga_s3e
port map (
clk50 => CLK_50MHZ,
clk25 => vga_clk
);
-- display
port map (
clk50 => CLK_50MHZ,
clk25 => vga_clk
);
-- display
- display_inst :
entity work.display(beh)
+ display_inst :
display
port map (
sys_clk => CLK_50MHZ,
sys_res_n => sys_res_n,
port map (
sys_clk => CLK_50MHZ,
sys_res_n => sys_res_n,
@@
-124,7
+125,7
@@
begin
);
-- history
);
-- history
- history_inst :
entity work.history(beh)
+ history_inst :
history
port map (
sys_clk => CLK_50MHZ,
sys_res_n => sys_res_n,
port map (
sys_clk => CLK_50MHZ,
sys_res_n => sys_res_n,
@@
-155,12
+156,11
@@
begin
pc_spalte => pc_spalte,
pc_zeile => pc_zeile,
pc_char => pc_char,
pc_spalte => pc_spalte,
pc_zeile => pc_zeile,
pc_char => pc_char,
- pc_busy => pc_busy,
pc_done => pc_done
);
-- parser
pc_done => pc_done
);
-- parser
- parser_inst :
entity work.parser(beh)
+ parser_inst :
parser
port map (
sys_clk => CLK_50MHZ,
sys_res_n => sys_res_n,
port map (
sys_clk => CLK_50MHZ,
sys_res_n => sys_res_n,
@@
-178,7
+178,7
@@
begin
);
-- scanner
);
-- scanner
- scanner_inst :
entity work.scanner(beh)
+ scanner_inst :
scanner
port map (
sys_clk => CLK_50MHZ,
sys_res_n => sys_res_n,
port map (
sys_clk => CLK_50MHZ,
sys_res_n => sys_res_n,
@@
-196,9
+196,9
@@
begin
);
-- ps/2
);
-- ps/2
- ps2_inst :
entity work.ps2_keyboard_controller(beh)
+ ps2_inst :
ps2_keyboard_controller
generic map (
generic map (
- CLK_FREQ =>
50000000
,
+ CLK_FREQ =>
CLK_FREQ
,
SYNC_STAGES => 2
)
port map (
SYNC_STAGES => 2
)
port map (
@@
-212,7
+212,7
@@
begin
);
-- synchronizer fuer rxd
);
-- synchronizer fuer rxd
- sync_rxd_inst :
entity work.sync(beh)
+ sync_rxd_inst :
sync
generic map (
SYNC_STAGES => 2,
RESET_VALUE => '1'
generic map (
SYNC_STAGES => 2,
RESET_VALUE => '1'
@@
-225,10
+225,10
@@
begin
);
-- rs232-rx
);
-- rs232-rx
- rs232rx_inst :
entity work.uart_rx(beh)
+ rs232rx_inst :
uart_rx
generic map (
generic map (
- CLK_FREQ =>
50000000
,
- BAUDRATE =>
115200
+ CLK_FREQ =>
CLK_FREQ
,
+ BAUDRATE =>
BAUDRATE
)
port map (
sys_clk => CLK_50MHZ,
)
port map (
sys_clk => CLK_50MHZ,
@@
-239,10
+239,10
@@
begin
);
-- rs232-tx
);
-- rs232-tx
- rs232tx_inst :
entity work.uart_tx(beh)
+ rs232tx_inst :
uart_tx
generic map (
generic map (
- CLK_FREQ =>
50000000
,
- BAUDRATE =>
115200
+ CLK_FREQ =>
CLK_FREQ
,
+ BAUDRATE =>
BAUDRATE
)
port map (
sys_clk => CLK_50MHZ,
)
port map (
sys_clk => CLK_50MHZ,
@@
-254,7
+254,7
@@
begin
);
-- pc-com
);
-- pc-com
- pc_com_inst :
entity work.pc_communication(beh)
+ pc_com_inst :
pc_communication
port map (
sys_clk => CLK_50MHZ,
sys_res_n => sys_res_n,
port map (
sys_clk => CLK_50MHZ,
sys_res_n => sys_res_n,
@@
-271,7
+271,6
@@
begin
pc_zeile => pc_zeile,
pc_spalte => pc_spalte,
pc_get => pc_get,
pc_zeile => pc_zeile,
pc_spalte => pc_spalte,
pc_get => pc_get,
- pc_busy => pc_busy,
pc_done => pc_done,
pc_char => pc_char
);
pc_done => pc_done,
pc_char => pc_char
);