bslathi19/super6502
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change test program to use correct args

Browse Source 
Seems to work, when you run the test program it resets the card and
sends the voltage and test pattern, and it does receive a response from
the card.
This commit is contained in:
Byron Lathi
2023-01-12 21:45:13 -06:00
parent 98c07b59b4
commit 7682dffe3c
5 changed files with 172 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
hw/efinix_fpga/debug_profile.wizard.json
View File

@@ -3,7 +3,7 @@
{ {
"name": "la0", "name": "la0",
"type": "la", "type": "la",
"uuid": "cb44f83ddf674d66b2dd550675cad77d", "uuid": "0b8b4dbc24484e29a3931c7539b99820",
"trigin_en": false, "trigin_en": false,
"trigout_en": false, "trigout_en": false,
"auto_inserted": true, "auto_inserted": true,
@@ -11,26 +11,11 @@
"data_depth": 1024, "data_depth": 1024,
"input_pipeline": 1, "input_pipeline": 1,
"probes": [ "probes": [
{
"name": "sd_data_OUT",
"width": 1,
"probe_type": 1
},
{ {
"name": "sd_cmd_IN", "name": "sd_cmd_IN",
"width": 1, "width": 1,
"probe_type": 1 "probe_type": 1
}, },
{
"name": "sd_data_OE",
"width": 1,
"probe_type": 1
},
{
"name": "sd_data_IN",
"width": 1,
"probe_type": 1
},
{ {
"name": "sd_cmd_OE", "name": "sd_cmd_OE",
"width": 1, "width": 1,
@@ -41,10 +26,30 @@
"width": 1, "width": 1,
"probe_type": 1 "probe_type": 1
}, },
{
"name": "sd_data_IN",
"width": 1,
"probe_type": 1
},
{
"name": "sd_data_OE",
"width": 1,
"probe_type": 1
},
{
"name": "sd_data_OUT",
"width": 1,
"probe_type": 1
},
{ {
"name": "w_sdcard_cs", "name": "w_sdcard_cs",
"width": 1, "width": 1,
"probe_type": 1 "probe_type": 1
},
{
"name": "sd_clk",
"width": 1,
"probe_type": 1
} }
] ]
} }
@@ -177,17 +182,17 @@
}, },
{ {
"name": "la0_probe0", "name": "la0_probe0",
"net": "sd_data_OUT",
"path": []
},
{
"name": "la0_probe1",
"net": "sd_cmd_IN", "net": "sd_cmd_IN",
"path": [] "path": []
}, },
{
"name": "la0_probe1",
"net": "sd_cmd_OE",
"path": []
},
{ {
"name": "la0_probe2", "name": "la0_probe2",
"net": "sd_data_OE", "net": "sd_cmd_OUT",
"path": [] "path": []
}, },
{ {
@@ -197,18 +202,23 @@
}, },
{ {
"name": "la0_probe4", "name": "la0_probe4",
"net": "sd_cmd_OE", "net": "sd_data_OE",
"path": [] "path": []
}, },
{ {
"name": "la0_probe5", "name": "la0_probe5",
"net": "sd_cmd_OUT", "net": "sd_data_OUT",
"path": [] "path": []
}, },
{ {
"name": "la0_probe6", "name": "la0_probe6",
"net": "w_sdcard_cs", "net": "w_sdcard_cs",
"path": [] "path": []
},
{
"name": "la0_probe7",
"net": "sd_clk",
"path": []
} }
] ]
} }
@@ -225,14 +235,6 @@
"data_depth": 1024, "data_depth": 1024,
"capture_control": false, "capture_control": false,
"selected_nets": [ "selected_nets": [
{
"name": "sd_data_OUT",
"width": 1,
"clk_domain": "clk_2",
"selected_probe_type": "DATA AND TRIGGER",
"child": [],
"path": []
},
{ {
"name": "sd_cmd_IN", "name": "sd_cmd_IN",
"width": 1, "width": 1,
@@ -241,22 +243,6 @@
"child": [], "child": [],
"path": [] "path": []
}, },
{
"name": "sd_data_OE",
"width": 1,
"clk_domain": "clk_2",
"selected_probe_type": "DATA AND TRIGGER",
"child": [],
"path": []
},
{
"name": "sd_data_IN",
"width": 1,
"clk_domain": "clk_2",
"selected_probe_type": "DATA AND TRIGGER",
"child": [],
"path": []
},
{ {
"name": "sd_cmd_OE", "name": "sd_cmd_OE",
"width": 1, "width": 1,
@@ -273,6 +259,30 @@
"child": [], "child": [],
"path": [] "path": []
}, },
{
"name": "sd_data_IN",
"width": 1,
"clk_domain": "clk_2",
"selected_probe_type": "DATA AND TRIGGER",
"child": [],
"path": []
},
{
"name": "sd_data_OE",
"width": 1,
"clk_domain": "clk_2",
"selected_probe_type": "DATA AND TRIGGER",
"child": [],
"path": []
},
{
"name": "sd_data_OUT",
"width": 1,
"clk_domain": "clk_2",
"selected_probe_type": "DATA AND TRIGGER",
"child": [],
"path": []
},
{ {
"name": "w_sdcard_cs", "name": "w_sdcard_cs",
"width": 1, "width": 1,
@@ -280,6 +290,14 @@
"selected_probe_type": "DATA AND TRIGGER", "selected_probe_type": "DATA AND TRIGGER",
"child": [], "child": [],
"path": [] "path": []
},
{
"name": "sd_clk",
"width": 1,
"clk_domain": "clk_2",
"selected_probe_type": "DATA AND TRIGGER",
"child": [],
"path": []
} }
], ],
"top_module": "super6502", "top_module": "super6502",

