Skip to content
Browse files

Merge branch 'master' into gcc

  • Loading branch information...
2 parents cdf674d + e3c713b commit 678615aed180cbe42f6e5a50d84a8bce704bcf69 @cnvogelg cnvogelg committed Feb 12, 2012
Showing with 1,481 additions and 1,387 deletions.
  1. +44 −0 doc/serial.txt
  2. +3 −2 fampiga/Makefile
  3. +10 −5 fampiga/board/cfide.vhd
  4. +1,304 −1,275 fampiga/board/fampiga_top.bdf
  5. +118 −104 fampiga/chameleon/cfide.bsf
  6. +2 −1 fampiga/chameleon/fampiga_top.qsf
View
44 doc/serial.txt
@@ -0,0 +1,44 @@
+serial.txt - Serial Connection on the MiniMig TC64 Core
+-------------------------------------------------------
+
+The core currently supports two serial ports all wired to pins on the IEC
+connector of the Chameleon.
+
+The protocol for both is RS 232 but the levels are _NOT_ (!!!)
+
+Both tolerate signal levels from 0V up to 5V and therefore need a serial device
+connected with TTL 5V levels.
+
+!!! NEVER USE AN ORDINARY RS232 SERIAL DEVICE WITH -12V TO 12V LEVELS DIRECTLY
+AT THE IEC CONNECTOR - YOU HAVE BEEN WARNED!!!
+
+E.g. I use a FT232 USB-to-serial break out board that provides TxD and RxD with
+5V levels.
+
+
+1.) Amiga Paula Serial
+
+The RS232 port available in a real Amiga (provided by custom chip Paula) is wired on this
+Minimig core, too. The RxD and TxD are available as IEC_CLK (Rxd) and IEC_ATN (Txd).
+
+IEC Connector:
+
+Pin 2 - GND
+Pin 3 - IEC_ATN = Amiga Serial TxD
+Pin 4 - IEC_CLK = Amiga Serial RxD
+
+The serial paramters of this port depend on the values you set up on your Amiga.
+
+
+2.) Debug Serial for OSD Menu Code Diagnosis
+
+This port is a transmit (TxD) only port and provides debugging information from
+the 68K SoftCore running the Menu Code. Its mainly useful for menu code or core
+developers.
+
+IEC Connector:
+
+Pin 2 - GND
+Pin 5 - IEC_DATA = Debug Serial TxD
+
+The serial parameters are 115200 Baud, 8 N 1, no flow control
View
5 fampiga/Makefile
@@ -1,4 +1,5 @@
CHACOCMD=chacocmd
+SLOT=2
clean:
for a in rpt summary done jdi smsg pin rbf sof ; do \
@@ -13,7 +14,7 @@ clean_bak:
run: flash start
flash:
- $(CHACOCMD) --flashrbf 2 chameleon/fampiga_top.rbf
+ $(CHACOCMD) --flashrbf $(SLOT) chameleon/fampiga_top.rbf
start:
- $(CHACOCMD) --start 2
+ $(CHACOCMD) --start $(SLOT)
View
15 fampiga/board/cfide.vhd
@@ -65,9 +65,11 @@ entity cfide is
ir: buffer std_logic;
ena1MHz: out std_logic;
irq_d: in std_logic;
- led: in std_logic_vector(1 downto 0)
-
-
+ led: in std_logic_vector(1 downto 0);
+
+ amiser_txd: in std_logic; -- CV: amiga serial txd
+ amiser_rxd: out std_logic -- CV: amiga serial rxd
+
);
end cfide;
@@ -263,6 +265,8 @@ end process;
kb_clk <= mux_q(1);
ms_data <= mux_q(2);
ms_clk <= mux_q(3);
+ when X"D" =>
+ amiser_rxd <= mux_q(1); -- IEC_CLK = amiga serial rxd
when others =>
null;
end case;
@@ -293,8 +297,9 @@ end process;
mux_d_regd <= "10" & led(0) & led(1);
mux_regd <= X"B";
when X"B" =>
- mux_d_regd(3 downto 1) <= "111";
- mux_d_regd(0) <= shiftout;
+ mux_d_regd(2 downto 1) <= "11";
+ mux_d_regd(3) <= amiser_txd; -- CV: IEC ATN is amiga serial txd
+ mux_d_regd(0) <= not shiftout; -- CV: invert serial signal to fit USB2serial dongle
-- mux_d_regd(0) <= '1';
mux_regd <= X"D";
when X"C" =>
View
2,579 fampiga/board/fampiga_top.bdf
1,304 additions, 1,275 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
222 fampiga/chameleon/cfide.bsf
@@ -4,7 +4,7 @@ editor if you plan to continue editing the block that represents it in
the Block Editor! File corruption is VERY likely to occur.
*/
/*
-Copyright (C) 1991-2009 Altera Corporation
+Copyright (C) 1991-2011 Altera Corporation
Your use of Altera Corporation's design tools, logic functions
and other software and tools, and its AMPP partner logic
functions, and any output files from any of the foregoing
@@ -18,264 +18,278 @@ programming logic devices manufactured by Altera and sold by
Altera or its authorized distributors. Please refer to the
applicable agreement for further details.
*/
-(header "symbol" (version "1.1"))
+(header "symbol" (version "1.2"))
(symbol
- (rect 16 16 232 368)
- (text "cfide" (rect 5 0 29 12)(font "Arial" ))
- (text "inst" (rect 8 336 25 348)(font "Arial" ))
+ (rect 64 64 280 416)
+ (text "cfide" (rect 5 0 29 11)(font "Arial" ))
+ (text "inst" (rect 8 336 26 347)(font "Arial" ))
(port
(pt 0 32)
(input)
- (text "mux_q[3..0]" (rect 0 0 59 12)(font "Arial" ))
- (text "mux_q[3..0]" (rect 21 27 80 39)(font "Arial" ))
+ (text "mux_q[3..0]" (rect 0 0 59 11)(font "Arial" ))
+ (text "mux_q[3..0]" (rect 21 27 80 38)(font "Arial" ))
(line (pt 0 32)(pt 16 32)(line_width 3))
)
(port
(pt 0 48)
(input)
- (text "sysclk" (rect 0 0 33 12)(font "Arial" ))
- (text "sysclk" (rect 21 43 54 55)(font "Arial" ))
- (line (pt 0 48)(pt 16 48)(line_width 1))
+ (text "sysclk" (rect 0 0 33 11)(font "Arial" ))
+ (text "sysclk" (rect 21 43 54 54)(font "Arial" ))
+ (line (pt 0 48)(pt 16 48))
)
(port
(pt 0 64)
(input)
- (text "n_reset" (rect 0 0 36 12)(font "Arial" ))
- (text "n_reset" (rect 21 59 57 71)(font "Arial" ))
- (line (pt 0 64)(pt 16 64)(line_width 1))
+ (text "n_reset" (rect 0 0 37 11)(font "Arial" ))
+ (text "n_reset" (rect 21 59 58 70)(font "Arial" ))
+ (line (pt 0 64)(pt 16 64))
)
(port
(pt 0 80)
(input)
- (text "cpuena_in" (rect 0 0 49 12)(font "Arial" ))
- (text "cpuena_in" (rect 21 75 70 87)(font "Arial" ))
- (line (pt 0 80)(pt 16 80)(line_width 1))
+ (text "cpuena_in" (rect 0 0 50 11)(font "Arial" ))
+ (text "cpuena_in" (rect 21 75 71 86)(font "Arial" ))
+ (line (pt 0 80)(pt 16 80))
)
(port
(pt 0 96)
(input)
- (text "memdata_in[15..0]" (rect 0 0 92 12)(font "Arial" ))
- (text "memdata_in[15..0]" (rect 21 91 113 103)(font "Arial" ))
+ (text "memdata_in[15..0]" (rect 0 0 92 11)(font "Arial" ))
+ (text "memdata_in[15..0]" (rect 21 91 113 102)(font "Arial" ))
(line (pt 0 96)(pt 16 96)(line_width 3))
)
(port
(pt 0 112)
(input)
- (text "addr[23..0]" (rect 0 0 53 12)(font "Arial" ))
- (text "addr[23..0]" (rect 21 107 74 119)(font "Arial" ))
+ (text "addr[23..0]" (rect 0 0 53 11)(font "Arial" ))
+ (text "addr[23..0]" (rect 21 107 74 118)(font "Arial" ))
(line (pt 0 112)(pt 16 112)(line_width 3))
)
(port
(pt 0 128)
(input)
- (text "cpudata_in[15..0]" (rect 0 0 84 12)(font "Arial" ))
- (text "cpudata_in[15..0]" (rect 21 123 105 135)(font "Arial" ))
+ (text "cpudata_in[15..0]" (rect 0 0 84 11)(font "Arial" ))
+ (text "cpudata_in[15..0]" (rect 21 123 105 134)(font "Arial" ))
(line (pt 0 128)(pt 16 128)(line_width 3))
)
(port
(pt 0 144)
(input)
- (text "state[1..0]" (rect 0 0 50 12)(font "Arial" ))
- (text "state[1..0]" (rect 21 139 71 151)(font "Arial" ))
+ (text "state[1..0]" (rect 0 0 50 11)(font "Arial" ))
+ (text "state[1..0]" (rect 21 139 71 150)(font "Arial" ))
(line (pt 0 144)(pt 16 144)(line_width 3))
)
(port
(pt 0 160)
(input)
- (text "lds" (rect 0 0 14 12)(font "Arial" ))
- (text "lds" (rect 21 155 35 167)(font "Arial" ))
- (line (pt 0 160)(pt 16 160)(line_width 1))
+ (text "lds" (rect 0 0 15 11)(font "Arial" ))
+ (text "lds" (rect 21 155 36 166)(font "Arial" ))
+ (line (pt 0 160)(pt 16 160))
)
(port
(pt 0 176)
(input)
- (text "uds" (rect 0 0 17 12)(font "Arial" ))
- (text "uds" (rect 21 171 38 183)(font "Arial" ))
- (line (pt 0 176)(pt 16 176)(line_width 1))
+ (text "uds" (rect 0 0 18 11)(font "Arial" ))
+ (text "uds" (rect 21 171 39 182)(font "Arial" ))
+ (line (pt 0 176)(pt 16 176))
)
(port
(pt 0 192)
(input)
- (text "sd_di" (rect 0 0 25 12)(font "Arial" ))
- (text "sd_di" (rect 21 187 46 199)(font "Arial" ))
- (line (pt 0 192)(pt 16 192)(line_width 1))
+ (text "sd_di" (rect 0 0 27 11)(font "Arial" ))
+ (text "sd_di" (rect 21 187 48 198)(font "Arial" ))
+ (line (pt 0 192)(pt 16 192))
)
(port
(pt 0 208)
(input)
- (text "sd_dimm" (rect 0 0 44 12)(font "Arial" ))
- (text "sd_dimm" (rect 21 203 65 215)(font "Arial" ))
- (line (pt 0 208)(pt 16 208)(line_width 1))
+ (text "sd_dimm" (rect 0 0 46 11)(font "Arial" ))
+ (text "sd_dimm" (rect 21 203 67 214)(font "Arial" ))
+ (line (pt 0 208)(pt 16 208))
)
(port
(pt 0 224)
(input)
- (text "enaWRreg" (rect 0 0 51 12)(font "Arial" ))
- (text "enaWRreg" (rect 21 219 72 231)(font "Arial" ))
- (line (pt 0 224)(pt 16 224)(line_width 1))
+ (text "enaWRreg" (rect 0 0 53 11)(font "Arial" ))
+ (text "enaWRreg" (rect 21 219 74 230)(font "Arial" ))
+ (line (pt 0 224)(pt 16 224))
)
(port
(pt 0 240)
(input)
- (text "kb_clki" (rect 0 0 34 12)(font "Arial" ))
- (text "kb_clki" (rect 21 235 55 247)(font "Arial" ))
- (line (pt 0 240)(pt 16 240)(line_width 1))
+ (text "kb_clki" (rect 0 0 35 11)(font "Arial" ))
+ (text "kb_clki" (rect 21 235 56 246)(font "Arial" ))
+ (line (pt 0 240)(pt 16 240))
)
(port
(pt 0 256)
(input)
- (text "kb_datai" (rect 0 0 41 12)(font "Arial" ))
- (text "kb_datai" (rect 21 251 62 263)(font "Arial" ))
- (line (pt 0 256)(pt 16 256)(line_width 1))
+ (text "kb_datai" (rect 0 0 42 11)(font "Arial" ))
+ (text "kb_datai" (rect 21 251 63 262)(font "Arial" ))
+ (line (pt 0 256)(pt 16 256))
)
(port
(pt 0 272)
(input)
- (text "ms_clki" (rect 0 0 37 12)(font "Arial" ))
- (text "ms_clki" (rect 21 267 58 279)(font "Arial" ))
- (line (pt 0 272)(pt 16 272)(line_width 1))
+ (text "ms_clki" (rect 0 0 38 11)(font "Arial" ))
+ (text "ms_clki" (rect 21 267 59 278)(font "Arial" ))
+ (line (pt 0 272)(pt 16 272))
)
(port
(pt 0 288)
(input)
- (text "ms_datai" (rect 0 0 44 12)(font "Arial" ))
- (text "ms_datai" (rect 21 283 65 295)(font "Arial" ))
- (line (pt 0 288)(pt 16 288)(line_width 1))
+ (text "ms_datai" (rect 0 0 46 11)(font "Arial" ))
+ (text "ms_datai" (rect 21 283 67 294)(font "Arial" ))
+ (line (pt 0 288)(pt 16 288))
)
(port
(pt 0 304)
(input)
- (text "irq_d" (rect 0 0 23 12)(font "Arial" ))
- (text "irq_d" (rect 21 299 44 311)(font "Arial" ))
- (line (pt 0 304)(pt 16 304)(line_width 1))
+ (text "irq_d" (rect 0 0 24 11)(font "Arial" ))
+ (text "irq_d" (rect 21 299 45 310)(font "Arial" ))
+ (line (pt 0 304)(pt 16 304))
)
(port
(pt 0 320)
(input)
- (text "led[1..0]" (rect 0 0 40 12)(font "Arial" ))
- (text "led[1..0]" (rect 21 315 61 327)(font "Arial" ))
+ (text "led[1..0]" (rect 0 0 40 11)(font "Arial" ))
+ (text "led[1..0]" (rect 21 315 61 326)(font "Arial" ))
(line (pt 0 320)(pt 16 320)(line_width 3))
)
(port
+ (pt 216 304)
+ (input)
+ (text "amiser_txd" (rect 163 304 225 317)(font "Arial" (font_size 8)))
+ (text "amiser_txd" (rect 152 296 207 307)(font "Arial" ))
+ (line (pt 216 304)(pt 200 304))
+ )
+ (port
(pt 216 32)
(output)
- (text "mux_clk" (rect 0 0 41 12)(font "Arial" ))
- (text "mux_clk" (rect 154 27 195 39)(font "Arial" ))
- (line (pt 216 32)(pt 200 32)(line_width 1))
+ (text "mux_clk" (rect 0 0 42 11)(font "Arial" ))
+ (text "mux_clk" (rect 160 27 195 38)(font "Arial" ))
+ (line (pt 216 32)(pt 200 32))
)
(port
(pt 216 48)
(output)
- (text "mux[3..0]" (rect 0 0 47 12)(font "Arial" ))
- (text "mux[3..0]" (rect 148 43 195 55)(font "Arial" ))
+ (text "mux[3..0]" (rect 0 0 47 11)(font "Arial" ))
+ (text "mux[3..0]" (rect 156 43 195 54)(font "Arial" ))
(line (pt 216 48)(pt 200 48)(line_width 3))
)
(port
(pt 216 64)
(output)
- (text "mux_d[3..0]" (rect 0 0 59 12)(font "Arial" ))
- (text "mux_d[3..0]" (rect 136 59 195 71)(font "Arial" ))
+ (text "mux_d[3..0]" (rect 0 0 59 11)(font "Arial" ))
+ (text "mux_d[3..0]" (rect 146 59 195 70)(font "Arial" ))
(line (pt 216 64)(pt 200 64)(line_width 3))
)
(port
(pt 216 80)
(output)
- (text "memce" (rect 0 0 36 12)(font "Arial" ))
- (text "memce" (rect 159 75 195 87)(font "Arial" ))
- (line (pt 216 80)(pt 200 80)(line_width 1))
+ (text "memce" (rect 0 0 37 11)(font "Arial" ))
+ (text "memce" (rect 164 75 195 86)(font "Arial" ))
+ (line (pt 216 80)(pt 200 80))
)
(port
(pt 216 96)
(output)
- (text "cpudata[15..0]" (rect 0 0 70 12)(font "Arial" ))
- (text "cpudata[15..0]" (rect 125 91 195 103)(font "Arial" ))
+ (text "cpudata[15..0]" (rect 0 0 70 11)(font "Arial" ))
+ (text "cpudata[15..0]" (rect 136 91 195 102)(font "Arial" ))
(line (pt 216 96)(pt 200 96)(line_width 3))
)
(port
(pt 216 112)
(output)
- (text "cpuena" (rect 0 0 35 12)(font "Arial" ))
- (text "cpuena" (rect 160 107 195 119)(font "Arial" ))
- (line (pt 216 112)(pt 200 112)(line_width 1))
+ (text "cpuena" (rect 0 0 36 11)(font "Arial" ))
+ (text "cpuena" (rect 165 107 195 118)(font "Arial" ))
+ (line (pt 216 112)(pt 200 112))
)
(port
(pt 216 128)
(output)
- (text "TxD" (rect 0 0 20 12)(font "Arial" ))
- (text "TxD" (rect 175 123 195 135)(font "Arial" ))
- (line (pt 216 128)(pt 200 128)(line_width 1))
+ (text "TxD" (rect 0 0 22 11)(font "Arial" ))
+ (text "TxD" (rect 177 123 195 134)(font "Arial" ))
+ (line (pt 216 128)(pt 200 128))
)
(port
(pt 216 144)
(output)
- (text "sd_cs[7..0]" (rect 0 0 55 12)(font "Arial" ))
- (text "sd_cs[7..0]" (rect 140 139 195 151)(font "Arial" ))
+ (text "sd_cs[7..0]" (rect 0 0 55 11)(font "Arial" ))
+ (text "sd_cs[7..0]" (rect 149 139 195 150)(font "Arial" ))
(line (pt 216 144)(pt 200 144)(line_width 3))
)
(port
(pt 216 160)
(output)
- (text "sd_clk" (rect 0 0 31 12)(font "Arial" ))
- (text "sd_clk" (rect 164 155 195 167)(font "Arial" ))
- (line (pt 216 160)(pt 200 160)(line_width 1))
+ (text "sd_clk" (rect 0 0 33 11)(font "Arial" ))
+ (text "sd_clk" (rect 168 155 195 166)(font "Arial" ))
+ (line (pt 216 160)(pt 200 160))
)
(port
(pt 216 176)
(output)
- (text "sd_do" (rect 0 0 29 12)(font "Arial" ))
- (text "sd_do" (rect 166 171 195 183)(font "Arial" ))
- (line (pt 216 176)(pt 200 176)(line_width 1))
+ (text "sd_do" (rect 0 0 30 11)(font "Arial" ))
+ (text "sd_do" (rect 170 171 195 182)(font "Arial" ))
+ (line (pt 216 176)(pt 200 176))
)
(port
(pt 216 192)
(output)
- (text "kb_clk" (rect 0 0 31 12)(font "Arial" ))
- (text "kb_clk" (rect 164 187 195 199)(font "Arial" ))
- (line (pt 216 192)(pt 200 192)(line_width 1))
+ (text "kb_clk" (rect 0 0 33 11)(font "Arial" ))
+ (text "kb_clk" (rect 168 187 195 198)(font "Arial" ))
+ (line (pt 216 192)(pt 200 192))
)
(port
(pt 216 208)
(output)
- (text "kb_data" (rect 0 0 38 12)(font "Arial" ))
- (text "kb_data" (rect 157 203 195 215)(font "Arial" ))
- (line (pt 216 208)(pt 200 208)(line_width 1))
+ (text "kb_data" (rect 0 0 40 11)(font "Arial" ))
+ (text "kb_data" (rect 162 203 195 214)(font "Arial" ))
+ (line (pt 216 208)(pt 200 208))
)
(port
(pt 216 224)
(output)
- (text "ms_clk" (rect 0 0 35 12)(font "Arial" ))
- (text "ms_clk" (rect 160 219 195 231)(font "Arial" ))
- (line (pt 216 224)(pt 200 224)(line_width 1))
+ (text "ms_clk" (rect 0 0 36 11)(font "Arial" ))
+ (text "ms_clk" (rect 165 219 195 230)(font "Arial" ))
+ (line (pt 216 224)(pt 200 224))
)
(port
(pt 216 240)
(output)
- (text "ms_data" (rect 0 0 42 12)(font "Arial" ))
- (text "ms_data" (rect 153 235 195 247)(font "Arial" ))
- (line (pt 216 240)(pt 200 240)(line_width 1))
+ (text "ms_data" (rect 0 0 43 11)(font "Arial" ))
+ (text "ms_data" (rect 159 235 195 246)(font "Arial" ))
+ (line (pt 216 240)(pt 200 240))
)
(port
(pt 216 256)
(output)
- (text "nreset" (rect 0 0 30 12)(font "Arial" ))
- (text "nreset" (rect 165 251 195 263)(font "Arial" ))
- (line (pt 216 256)(pt 200 256)(line_width 1))
+ (text "nreset" (rect 0 0 31 11)(font "Arial" ))
+ (text "nreset" (rect 169 251 195 262)(font "Arial" ))
+ (line (pt 216 256)(pt 200 256))
)
(port
(pt 216 272)
(output)
- (text "ir" (rect 0 0 5 12)(font "Arial" ))
- (text "ir" (rect 190 267 195 279)(font "Arial" ))
- (line (pt 216 272)(pt 200 272)(line_width 1))
+ (text "ir" (rect 0 0 8 11)(font "Arial" ))
+ (text "ir" (rect 189 267 195 278)(font "Arial" ))
+ (line (pt 216 272)(pt 200 272))
)
(port
(pt 216 288)
(output)
- (text "ena1MHz" (rect 0 0 44 12)(font "Arial" ))
- (text "ena1MHz" (rect 151 283 195 295)(font "Arial" ))
- (line (pt 216 288)(pt 200 288)(line_width 1))
+ (text "ena1MHz" (rect 0 0 48 11)(font "Arial" ))
+ (text "ena1MHz" (rect 155 283 195 294)(font "Arial" ))
+ (line (pt 216 288)(pt 200 288))
+ )
+ (port
+ (pt 216 320)
+ (output)
+ (text "amiser_rxd" (rect 163 312 226 325)(font "Arial" (font_size 8)))
+ (text "amiser_rxd" (rect 152 312 207 323)(font "Arial" ))
+ (line (pt 216 320)(pt 200 320))
)
(drawing
- (rectangle (rect 16 16 200 336)(line_width 1))
+ (rectangle (rect 16 16 200 336))
)
)
View
3 fampiga/chameleon/fampiga_top.qsf
@@ -202,4 +202,5 @@ set_global_assignment -name SDC_FILE fampiga.sdc
set_global_assignment -name PHYSICAL_SYNTHESIS_COMBO_LOGIC ON
set_global_assignment -name PHYSICAL_SYNTHESIS_REGISTER_RETIMING ON
set_global_assignment -name PHYSICAL_SYNTHESIS_REGISTER_DUPLICATION ON
-set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
+
+set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top

0 comments on commit 678615a

Please sign in to comment.
Something went wrong with that request. Please try again.