Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix USB Interrupt Wiring #8

Merged
merged 6 commits into from
Oct 28, 2024
Merged

Fix USB Interrupt Wiring #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a1944fb
fix(otg/usbfs): Correct OTG/USBFS Interrupt definition
Codetector1374 Sep 30, 2024
00ae04e
style(USBHS): Fix USBHS yaml file to have consistent style with other.
Codetector1374 Sep 30, 2024
d211fda
fix(usbfs/otgfs): Remove WAKEUP from USBFS/OTG_FS.
Codetector1374 Sep 30, 2024
390931d
fix(usbfs/otgfs): Introduce Enums
Codetector1374 Oct 8, 2024
2490c6c
split out endpoint mode registers
Dummyc0m Oct 8, 2024
cbf6312
use /usr/bin/env bash for better hygiene
Dummyc0m Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

set -ex

Expand Down
8 changes: 2 additions & 6 deletions data/peripherals/FV2x_V3x_USBFS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@
register: AHBPCENR
field: OTG_EN
interrupts:
- signal: HP
interrupt: USB_HP_CAN1_TX
- signal: LP
interrupt: USB_LP_CAN1_RX0
- signal: WKUP
interrupt: USB_WKUP
- signal: GLOBAL
interrupt: OTG_FS
pins:
- pin: PA11
signal: DM
Expand Down
6 changes: 4 additions & 2 deletions data/peripherals/FV2x_V3x_USBHS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
register: AHBRSTR
field: USBHSRST
interrupts:
- { "signal": "GLOBAL", "interrupt": "USBHS" }
- { "signal": "WAKEUP", "interrupt": "USBHS_WKUP" }
- signal: GLOBAL
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pure style change while we are here.