38
hw/efinix_fpga/ip/bram/bram_ini.vh
View File

@@ -4,25 +4,25 @@ input integer index;//Mode type
input integer val_; //Port A index, Port B Index, Number of Items in Loop, Port A Start, Port B Start, reserved input integer val_; //Port A index, Port B Index, Number of Items in Loop, Port A Start, Port B Start, reserved
case (index) case (index)
0: bram_ini_table= 0: bram_ini_table=
(val_== 0)?256'h001000085000aa000a9000ea000ff0002b0002000000000a9000ff0002200020: (val_== 0)?256'h00d00003a00018000a9000ea000ff000300002000000000a9000ff0002700020:
(val_== 1)?256'h07b0002000000000a200010000a9000ff0002b0002000008000a900011000e60: (val_== 1)?256'h0a9000ff000300002000008000a900011000e60001000085000aa000a9000fd0:
(val_== 2)?256'h6400011000640001000064000fd00080000cb000ea000f000010000a5000ff00: (val_== 2)?256'hfd00080000cb000ea000f000010000a5000ff000800002000000000a20001000:
(val_== 3)?256'h90008e000ef000d80008d000ff000d3000200004800060000130006400012000: (val_== 3)?256'hd00010000a500048000600001300064000120006400011000640001000064000:
(val_== 4)?256'h00068000ef000db0008d00003000a5000ef000da0008d00002000a5000ef000d: (val_== 4)?256'h000ef000da0008d00012000a5000ef000d90008d00011000a5000ef000d80008:
(val_== 5)?256'h0029000ef000dc000ad000090008600008000850005a00060000ef000dc0008d: (val_== 5)?256'h0008000850005a00060000ef000dc0008d00068000ef000db0008d00013000a5:
(val_== 6)?256'h0ef000d9000ad000080009100000000a0000ef000d8000ad000f9000f0000010: (val_== 6)?256'h091000c80000800091000c8000080009100000000a000000000a900009000860:
(val_== 7)?256'hc8000ef000db000ad0000800091000c8000ef000da000ad0000800091000c800: (val_== 7)?256'hd8000ad000f9000f00000100029000ef000dc000ad0000800091000c80000800:
(val_== 8)?256'hc000ad000480006000000000a2000ef000dd000ad000600007a0000800091000: (val_== 8)?256'ha000ad0000800091000c8000ef000d9000ad000080009100000000a0000ef000:
(val_== 9)?256'h000090008600008000850005a0006000068000f9000f00000200029000ef000d: (val_== 9)?256'h000600007a0000800091000c8000ef000db000ad0000800091000c8000ef000d:
(val_==10)?256'h00c80000800091000c80000800091000c8000080009100000000a000000000a9: (val_==10)?256'h0091000c8000080009100000000a000000000a9000090008600008000850005a:
(val_==11)?256'h0f00000100029000ef000dc000ad00026000f00008800009000a000008000910: (val_==11)?256'h0ad00026000f00008800012000a00000800091000c80000800091000c8000080:
(val_==12)?256'h91000c8000ef000d9000ad000080009100000000a0000ef000d8000ad000f600: (val_==12)?256'h080009100000000a0000ef000d8000ad000f6000f00000100029000ef000dc00:
(val_==13)?256'h800091000c8000ef000db000ad0000800091000c8000ef000da000ad00008000: (val_==13)?256'hd0000800091000c8000ef000da000ad0000800091000c8000ef000d9000ad000:
(val_==14)?256'h00060000ff000a2000ff000a90007a0006000000000a200000000a90007a0000: (val_==14)?256'h0007a0006000000000a200000000a90007a0000800091000c8000ef000db000a:
(val_==15)?256'h006800001000e6000020009000000000850000000065000980001800048000c8: (val_==15)?256'h00000000000000000000000000000000000000000060000ff000a2000ff000a9:
(val_==16)?256'h088000030008500000000b100003000a0000ff000c10004c00004000a0000600: (val_==16)?256'h0000000000000000000000000000000000000000000000000000000000000000:
(val_==17)?256'hce0004c00000000b100088000aa00000000b100088000020008500000000b100: (val_==17)?256'h0000000000000000000000000000000000000000000000000000000000000000:
(val_==18)?256'h00000000000000000000000000000000000000000000000000000000000ff000: (val_==18)?256'h0000000000000000000000000000000000000000000000000000000000000000:
(val_==19)?256'h000ff00000000ff00000000ff000000000000000000000000000000000000000: (val_==19)?256'h000ff00000000ff00000000ff000000000000000000000000000000000000000:
(val_==20)?256'h0000000000000000000000000000000000000000000000000000000000000000: (val_==20)?256'h0000000000000000000000000000000000000000000000000000000000000000:
(val_==21)?256'h0000000000000000000000000000000000000000000000000000000000000000: (val_==21)?256'h0000000000000000000000000000000000000000000000000000000000000000:

