Skip to content

Commit 572280b

Browse files
burrbullburrbull
authored
Merge pull request #1166 from z-av/usb-otg
USB_OTG refactor
2 parents c2d5574 + e56aa17 commit 572280b

File tree

109 files changed

+1664
-1550
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+1664
-1550
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
* rename `devices/common_patches` to just `devices/patches`
5151
* move field related patches from `peripherals` to `devices/fields`
5252
* Replace `makehtml.py` with `svdtools html`
53-
* Updated to `svd2rust` 0.35.0, `svdtools` 0.4.3, `form` 0.12.1, use tools binaries for CI
53+
* Updated to `svd2rust` 0.35.0, `svdtools` 0.4.4, `form` 0.12.1, use tools binaries for CI
5454
* Use `svd2rust.toml` config, use custom ident suffixes
5555
* Normalized docs. Split (for `cargo make`) `form` task on `form` and `fmt`
5656
* Show avaliable device features if no one selected (#998)

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ contain the latest patches and updates.
9696
current version used by stm32-rs
9797
* Otherwise, build using `cargo` (double check versions against `scripts/tool_install.sh`):
9898
* `cargo install form --version 0.12.1`
99-
* `cargo install svdtools --version 0.4.3`
99+
* `cargo install svdtools --version 0.4.4`
100100
* `cargo install svd2rust --version 0.35.0`
101101
* Install rustfmt: `rustup component add rustfmt`
102102
* Generate patched SVD files: `make patch` (you probably want `-j` for all `make` invocations)

‎devices/collect/usb_otg/fs.yaml

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎devices/collect/usb_otg/fs_device.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
_cluster:
2+
DIEP0:
3+
description: Device IN endpoint 0
4+
DIEPCTL[0]: { name: CTL }
5+
DIEPINT[0]: { name: INT }
6+
DIEPTSIZ[0]: { name: TSIZ }
7+
DTXFSTS[0]: { name: TXFSTS }
8+
DIEP%s:
9+
description: Device IN endpoint X
10+
DIEPCTL[1-5]: { name: CTL }
11+
DIEPINT[1-5]: { name: INT }
12+
DIEPTSIZ[1-5]: { name: TSIZ }
13+
DTXFSTS[1-5]: { name: TXFSTS }
14+
_derive:
15+
INT: DIEP0.INT
16+
TXFSTS: DIEP0.TXFSTS
17+
DOEP0:
18+
description: Device OUT endpoint 0
19+
DOEPCTL[0]: { name: CTL }
20+
DOEPINT[0]: { name: INT }
21+
DOEPTSIZ[0]: { name: TSIZ }
22+
DOEP%s:
23+
description: Device IN endpoint X
24+
DOEPCTL[1-5]: { name: CTL }
25+
DOEPINT[1-5]: { name: INT }
26+
DOEPTSIZ[1-5]: { name: TSIZ }
27+
_derive:
28+
INT: DOEP0.INT

‎devices/collect/usb_otg/fs_global.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
_array:
2+
DIEPTXF[1-5]:
3+
displayName: DIEPTXF%s
4+
description: OTF_FS device IN endpoint transmit FIFO size register

‎devices/collect/usb_otg/fs_host.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
_cluster:
2+
HC%s:
3+
description: Host channel
4+
HCCHAR?,HCCHAR??:
5+
name: CHAR
6+
HCINT?,HCINT??:
7+
name: INT
8+
HCINTMSK?,HCINTMSK??:
9+
name: INTMSK
10+
HCTSIZ?,HCTSIZ??:
11+
name: TSIZ

‎devices/collect/usb_otg/hs.yaml

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎devices/collect/usb_otg/hs_device.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
_cluster:
2+
DIEP0:
3+
description: Device IN endpoint 0
4+
DIEPCTL[0]: { name: CTL }
5+
DIEPINT[0]: { name: INT }
6+
DIEPTSIZ[0]: { name: TSIZ }
7+
DIEPDMA[0]: { name: DMA }
8+
DTXFSTS[0]: { name: TXFSTS }
9+
DIEP%s:
10+
description: Device IN endpoint X
11+
DIEPCTL[1-8]: { name: CTL }
12+
DIEPINT[1-8]: { name: INT }
13+
DIEPTSIZ[1-8]: { name: TSIZ }
14+
DIEPDMA[1-8]: { name: DMA }
15+
DTXFSTS[1-8]: { name: TXFSTS }
16+
_derive:
17+
INT: DIEP0.INT
18+
TXFSTS: DIEP0.TXFSTS
19+
DMA: DIEP0.DMA
20+
DOEP0:
21+
description: Device OUT endpoint 0
22+
DOEPCTL[0]: { name: CTL }
23+
DOEPINT[0]: { name: INT }
24+
DOEPTSIZ[0]: { name: TSIZ }
25+
DOEPDMA[0]: { name: DMA }
26+
DOEP%s:
27+
description: Device IN endpoint X
28+
DOEPCTL[1-8]: { name: CTL }
29+
DOEPINT[1-8]: { name: INT }
30+
DOEPDMA[1-8]: { name: DMA }
31+
DOEPTSIZ[1-8]: { name: TSIZ }
32+
_derive:
33+
INT: DIEP0.INT
34+
DMA: DIEP0.DMA

‎devices/collect/usb_otg/hs_global.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
_array:
2+
DIEPTXF[1-8]:
3+
displayName: DIEPTXF%s
4+
description: OTG_HS device IN endpoint transmit FIFO size register

‎devices/collect/usb_otg/hs_host.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
_cluster:
2+
HC%s:
3+
description: Host channel
4+
HCCHAR?,HCCHAR??:
5+
name: CHAR
6+
HCSPLT?,HCSPLT??:
7+
name: SPLT
8+
HCINT?,HCINT??:
9+
name: INT
10+
HCINTMSK?,HCINTMSK??:
11+
name: INTMSK
12+
HCTSIZ?,HCTSIZ??:
13+
name: TSIZ
14+
HCDMA?,HCDMA??:
15+
name: DMA

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy