Sync with Fredi's source 22/06/2017

Blitter work.
This commit is contained in:
David Gálvez
2018-04-09 17:25:52 +02:00
parent 343ede8328
commit 3a91813da7
58 changed files with 2380 additions and 3603 deletions

View File

@@ -6594,64 +6594,6 @@ applicable agreement for further details.
(line (pt 80 296)(pt 96 288)(line_width 1))
)
)
(symbol
(rect 2072 1176 2232 1320)
(text "lpm_fifoDZ" (rect 50 1 120 17)(font "Arial" (font_size 10)))
(text "inst63" (rect 8 128 37 140)(font "Arial" ))
(port
(pt 0 32)
(input)
(text "data[127..0]" (rect 0 0 67 14)(font "Arial" (font_size 8)))
(text "data[127..0]" (rect 20 26 87 40)(font "Arial" (font_size 8)))
(line (pt 0 32)(pt 16 32)(line_width 3))
)
(port
(pt 0 56)
(input)
(text "wrreq" (rect 0 0 35 14)(font "Arial" (font_size 8)))
(text "wrreq" (rect 20 50 55 64)(font "Arial" (font_size 8)))
(line (pt 0 56)(pt 16 56)(line_width 1))
)
(port
(pt 0 72)
(input)
(text "rdreq" (rect 0 0 30 14)(font "Arial" (font_size 8)))
(text "rdreq" (rect 20 66 50 80)(font "Arial" (font_size 8)))
(line (pt 0 72)(pt 16 72)(line_width 1))
)
(port
(pt 0 96)
(input)
(text "clock" (rect 0 0 29 14)(font "Arial" (font_size 8)))
(text "clock" (rect 26 90 55 104)(font "Arial" (font_size 8)))
(line (pt 0 96)(pt 16 96)(line_width 1))
)
(port
(pt 0 120)
(input)
(text "aclr" (rect 0 0 21 14)(font "Arial" (font_size 8)))
(text "aclr" (rect 20 114 41 128)(font "Arial" (font_size 8)))
(line (pt 0 120)(pt 16 120)(line_width 1))
)
(port
(pt 160 32)
(output)
(text "q[127..0]" (rect 0 0 49 14)(font "Arial" (font_size 8)))
(text "q[127..0]" (rect 99 26 148 40)(font "Arial" (font_size 8)))
(line (pt 160 32)(pt 144 32)(line_width 3))
)
(drawing
(text "(ack)" (rect 51 67 75 79)(font "Arial" ))
(text "128 bits x 512 words" (rect 58 116 159 128)(font "Arial" ))
(line (pt 16 16)(pt 144 16)(line_width 1))
(line (pt 144 16)(pt 144 128)(line_width 1))
(line (pt 144 128)(pt 16 128)(line_width 1))
(line (pt 16 128)(pt 16 16)(line_width 1))
(line (pt 16 108)(pt 144 108)(line_width 1))
(line (pt 16 90)(pt 22 96)(line_width 1))
(line (pt 22 96)(pt 16 102)(line_width 1))
)
)
(symbol
(rect 1712 1328 1872 1496)
(text "lpm_fifo_dc0" (rect 44 1 128 17)(font "Arial" (font_size 10)))
@@ -6726,253 +6668,144 @@ applicable agreement for further details.
(line (pt 22 120)(pt 16 126)(line_width 1))
)
)
(block
(rect 1664 1664 2016 2600)
(text "VIDEO_MOD_MUX_CLUTCTR" (rect 5 5 170 19)(font "Arial" (font_size 8))) (text "VIDEO_MOD_MUX_CLUTCTR" (rect 5 922 154 934)(font "Arial" )) (block_io "nRSTO" (input))
(block_io "MAIN_CLK" (input))
(block_io "nFB_CS1" (input))
(block_io "nFB_CS2" (input))
(block_io "nFB_CS3" (input))
(block_io "nFB_WR" (input))
(block_io "nFB_OE" (input))
(block_io "FB_SIZE0" (input))
(block_io "FB_SIZE1" (input))
(block_io "nFB_BURST" (input))
(block_io "FB_ADR[31..0]" (input))
(block_io "CLK33M" (input))
(block_io "CLK25M" (input))
(block_io "BLITTER_RUN" (input))
(block_io "CLK_VIDEO" (input))
(block_io "VR_D[8..0]" (input))
(block_io "VR_BUSY" (input))
(block_io "COLOR8" (output))
(block_io "ACP_CLUT_RD" (output))
(block_io "COLOR1" (output))
(block_io "FALCON_CLUT_RDH" (output))
(block_io "FALCON_CLUT_RDL" (output))
(block_io "FALCON_CLUT_WR[3..0]" (output))
(block_io "ST_CLUT_RD" (output))
(block_io "ST_CLUT_WR[1..0]" (output))
(block_io "CLUT_MUX_ADR[3..0]" (output))
(block_io "HSYNC" (output))
(block_io "VSYNC" (output))
(block_io "nBLANK" (output))
(block_io "nSYNC" (output))
(block_io "nPD_VGA" (output))
(block_io "FIFO_RDE" (output))
(block_io "COLOR2" (output))
(block_io "COLOR4" (output))
(block_io "PIXEL_CLK" (output))
(block_io "CLUT_OFF[3..0]" (output))
(block_io "BLITTER_ON" (output))
(block_io "VIDEO_RAM_CTR[15..0]" (output))
(block_io "VIDEO_MOD_TA" (output))
(block_io "CCR[23..0]" (output))
(block_io "CCSEL[2..0]" (output))
(block_io "ACP_CLUT_WR[3..0]" (output))
(block_io "INTER_ZEI" (output))
(block_io "DOP_FIFO_CLR" (output))
(block_io "VIDEO_RECONFIG" (output))
(block_io "VR_WR" (output))
(block_io "VR_RD" (output))
(block_io "CLR_FIFO" (output))
(block_io "FB_AD[31..0]" (bidir))
(mapper
(pt 352 72)
(bidir)
)
(mapper
(pt 0 272)
(bidir)
)
(mapper
(symbol
(rect 1656 1216 1720 1296)
(text "DFF" (rect 1 0 19 10)(font "Arial" (font_size 6)))
(text "inst101" (rect 3 68 38 80)(font "Arial" ))
(port
(pt 32 80)
(input)
(text "CLRN" (rect 21 59 44 71)(font "Courier New" (bold)))
(text "CLRN" (rect 21 58 44 70)(font "Courier New" (bold)))
(line (pt 32 80)(pt 32 76)(line_width 1))
)
(port
(pt 0 40)
(input)
(text "CLK" (rect 3 29 20 41)(font "Courier New" (bold))(invisible))
(text "CLK" (rect 3 29 20 41)(font "Courier New" (bold))(invisible))
(line (pt 0 40)(pt 12 40)(line_width 1))
)
(port
(pt 0 24)
(input)
(text "D" (rect 14 20 19 32)(font "Courier New" (bold)))
(text "D" (rect 14 20 19 32)(font "Courier New" (bold)))
(line (pt 0 24)(pt 12 24)(line_width 1))
)
(port
(pt 32 0)
(input)
(text "PRN" (rect 24 13 41 25)(font "Courier New" (bold)))
(text "PRN" (rect 24 11 41 23)(font "Courier New" (bold)))
(line (pt 32 4)(pt 32 0)(line_width 1))
)
(port
(pt 64 24)
(output)
(text "Q" (rect 45 20 50 32)(font "Courier New" (bold)))
(text "Q" (rect 45 20 50 32)(font "Courier New" (bold)))
(line (pt 52 24)(pt 64 24)(line_width 1))
)
(drawing
(line (pt 12 12)(pt 52 12)(line_width 1))
(line (pt 12 68)(pt 52 68)(line_width 1))
(line (pt 52 68)(pt 52 12)(line_width 1))
(line (pt 12 68)(pt 12 12)(line_width 1))
(line (pt 19 40)(pt 12 47)(line_width 1))
(line (pt 12 32)(pt 20 40)(line_width 1))
(circle (rect 28 4 36 12)(line_width 1))
(circle (rect 28 68 36 76)(line_width 1))
)
)
(symbol
(rect 2072 1176 2232 1320)
(text "Doppelzeilen_Fifo" (rect 29 1 149 17)(font "Arial" (font_size 10)))
(text "inst98" (rect 8 128 37 140)(font "Arial" ))
(port
(pt 0 32)
(input)
(text "data[127..0]" (rect 0 0 67 14)(font "Arial" (font_size 8)))
(text "data[127..0]" (rect 20 26 87 40)(font "Arial" (font_size 8)))
(line (pt 0 32)(pt 16 32)(line_width 3))
)
(port
(pt 0 56)
(bidir)
)
(mapper
(pt 0 80)
(bidir)
)
(mapper
(pt 0 296)
(bidir)
)
(mapper
(pt 0 104)
(bidir)
)
(mapper
(pt 0 128)
(bidir)
)
(mapper
(pt 0 152)
(bidir)
)
(mapper
(pt 0 176)
(bidir)
)
(mapper
(pt 0 248)
(bidir)
)
(mapper
(pt 0 200)
(bidir)
)
(mapper
(pt 0 224)
(bidir)
)
(mapper
(pt 0 520)
(bidir)
)
(mapper
(pt 0 544)
(bidir)
)
(mapper
(pt 0 880)
(bidir)
)
(mapper
(pt 352 600)
(bidir)
)
(mapper
(pt 352 624)
(bidir)
)
(mapper
(pt 352 648)
(bidir)
)
(mapper
(pt 352 672)
(bidir)
)
(mapper
(pt 352 696)
(bidir)
)
(mapper
(pt 352 720)
(bidir)
)
(mapper
(pt 352 840)
(bidir)
)
(mapper
(pt 352 472)
(bidir)
)
(mapper
(pt 352 448)
(bidir)
)
(mapper
(pt 352 528)
(bidir)
)
(mapper
(pt 352 320)
(bidir)
)
(mapper
(pt 352 576)
(bidir)
)
(mapper
(pt 352 400)
(bidir)
)
(mapper
(pt 352 376)
(bidir)
)
(mapper
(pt 352 352)
(bidir)
)
(mapper
(pt 352 504)
(bidir)
)
(mapper
(pt 352 296)
(bidir)
)
(mapper
(pt 352 424)
(bidir)
)
(mapper
(pt 352 552)
(bidir)
)
(mapper
(pt 352 752)
(bidir)
)
(mapper
(pt 352 776)
(bidir)
)
(mapper
(pt 352 872)
(bidir)
)
(mapper
(pt 0 496)
(bidir)
)
(mapper
(pt 352 88)
(bidir)
)
(mapper
(pt 352 264)
(bidir)
)
(mapper
(pt 352 248)
(bidir)
)
(mapper
(pt 352 232)
(bidir)
)
(mapper
(pt 352 216)
(bidir)
)
(mapper
(pt 352 136)
(bidir)
)
(mapper
(pt 352 40)
(bidir)
)
(mapper
(pt 352 152)
(bidir)
)
(mapper
(pt 0 472)
(bidir)
)
(mapper
(pt 0 456)
(bidir)
)
(mapper
(pt 352 104)
(bidir)
)
(input)
(text "wrreq" (rect 0 0 35 14)(font "Arial" (font_size 8)))
(text "wrreq" (rect 20 50 55 64)(font "Arial" (font_size 8)))
(line (pt 0 56)(pt 16 56)(line_width 1))
)
(port
(pt 0 72)
(input)
(text "rdreq" (rect 0 0 30 14)(font "Arial" (font_size 8)))
(text "rdreq" (rect 20 66 50 80)(font "Arial" (font_size 8)))
(line (pt 0 72)(pt 16 72)(line_width 1))
)
(port
(pt 0 96)
(input)
(text "clock" (rect 0 0 29 14)(font "Arial" (font_size 8)))
(text "clock" (rect 26 90 55 104)(font "Arial" (font_size 8)))
(line (pt 0 96)(pt 16 96)(line_width 1))
)
(port
(pt 0 120)
(input)
(text "aclr" (rect 0 0 21 14)(font "Arial" (font_size 8)))
(text "aclr" (rect 20 114 41 128)(font "Arial" (font_size 8)))
(line (pt 0 120)(pt 16 120)(line_width 1))
)
(port
(pt 160 32)
(output)
(text "q[127..0]" (rect 0 0 49 14)(font "Arial" (font_size 8)))
(text "q[127..0]" (rect 99 26 148 40)(font "Arial" (font_size 8)))
(line (pt 160 32)(pt 144 32)(line_width 3))
)
(drawing
(text "128 bits x 512 words" (rect 58 116 159 128)(font "Arial" ))
(line (pt 16 16)(pt 144 16)(line_width 1))
(line (pt 144 16)(pt 144 128)(line_width 1))
(line (pt 144 128)(pt 16 128)(line_width 1))
(line (pt 16 128)(pt 16 16)(line_width 1))
(line (pt 16 108)(pt 144 108)(line_width 1))
(line (pt 16 90)(pt 22 96)(line_width 1))
(line (pt 22 96)(pt 16 102)(line_width 1))
)
)
(symbol
(rect 1856 1208 1920 1256)
(text "AND2" (rect 1 0 25 10)(font "Arial" (font_size 6)))
(text "inst99" (rect 3 37 32 49)(font "Arial" ))
(port
(pt 0 16)
(input)
(text "IN1" (rect 2 7 19 19)(font "Courier New" (bold))(invisible))
(text "IN1" (rect 2 7 19 19)(font "Courier New" (bold))(invisible))
(line (pt 0 16)(pt 14 16)(line_width 1))
)
(port
(pt 0 32)
(input)
(text "IN2" (rect 2 23 19 35)(font "Courier New" (bold))(invisible))
(text "IN2" (rect 2 23 19 35)(font "Courier New" (bold))(invisible))
(line (pt 0 32)(pt 14 32)(line_width 1))
)
(port
(pt 64 24)
(output)
(text "OUT" (rect 48 15 65 27)(font "Courier New" (bold))(invisible))
(text "OUT" (rect 48 15 65 27)(font "Courier New" (bold))(invisible))
(line (pt 42 24)(pt 64 24)(line_width 1))
)
(drawing
(line (pt 14 12)(pt 30 12)(line_width 1))
(line (pt 14 37)(pt 31 37)(line_width 1))
(line (pt 14 12)(pt 14 37)(line_width 1))
(arc (pt 31 37)(pt 30 12)(rect 18 12 43 37)(line_width 1))
)
)
(block
(rect 296 1872 560 2536)
@@ -7300,6 +7133,259 @@ applicable agreement for further details.
(bidir)
)
)
(block
(rect 1664 1664 2016 2600)
(text "VIDEO_MOD_MUX_CLUTCTR" (rect 5 5 170 19)(font "Arial" (font_size 8))) (text "VIDEO_MOD_MUX_CLUTCTR" (rect 5 922 154 934)(font "Arial" )) (block_io "nRSTO" (input))
(block_io "MAIN_CLK" (input))
(block_io "nFB_CS1" (input))
(block_io "nFB_CS2" (input))
(block_io "nFB_CS3" (input))
(block_io "nFB_WR" (input))
(block_io "nFB_OE" (input))
(block_io "FB_SIZE0" (input))
(block_io "FB_SIZE1" (input))
(block_io "nFB_BURST" (input))
(block_io "FB_ADR[31..0]" (input))
(block_io "CLK33M" (input))
(block_io "CLK25M" (input))
(block_io "BLITTER_RUN" (input))
(block_io "CLK_VIDEO" (input))
(block_io "VR_D[8..0]" (input))
(block_io "VR_BUSY" (input))
(block_io "COLOR8" (output))
(block_io "ACP_CLUT_RD" (output))
(block_io "COLOR1" (output))
(block_io "FALCON_CLUT_RDH" (output))
(block_io "FALCON_CLUT_RDL" (output))
(block_io "FALCON_CLUT_WR[3..0]" (output))
(block_io "ST_CLUT_RD" (output))
(block_io "ST_CLUT_WR[1..0]" (output))
(block_io "CLUT_MUX_ADR[3..0]" (output))
(block_io "HSYNC" (output))
(block_io "VSYNC" (output))
(block_io "nBLANK" (output))
(block_io "nSYNC" (output))
(block_io "nPD_VGA" (output))
(block_io "FIFO_RDE" (output))
(block_io "COLOR2" (output))
(block_io "COLOR4" (output))
(block_io "PIXEL_CLK" (output))
(block_io "CLUT_OFF[3..0]" (output))
(block_io "BLITTER_ON" (output))
(block_io "VIDEO_RAM_CTR[15..0]" (output))
(block_io "VIDEO_MOD_TA" (output))
(block_io "CCR[23..0]" (output))
(block_io "CCSEL[2..0]" (output))
(block_io "ACP_CLUT_WR[3..0]" (output))
(block_io "INTER_ZEI" (output))
(block_io "DOP_FIFO_CLR" (output))
(block_io "VIDEO_RECONFIG" (output))
(block_io "VR_WR" (output))
(block_io "VR_RD" (output))
(block_io "CLR_FIFO" (output))
(block_io "DPZF_CLKENA" (output))
(block_io "FB_AD[31..0]" (bidir))
(mapper
(pt 352 72)
(bidir)
)
(mapper
(pt 0 272)
(bidir)
)
(mapper
(pt 0 56)
(bidir)
)
(mapper
(pt 0 80)
(bidir)
)
(mapper
(pt 0 296)
(bidir)
)
(mapper
(pt 0 104)
(bidir)
)
(mapper
(pt 0 128)
(bidir)
)
(mapper
(pt 0 152)
(bidir)
)
(mapper
(pt 0 176)
(bidir)
)
(mapper
(pt 0 248)
(bidir)
)
(mapper
(pt 0 200)
(bidir)
)
(mapper
(pt 0 224)
(bidir)
)
(mapper
(pt 0 520)
(bidir)
)
(mapper
(pt 0 544)
(bidir)
)
(mapper
(pt 0 880)
(bidir)
)
(mapper
(pt 352 600)
(bidir)
)
(mapper
(pt 352 624)
(bidir)
)
(mapper
(pt 352 648)
(bidir)
)
(mapper
(pt 352 672)
(bidir)
)
(mapper
(pt 352 696)
(bidir)
)
(mapper
(pt 352 720)
(bidir)
)
(mapper
(pt 352 840)
(bidir)
)
(mapper
(pt 352 472)
(bidir)
)
(mapper
(pt 352 448)
(bidir)
)
(mapper
(pt 352 528)
(bidir)
)
(mapper
(pt 352 320)
(bidir)
)
(mapper
(pt 352 576)
(bidir)
)
(mapper
(pt 352 400)
(bidir)
)
(mapper
(pt 352 376)
(bidir)
)
(mapper
(pt 352 352)
(bidir)
)
(mapper
(pt 352 504)
(bidir)
)
(mapper
(pt 352 296)
(bidir)
)
(mapper
(pt 352 424)
(bidir)
)
(mapper
(pt 352 552)
(bidir)
)
(mapper
(pt 352 752)
(bidir)
)
(mapper
(pt 352 776)
(bidir)
)
(mapper
(pt 352 872)
(bidir)
)
(mapper
(pt 0 496)
(bidir)
)
(mapper
(pt 352 88)
(bidir)
)
(mapper
(pt 352 264)
(bidir)
)
(mapper
(pt 352 248)
(bidir)
)
(mapper
(pt 352 232)
(bidir)
)
(mapper
(pt 352 216)
(bidir)
)
(mapper
(pt 352 136)
(bidir)
)
(mapper
(pt 352 40)
(bidir)
)
(mapper
(pt 352 152)
(bidir)
)
(mapper
(pt 0 472)
(bidir)
)
(mapper
(pt 0 456)
(bidir)
)
(mapper
(pt 352 104)
(bidir)
)
(mapper
(pt 352 800)
(bidir)
)
)
(connector
(text "CLUT_ADR0" (rect 2786 1272 2849 1284)(font "Arial" ))
(pt 2776 1288)
@@ -8629,11 +8715,6 @@ applicable agreement for further details.
(pt 2512 1568)
(pt 2512 1728)
)
(connector
(text "PIXEL_CLK" (rect 1634 1432 1690 1444)(font "Arial" ))
(pt 1640 1448)
(pt 1712 1448)
)
(connector
(text "PIXEL_CLK" (rect 1938 1424 1994 1436)(font "Arial" ))
(pt 1928 1440)
@@ -10289,22 +10370,6 @@ applicable agreement for further details.
(pt 1800 1160)
(bus)
)
(connector
(pt 1608 1432)
(pt 1608 1232)
)
(connector
(pt 1600 1432)
(pt 1608 1432)
)
(connector
(pt 1608 1432)
(pt 1712 1432)
)
(connector
(pt 1608 1232)
(pt 2072 1232)
)
(connector
(pt 2072 1248)
(pt 1944 1248)
@@ -10591,6 +10656,57 @@ applicable agreement for further details.
(pt 848 2744)
(pt 928 2744)
)
(connector
(pt 1920 1232)
(pt 2072 1232)
)
(connector
(pt 1608 1432)
(pt 1608 1240)
)
(connector
(pt 1608 1240)
(pt 1656 1240)
)
(connector
(pt 1624 1256)
(pt 1656 1256)
)
(connector
(pt 1624 1448)
(pt 1624 1256)
)
(connector
(pt 1600 1432)
(pt 1608 1432)
)
(connector
(pt 1608 1432)
(pt 1712 1432)
)
(connector
(pt 1608 1448)
(pt 1624 1448)
)
(connector
(text "PIXEL_CLK" (rect 1634 1432 1690 1444)(font "Arial" ))
(pt 1624 1448)
(pt 1712 1448)
)
(connector
(pt 1720 1240)
(pt 1856 1240)
)
(connector
(text "DPZF_CLKENA" (rect 1754 1208 1833 1220)(font "Arial" ))
(pt 1856 1224)
(pt 1744 1224)
)
(connector
(text "DPZF_CLKENA" (rect 2026 2448 2105 2460)(font "Arial" ))
(pt 2128 2464)
(pt 2016 2464)
)
(junction (pt 2984 1688))
(junction (pt 792 1192))
(junction (pt 792 1312))
@@ -10615,3 +10731,4 @@ applicable agreement for further details.
(junction (pt 3232 3024))
(junction (pt 1968 1424))
(junction (pt 1608 1432))
(junction (pt 1624 1448))