Merge branch 'master' of https://gitlab.com/MHeinrichs/Zorro-LAN-IDE

# Conflicts:
#	Logic/LAN_IDE_V2/LAN_IDE_CP-Z2v2.vhd
#	Logic/LAN_IDE_V2/LAN_IDE_CP-z2v2.jed
#	Logic/LAN_IDE_V2/LAN_IDE_CP-z3v2.jed

Logic/LAN_IDE_V2/LAN_IDE_CP-Z2v2.vhd

@@ -1,10 +1,10 @@
 ----------------------------------------------------------------------------------
--- Company: 
--- Engineer: 
+-- Company:        a1k.org
+-- Engineer:       M. Heinrichs, H. Richter
 -- 
--- Create Date:    22:08:29 12/13/2016 
+-- Create Date:    14:45:29 07/15/2020
 -- Design Name: 
--- Module Name:    LAN_IDE_CP - Behavioral 
+-- Module Name:    LAN_IDE_CP-Z2v2 - Behavioral 
 -- Project Name: 
 -- Target Devices: 
 -- Tool versions: 
@@ -69,7 +69,6 @@ entity LAN_IDE_CP is
            IDE_R : out  STD_LOGIC;
            IDE_A : out  STD_LOGIC_VECTOR (2 downto 0);
            IDE_CS : out  STD_LOGIC_VECTOR (1 downto 0);
---         LAN_CFG : out  STD_LOGIC_VECTOR (4 downto 1);
            LAN_RD : out  STD_LOGIC;
            LAN_CS : out  STD_LOGIC;
            LAN_WRH : out  STD_LOGIC;
@@ -440,7 +439,11 @@ begin
 							elsif(AUTO_CONFIG_DONE = 1)then									
 								CP_BASEADR(7 downto 0)	<= D(15 downto 8); --Base adress
 								SHUT_UP(1)					<= '0'; --enable board
+<<<<<<< HEAD
 								AUTO_CONFIG_DONE_CYCLE	<= ('1' & not(AUTOBOOT_OFF)); --done here, if Autoboot = 1 skip ide part!
+=======
+								AUTO_CONFIG_DONE_CYCLE	<= '1' & not AUTOBOOT_OFF; --done here, if Autoboot = 1 skip ide part!
+>>>>>>> 85a06c170160536d7bbf493fc16ea4577085778e
 							elsif(AUTO_CONFIG_DONE = 2)then
 								IDE_BASEADR(7 downto 0)	<= D(15 downto 8); --Base adress
 								SHUT_UP(2) 					<= '0'; --enable board
@@ -462,17 +465,31 @@ begin
 	LAN_WRL	<= LAN_WRL_S when AS='0' and reset = '1' else LAN_WR_RST;
 	LAN_WRH	<= LAN_WRH_S when AS='0' and reset = '1' else LAN_WR_RST;
 	LAN_RD	<= LAN_RD_S  when AS='0' and reset = '1' else '0';
---	LAN_CFG	<= "0010"; -- "ZZZZ";
 	
 	CP_WE		<= CP_WE_S when AS='0' and CP_WE_QUIRK ='1' else '1';
 	CP_RD		<= CP_RD_S when AS='0' else '1';
 	CP_CS		<= not cp;
 
 	--the lanport is shifted by one adress line but I forgot to adopt the clockport address!
+<<<<<<< HEAD
 	A_LAN(13 downto 0)<=	LAN_A_CLRREG(13 downto 0) when (LAN_RST_SM = wait0 or LAN_RST_SM = clr or LAN_RST_SM = clr_commit) else
 							LAN_A_SETREG(13 downto 0) when (LAN_RST_SM = wait1 or LAN_RST_SM = set or LAN_RST_SM = set_commit) else
 							A(14 downto 1) when lan_adr ='1' else
 							A(12 downto 1) &"00";
+=======
+	A_LAN(13 downto 6)<=	LAN_A_CLRREG(13 downto 6) when (LAN_RST_SM = wait0 or LAN_RST_SM = clr or LAN_RST_SM = clr_commit) else
+								LAN_A_SETREG(13 downto 6) when (LAN_RST_SM = wait1 or LAN_RST_SM = set or LAN_RST_SM = set_commit) else
+								 --(A(14)&A(12)&A(13)&A(11 downto 7)); --swap A12/13 for the enj-Chip
+								 A(14 downto 7); 
+	A_LAN(5 downto 2) <=		LAN_A_CLRREG(5 downto 2) when (LAN_RST_SM = wait0 or LAN_RST_SM = clr or LAN_RST_SM = clr_commit) else
+									LAN_A_SETREG(5 downto 2) when (LAN_RST_SM = wait1 or LAN_RST_SM = set or LAN_RST_SM = set_commit) else
+--									A(5 downto 2) when cp='1' else A(6 downto 3); --mux the clock-port adresses!
+									A(4 downto 1) when cp='1' else A(6 downto 3); --mux the clock-port adresses! (shifted 1 down due to V2 bug)
+
+	A_LAN(1 downto 0)<= LAN_A_CLRREG(1 downto 0) when (LAN_RST_SM = wait0 or LAN_RST_SM = clr or LAN_RST_SM = clr_commit) else
+							  LAN_A_SETREG(1 downto 0) when (LAN_RST_SM = wait1 or LAN_RST_SM = set or LAN_RST_SM = set_commit) else
+							  A(2 downto 1);
+>>>>>>> 85a06c170160536d7bbf493fc16ea4577085778e
 	
 	
 	
@@ -500,7 +517,12 @@ begin
 	IDE_CS(1)<= not(A(13));
 	IDE_A(2 downto 0)	<= A(11 downto 9);
 	ROM_B	<= "00";
+<<<<<<< HEAD
 	ROM_OE	<= ROM_OE_S when AS='0' else '1';				
+=======
+--	ROM_OE	<= ROM_OE_S when AS='0' and AUTOBOOT_OFF = '0' else '1';				
+	ROM_OE	<= ROM_OE_S when AS='0' else '1';
+>>>>>>> 85a06c170160536d7bbf493fc16ea4577085778e
 
 --	INT_OUT <= 'Z';
 	INT2_OUT <= '0' when 

Logic/LAN_IDE_V2/LAN_IDE_CP-z2v2.readme.txt

@@ -0,0 +1,8 @@
+Important: The Zorro-II firmware dated 15-Jul-2020 and later
+changes the handling of the "IDE_OFF" jumper compared to earlier
+firmwares. Now IDE_OFF now behaves as stated on the silkscreen
+and will disable the IDE controller if the jumper is set.
+
+This changed behaviour is consistent with the Zorro-III firmware
+now.
+