 MHeinrichs
|
fdde3273e8
|
Resolved merge mess
|
2020-10-09 22:02:01 +02:00 |
|
|
MHeinrichs
|
74dac57258
|
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
|
2020-10-09 00:19:11 +02:00 |
|
|
MHeinrichs
|
8231b54f78
|
Improved clock startup and IDE-ROM-timing
|
2020-10-09 00:17:40 +02:00 |
|
|
Henryk Richter
|
40c53e75b5
|
Zorro-II firmware update
- fixed clockport addressing
- changed IDE_OFF jumper handling to actually disable IDE when the jumper is in
|
2020-07-15 17:45:55 +02:00 |
|
|
MHeinrichs
|
02c04ac3c5
|
unified behavior on address decode
|
2019-11-19 23:41:25 +01:00 |
|
|
Heinrichs, Matthias
|
a7141792f4
|
Merge branch 'master' into driverupdate2
# Conflicts: (taken: newer version)
# Driver/baxnet/README.enc
# Driver/baxnet/bin/enc624j6net.device
# Driver/baxnet/bin/enc624j6net.device_68000
# Driver/baxnet/source/Makefile.enc
# Driver/baxnet/source/device.c
# Driver/baxnet/source/enc624j6net/enc624j6l.asm
# Driver/baxnet/source/server.c
# Driver/baxnet/source/version.h
|
2019-11-19 14:56:37 +01:00 |
|
|
MHeinrichs
|
d125d49fa6
|
Updated baxnet-driver ansd Z3-Interface
|
2019-11-15 00:40:34 +01:00 |
|
|
HenrykRichter
|
718b7fed44
|
reverted last Z2 firmware VHDL
- useful in Z2 mode until unified firmare is ready
|
2019-06-06 15:36:49 +02:00 |
|
|
MHeinrichs
|
906d8a902f
|
Firmware for new version. IDE and CP working
|
2019-05-26 22:17:28 +02:00 |
|
|
HenrykRichter
|
5c8a5c12ed
|
updated pinlist for V2
|
2019-03-20 17:47:16 +01:00 |
|
|
HenrykRichter
|
87739da8b8
|
new jed files for V2 board, untested for now
|
2019-03-20 17:43:32 +01:00 |
|
|
HenrykRichter
|
ec9088d70d
|
V2 changes:
- moved IRQ6 to Pin 135 in pinlist and VHD files
- added IDE data lines to Z3 vhd
|
2019-03-19 16:15:22 +01:00 |
|
|
MHeinrichs
|
7936ad431b
|
CP and LAN working! Clockport needed to be stopped if FCS='1'
|
2019-03-07 23:53:52 +01:00 |
|
|
MHeinrichs
|
5fc99a4460
|
Z2-Firmware with working CP and LAN
|
2019-02-21 13:53:40 +01:00 |
|
|
MHeinrichs
|
11c25fe78d
|
CP working in Z3 and driver update
A fix for int6 is needed for the first proto: Connect SJ1 right with INT6-Pad. But CP and lan are not working with AmiTCP
|
2019-02-20 23:45:57 +01:00 |
|
|
MHeinrichs
|
94425362cc
|
Update in Firmware (pure Z2-AC but LAN becomes Z3) and new pcb
|
2019-02-19 23:01:57 +01:00 |
|