Skip to content

Commit 228c1c0

Browse files
fpistmfpistm
committed
script(stm32variant): review quadspi* naming
as it manages octo and quad. Signed-off-by: Frederic Pillon <[email protected]>
1 parent 6dc7134 commit 228c1c0

File tree

1 file changed

+97
-97
lines changed

1 file changed

+97
-97
lines changed

Diff for: ‎CI/update/stm32variant.py

+97-97
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@
3939
cantd_list = [] # ['PIN','name','CANTD', ['af']]
4040
canrd_list = [] # ['PIN','name','CANRD', ['af']]
4141
eth_list = [] # ['PIN','name','ETH', ['af']]
42-
quadspidata0_list = [] # ['PIN','name','QUADSPIDATA0', ['af']]
43-
quadspidata1_list = [] # ['PIN','name','QUADSPIDATA1', ['af']]
44-
quadspidata2_list = [] # ['PIN','name','QUADSPIDATA2', ['af']]
45-
quadspidata3_list = [] # ['PIN','name','QUADSPIDATA3', ['af']]
46-
quadspidata4_list = [] # ['PIN','name','QUADSPIDATA4', ['af']]
47-
quadspidata5_list = [] # ['PIN','name','QUADSPIDATA5', ['af']]
48-
quadspidata6_list = [] # ['PIN','name','QUADSPIDATA6', ['af']]
49-
quadspidata7_list = [] # ['PIN','name','QUADSPIDATA7', ['af']]
50-
quadspisclk_list = [] # ['PIN','name','QUADSPISCLK', ['af']]
51-
quadspissel_list = [] # ['PIN','name','QUADSPISSEL', ['af']]
42+
xspidata0_list = [] # ['PIN','name','XSPIDATA0', ['af']]
43+
xspidata1_list = [] # ['PIN','name','XSPIDATA1', ['af']]
44+
xspidata2_list = [] # ['PIN','name','XSPIDATA2', ['af']]
45+
xspidata3_list = [] # ['PIN','name','XSPIDATA3', ['af']]
46+
ospidata4_list = [] # ['PIN','name','OSPIDATA4', ['af']]
47+
ospidata5_list = [] # ['PIN','name','OSPIDATA5', ['af']]
48+
ospidata6_list = [] # ['PIN','name','OSPIDATA6', ['af']]
49+
ospidata7_list = [] # ['PIN','name','OSPIDATA7', ['af']]
50+
xspisclk_list = [] # ['PIN','name','XSPISCLK', ['af']]
51+
xspissel_list = [] # ['PIN','name','XSPISSEL', ['af']]
5252
syswkup_list = [] # ['PIN','name','SYSWKUP']
5353
usb_list = [] # ['PIN','name','USB', ['af']]
5454
usb_otgfs_list = [] # ['PIN','name','USB', ['af']]
@@ -502,27 +502,27 @@ def store_eth(pin, name, signal):
502502

503503

504504
# Store O/QSPI pins
505-
def store_qspi(pin, name, signal):
505+
def store_xspi(pin, name, signal):
506506
if "_IO0" in signal:
507-
quadspidata0_list.append([pin, name, signal])
508-
if "_IO1" in signal:
509-
quadspidata1_list.append([pin, name, signal])
510-
if "_IO2" in signal:
511-
quadspidata2_list.append([pin, name, signal])
512-
if "_IO3" in signal:
513-
quadspidata3_list.append([pin, name, signal])
514-
if "_IO4" in signal:
515-
quadspidata4_list.append([pin, name, signal])
516-
if "_IO5" in signal:
517-
quadspidata5_list.append([pin, name, signal])
518-
if "_IO6" in signal:
519-
quadspidata6_list.append([pin, name, signal])
520-
if "_IO7" in signal:
521-
quadspidata7_list.append([pin, name, signal])
522-
if "_CLK" in signal:
523-
quadspisclk_list.append([pin, name, signal])
524-
if "_NCS" in signal:
525-
quadspissel_list.append([pin, name, signal])
507+
xspidata0_list.append([pin, name, signal])
508+
elif "_IO1" in signal:
509+
xspidata1_list.append([pin, name, signal])
510+
elif "_IO2" in signal:
511+
xspidata2_list.append([pin, name, signal])
512+
elif "_IO3" in signal:
513+
xspidata3_list.append([pin, name, signal])
514+
elif "_IO4" in signal:
515+
ospidata4_list.append([pin, name, signal])
516+
elif "_IO5" in signal:
517+
ospidata5_list.append([pin, name, signal])
518+
elif "_IO6" in signal:
519+
ospidata6_list.append([pin, name, signal])
520+
elif "_IO7" in signal:
521+
ospidata7_list.append([pin, name, signal])
522+
elif "_CLK" in signal:
523+
xspisclk_list.append([pin, name, signal])
524+
elif "_NCS" in signal:
525+
xspissel_list.append([pin, name, signal])
526526

527527

528528
# Store SYS pins
@@ -910,34 +910,34 @@ def eth_pinmap():
910910
)
911911

912912

