summaryrefslogtreecommitdiff
path: root/2004/n
diff options
context:
space:
mode:
authorgalmes2004-02-27 17:58:49 +0000
committergalmes2004-02-27 17:58:49 +0000
commitf7383ef47a285c80170a02a3ac00d4b75818de25 (patch)
tree1aec0faad73a414e491c9503b00a1d00c049f935 /2004/n
parent872a5b43d413383e6a841910397417a084e9057f (diff)
Modification de noms des constantes dans nono_cont
Diffstat (limited to '2004/n')
-rw-r--r--2004/n/fpga/src/modele/bch_modele.vhd12
-rw-r--r--2004/n/fpga/src/modele/nono_const.vhd12
2 files changed, 15 insertions, 9 deletions
diff --git a/2004/n/fpga/src/modele/bch_modele.vhd b/2004/n/fpga/src/modele/bch_modele.vhd
index eb062c5..f813335 100644
--- a/2004/n/fpga/src/modele/bch_modele.vhd
+++ b/2004/n/fpga/src/modele/bch_modele.vhd
@@ -44,9 +44,9 @@ begin
U1 : modele
generic map (
-- Définition des addresses.
- A_REG1 => A_REG_IO_DIRECTION,
- A_REG2 => A_REG_IO_DATA,
- A_REG3 => A_REG_IO_INTERRUPT_MASK
+ A_REG1 => A_IO1_REG_DIRECTION,
+ A_REG2 => A_IO1_REG_DATA,
+ A_REG3 => A_IO1_REG_INTERRUPT_MASK
)
port map (
rst => rst,
@@ -59,9 +59,9 @@ begin
rst <= '1', '0' after CK_PERIOD;
clk <= not clk after (CK_PERIOD/2);
rw <= '0';
- bus_address <= A_REG_IO_DIRECTION,
- A_REG_IO_DATA after 3*CK_PERIOD,
- A_REG_IO_INTERRUPT_MASK after 5*CK_PERIOD;
+ bus_address <= A_IO1_REG_DIRECTION,
+ A_IO1_REG_DATA after 3*CK_PERIOD,
+ A_IO1_REG_INTERRUPT_MASK after 5*CK_PERIOD;
end sim1;
configuration cf1_bch_modele of bch_modele is
diff --git a/2004/n/fpga/src/modele/nono_const.vhd b/2004/n/fpga/src/modele/nono_const.vhd
index 0afbace..e7b0454 100644
--- a/2004/n/fpga/src/modele/nono_const.vhd
+++ b/2004/n/fpga/src/modele/nono_const.vhd
@@ -46,9 +46,15 @@ package nono_const is
-- gestion des interruptions
constant A_INTERRUPT_MANAGER : T_ADDRESS := START_ADDR_B0 + x"00";
-- Bloc d'IO1
- constant A_REG_IO_DIRECTION : T_ADDRESS := START_ADDR_B0 + x"01";
- constant A_REG_IO_DATA : T_ADDRESS := START_ADDR_B0 + x"02";
- constant A_REG_IO_INTERRUPT_MASK : T_ADDRESS := START_ADDR_B0 + x"03";
+ constant A_IO1_REG_DATA : T_ADDRESS := START_ADDR_B0 + x"01";
+ constant A_IO1_REG_DIRECTION : T_ADDRESS := START_ADDR_B0 + x"02";
+ constant A_IO1_REG_INTERRUPT_MASK : T_ADDRESS := START_ADDR_B0 + x"03";
+ constant A_IO1_READ_OUTPUT : T_ADDRESS := START_ADDR_B0 + x"04";
+ -- Bloc d'IO2
+ constant A_IO2_REG_DATA : T_ADDRESS := START_ADDR_B0 + x"05";
+ constant A_IO2_REG_DIRECTION : T_ADDRESS := START_ADDR_B0 + x"06";
+ constant A_IO2_REG_INTERRUPT_MASK : T_ADDRESS := START_ADDR_B0 + x"07";
+ constant A_IO2_READ_OUTPUT : T_ADDRESS := START_ADDR_B0 + x"08";
-- Bloc port série
-- Bloc caméra
-- Bloc PWM