122
hw/efinix_fpga/ip/bram/init_hex.mem
View File

@@ -1,13 +1,18 @@
20 20
22 27
ff ff
a9 a9
00 00
20 20
2b 30
ff ff
ea ea
a9 a9
18
3a
d0
fd
a9
aa aa
85 85
10 10
@@ -16,14 +21,14 @@ e6
a9 a9
08 08
20 20
2b 30
ff ff
a9 a9
10 10
a2 a2
00 00
20 20
7b 80
ff ff
a5 a5
10 10
@@ -42,22 +47,23 @@ fd
13 13
60 60
48 48
20 a5
d3 10
ff
8d 8d
d8 d8
ef ef
8e a5
11
8d
d9 d9
ef ef
a5 a5
02 12
8d 8d
da da
ef ef
a5 a5
03 13
8d 8d
db db
ef ef
@@ -71,6 +77,21 @@ ef
08 08
86 86
09 09
a9
00
a0
00
91
08
c8
91
08
c8
91
08
c8
91
08
ad ad
dc dc
ef ef
@@ -105,22 +126,6 @@ c8
08 08
7a 7a
60 60
ad
dd
ef
a2
00
60
48
ad
dc
ef
29
02
f0
f9
68
60
5a 5a
85 85
08 08
@@ -142,7 +147,7 @@ c8
91 91
08 08
a0 a0
09 12
88 88
f0 f0
26 26
@@ -190,46 +195,41 @@ ff
a2 a2
ff ff
60 60
c8
48
18
98
65
00 00
85
00 00
90
02
e6
01
68
60
a0
04
4c
c1
ff
a0
03
b1
00 00
85
03
88
b1
00 00
85
02
88
b1
00 00
aa
88
b1
00 00
4c 00
ce 00
ff 00
00
00
00
00
00
00
00
00
00
00
00
00
00
00
00
00
00
00
00
00
00
00
00
00
00
00
00 00
00 00
00 00