913-
def qspi_pinmap(lst):
914-
qspi_pins_list = []
913+
def xspi_pinmap(lst):
914+
xspi_pins_list = []
915915
winst = [0]
916916
wpin = [0]
917917
name = "QUADSPI"
918918
hal = "QSPI"
919919
ospi_regex = r"OCTOSPI(?:M_P)?(\d).*"
920920

921-
if quadspidata0_list and "OCTOSPI" in quadspidata0_list[0][2]:
921+
if xspidata0_list and "OCTOSPI" in xspidata0_list[0][2]:
922922
name = "OCTOSPI"
923923
hal = "OSPI"
924-
if lst == quadspidata0_list:
924+
if lst == xspidata0_list:
925925
aname = f"{name}_DATA0"
926-
elif lst == quadspidata1_list:
926+
elif lst == xspidata1_list:
927927
aname = f"{name}_DATA1"
928-
elif lst == quadspidata2_list:
928+
elif lst == xspidata2_list:
929929
aname = f"{name}_DATA2"
930-
elif lst == quadspidata3_list:
930+
elif lst == xspidata3_list:
931931
aname = f"{name}_DATA3"
932-
elif lst == quadspidata4_list:
932+
elif lst == ospidata4_list:
933933
aname = f"{name}_DATA4"
934-
elif lst == quadspidata5_list:
934+
elif lst == ospidata5_list:
935935
aname = f"{name}_DATA5"
936-
elif lst == quadspidata6_list:
936+
elif lst == ospidata6_list:
937937
aname = f"{name}_DATA6"
938-
elif lst == quadspidata7_list:
938+
elif lst == ospidata7_list:
939939
aname = f"{name}_DATA7"
940-
elif lst == quadspisclk_list:
940+
elif lst == xspisclk_list:
941941
aname = f"{name}_SCLK"
942942
else:
943943
aname = f"{name}_SSEL"
@@ -953,7 +953,7 @@ def qspi_pinmap(lst):
953953
inst = "QUADSPI"
954954
winst.append(len(inst))
955955
wpin.append(len(p[0]))
956-
qspi_pins_list.append(
956+
xspi_pins_list.append(
957957
{
958958
"pin": p[0],
959959
"inst": inst,
@@ -970,7 +970,7 @@ def qspi_pinmap(lst):
970970
data="",
971971
wpin=max(wpin) + 1,
972972
winst=max(winst) + 1,
973-
list=qspi_pins_list,
973+
list=xspi_pins_list,
974974
)
975975

976976

@@ -1119,16 +1119,16 @@ def print_peripheral():
11191119
(can_pinmap(canrd_list), can_pinmap(cantd_list)),
11201120
[eth_pinmap()],
11211121
(
1122-
qspi_pinmap(quadspidata0_list),
1123-
qspi_pinmap(quadspidata1_list),
1124-
qspi_pinmap(quadspidata2_list),
1125-
qspi_pinmap(quadspidata3_list),
1126-
qspi_pinmap(quadspidata4_list),
1127-
qspi_pinmap(quadspidata5_list),
1128-
qspi_pinmap(quadspidata6_list),
1129-
qspi_pinmap(quadspidata7_list),
1130-
qspi_pinmap(quadspisclk_list),
1131-
qspi_pinmap(quadspissel_list),
1122+
xspi_pinmap(xspidata0_list),
1123+
xspi_pinmap(xspidata1_list),
1124+
xspi_pinmap(xspidata2_list),
1125+
xspi_pinmap(xspidata3_list),
1126+
xspi_pinmap(ospidata4_list),
1127+
xspi_pinmap(ospidata5_list),
1128+
xspi_pinmap(ospidata6_list),
1129+
xspi_pinmap(ospidata7_list),
1130+
xspi_pinmap(xspisclk_list),
1131+
xspi_pinmap(xspissel_list),
11321132
),
11331133
usb_pinmmap,
11341134
[sd_pinmap()],
@@ -1442,8 +1442,8 @@ def print_variant(generic_list, alt_syswkup_list):
14421442
hal_modules_list.append("DAC")
14431443
if eth_list:
14441444
hal_modules_list.append("ETH")
1445-
if quadspidata0_list:
1446-
if "OCTOSPI" in quadspidata0_list[0][2]:
1445+
if xspidata0_list:
1446+
if "OCTOSPI" in xspidata0_list[0][2]:
14471447
hal_modules_list.append("OSPI")
14481448
else:
14491449
hal_modules_list.append("QSPI")
@@ -1654,16 +1654,16 @@ def sort_my_lists():
16541654
cantd_list.sort(key=natural_sortkey)
16551655
canrd_list.sort(key=natural_sortkey)
16561656
eth_list.sort(key=natural_sortkey)
1657-
quadspidata0_list.sort(key=natural_sortkey)
1658-
quadspidata1_list.sort(key=natural_sortkey)
1659-
quadspidata2_list.sort(key=natural_sortkey)
1660-
quadspidata3_list.sort(key=natural_sortkey)
1661-
quadspidata4_list.sort(key=natural_sortkey)
1662-
quadspidata5_list.sort(key=natural_sortkey)
1663-
quadspidata6_list.sort(key=natural_sortkey)
1664-
quadspidata7_list.sort(key=natural_sortkey)
1665-
quadspisclk_list.sort(key=natural_sortkey)
1666-
quadspissel_list.sort(key=natural_sortkey)
1657+
xspidata0_list.sort(key=natural_sortkey)
1658+
xspidata1_list.sort(key=natural_sortkey)
1659+
xspidata2_list.sort(key=natural_sortkey)
1660+
xspidata3_list.sort(key=natural_sortkey)
1661+
ospidata4_list.sort(key=natural_sortkey)
1662+
ospidata5_list.sort(key=natural_sortkey)
1663+
ospidata6_list.sort(key=natural_sortkey)
1664+
ospidata7_list.sort(key=natural_sortkey)
1665+
xspisclk_list.sort(key=natural_sortkey)
1666+
xspissel_list.sort(key=natural_sortkey)
16671667
syswkup_list.sort(key=natural_sortkey2)
16681668
usb_list.sort(key=natural_sortkey)
16691669
usb_otgfs_list.sort(key=natural_sortkey)
@@ -1694,16 +1694,16 @@ def clean_all_lists():
16941694
del cantd_list[:]
16951695
del canrd_list[:]
16961696
del eth_list[:]
1697-
del quadspidata0_list[:]
1698-
del quadspidata1_list[:]
1699-
del quadspidata2_list[:]
1700-
del quadspidata3_list[:]
1701-
del quadspidata4_list[:]
1702-
del quadspidata5_list[:]
1703-
del quadspidata6_list[:]
1704-
del quadspidata7_list[:]
1705-
del quadspisclk_list[:]
1706-
del quadspissel_list[:]
1697+
del xspidata0_list[:]
1698+
del xspidata1_list[:]
1699+
del xspidata2_list[:]
1700+
del xspidata3_list[:]
1701+
del ospidata4_list[:]
1702+
del ospidata5_list[:]
1703+
del ospidata6_list[:]
1704+
del ospidata7_list[:]
1705+
del xspisclk_list[:]
1706+
del xspissel_list[:]
17071707
del syswkup_list[:]
17081708
del usb_list[:]
17091709
del usb_otgfs_list[:]
@@ -1729,16 +1729,16 @@ def manage_af_and_alternate():
17291729
add_af(cantd_list)
17301730
add_af(canrd_list)
17311731
add_af(eth_list)
1732-
add_af(quadspidata0_list)
1733-
add_af(quadspidata1_list)
1734-
add_af(quadspidata2_list)
1735-
add_af(quadspidata3_list)
1736-
add_af(quadspidata4_list)
1737-
add_af(quadspidata5_list)
1738-
add_af(quadspidata6_list)
1739-
add_af(quadspidata7_list)
1740-
add_af(quadspisclk_list)
1741-
add_af(quadspissel_list)
1732+
add_af(xspidata0_list)
1733+
add_af(xspidata1_list)
1734+
add_af(xspidata2_list)
1735+
add_af(xspidata3_list)
1736+
add_af(ospidata4_list)
1737+
add_af(ospidata5_list)
1738+
add_af(ospidata6_list)
1739+
add_af(ospidata7_list)
1740+
add_af(xspisclk_list)
1741+
add_af(xspissel_list)
17421742
add_af(usb_list)
17431743
add_af(usb_otgfs_list)
17441744
add_af(usb_otghs_list)
@@ -1764,16 +1764,16 @@ def manage_af_and_alternate():
17641764
update_alternate(cantd_list)
17651765
update_alternate(canrd_list)
17661766
update_alternate(eth_list)
1767-
update_alternate(quadspidata0_list)
1768-
update_alternate(quadspidata1_list)
1769-
update_alternate(quadspidata2_list)
1770-
update_alternate(quadspidata3_list)
1771-
update_alternate(quadspidata4_list)
1772-
update_alternate(quadspidata5_list)
1773-
update_alternate(quadspidata6_list)
1774-
update_alternate(quadspidata7_list)
1775-
update_alternate(quadspisclk_list)
1776-
update_alternate(quadspissel_list)
1767+
update_alternate(xspidata0_list)
1768+
update_alternate(xspidata1_list)
1769+
update_alternate(xspidata2_list)
1770+
update_alternate(xspidata3_list)
1771+
update_alternate(ospidata4_list)
1772+
update_alternate(ospidata5_list)
1773+
update_alternate(ospidata6_list)
1774+
update_alternate(ospidata7_list)
1775+
update_alternate(xspisclk_list)
1776+
update_alternate(xspissel_list)
17771777
update_alternate(syswkup_list)
17781778
update_alternate(usb_list)
17791779
update_alternate(usb_otgfs_list)
@@ -1877,7 +1877,7 @@ def parse_pins():
18771877
store_uart(pin, name, sig)
18781878
elif "SPI" in sig:
18791879
if "QUADSPI" in sig or "OCTOSPI" in sig:
1880-
store_qspi(pin, name, sig)
1880+
store_xspi(pin, name, sig)
18811881
else:
18821882
store_spi(pin, name, sig)
18831883
elif "CAN" in sig:

0 commit comments

Comments
 (0)