interrupt: USBHS
- signal: WAKEUP
interrupt: USBHS_WKUP
pins:
- pin: PB6
signal: DM
Expand Down
8 changes: 2 additions & 6 deletions data/peripherals/FV2x_V3x_USB_OTG_FS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@
register: AHBPCENR
field: OTG_EN
interrupts:
- signal: HP
interrupt: USB_HP_CAN1_TX
- signal: LP
interrupt: USB_LP_CAN1_RX0
- signal: WKUP
interrupt: USB_WKUP
- signal: GLOBAL
interrupt: OTG_FS
pins:
- pin: PA11
signal: DM
Expand Down
171 changes: 149 additions & 22 deletions data/registers/otg_v2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ block/USBD:
description: endpoint 4/1 mode.
byte_offset: 12
bit_size: 8
fieldset: UEP_MOD
fieldset: UEP4_1_MOD
- name: UEP2_3_MOD
description: Endpoint 2/3 mode control register.
byte_offset: 13
bit_size: 8
fieldset: UEP_MOD
fieldset: UEP2_3_MOD
- name: UEP5_6_MOD
description: endpoint 5/6 mode.
byte_offset: 14
bit_size: 8
fieldset: UEP_MOD
fieldset: UEP5_6_MOD
- name: UEP7_MOD
description: endpoint 7 mode.
byte_offset: 15
Expand Down Expand Up @@ -329,6 +329,7 @@ fieldset/USB_INT_ST:
description: RO, bit mask of current token PID code received for USB device mode.
bit_offset: 4
bit_size: 2
enum: USB_TOKEN
- name: TOG_OK
description: RO, indicate current USB transfer toggle is OK.
bit_offset: 6
Expand Down Expand Up @@ -421,44 +422,110 @@ fieldset/UDEV_CTRL:
description: USB device port UD+/UD- pin internal pull-down resistor control.
bit_offset: 7
bit_size: 1
fieldset/UEP_MOD:
description: endpoint a/b mode. lower bits comes first
fieldset/UEP4_1_MOD:
description: endpoint 4/1 mode.
bit_size: 8
fields:
- name: BUF_MOD
description: buffer mode of USB endpoint
- name: UEP4_BUF_MOD
description: buffer mode of USB endpoint 4.
bit_offset: 0
bit_size: 1
array:
len: 2
stride: 4
- name: TX_EN
description: enable USB endpoint 1 transmittal (IN).
enum: BUF_MODE
- name: UEP4_TX_EN
description: enable USB endpoint 4 transmittal (IN).
bit_offset: 2
bit_size: 1
array:
len: 2
stride: 4
- name: RX_EN
- name: UEP4_RX_EN
description: enable USB endpoint 4 receiving (OUT).
bit_offset: 3
bit_size: 1
array:
len: 2
stride: 4
- name: UEP1_BUF_MOD
description: buffer mode of USB endpoint 1.
bit_offset: 4
bit_size: 1
enum: BUF_MODE
- name: UEP1_TX_EN
description: enable USB endpoint 1 transmittal (IN).
bit_offset: 6
bit_size: 1
- name: UEP1_RX_EN
description: enable USB endpoint 1 receiving (OUT).
bit_offset: 7
bit_size: 1
fieldset/UEP2_3_MOD:
description: endpoint 2/3 mode.
bit_size: 8
fields:
- name: UEP2_BUF_MOD
description: buffer mode of USB endpoint 2.
bit_offset: 0
bit_size: 1
enum: BUF_MODE
- name: UEP2_TX_EN
description: enable USB endpoint 2 transmittal (IN).
bit_offset: 2
bit_size: 1
- name: UEP2_RX_EN
description: enable USB endpoint 2 receiving (OUT).
bit_offset: 3
bit_size: 1
- name: UEP3_BUF_MOD
description: buffer mode of USB endpoint 3.
bit_offset: 4
bit_size: 1
enum: BUF_MODE
- name: UEP3_TX_EN
description: enable USB endpoint 3 transmittal (IN).
bit_offset: 6
bit_size: 1
- name: UEP3_RX_EN
description: enable USB endpoint 3 receiving (OUT).
bit_offset: 7
bit_size: 1
fieldset/UEP5_6_MOD:
description: endpoint 5/6 mode.
bit_size: 8
fields:
- name: UEP5_BUF_MOD
description: buffer mode of USB endpoint 5.
bit_offset: 0
bit_size: 1
enum: BUF_MODE
- name: UEP5_TX_EN
description: enable USB endpoint 5 transmittal (IN).
bit_offset: 2
bit_size: 1
- name: UEP5_RX_EN
description: enable USB endpoint 5 receiving (OUT).
bit_offset: 3
bit_size: 1
- name: UEP6_BUF_MOD
description: buffer mode of USB endpoint 6.
bit_offset: 4
bit_size: 1
enum: BUF_MODE
- name: UEP6_TX_EN
description: enable USB endpoint 6 transmittal (IN).
bit_offset: 6
bit_size: 1
- name: UEP6_RX_EN
description: enable USB endpoint 6 receiving (OUT).
bit_offset: 7
bit_size: 1
fieldset/UEP7_MOD:
description: endpoint 7 mode.
bit_size: 8
fields:
- name: BUF_MOD
- name: UEP7_BUF_MOD
description: buffer mode of USB endpoint 7.
bit_offset: 0
bit_size: 1
- name: TX_EN
enum: BUF_MODE
- name: UEP7_TX_EN
description: enable USB endpoint 7 transmittal (IN).
bit_offset: 2
bit_size: 1
- name: RX_EN
- name: UEP7_RX_EN
description: enable USB endpoint 7 receiving (OUT).
bit_offset: 3
bit_size: 1
Expand All @@ -470,6 +537,7 @@ fieldset/UEP_TX_CTRL:
description: bit mask of handshake response type for USB endpoint X transmittal (IN).
bit_offset: 0
bit_size: 2
enum: EP_TX_RESPONSE
- name: T_TOG
description: "prepared data toggle flag of USB endpoint X transmittal (IN): 0=DATA0, 1=DATA1."
bit_offset: 2
Expand All @@ -486,6 +554,7 @@ fieldset/UEP_RX_CTRL:
description: bit mask of handshake response type for USB endpoint X receiving (OUT).
bit_offset: 0
bit_size: 2
enum: EP_RX_RESPONSE
- name: R_TOG
description: "expected data toggle flag of USB endpoint X receiving (OUT): 0=DATA0, 1=DATA1."
bit_offset: 2
Expand Down Expand Up @@ -592,3 +661,61 @@ fieldset/UH_TX_CTRL:
- name: T_AUTO_TOG
bit_offset: 3
bit_size: 1

enum/EP_TX_RESPONSE:
bit_size: 2
variants:
- name: ACK
description: Respond with DATA0/DATA1 and expect ACK
value: 0
- name: None
description: Respond with DATA0/DATA1 and not expect ACK
value: 1
- name: NAK
description: Respond with NAK or Busy
value: 2
- name: STALL
description: Respond with STALL or Error
value: 3

enum/EP_RX_RESPONSE:
bit_size: 2
variants:
- name: ACK
description: Respond with ACK
value: 0
- name: None
description: Timeout / No Response, used for non-EP0 iso/sync transfer
value: 1
- name: NAK
description: Respond with NAK or Busy
value: 2
- name: STALL
description: Respond with STALL or Error
value: 3

enum/USB_TOKEN:
bit_size: 2
variants:
- name: OUT
description: OUT Packet
value: 0
- name: Rsvd
description: Reserved
value: 1
- name: IN
description: IN Packet
value: 2
- name: SETUP
description: Setup Packet
value: 3

enum/BUF_MODE:
bit_size: 1
variants:
- name: SINGLE
description: Single Buffer Mode
value: 0
- name: DOUBLE
description: Double Buffer Mode
value: 1
Loading