2
hw/efinix_fpga/super6502.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<efx:project name="super6502" description="" last_change_date="Thu January 12 2023 16:25:39" location="/home/byron/Projects/super6502/hw/efinix_fpga" sw_version="2022.2.322" last_run_state="pass" last_run_tool="efx_pgm" last_run_flow="bitstream" config_result_in_sync="true" design_ood="sync" place_ood="sync" route_ood="sync" xmlns:efx="http://www.efinixinc.com/enf_proj" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.efinixinc.com/enf_proj enf_proj.xsd"> <efx:project name="super6502" description="" last_change_date="Thu January 12 2023 21:31:38" location="/home/byron/Projects/super6502/hw/efinix_fpga" sw_version="2022.2.322" last_run_state="pass" last_run_tool="efx_pgm" last_run_flow="bitstream" config_result_in_sync="true" design_ood="sync" place_ood="sync" route_ood="sync" xmlns:efx="http://www.efinixinc.com/enf_proj" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.efinixinc.com/enf_proj enf_proj.xsd">
<efx:device_info> <efx:device_info>
<efx:family name="Trion"/> <efx:family name="Trion"/>
<efx:device name="T20F256"/> <efx:device name="T20F256"/>

52
hw/efinix_fpga/test_programs/sdcard.s
View File

@@ -2,8 +2,6 @@
.export _sd_card_command .export _sd_card_command
.export _sd_card_resp .export _sd_card_resp
.export _sd_card_read_byte
.export _sd_card_wait_for_data
.autoimport on .autoimport on
@@ -24,6 +22,11 @@ main:
jsr _sd_card_command jsr _sd_card_command
nop ; no resp, so need to wait for cmd to finish nop ; no resp, so need to wait for cmd to finish
lda #$18
@delay: dec
bne @delay
@cmd8: @cmd8:
lda #$aa lda #$aa
sta tmp1 sta tmp1
@@ -50,28 +53,36 @@ stztmp:
rts rts
; Send sd card command. ; Send sd card command.
; command is in A register, the args are on the stack ; command is in A register, the args are in tmp1-4 le
; I think the order is high byte first?
_sd_card_command: _sd_card_command:
pha pha ; store cmd
lda tmp1 ; write args
jsr popeax
sta SD_ARG sta SD_ARG
stx SD_ARG+1 lda tmp2
lda sreg sta SD_ARG+1
lda tmp3
sta SD_ARG+2 sta SD_ARG+2
lda sreg+1 lda tmp4
sta SD_ARG+3 sta SD_ARG+3
pla ; write cmd
pla
sta SD_CMD sta SD_CMD
rts rts
; void sd_card_resp(uint32_t* resp); ; void sd_card_resp(uint32_t* resp);
_sd_card_resp: _sd_card_resp:
phy phy
sta ptr1 ; store pointer sta ptr1 ; store pointer
stx ptr1+1 stx ptr1+1
lda #$0
ldy #$0
sta (ptr1),y
iny
sta (ptr1),y
iny
sta (ptr1),y
iny
sta (ptr1),y
@1: lda SD_CMD ; wait for status flag @1: lda SD_CMD ; wait for status flag
and #$01 and #$01
beq @1 beq @1
@@ -90,20 +101,7 @@ _sd_card_resp:
ply ply
rts rts
_sd_card_read_byte:
lda SD_DATA
ldx #$00
rts
_sd_card_wait_for_data:
pha
@1: lda SD_CMD ; wait for status flag
and #$02
beq @1
pla
rts
; int sd_card_resp_timeout(uint32_t* resp); ; int sd_card_resp_timeout(uint32_t* resp);
_sd_card_resp_timeout: _sd_card_resp_timeout:
phy phy
@@ -118,7 +116,7 @@ _sd_card_resp_timeout:
sta (ptr1),y sta (ptr1),y
iny iny
sta (ptr1),y sta (ptr1),y
ldy #$9 ldy #$12
@1: dey @1: dey
beq @timeout beq @timeout
lda SD_CMD ; wait for status flag lda SD_CMD ; wait for status flag